Merge branch 'master' into enh/hide-some-tabs

Author: odeimaiz

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Literal
 
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.functions import (
@@ -18,6 +19,7 @@
 )
 from models_library.functions import (
     FunctionClass,
+    FunctionGroupAccessRights,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionUserAccessRights,
@@ -418,6 +420,7 @@ async def update_function_job_status(
     product_name: ProductName,
     function_job_id: FunctionJobID,
     job_status: FunctionJobStatus,
+    check_write_permissions: bool = True,
 ) -> FunctionJobStatus:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -426,6 +429,7 @@ async def update_function_job_status(
         job_status=job_status,
         user_id=user_id,
         product_name=product_name,
+        check_write_permissions=check_write_permissions,
     )
     return TypeAdapter(FunctionJobStatus).validate_python(result)
 
@@ -438,6 +442,7 @@ async def update_function_job_outputs(
     product_name: ProductName,
     function_job_id: FunctionJobID,
     outputs: FunctionOutputs,
+    check_write_permissions: bool = True,
 ) -> FunctionOutputs:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -446,6 +451,7 @@ async def update_function_job_outputs(
         outputs=outputs,
         user_id=user_id,
         product_name=product_name,
+        check_write_permissions=check_write_permissions,
     )
     return TypeAdapter(FunctionOutputs).validate_python(result)
 
@@ -578,3 +584,37 @@ async def get_functions_user_api_access_rights(
         product_name=product_name,
     )
     return TypeAdapter(FunctionUserApiAccessRights).validate_python(result)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def set_group_permissions(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    object_type: Literal["function", "function_job", "function_job_collection"],
+    object_ids: list[FunctionID | FunctionJobID | FunctionJobCollectionID],
+    permission_group_id: int,
+    read: bool | None = None,
+    write: bool | None = None,
+    execute: bool | None = None,
+) -> list[
+    tuple[
+        FunctionID | FunctionJobID | FunctionJobCollectionID, FunctionGroupAccessRights
+    ]
+]:
+    result = await rabbitmq_rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("set_group_permissions"),
+        user_id=user_id,
+        product_name=product_name,
+        object_type=object_type,
+        object_ids=object_ids,
+        permission_group_id=permission_group_id,
+        read=read,
+        write=write,
+        execute=execute,
+    )
+    return TypeAdapter(
+        list[tuple[FunctionID | FunctionJobID, FunctionGroupAccessRights]]
+    ).validate_python(result)

services/api-server/src/simcore_service_api_server/_service_function_jobs.py

@@ -203,6 +203,7 @@ async def inspect_function_job(
             user_id=self.user_id,
             product_name=self.product_name,
             job_status=new_job_status,
+            check_write_permissions=False,
         )
 
     async def create_function_job_inputs(  # pylint: disable=no-self-use
@@ -529,4 +530,5 @@ async def function_job_outputs(
             user_id=user_id,
             product_name=product_name,
             outputs=new_outputs,
+            check_write_permissions=False,
         )

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -587,13 +587,15 @@ async def update_function_job_status(
         user_id: UserID,
         product_name: ProductName,
         job_status: FunctionJobStatus,
+        check_write_permissions: bool = True,
     ) -> FunctionJobStatus:
         return await functions_rpc_interface.update_function_job_status(
             self._client,
             function_job_id=function_job_id,
             user_id=user_id,
             product_name=product_name,
             job_status=job_status,
+            check_write_permissions=check_write_permissions,
         )
 
     async def update_function_job_outputs(
@@ -603,13 +605,15 @@ async def update_function_job_outputs(
         user_id: UserID,
         product_name: ProductName,
         outputs: FunctionOutputs,
+        check_write_permissions: bool = True,
     ) -> FunctionOutputs:
         return await functions_rpc_interface.update_function_job_outputs(
             self._client,
             function_job_id=function_job_id,
             user_id=user_id,
             product_name=product_name,
             outputs=outputs,
+            check_write_permissions=check_write_permissions,
         )
 
     async def find_cached_function_jobs(

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_api/_core.py

@@ -18,6 +18,7 @@
 from models_library.services_enums import ServiceState
 from models_library.services_metadata_runtime import to_simcore_runtime_docker_label_key
 from servicelib.utils import logged_gather
+from settings_library.docker_registry import RegistrySettings
 from starlette import status
 from tenacity import TryAgain, retry
 from tenacity.asyncio import AsyncRetrying
@@ -99,6 +100,7 @@ def _to_snake_case(string: str) -> str:
 
 async def create_service_and_get_id(
     create_service_data: AioDockerServiceSpec | dict[str, Any],
+    registry_settings: RegistrySettings | None,
 ) -> ServiceId:
     # NOTE: ideally the argument should always be AioDockerServiceSpec
     # but for that we need get_dynamic_proxy_spec to return that type
@@ -107,6 +109,13 @@ async def create_service_and_get_id(
             create_service_data, by_alias=True, exclude_unset=True
         )
         kwargs = {_to_snake_case(k): v for k, v in kwargs.items()}
+        if registry_settings:
+            kwargs["auth"] = {
+                "username": registry_settings.REGISTRY_USER,
+                "password": registry_settings.REGISTRY_PW.get_secret_value(),
+                "serveraddress": registry_settings.resolved_registry_url,
+            }
+            kwargs["registry"] = registry_settings.resolved_registry_url
 
         logging.debug("Creating service with\n%s", json_dumps(kwargs, indent=1))
         service_start_result = await client.services.create(**kwargs)

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py

@@ -30,6 +30,7 @@
     DynamicSidecarSettings,
     PlacementSettings,
 )
+from .....core.settings import AppSettings
 from .....models.dynamic_services_scheduler import NetworkId, SchedulerData
 from .....utils.db import get_repository
 from .....utils.dict_utils import nested_update
@@ -93,32 +94,35 @@ async def _create_proxy_service(
     swarm_network_id: NetworkId,
     swarm_network_name: str,
 ):
+    app_settings: AppSettings = app.state.settings
     proxy_settings: DynamicSidecarProxySettings = (
         app.state.settings.DYNAMIC_SERVICES.DYNAMIC_SIDECAR_PROXY_SETTINGS
     )
     scheduler_data.proxy_admin_api_port = (
         proxy_settings.DYNAMIC_SIDECAR_CADDY_ADMIN_API_PORT
     )
-
     dynamic_services_settings: DynamicServicesSettings = (
         app.state.settings.DYNAMIC_SERVICES
     )
 
-    dynamic_sidecar_proxy_create_service_params: dict[
-        str, Any
-    ] = get_dynamic_proxy_spec(
-        scheduler_data=scheduler_data,
-        dynamic_services_settings=dynamic_services_settings,
-        dynamic_sidecar_network_id=dynamic_sidecar_network_id,
-        swarm_network_id=swarm_network_id,
-        swarm_network_name=swarm_network_name,
+    dynamic_sidecar_proxy_create_service_params: dict[str, Any] = (
+        get_dynamic_proxy_spec(
+            scheduler_data=scheduler_data,
+            dynamic_services_settings=dynamic_services_settings,
+            dynamic_sidecar_network_id=dynamic_sidecar_network_id,
+            swarm_network_id=swarm_network_id,
+            swarm_network_name=swarm_network_name,
+        )
     )
     _logger.debug(
         "dynamic-sidecar-proxy create_service_params %s",
         json_dumps(dynamic_sidecar_proxy_create_service_params),
     )
 
-    await create_service_and_get_id(dynamic_sidecar_proxy_create_service_params)
+    await create_service_and_get_id(
+        dynamic_sidecar_proxy_create_service_params,
+        app_settings.DIRECTOR_V2_DOCKER_HUB_REGISTRY,
+    )
 
 
 class CreateSidecars(DynamicSchedulerEvent):
@@ -156,6 +160,7 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
         rabbitmq_client: RabbitMQClient = app.state.rabbitmq_client
         await rabbitmq_client.publish(message.channel_name, message)
 
+        app_settings: AppSettings = app.state.settings
         dynamic_sidecar_settings: DynamicSidecarSettings = (
             app.state.settings.DYNAMIC_SERVICES.DYNAMIC_SIDECAR
         )
@@ -244,18 +249,20 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
 
         # WARNING: do NOT log, this structure has secrets in the open
         # If you want to log, please use an obfuscator
-        dynamic_sidecar_service_spec_base: AioDockerServiceSpec = await get_dynamic_sidecar_spec(
-            scheduler_data=scheduler_data,
-            dynamic_sidecar_settings=dynamic_sidecar_settings,
-            dynamic_services_scheduler_settings=dynamic_services_scheduler_settings,
-            swarm_network_id=swarm_network_id,
-            settings=settings,
-            app_settings=app.state.settings,
-            hardware_info=scheduler_data.hardware_info,
-            has_quota_support=dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS,
-            metrics_collection_allowed=metrics_collection_allowed,
-            user_extra_properties=user_extra_properties,
-            rpc_client=rpc_client,
+        dynamic_sidecar_service_spec_base: AioDockerServiceSpec = (
+            await get_dynamic_sidecar_spec(
+                scheduler_data=scheduler_data,
+                dynamic_sidecar_settings=dynamic_sidecar_settings,
+                dynamic_services_scheduler_settings=dynamic_services_scheduler_settings,
+                swarm_network_id=swarm_network_id,
+                settings=settings,
+                app_settings=app.state.settings,
+                hardware_info=scheduler_data.hardware_info,
+                has_quota_support=dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS,
+                metrics_collection_allowed=metrics_collection_allowed,
+                user_extra_properties=user_extra_properties,
+                rpc_client=rpc_client,
+            )
         )
 
         user_specific_service_spec = (
@@ -278,7 +285,8 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
         )
         await rabbitmq_client.publish(rabbit_message.channel_name, rabbit_message)
         dynamic_sidecar_id = await create_service_and_get_id(
-            dynamic_sidecar_service_final_spec
+            dynamic_sidecar_service_final_spec,
+            app_settings.DIRECTOR_V2_DOCKER_HUB_REGISTRY,
         )
         # constrain service to the same node
         scheduler_data.dynamic_sidecar.docker_node_id = (

services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py

@@ -453,7 +453,7 @@ async def test_create_service(
     cleanup_test_service_name: None,
     docker_swarm: None,
 ):
-    service_id = await docker_api.create_service_and_get_id(service_spec)
+    service_id = await docker_api.create_service_and_get_id(service_spec, None)
     assert service_id
 
 
@@ -465,7 +465,7 @@ async def test_services_to_observe_exist(
     docker_swarm: None,
 ):
     service_id = await docker_api.create_service_and_get_id(
-        dynamic_sidecar_service_spec
+        dynamic_sidecar_service_spec, None
     )
     assert service_id
 
@@ -484,7 +484,7 @@ async def test_dynamic_sidecar_in_running_state_and_node_id_is_recovered(
     docker_swarm: None,
 ):
     service_id = await docker_api.create_service_and_get_id(
-        dynamic_sidecar_service_spec
+        dynamic_sidecar_service_spec, None
     )
     assert service_id
 
@@ -511,7 +511,7 @@ async def test_dynamic_sidecar_get_dynamic_sidecar_sate_fail_to_schedule(
     }
 
     service_id = await docker_api.create_service_and_get_id(
-        dynamic_sidecar_service_spec
+        dynamic_sidecar_service_spec, None
     )
     assert service_id
 
@@ -539,7 +539,9 @@ async def test_is_dynamic_sidecar_stack_missing(
 
     # start 2 fake services to emulate the dynamic-sidecar stack
     for dynamic_sidecar_stack in dynamic_sidecar_stack_specs:
-        service_id = await docker_api.create_service_and_get_id(dynamic_sidecar_stack)
+        service_id = await docker_api.create_service_and_get_id(
+            dynamic_sidecar_stack, None
+        )
         assert service_id
 
     services_are_missing = await docker_api.is_dynamic_sidecar_stack_missing(
@@ -562,7 +564,9 @@ async def test_are_sidecar_and_proxy_services_present(
 
     # start 2 fake services to emulate the dynamic-sidecar stack
     for dynamic_sidecar_stack in dynamic_sidecar_stack_specs:
-        service_id = await docker_api.create_service_and_get_id(dynamic_sidecar_stack)
+        service_id = await docker_api.create_service_and_get_id(
+            dynamic_sidecar_stack, None
+        )
         assert service_id
 
     services_are_missing = await docker_api.are_sidecar_and_proxy_services_present(
@@ -605,7 +609,9 @@ async def _count_services_in_stack(
 
     # start 2 fake services to emulate the dynamic-sidecar stack
     for dynamic_sidecar_stack in dynamic_sidecar_stack_specs:
-        service_id = await docker_api.create_service_and_get_id(dynamic_sidecar_stack)
+        service_id = await docker_api.create_service_and_get_id(
+            dynamic_sidecar_stack, None
+        )
         assert service_id
 
     assert (
@@ -667,7 +673,9 @@ async def test_is_sidecar_running(
 
     # start 2 fake services to emulate the dynamic-sidecar stack
     for dynamic_sidecar_stack in dynamic_sidecar_stack_specs:
-        service_id = await docker_api.create_service_and_get_id(dynamic_sidecar_stack)
+        service_id = await docker_api.create_service_and_get_id(
+            dynamic_sidecar_stack, None
+        )
         assert service_id
 
     async for attempt in AsyncRetrying(

services/static-webserver/client/source/class/osparc/data/model/Node.js

@@ -196,7 +196,6 @@ qx.Class.define("osparc.data.model.Node", {
   },
 
   events: {
-    "updateStudyDocument": "qx.event.type.Event",
     "projectDocumentChanged": "qx.event.type.Data",
     "reloadModel": "qx.event.type.Event",
     "retrieveInputs": "qx.event.type.Data",
@@ -490,6 +489,7 @@ qx.Class.define("osparc.data.model.Node", {
           this.populateNodeUIData(nodeData);
           // new place to store the position and marker
           this.populateNodeUIData(nodeUiData);
+          this.listenToChanges();
         })
         .catch(err => {
           console.log(err);