Merge branch 'master' into pr-osparc-fix-devel-mode-notifications

Author: mergify[bot]

packages/aws-library/requirements/_base.txt

@@ -384,7 +384,7 @@ typer==0.15.2
     # via
     #   -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
     #   -r requirements/../../../packages/settings-library/requirements/_base.in
-types-aiobotocore==2.21.0
+types-aiobotocore==2.21.1
     # via -r requirements/_base.in
 types-aiobotocore-ec2==2.21.0
     # via types-aiobotocore

packages/aws-library/requirements/_test.txt

@@ -280,17 +280,17 @@ sympy==1.13.3
     # via cfn-lint
 termcolor==2.5.0
     # via pytest-sugar
-types-aioboto3==14.0.0
+types-aioboto3==14.1.0
     # via -r requirements/_test.in
-types-aiobotocore==2.21.0
+types-aiobotocore==2.21.1
     # via
     #   -c requirements/_base.txt
     #   types-aioboto3
 types-awscrt==0.23.10
     # via
     #   -c requirements/_base.txt
     #   botocore-stubs
-types-boto3==1.37.4
+types-boto3==1.38.2
     # via -r requirements/_test.in
 types-s3transfer==0.11.3
     # via

packages/aws-library/src/aws_library/s3/_client.py

@@ -88,13 +88,21 @@ async def create(
         session_client = None
         exit_stack = contextlib.AsyncExitStack()
         try:
+            config = Config(
+                # This setting tells the S3 client to only calculate checksums when explicitly required
+                # by the operation. This avoids unnecessary checksum calculations for operations that
+                # don't need them, improving performance.
+                # See: https://boto3.amazonaws.com/v1/documentation/api/latest/guide/s3.html#calculating-checksums
+                signature_version="s3v4",
+                request_checksum_calculation="when_required",  # type: ignore[call-arg]
+            )
             session_client = session.client(  # type: ignore[call-overload]
                 "s3",
                 endpoint_url=f"{settings.S3_ENDPOINT}",
                 aws_access_key_id=settings.S3_ACCESS_KEY,
                 aws_secret_access_key=settings.S3_SECRET_KEY,
                 region_name=settings.S3_REGION,
-                config=Config(signature_version="s3v4"),
+                config=config,
             )
             assert isinstance(session_client, ClientCreatorContext)  # nosec
 

packages/dask-task-models-library/src/dask_task_models_library/container_tasks/utils.py

@@ -0,0 +1,44 @@
+from typing import Final
+from uuid import uuid4
+
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import NodeID
+from models_library.services_types import ServiceKey, ServiceVersion
+from models_library.users import UserID
+from pydantic import TypeAdapter
+
+from ..models import DaskJobID
+
+
+def generate_dask_job_id(
+    service_key: ServiceKey,
+    service_version: ServiceVersion,
+    user_id: UserID,
+    project_id: ProjectID,
+    node_id: NodeID,
+) -> DaskJobID:
+    """creates a dask job id:
+    The job ID shall contain the user_id, project_id, node_id
+    Also, it must be unique
+    and it is shown in the Dask scheduler dashboard website
+    """
+    return DaskJobID(
+        f"{service_key}:{service_version}:userid_{user_id}:projectid_{project_id}:nodeid_{node_id}:uuid_{uuid4()}"
+    )
+
+
+_JOB_ID_PARTS: Final[int] = 6
+
+
+def parse_dask_job_id(
+    job_id: str,
+) -> tuple[ServiceKey, ServiceVersion, UserID, ProjectID, NodeID]:
+    parts = job_id.split(":")
+    assert len(parts) == _JOB_ID_PARTS  # nosec
+    return (
+        parts[0],
+        parts[1],
+        TypeAdapter(UserID).validate_python(parts[2][len("userid_") :]),
+        ProjectID(parts[3][len("projectid_") :]),
+        NodeID(parts[4][len("nodeid_") :]),
+    )

packages/dask-task-models-library/src/dask_task_models_library/models.py

@@ -0,0 +1,4 @@
+from typing import TypeAlias
+
+DaskJobID: TypeAlias = str
+DaskResources: TypeAlias = dict[str, int | float]

packages/dask-task-models-library/tests/container_tasks/test_utils.py

@@ -0,0 +1,68 @@
+# pylint: disable=too-many-positional-arguments
+# pylint:disable=redefined-outer-name
+# pylint:disable=too-many-arguments
+# pylint:disable=unused-argument
+# pylint:disable=unused-variable
+
+import pytest
+from dask_task_models_library.container_tasks.utils import (
+    generate_dask_job_id,
+    parse_dask_job_id,
+)
+from faker import Faker
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import NodeID
+from models_library.services_types import ServiceKey, ServiceVersion
+from models_library.users import UserID
+from pydantic import TypeAdapter
+
+
+@pytest.fixture(
+    params=["simcore/service/comp/some/fake/service/key", "dockerhub-style/service_key"]
+)
+def service_key(request) -> ServiceKey:
+    return request.param
+
+
+@pytest.fixture()
+def service_version() -> str:
+    return "1234.32432.2344"
+
+
+@pytest.fixture
+def user_id(faker: Faker) -> UserID:
+    return TypeAdapter(UserID).validate_python(faker.pyint(min_value=1))
+
+
+@pytest.fixture
+def project_id(faker: Faker) -> ProjectID:
+    return ProjectID(faker.uuid4())
+
+
+@pytest.fixture
+def node_id(faker: Faker) -> NodeID:
+    return NodeID(faker.uuid4())
+
+
+def test_dask_job_id_serialization(
+    service_key: ServiceKey,
+    service_version: ServiceVersion,
+    user_id: UserID,
+    project_id: ProjectID,
+    node_id: NodeID,
+):
+    dask_job_id = generate_dask_job_id(
+        service_key, service_version, user_id, project_id, node_id
+    )
+    (
+        parsed_service_key,
+        parsed_service_version,
+        parsed_user_id,
+        parsed_project_id,
+        parsed_node_id,
+    ) = parse_dask_job_id(dask_job_id)
+    assert service_key == parsed_service_key
+    assert service_version == parsed_service_version
+    assert user_id == parsed_user_id
+    assert project_id == parsed_project_id
+    assert node_id == parsed_node_id

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

@@ -113,8 +113,8 @@ class ProjectAtDB(BaseProjectModel):
 
     published: Annotated[
         bool | None,
-        Field(default=False, description="Defines if a study is available publicly"),
-    ]
+        Field(description="Defines if a study is available publicly"),
+    ] = False
 
     @field_validator("project_type", mode="before")
     @classmethod