Merge branch 'master' into 7795-add-osparc-trace-id-to-response-headers

Author: bisgaard-itis

.github/copilot-instructions.md

@@ -52,4 +52,4 @@ This document provides guidelines and best practices for using GitHub Copilot in
 - [Python Coding Conventions](../docs/coding-conventions.md)
 - [Environment Variables Guide](../docs/env-vars.md)
 - [Steps to Upgrade Python](../docs/steps-to-upgrade-python.md)
-- [Node.js Installation Script](../scripts/install_nodejs_14.bash)
+- [Pydantic Annotated fields](../docs/llm-prompts/pydantic-annotated-fields.md)

.vscode/settings.template.json

@@ -1,7 +1,6 @@
 // This is a template. Clone and replace extension ".template.json" by ".json"
 {
   "autoDocstring.docstringFormat": "pep257",
-
   "editor.tabSize": 2,
   "editor.insertSpaces": true,
   "editor.detectIndentation": false,
@@ -34,6 +33,8 @@
   "python.analysis.typeCheckingMode": "basic",
   "python.analysis.extraPaths": [
     "./packages/aws-library/src",
+    "./packages/common-library/src",
+    "./packages/dask-task-models-library/src",
     "./packages/models-library/src",
     "./packages/postgres-database/src",
     "./packages/postgres-database/tests",

api/tests/requirements.txt

@@ -1,6 +1,6 @@
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.12.7
+aiohttp==3.11.18
     # 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.12.7
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/requirements.in

packages/aws-library/requirements/_base.txt

@@ -18,7 +18,7 @@ aiofiles==24.1.0
     #   aioboto3
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.12.7
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

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

@@ -135,10 +135,23 @@ class ProductUIGet(OutputSchema):
 ExtraCreditsUsdRangeInt: TypeAlias = Annotated[int, Field(ge=0, lt=500)]
 
 
+TrialAccountAnnotated: TypeAlias = Annotated[
+    PositiveInt | None,
+    Field(
+        description="Expiration time in days for trial accounts; `null` means not a trial account"
+    ),
+]
+
+WelcomeCreditsAnnotated: TypeAlias = Annotated[
+    ExtraCreditsUsdRangeInt | None,
+    Field(description="Welcome credits in USD; `null` means no welcome credits"),
+]
+
+
 class InvitationGenerate(InputSchema):
     guest: LowerCaseEmailStr
-    trial_account_days: PositiveInt | None = None
-    extra_credits_in_usd: ExtraCreditsUsdRangeInt | None = None
+    trial_account_days: TrialAccountAnnotated = None
+    extra_credits_in_usd: WelcomeCreditsAnnotated = None
 
 
 class InvitationGenerated(OutputSchema):

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

@@ -41,7 +41,7 @@
     OutputSchemaWithoutCamelCase,
 )
 from .groups import MyGroupsGet
-from .products import InvitationGenerate
+from .products import TrialAccountAnnotated, WelcomeCreditsAnnotated
 from .users_preferences import AggregatedPreferences
 
 #
@@ -255,9 +255,14 @@ class UsersForAdminListFilter(Filters):
 class UsersAccountListQueryParams(UsersForAdminListFilter, PageQueryParameters): ...
 
 
+class _InvitationDetails(InputSchema):
+    trial_account_days: TrialAccountAnnotated = None
+    extra_credits_in_usd: WelcomeCreditsAnnotated = None
+
+
 class UserAccountApprove(InputSchema):
     email: EmailStr
-    invitation: InvitationGenerate | None = None
+    invitation: _InvitationDetails | None = None
 
 
 class UserAccountReject(InputSchema):

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

@@ -1,3 +1,4 @@
+import datetime
 from collections.abc import Mapping
 from enum import Enum
 from typing import Annotated, Any, Literal, TypeAlias
@@ -96,6 +97,7 @@ class FunctionBase(BaseModel):
 
 class RegisteredFunctionBase(FunctionBase):
     uid: FunctionID
+    created_at: datetime.datetime
 
 
 class ProjectFunction(FunctionBase):
@@ -152,6 +154,7 @@ class FunctionJobBase(BaseModel):
 
 class RegisteredFunctionJobBase(FunctionJobBase):
     uid: FunctionJobID
+    created_at: datetime.datetime
 
 
 class ProjectFunctionJob(FunctionJobBase):
@@ -207,6 +210,7 @@ class FunctionJobCollection(BaseModel):
 
 class RegisteredFunctionJobCollection(FunctionJobCollection):
     uid: FunctionJobCollectionID
+    created_at: datetime.datetime
 
 
 class FunctionJobCollectionStatus(BaseModel):
@@ -225,6 +229,7 @@ class FunctionJobDB(BaseModel):
 
 class RegisteredFunctionJobDB(FunctionJobDB):
     uuid: FunctionJobID
+    created: datetime.datetime
 
 
 class FunctionDB(BaseModel):
@@ -239,6 +244,7 @@ class FunctionDB(BaseModel):
 
 class RegisteredFunctionDB(FunctionDB):
     uuid: FunctionID
+    created: datetime.datetime
 
 
 class FunctionJobCollectionDB(BaseModel):
@@ -248,6 +254,7 @@ class FunctionJobCollectionDB(BaseModel):
 
 class RegisteredFunctionJobCollectionDB(FunctionJobCollectionDB):
     uuid: FunctionJobCollectionID
+    created: datetime.datetime
 
 
 class FunctionIDString(ConstrainedStr):

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

@@ -2,84 +2,100 @@
 
 
 class FunctionBaseError(OsparcErrorMixin, Exception):
-    pass
+    status_code: int
 
 
 class FunctionJobReadAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job {function_job_id} read access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionIDNotFoundError(FunctionBaseError):
     msg_template: str = "Function {function_id} not found"
+    status_code: int = 404  # Not Found
 
 
 class FunctionJobIDNotFoundError(FunctionBaseError):
     msg_template: str = "Function job {function_job_id} not found"
+    status_code: int = 404  # Not Found
 
 
 class FunctionInputsValidationError(FunctionBaseError):
     msg_template: str = "Function inputs validation failed: {error}"
+    status_code: int = 422  # Unprocessable Entity
 
 
 class FunctionReadAccessDeniedError(FunctionBaseError):
     msg_template: str = "Function {function_id} read access denied for user {user_id}"
+    status_code: int = 403  # Forbidden
 
 
 class FunctionJobCollectionIDNotFoundError(FunctionBaseError):
     msg_template: str = "Function job collection {function_job_collection_id} not found"
+    status_code: int = 404  # Not Found
 
 
 class UnsupportedFunctionClassError(FunctionBaseError):
     msg_template: str = "Function class {function_class} is not supported"
+    status_code: int = 400  # Bad Request
 
 
 class UnsupportedFunctionJobClassError(FunctionBaseError):
     msg_template: str = "Function job class {function_job_class} is not supported"
+    status_code: int = 400  # Bad Request
 
 
 class UnsupportedFunctionFunctionJobClassCombinationError(FunctionBaseError):
     msg_template: str = (
         "Function class {function_class} and function job class {function_job_class} combination is not supported"
     )
+    status_code: int = 400  # Bad Request
 
 
 class FunctionJobCollectionReadAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job collection {function_job_collection_id} read access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionWriteAccessDeniedError(FunctionBaseError):
     msg_template: str = "Function {function_id} write access denied for user {user_id}"
+    status_code: int = 403  # Forbidden
 
 
 class FunctionJobWriteAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job {function_job_id} write access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionJobCollectionWriteAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job collection {function_job_collection_id} write access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionExecuteAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function {function_id} execute access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionJobExecuteAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job {function_job_id} execute access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden
 
 
 class FunctionJobCollectionExecuteAccessDeniedError(FunctionBaseError):
     msg_template: str = (
         "Function job collection {function_job_collection_id} execute access denied for user {user_id}"
     )
+    status_code: int = 403  # Forbidden

packages/notifications-library/requirements/_test.txt

@@ -2,7 +2,7 @@ aiodocker==0.24.0
     # via -r requirements/_test.in
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.12.7
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   aiodocker