Merge remote-tracking branch 'upstream/master' into pr-osparc-s3-zip-stream-worker-code

Author: Andrei Neagu

api/specs/web-server/_storage.py

@@ -22,6 +22,7 @@
     PresignedLink,
 )
 from models_library.api_schemas_webserver.storage import (
+    BatchDeletePathsBodyParams,
     DataExportPost,
     ListPathsQueryParams,
     StorageLocationPathParams,
@@ -80,6 +81,19 @@ async def compute_path_size(_path: Annotated[StoragePathComputeSizeParams, Depen
     """Compute the size of a path"""
 
 
+@router.post(
+    "/storage/locations/{location_id}/-/paths:batchDelete",
+    response_model=Envelope[TaskGet],
+    status_code=status.HTTP_202_ACCEPTED,
+    description="Deletes Paths",
+)
+async def batch_delete_paths(
+    _path: Annotated[StorageLocationPathParams, Depends()],
+    _body: Annotated[BatchDeletePathsBodyParams, Depends()],
+):
+    """deletes files/folders if user has the rights to"""
+
+
 @router.get(
     "/storage/locations/{location_id}/datasets",
     response_model=Envelope[list[DatasetMetaData]],

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -35,5 +35,9 @@ class ListPathsQueryParams(InputSchema, CursorQueryParameters):
     ] = DEFAULT_NUMBER_OF_PATHS_PER_PAGE
 
 
+class BatchDeletePathsBodyParams(InputSchema):
+    paths: set[Path]
+
+
 class DataExportPost(InputSchema):
     paths: list[StorageFileID]

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

@@ -63,9 +63,9 @@ def from_key(cls, key: str) -> "DockerLabelKey":
 _UNDEFINED_LABEL_VALUE_INT: Final[str] = "0"
 
 
-DOCKER_TASK_EC2_INSTANCE_TYPE_PLACEMENT_CONSTRAINT_KEY: Final[
-    DockerLabelKey
-] = TypeAdapter(DockerLabelKey).validate_python("ec2-instance-type")
+DOCKER_TASK_EC2_INSTANCE_TYPE_PLACEMENT_CONSTRAINT_KEY: Final[DockerLabelKey] = (
+    TypeAdapter(DockerLabelKey).validate_python("ec2-instance-type")
+)
 
 
 def to_simcore_runtime_docker_label_key(key: str) -> DockerLabelKey:
@@ -122,18 +122,24 @@ def _backwards_compatibility(cls, values: dict[str, Any]) -> dict[str, Any]:
 
             mapped_values.setdefault(
                 f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}memory-limit",
-                _UNDEFINED_LABEL_VALUE_INT,
+                values.get("memory_limit", _UNDEFINED_LABEL_VALUE_INT),
             )
 
             def _convert_nano_cpus_to_cpus(nano_cpu: str) -> str:
                 with contextlib.suppress(ValidationError):
-                    return f"{TypeAdapter(float).validate_python(nano_cpu) / (1.0*10**9):.2f}"
+                    return f"{TypeAdapter(float).validate_python(nano_cpu) / (1.0 * 10**9):.2f}"
                 return _UNDEFINED_LABEL_VALUE_INT
 
             mapped_values.setdefault(
                 f"{_SIMCORE_RUNTIME_DOCKER_LABEL_PREFIX}cpu-limit",
-                _convert_nano_cpus_to_cpus(
-                    values.get("nano_cpus_limit", _UNDEFINED_LABEL_VALUE_INT)
+                values.get(
+                    "cpu_limit",
+                    _convert_nano_cpus_to_cpus(
+                        values.get(
+                            "nano_cpus_limit",
+                            _UNDEFINED_LABEL_VALUE_INT,
+                        )
+                    ),
                 ),
             )
             return mapped_values

packages/models-library/tests/test_docker.py

@@ -4,6 +4,7 @@
 
 
 from typing import Any
+from uuid import UUID
 
 import pytest
 from faker import Faker
@@ -13,7 +14,7 @@
     DockerLabelKey,
     StandardSimcoreDockerLabels,
 )
-from pydantic import TypeAdapter, ValidationError
+from pydantic import ByteSize, TypeAdapter, ValidationError
 
 _faker = Faker()
 
@@ -83,11 +84,11 @@ def test_docker_label_key(label_key: str, valid: bool):
             True,
         ),
         (
-            f"registry:5000/si.m--c_ore/services/1234/jupyter-smash:{'A'*128}",
+            f"registry:5000/si.m--c_ore/services/1234/jupyter-smash:{'A' * 128}",
             True,
         ),
         (
-            f"registry:5000/si.m--c_ore/services/1234/jupyter-smash:{'A'*129}",
+            f"registry:5000/si.m--c_ore/services/1234/jupyter-smash:{'A' * 129}",
             False,
         ),
     ),
@@ -122,3 +123,17 @@ def test_simcore_service_docker_label_keys(obj_data: dict[str, Any]):
     ).validate_python(exported_dict)
     assert re_imported_docker_label_keys
     assert simcore_service_docker_label_keys == re_imported_docker_label_keys
+
+
+def test_simcore_service_docker_label_keys_construction():
+    simcore_service_docker_label_keys = StandardSimcoreDockerLabels(
+        user_id=8268,
+        project_id=UUID("5ea24ce0-0e4d-4ee6-a3f1-e4799752a684"),
+        node_id=UUID("c17c6279-23c6-412f-8826-867323a7711a"),
+        product_name="osparc",
+        simcore_user_agent="oePqmjQbZndJghceKRJR",
+        swarm_stack_name="UNDEFINED_DOCKER_LABEL",  # NOTE: there is currently no need for this label in the comp backend
+        memory_limit=ByteSize(23424324),
+        cpu_limit=1.0,
+    )
+    assert simcore_service_docker_label_keys.cpu_limit == 1.0