Merge branch 'master' into feature/on-share-project-email

Author: odeimaiz

api/specs/web-server/_projects_groups.py renamed to api/specs/web-server/_projects_access_rights.py

@@ -7,15 +7,17 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, status
+from models_library.api_schemas_webserver.projects_access_rights import (
+    ProjectsGroupsBodyParams,
+    ProjectsGroupsPathParams,
+    ProjectShare,
+    ProjectShareAccepted,
+)
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.projects._controller._rest_schemas import (
     ProjectPathParams,
 )
-from simcore_service_webserver.projects._controller.groups_rest import (
-    _ProjectsGroupsBodyParams,
-    _ProjectsGroupsPathParams,
-)
 from simcore_service_webserver.projects._groups_service import ProjectGroupGet
 
 router = APIRouter(
@@ -24,14 +26,30 @@
 )
 
 
+@router.post(
+    "/projects/{project_id}:share",
+    response_model=Envelope[ProjectShareAccepted],
+    status_code=status.HTTP_202_ACCEPTED,
+    responses={
+        status.HTTP_202_ACCEPTED: {
+            "description": "The request to share the project has been accepted, but the actual sharing process has to be confirmd."
+        }
+    },
+)
+async def share_project(
+    _path: Annotated[ProjectPathParams, Depends()],
+    _body: ProjectShare,
+): ...
+
+
 @router.post(
     "/projects/{project_id}/groups/{group_id}",
     response_model=Envelope[ProjectGroupGet],
     status_code=status.HTTP_201_CREATED,
 )
 async def create_project_group(
-    _path: Annotated[_ProjectsGroupsPathParams, Depends()],
-    _body: _ProjectsGroupsBodyParams,
+    _path: Annotated[ProjectsGroupsPathParams, Depends()],
+    _body: ProjectsGroupsBodyParams,
 ): ...
 
 
@@ -47,8 +65,8 @@ async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]): .
     response_model=Envelope[ProjectGroupGet],
 )
 async def replace_project_group(
-    _path: Annotated[_ProjectsGroupsPathParams, Depends()],
-    _body: _ProjectsGroupsBodyParams,
+    _path: Annotated[ProjectsGroupsPathParams, Depends()],
+    _body: ProjectsGroupsBodyParams,
 ): ...
 
 
@@ -57,5 +75,5 @@ async def replace_project_group(
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def delete_project_group(
-    _path: Annotated[_ProjectsGroupsPathParams, Depends()],
+    _path: Annotated[ProjectsGroupsPathParams, Depends()],
 ): ...

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]],

api/specs/web-server/openapi.py

@@ -42,9 +42,9 @@
         "_nih_sparc",
         "_nih_sparc_redirections",
         "_projects",
+        "_projects_access_rights",
         "_projects_comments",
         "_projects_folders",
-        "_projects_groups",
         "_projects_metadata",
         "_projects_nodes",
         "_projects_nodes_pricing_unit",  # after _projects_nodes

packages/common-library/tests/test_errors_classes.py

@@ -13,20 +13,15 @@
 
 
 def test_get_full_class_name():
-    class A(OsparcErrorMixin):
-        ...
+    class A(OsparcErrorMixin): ...
 
-    class B1(A):
-        ...
+    class B1(A): ...
 
-    class B2(A):
-        ...
+    class B2(A): ...
 
-    class C(B2):
-        ...
+    class C(B2): ...
 
-    class B12(B1, ValueError):
-        ...
+    class B12(B1, ValueError): ...
 
     assert B1._get_full_class_name() == "A.B1"
     assert C._get_full_class_name() == "A.B2.C"

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

@@ -10,6 +10,16 @@ class AccessRights(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
+    def verify_access_integrity(self):
+        """Helper function that checks extra constraints in access-rights flags"""
+        if self.write and not self.read:
+            msg = "Write access requires read access"
+            raise ValueError(msg)
+        if self.delete and not self.write:
+            msg = "Delete access requires read access"
+            raise ValueError(msg)
+        return self
+
 
 class ExecutableAccessRights(BaseModel):
     write: Annotated[bool, Field(description="can change executable settings")]

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

@@ -0,0 +1,55 @@
+from typing import Annotated, Self
+
+from models_library.groups import GroupID
+from models_library.projects import ProjectID
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    EmailStr,
+    Field,
+    HttpUrl,
+    StringConstraints,
+    model_validator,
+)
+
+from ..access_rights import AccessRights
+from ._base import InputSchema, OutputSchema
+
+
+class ProjectsGroupsPathParams(BaseModel):
+    project_id: ProjectID
+    group_id: GroupID
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class ProjectsGroupsBodyParams(InputSchema):
+    read: bool
+    write: bool
+    delete: bool
+
+
+class ProjectShare(InputSchema):
+    sharee_email: EmailStr
+    sharer_message: Annotated[
+        str,
+        StringConstraints(max_length=500, strip_whitespace=True),
+        Field(description="An optional message from sharer to sharee"),
+    ] = ""
+
+    # Sharing access rights
+    read: bool
+    write: bool
+    delete: bool
+
+    @model_validator(mode="after")
+    def _validate_access_rights(self) -> Self:
+        AccessRights.model_construct(
+            read=self.read, write=self.write, delete=self.delete
+        ).verify_access_integrity()
+        return self
+
+
+class ProjectShareAccepted(OutputSchema):
+    sharee_email: EmailStr
+    confirmation_link: HttpUrl

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

@@ -36,6 +36,10 @@ 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

packages/notifications-library/src/notifications_library/_models.py

@@ -2,10 +2,18 @@
 
 from models_library.products import ProductName
 
-
 #
 # *Data are models used for rendering
 #
+
+
+@dataclass(frozen=True)
+class JinjaTemplateDbGet:
+    product_name: ProductName
+    name: str
+    content: str
+
+
 @dataclass(frozen=True)
 class UserData:
     first_name: str