diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6b82a2db0..86c4ad0e4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 6.6.0 +current_version = 6.6.1 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P[A-z0-9-]+) diff --git a/api/server.py b/api/server.py index 8e035c97e..4c3d1bcb8 100644 --- a/api/server.py +++ b/api/server.py @@ -20,7 +20,7 @@ from api.settings import PROFILE_REQUESTS, SKIP_DATABASE_CONNECTION # This tag is automatically updated by bump2version -_VERSION = '6.6.0' +_VERSION = '6.6.1' logger = get_logger() diff --git a/deploy/python/version.txt b/deploy/python/version.txt index 826f5ce03..09a7391e4 100644 --- a/deploy/python/version.txt +++ b/deploy/python/version.txt @@ -1 +1 @@ -6.6.0 +6.6.1 diff --git a/metamist/graphql/__init__.py b/metamist/graphql/__init__.py index 44b16ba7b..8b1e255ca 100644 --- a/metamist/graphql/__init__.py +++ b/metamist/graphql/__init__.py @@ -54,13 +54,18 @@ def configure_sync_client( if _sync_client and not force_recreate: return _sync_client - token = auth_token or get_google_identity_token( - target_audience=metamist.configuration.sm_url - ) - transport = RequestsHTTPTransport( - url=url or get_sm_url(), - headers={'Authorization': f'Bearer {token}'}, - ) + env = os.getenv('SM_ENVIRONMENT', 'PRODUCTION').lower() + if env == 'local': + transport = RequestsHTTPTransport(url=url or get_sm_url()) + else: + token = auth_token or get_google_identity_token( + target_audience=metamist.configuration.sm_url + ) + transport = RequestsHTTPTransport( + url=url or get_sm_url(), + headers={'Authorization': f'Bearer {token}'}, + ) + _sync_client = Client( transport=transport, schema=schema, fetch_schema_from_transport=schema is None ) @@ -78,13 +83,18 @@ async def configure_async_client( if _async_client and not force_recreate: return _async_client - token = auth_token or get_google_identity_token( - target_audience=metamist.configuration.sm_url - ) - transport = AIOHTTPTransport( - url=url or get_sm_url(), - headers={'Authorization': f'Bearer {token}'}, - ) + env = os.getenv('SM_ENVIRONMENT', 'PRODUCTION').lower() + if env == 'local': + transport = AIOHTTPTransport(url=url or get_sm_url()) + else: + token = auth_token or get_google_identity_token( + target_audience=metamist.configuration.sm_url + ) + transport = AIOHTTPTransport( + url=url or get_sm_url(), + headers={'Authorization': f'Bearer {token}'}, + ) + _async_client = Client( transport=transport, schema=schema, fetch_schema_from_transport=schema is None ) diff --git a/openapi-templates/configuration.mustache b/openapi-templates/configuration.mustache index b1aafc2ac..609dea623 100644 --- a/openapi-templates/configuration.mustache +++ b/openapi-templates/configuration.mustache @@ -24,10 +24,10 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = { sm_url = getenv('SM_URL') if not sm_url: - env = getenv('SM_ENVIRONMENT', 'PRODUCTION') - if 'local' in env.lower(): + env = getenv('SM_ENVIRONMENT', 'PRODUCTION').lower() + if 'local' in env: sm_url = "http://localhost:8000" - elif 'dev' in env.lower(): + elif 'dev' in env: sm_url = 'https://sample-metadata-api-dev-mnrpw3mdza-ts.a.run.app' else: sm_url = 'https://sample-metadata-api-mnrpw3mdza-ts.a.run.app' @@ -192,7 +192,7 @@ conf = {{{packageName}}}.Configuration( ): """Constructor """ - env = getenv('SM_ENVIRONMENT', 'PRODUCTION') + self.env = getenv('SM_ENVIRONMENT', 'PRODUCTION').lower() self._base_path = host or sm_url """Default Base url @@ -491,6 +491,9 @@ conf = {{{packageName}}}.Configuration( :return: The Auth Settings information dict. """ + if self.env == 'local': + return {} + auth = { 'HTTPBearer': { 'type': 'bearer', diff --git a/setup.py b/setup.py index 652b5093f..6050bba10 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name=PKG, # This tag is automatically updated by bump2version - version='6.6.0', + version='6.6.1', description='Python API for interacting with the Sample API system', long_description=readme, long_description_content_type='text/markdown', diff --git a/web/package.json b/web/package.json index afeaa739b..c9705d440 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "metamist", - "version": "6.6.0", + "version": "6.6.1", "private": true, "dependencies": { "@apollo/client": "^3.7.3",