Merge remote-tracking branch 'upstream/master' into pr-osparc-long-running-tasks-refactor-6

Author: Andrei Neagu

packages/models-library/src/models_library/service_settings_labels.py

@@ -372,6 +372,16 @@ class DynamicSidecarServiceLabels(BaseModel):
         ),
     ] = None
 
+    is_collaborative: Annotated[
+        bool,
+        Field(
+            alias="simcore.service.is-collaborative",
+            description=(
+                "if True, the service is collaborative and will not be locked"
+            ),
+        ),
+    ] = False
+
     compose_spec: Annotated[
         Json[ComposeSpecLabelDict | None] | None,
         Field(
@@ -663,6 +673,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "simcore.service.user-preferences-path": json_dumps(
                             "/tmp/path_to_preferences"  # noqa: S108
                         ),
+                        "simcore.service.is_collaborative": "False",
                     },
                     # dynamic-service with compose spec
                     {
@@ -702,6 +713,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "simcore.service.callbacks-mapping": json_dumps(
                             CallbacksMapping.model_json_schema()["examples"][3]
                         ),
+                        "simcore.service.is_collaborative": "True",
                     },
                 ]
             },

packages/models-library/tests/test_service_settings_labels.py

@@ -52,12 +52,12 @@ class _Parametrization(NamedTuple):
     ),
     "dynamic-service": _Parametrization(
         example=SimcoreServiceLabels.model_json_schema()["examples"][1],
-        items=5,
+        items=6,
         uses_dynamic_sidecar=True,
     ),
     "dynamic-service-with-compose-spec": _Parametrization(
         example=SimcoreServiceLabels.model_json_schema()["examples"][2],
-        items=6,
+        items=7,
         uses_dynamic_sidecar=True,
     ),
 }

packages/service-integration/src/service_integration/osparc_config.py

@@ -213,6 +213,8 @@ class RuntimeConfig(BaseModel):
 
     paths_mapping: PathMappingsLabel | None = None
 
+    is_collaborative: bool = False
+
     user_preferences_path: Path | None = None
     boot_options: BootOptions | None = None
     min_visible_inputs: NonNegativeInt | None = None

services/director-v2/openapi.json

@@ -2852,6 +2852,11 @@
           "paths_mapping": {
             "$ref": "#/components/schemas/PathMappingsLabel"
           },
+          "is_collaborative": {
+            "type": "boolean",
+            "title": "Is Collaborative",
+            "default": false
+          },
           "simcore.service.compose-spec": {
             "anyOf": [
               {

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/__init__.py

@@ -13,7 +13,9 @@ class DynamicServicesSettings(BaseCustomSettings):
         default=True, description="Enables/Disables the dynamic_sidecar submodule"
     )
 
-    DYNAMIC_SIDECAR: DynamicSidecarSettings = Field(json_schema_extra={"auto_default_from_env": True})
+    DYNAMIC_SIDECAR: DynamicSidecarSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     DYNAMIC_SCHEDULER: DynamicServicesSchedulerSettings = Field(
         json_schema_extra={"auto_default_from_env": True}
@@ -31,4 +33,6 @@ class DynamicServicesSettings(BaseCustomSettings):
         json_schema_extra={"auto_default_from_env": True}
     )
 
-    WEBSERVER_SETTINGS: WebServerSettings = Field(json_schema_extra={"auto_default_from_env": True})
+    WEBSERVER_AUTH_SETTINGS: WebServerSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )

services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py

@@ -406,6 +406,8 @@ def endpoint(self) -> AnyHttpUrl:
 
     paths_mapping: PathMappingsLabel  # overwrites in DynamicSidecarServiceLabels
 
+    is_collaborative: bool = False
+
     user_preferences_path: Path | None = None
     callbacks_mapping: Annotated[CallbacksMapping, Field(default_factory=dict)]
 
@@ -513,6 +515,7 @@ def from_http_request(
             "product_name": service.product_name,
             "product_api_base_url": service.product_api_base_url,
             "paths_mapping": simcore_service_labels.paths_mapping,
+            "is_collaborative": simcore_service_labels.is_collaborative,
             "callbacks_mapping": simcore_service_labels.callbacks_mapping,
             "compose_spec": json_dumps(simcore_service_labels.compose_spec),
             "container_http_entry": simcore_service_labels.container_http_entry,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py

@@ -48,8 +48,8 @@ def get_dynamic_proxy_spec(
     dynamic_services_scheduler_settings: DynamicServicesSchedulerSettings = (
         dynamic_services_settings.DYNAMIC_SCHEDULER
     )
-    webserver_settings: webserver.WebServerSettings = (
-        dynamic_services_settings.WEBSERVER_SETTINGS
+    wb_auth_settings: webserver.WebServerSettings = (
+        dynamic_services_settings.WEBSERVER_AUTH_SETTINGS
     )
 
     mounts = [
@@ -99,7 +99,7 @@ def get_dynamic_proxy_spec(
             f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-security-headers.headers.accesscontrolmaxage": "100",
             f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-security-headers.headers.addvaryheader": "true",
             # auth
-            f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-auth.forwardauth.address": f"{webserver_settings.api_base_url}/auth:check",
+            f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-auth.forwardauth.address": f"{wb_auth_settings.api_base_url}/auth:check",
             f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-auth.forwardauth.trustForwardHeader": "true",
             f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-auth.forwardauth.authResponseHeaders": f"Set-Cookie,{DEFAULT_SESSION_COOKIE_NAME}",
             # routing

services/docker-compose.yml

@@ -390,8 +390,10 @@ services:
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
-      WEBSERVER_HOST: ${WEBSERVER_HOST}
-      WEBSERVER_PORT: ${WEBSERVER_PORT}
+      # WEBSERVER_AUTH_SETTINGS
+      WEBSERVER_HOST: ${WB_AUTH_WEBSERVER_HOST}
+      WEBSERVER_PORT: ${WB_AUTH_WEBSERVER_PORT}
+
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     deploy:

services/web/server/tests/unit/with_dbs/03/test_login_auth_app.py

@@ -159,7 +159,11 @@ def test_docker_compose_dev_vendors_forwardauth_configuration(
     services_docker_compose_dev_vendors_file: Path,
     env_devel_dict: EnvVarsDict,
 ):
-    """Test that manual service forwardauth.address points to correct WB_AUTH_WEBSERVER_HOST and port."""
+    """Test that manual service forwardauth.address points to correct WB_AUTH_WEBSERVER_HOST and port.
+
+    NOTE: traefik's `forwardauth` labels are also used in
+        `services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py`
+    """
 
     # Load docker-compose file
     compose_config = yaml.safe_load(