fix

Author: sanderegg

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/substitutions.py

@@ -1,6 +1,4 @@
-""" Substitution of osparc variables and secrets
-
-"""
+"""Substitution of osparc variables and secrets"""
 
 import functools
 import logging
@@ -24,6 +22,7 @@
 from pydantic import BaseModel
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.logging_utils import log_context
+from simcore_service_director_v2.core.settings import get_application_settings
 
 from ...utils.db import get_repository
 from ...utils.osparc_variables import (
@@ -194,6 +193,7 @@ async def resolve_and_substitute_session_variables_in_model(
             # if it raises an error vars need replacement
             raise_if_unresolved_osparc_variable_identifier_found(model)
     except UnresolvedOsparcVariableIdentifierError:
+        app_settings = get_application_settings(app)
         table = OsparcSessionVariablesTable.get_from_app_state(app)
         identifiers = await resolve_variables_from_context(
             table.copy(),
@@ -204,7 +204,9 @@ async def resolve_and_substitute_session_variables_in_model(
                 project_id=project_id,
                 node_id=node_id,
                 run_id=service_run_id,
-                api_server_base_url=app.state.settings.DIRECTOR_V2_PUBLIC_API_BASE_URL,
+                api_server_base_url=f"{app_settings.DIRECTOR_V2_PUBLIC_API_BASE_URL}".rstrip(
+                    "/"
+                ),
             ),
         )
         _logger.debug("replacing with the identifiers=%s", identifiers)
@@ -238,6 +240,7 @@ async def resolve_and_substitute_session_variables_in_specs(
             identifiers_to_replace,
         )
         if identifiers_to_replace:
+            app_settings = get_application_settings(app)
             environs = await resolve_variables_from_context(
                 table.copy(include=identifiers_to_replace),
                 context=ContextDict(
@@ -247,7 +250,9 @@ async def resolve_and_substitute_session_variables_in_specs(
                     project_id=project_id,
                     node_id=node_id,
                     run_id=service_run_id,
-                    api_server_base_url=app.state.settings.DIRECTOR_V2_PUBLIC_API_BASE_URL,
+                    api_server_base_url=f"{app_settings.DIRECTOR_V2_PUBLIC_API_BASE_URL}".rstrip(
+                        "/"
+                    ),
                 ),
             )