Merge remote-tracking branch 'upstream/master' into add-notifications-service

Author: giancarloromeo

.github/copilot-instructions.md

@@ -12,7 +12,7 @@ This document provides guidelines and best practices for using GitHub Copilot in
 
 ## 🛠️Coding Instructions for Python in This Repository
 
-Follow these rules strictly when generating Python code:
+Follow these rules **strictly** when generating Python code:
 
 ### 1. Python Version
 
@@ -43,7 +43,7 @@ Ensure compatibility with the following library versions:
 * Use `f-string` formatting for all string interpolation except for logging message strings.
 * Use **relative imports** within the same package/module.
 * Place **all imports at the top** of the file.
-* Add comments **only when the code is not self-explanatory**.
+* Document functions when the code is not self-explanatory or if asked explicitly.
 
 
 ### 6. **JSON Serialization**

api/specs/web-server/_computations.py

@@ -6,7 +6,9 @@
 from models_library.api_schemas_webserver.computations import (
     ComputationCollectionRunListQueryParams,
     ComputationCollectionRunPathParams,
+    ComputationCollectionRunRestGet,
     ComputationCollectionRunTaskListQueryParams,
+    ComputationCollectionRunTaskRestGet,
     ComputationGet,
     ComputationPathParams,
     ComputationRunIterationsLatestListQueryParams,
@@ -102,7 +104,7 @@ async def list_computations_latest_iteration_tasks(
 
 @router.get(
     "/computation-collection-runs",
-    response_model=Page[ComputationTaskRestGet],
+    response_model=Page[ComputationCollectionRunRestGet],
 )
 async def list_computation_collection_runs(
     _query: Annotated[as_query(ComputationCollectionRunListQueryParams), Depends()],
@@ -111,7 +113,7 @@ async def list_computation_collection_runs(
 
 @router.get(
     "/computation-collection-runs/{collection_run_id}/tasks",
-    response_model=Page[ComputationTaskRestGet],
+    response_model=Page[ComputationCollectionRunTaskRestGet],
 )
 async def list_computation_collection_run_tasks(
     _query: Annotated[as_query(ComputationCollectionRunTaskListQueryParams), Depends()],

api/specs/web-server/_users.py

@@ -14,20 +14,22 @@
     MyProfilePatch,
     MyTokenCreate,
     MyTokenGet,
+    TokenPathParams,
     UserGet,
     UsersSearch,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
 from models_library.generics import Envelope
 from models_library.user_preferences import PreferenceIdentifier
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.users._notifications import (
+from simcore_service_webserver.user_notifications._controller.rest.user_notification_rest import (
+    NotificationPathParams,
+)
+from simcore_service_webserver.user_notifications._models import (
     UserNotification,
     UserNotificationCreate,
     UserNotificationPatch,
 )
-from simcore_service_webserver.users._notifications_rest import _NotificationPathParams
-from simcore_service_webserver.users._tokens_rest import _TokenPathParams
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["users"])
 
@@ -76,15 +78,15 @@ async def create_token(_body: MyTokenCreate): ...
     response_model=Envelope[MyTokenGet],
 )
 async def get_token(
-    _path: Annotated[_TokenPathParams, Depends()],
+    _path: Annotated[TokenPathParams, Depends()],
 ): ...
 
 
 @router.delete(
     "/me/tokens/{service}",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def delete_token(_path: Annotated[_TokenPathParams, Depends()]): ...
+async def delete_token(_path: Annotated[TokenPathParams, Depends()]): ...
 
 
 @router.get(
@@ -108,7 +110,7 @@ async def create_user_notification(
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def mark_notification_as_read(
-    _path: Annotated[_NotificationPathParams, Depends()],
+    _path: Annotated[NotificationPathParams, Depends()],
     _body: UserNotificationPatch,
 ): ...
 

ci/helpers/requirements/requirements.txt

@@ -45,7 +45,7 @@ pydantic==2.10.5
     #   fastapi
 pydantic-core==2.27.2
     # via pydantic
-requests==2.32.3
+requests==2.32.4
     # via docker
 sniffio==1.3.1
     # via anyio
@@ -58,7 +58,7 @@ typing-extensions==4.14.1
     #   fastapi
     #   pydantic
     #   pydantic-core
-urllib3==2.3.0
+urllib3==2.5.0
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   docker

packages/aws-library/requirements/_base.txt

@@ -354,7 +354,7 @@ referencing==0.35.1
     #   -c requirements/../../../requirements/constraints.txt
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via opentelemetry-exporter-otlp-proto-http
 rich==13.9.4
     # via
@@ -417,7 +417,7 @@ typing-extensions==4.14.1
     #   types-aiobotocore-ec2
     #   types-aiobotocore-s3
     #   types-aiobotocore-ssm
-urllib3==2.3.0
+urllib3==2.5.0
     # 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

@@ -76,7 +76,7 @@ flask==3.1.0
     # via
     #   flask-cors
     #   moto
-flask-cors==5.0.1
+flask-cors==6.0.1
     # via moto
 flexcache==0.3
     # via pint
@@ -104,7 +104,7 @@ iniconfig==2.0.0
     # via pytest
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.5
+jinja2==3.1.6
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   flask
@@ -245,7 +245,7 @@ referencing==0.35.1
     #   jsonschema-specifications
 regex==2024.11.6
     # via cfn-lint
-requests==2.32.3
+requests==2.32.4
     # via
     #   -c requirements/_base.txt
     #   docker
@@ -317,7 +317,7 @@ typing-extensions==4.14.1
     #   types-boto3
 tzdata==2025.1
     # via faker
-urllib3==2.3.0
+urllib3==2.5.0
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt

packages/celery-library/requirements/_base.txt

@@ -341,7 +341,7 @@ referencing==0.35.1
     #   -c requirements/../../../requirements/constraints.txt
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.3
+requests==2.32.4
     # via opentelemetry-exporter-otlp-proto-http
 rich==14.0.0
     # via
@@ -392,7 +392,7 @@ typing-inspection==0.4.0
     # via pydantic
 tzdata==2025.2
     # via kombu
-urllib3==2.4.0
+urllib3==2.5.0
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/celery-library/requirements/_test.txt

@@ -156,7 +156,7 @@ pyyaml==6.0.2
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
     #   -r requirements/_test.in
-requests==2.32.3
+requests==2.32.4
     # via
     #   -c requirements/_base.txt
     #   docker
@@ -188,7 +188,7 @@ tzdata==2025.2
     #   -c requirements/_base.txt
     #   faker
     #   kombu
-urllib3==2.4.0
+urllib3==2.5.0
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt

packages/dask-task-models-library/requirements/_base.txt

@@ -172,7 +172,7 @@ typing-extensions==4.14.1
     #   typing-inspection
 typing-inspection==0.4.0
     # via pydantic
-urllib3==2.4.0
+urllib3==2.5.0
     # 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/users.py

@@ -11,6 +11,7 @@
 from models_library.rest_filters import Filters
 from models_library.rest_pagination import PageQueryParameters
 from pydantic import (
+    BaseModel,
     ConfigDict,
     EmailStr,
     Field,
@@ -334,6 +335,10 @@ def _consistency_check(cls, v, info: ValidationInfo):
 #
 
 
+class TokenPathParams(BaseModel):
+    service: str
+
+
 class MyTokenCreate(InputSchemaWithoutCamelCase):
     service: Annotated[
         IDStr,