Merge branch 'master' into extract-celery-code

Author: bisgaard-itis

api/specs/web-server/_projects_states.py

@@ -13,7 +13,7 @@
 from pydantic import ValidationError
 from servicelib.aiohttp import status
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
+from simcore_service_webserver.director_v2.exceptions import DirectorV2ServiceError
 from simcore_service_webserver.projects._controller.projects_states_rest import (
     ProjectPathParams,
     _OpenProjectQuery,
@@ -62,7 +62,7 @@ def to_desc(exceptions: list[type[Exception]] | type[Exception]):
             "description": to_desc([ValidationError])
         },
         status.HTTP_503_SERVICE_UNAVAILABLE: {
-            "description": to_desc([DirectorServiceError])
+            "description": to_desc([DirectorV2ServiceError])
         },
     },
 )

api/tests/requirements.txt

@@ -1,6 +1,6 @@
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in

ci/helpers/requirements/requirements.txt

@@ -1,6 +1,6 @@
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/requirements.in
@@ -20,7 +20,7 @@ charset-normalizer==3.4.1
     # via requests
 docker==7.1.0
     # via -r requirements/requirements.in
-fastapi==0.115.0
+fastapi==0.115.12
     # via -r requirements/requirements.in
 frozenlist==1.4.1
     # via
@@ -49,7 +49,7 @@ requests==2.32.3
     # via docker
 sniffio==1.3.1
     # via anyio
-starlette==0.38.6
+starlette==0.46.2
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   fastapi

packages/aws-library/requirements/_base.txt

@@ -16,9 +16,9 @@ aiofiles==24.1.0
     # via
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aioboto3
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/aws-library/requirements/_test.txt

@@ -70,7 +70,7 @@ docker==7.1.0
     # via moto
 faker==36.1.1
     # via -r requirements/_test.in
-fastapi==0.115.11
+fastapi==0.115.12
     # via -r requirements/_test.in
 flask==3.1.0
     # via

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

@@ -1,11 +1,9 @@
-""" Dask task exceptions
+"""Dask task exceptions"""
 
-"""
 from common_library.errors_classes import OsparcErrorMixin
 
 
-class TaskValueError(OsparcErrorMixin, ValueError):
-    ...
+class TaskValueError(OsparcErrorMixin, ValueError): ...
 
 
 class TaskCancelledError(OsparcErrorMixin, RuntimeError):
@@ -18,3 +16,12 @@ class ServiceRuntimeError(OsparcErrorMixin, RuntimeError):
         " running in container {container_id} failed with code"
         " {exit_code}. Last logs:\n{service_logs}"
     )
+
+
+class ServiceInputsUseFileToKeyMapButReceivesZipDataError(
+    OsparcErrorMixin, RuntimeError
+):
+    msg_template = (
+        "The service {service_key}:{service_version} {input} uses a file-to-key {file_to_key_map} map but receives zip data instead. "
+        "TIP: either pass a single file or zip file and remove the file-to-key map parameter."
+    )

packages/models-library/src/models_library/api_schemas_api_server/functions.py

@@ -5,20 +5,16 @@
     FunctionClass,
     FunctionClassSpecificData,
     FunctionID,
-    FunctionIDNotFoundError,
     FunctionInputs,
     FunctionInputSchema,
     FunctionInputsList,
-    FunctionInputsValidationError,
     FunctionJob,
     FunctionJobClassSpecificData,
     FunctionJobCollection,
     FunctionJobCollectionID,
-    FunctionJobCollectionIDNotFoundError,
     FunctionJobCollectionsListFilters,
     FunctionJobCollectionStatus,
     FunctionJobID,
-    FunctionJobIDNotFoundError,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionOutputSchema,
@@ -34,6 +30,12 @@
     RegisteredProjectFunctionJob,
     SolverFunction,
     SolverFunctionJob,
+)
+from ..functions_errors import (
+    FunctionIDNotFoundError,
+    FunctionInputsValidationError,
+    FunctionJobCollectionIDNotFoundError,
+    FunctionJobIDNotFoundError,
     UnsupportedFunctionClassError,
     UnsupportedFunctionFunctionJobClassCombinationError,
 )

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

@@ -8,20 +8,17 @@
     FunctionClass,
     FunctionClassSpecificData,
     FunctionID,
-    FunctionIDNotFoundError,
+    FunctionIDString,
     FunctionInputs,
     FunctionInputSchema,
     FunctionInputsList,
-    FunctionInputsValidationError,
     FunctionJob,
     FunctionJobClassSpecificData,
     FunctionJobCollection,
     FunctionJobCollectionID,
-    FunctionJobCollectionIDNotFoundError,
     FunctionJobCollectionsListFilters,
     FunctionJobCollectionStatus,
     FunctionJobID,
-    FunctionJobIDNotFoundError,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionOutputSchema,
@@ -39,6 +36,13 @@
     RegisteredSolverFunction,
     SolverFunction,
     SolverFunctionJob,
+)
+from ..functions_errors import (
+    FunctionIDNotFoundError,
+    FunctionInputsValidationError,
+    FunctionJobCollectionIDNotFoundError,
+    FunctionJobIDNotFoundError,
+    FunctionReadAccessDeniedError,
     UnsupportedFunctionClassError,
     UnsupportedFunctionFunctionJobClassCombinationError,
 )
@@ -54,6 +58,7 @@
     "FunctionID",
     "FunctionIDNotFoundError",
     "FunctionIDNotFoundError",
+    "FunctionIDString",
     "FunctionInputSchema",
     "FunctionInputs",
     "FunctionInputs",
@@ -80,6 +85,7 @@
     "FunctionJobStatus",
     "FunctionOutputSchema",
     "FunctionOutputs",
+    "FunctionReadAccessDeniedError",
     "FunctionSchemaClass",
     "FunctionToRegister",
     "FunctionToRegister",

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

@@ -1,16 +1,20 @@
+import datetime
 from collections.abc import Mapping
 from enum import Enum
 from typing import Annotated, Any, Literal, TypeAlias
 from uuid import UUID
 
-from common_library.errors_classes import OsparcErrorMixin
 from models_library import projects
 from models_library.basic_regex import UUID_RE_BASE
 from models_library.basic_types import ConstrainedStr
+from models_library.groups import GroupID
+from models_library.products import ProductName
 from models_library.services_types import ServiceKey, ServiceVersion
-from pydantic import BaseModel, Field
+from models_library.users import UserID
+from pydantic import BaseModel, ConfigDict, Field
 
 from .projects import ProjectID
+from .utils.change_case import snake_to_camel
 
 FunctionID: TypeAlias = UUID
 FunctionJobID: TypeAlias = UUID
@@ -72,7 +76,10 @@ class FunctionClass(str, Enum):
 # see here https://github.com/ITISFoundation/osparc-simcore/issues/7659
 FunctionInputs: TypeAlias = dict[str, Any] | None
 
-FunctionInputsList: TypeAlias = list[FunctionInputs]
+FunctionInputsList: TypeAlias = Annotated[
+    list[FunctionInputs],
+    Field(max_length=50),
+]
 
 FunctionOutputs: TypeAlias = dict[str, Any] | None
 
@@ -90,6 +97,7 @@ class FunctionBase(BaseModel):
 
 class RegisteredFunctionBase(FunctionBase):
     uid: FunctionID
+    created_at: datetime.datetime
 
 
 class ProjectFunction(FunctionBase):
@@ -146,6 +154,7 @@ class FunctionJobBase(BaseModel):
 
 class RegisteredFunctionJobBase(FunctionJobBase):
     uid: FunctionJobID
+    created_at: datetime.datetime
 
 
 class ProjectFunctionJob(FunctionJobBase):
@@ -201,46 +210,13 @@ class FunctionJobCollection(BaseModel):
 
 class RegisteredFunctionJobCollection(FunctionJobCollection):
     uid: FunctionJobCollectionID
+    created_at: datetime.datetime
 
 
 class FunctionJobCollectionStatus(BaseModel):
     status: list[str]
 
 
-class FunctionBaseError(OsparcErrorMixin, Exception):
-    pass
-
-
-class FunctionIDNotFoundError(FunctionBaseError):
-    msg_template: str = "Function {function_id} not found"
-
-
-class FunctionJobIDNotFoundError(FunctionBaseError):
-    msg_template: str = "Function job {function_job_id} not found"
-
-
-class FunctionJobCollectionIDNotFoundError(FunctionBaseError):
-    msg_template: str = "Function job collection {function_job_collection_id} not found"
-
-
-class UnsupportedFunctionClassError(FunctionBaseError):
-    msg_template: str = "Function class {function_class} is not supported"
-
-
-class UnsupportedFunctionJobClassError(FunctionBaseError):
-    msg_template: str = "Function job class {function_job_class} is not supported"
-
-
-class UnsupportedFunctionFunctionJobClassCombinationError(FunctionBaseError):
-    msg_template: str = (
-        "Function class {function_class} and function job class {function_job_class} combination is not supported"
-    )
-
-
-class FunctionInputsValidationError(FunctionBaseError):
-    msg_template: str = "Function inputs validation failed: {error}"
-
-
 class FunctionJobDB(BaseModel):
     function_uuid: FunctionID
     title: str = ""
@@ -253,6 +229,7 @@ class FunctionJobDB(BaseModel):
 
 class RegisteredFunctionJobDB(FunctionJobDB):
     uuid: FunctionJobID
+    created: datetime.datetime
 
 
 class FunctionDB(BaseModel):
@@ -267,6 +244,7 @@ class FunctionDB(BaseModel):
 
 class RegisteredFunctionDB(FunctionDB):
     uuid: FunctionID
+    created: datetime.datetime
 
 
 class FunctionJobCollectionDB(BaseModel):
@@ -276,6 +254,7 @@ class FunctionJobCollectionDB(BaseModel):
 
 class RegisteredFunctionJobCollectionDB(FunctionJobCollectionDB):
     uuid: FunctionJobCollectionID
+    created: datetime.datetime
 
 
 class FunctionIDString(ConstrainedStr):
@@ -286,3 +265,48 @@ class FunctionJobCollectionsListFilters(BaseModel):
     """Filters for listing function job collections"""
 
     has_function_id: FunctionIDString | None = None
+
+
+class FunctionAccessRights(BaseModel):
+    read: bool = False
+    write: bool = False
+    execute: bool = False
+
+    model_config = ConfigDict(
+        alias_generator=snake_to_camel,
+        populate_by_name=True,
+        extra="forbid",
+    )
+
+
+class FunctionUserAccessRights(FunctionAccessRights):
+    user_id: UserID
+
+
+class FunctionGroupAccessRights(FunctionAccessRights):
+    group_id: GroupID
+
+
+class FunctionAccessRightsDB(BaseModel):
+    group_id: GroupID | None = None
+    product_name: ProductName | None = None
+    read: bool = False
+    write: bool = False
+    execute: bool = False
+
+    model_config = ConfigDict(
+        alias_generator=snake_to_camel,
+        populate_by_name=True,
+        extra="forbid",
+    )
+
+
+FunctionJobAccessRights: TypeAlias = FunctionAccessRights
+FunctionJobAccessRightsDB: TypeAlias = FunctionAccessRightsDB
+FunctionJobUserAccessRights: TypeAlias = FunctionUserAccessRights
+FunctionJobGroupAccessRights: TypeAlias = FunctionGroupAccessRights
+
+FunctionJobCollectionAccessRights: TypeAlias = FunctionAccessRights
+FunctionJobCollectionAccessRightsDB: TypeAlias = FunctionAccessRightsDB
+FunctionJobCollectionUserAccessRights: TypeAlias = FunctionUserAccessRights
+FunctionJobCollectionGroupAccessRights: TypeAlias = FunctionGroupAccessRights