Merge branch 'master' into store_function_outputs

Author: wvangeit

.env-devel

@@ -269,11 +269,15 @@ VENDOR_DEV_MANUAL_IMAGE=containous/whoami
 VENDOR_DEV_MANUAL_REPLICAS=1
 VENDOR_DEV_MANUAL_SUBDOMAIN=manual
 
-## VENDOR DEVELOPMENT SERVICES ---
+## WEBSERVER SERVICES VARIANTS ---
 
 WB_API_WEBSERVER_HOST=wb-api-server
 WB_API_WEBSERVER_PORT=8080
 
+WB_AUTH_WEBSERVER_HOST=wb-auth
+WB_AUTH_WEBSERVER_PORT=8080
+WB_AUTH_LOGLEVEL=INFO
+
 WB_GC_ACTIVITY=null
 WB_GC_ANNOUNCEMENTS=0
 WB_GC_CATALOG=null
@@ -395,6 +399,7 @@ WEBSERVER_PROJECTS={}
 WEBSERVER_PROMETHEUS_API_VERSION=v1
 WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
 WEBSERVER_PUBLICATIONS=1
+WEBSERVER_REALTIME_COLLABORATION='{"RTC_MAX_NUMBER_OF_USERS":3}'
 WEBSERVER_SCICRUNCH={}
 WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
 WEBSERVER_SOCKETIO=1

.github/workflows/ci-arm-build.yml

@@ -38,7 +38,7 @@ jobs:
       - name: show system environs
         run: ./ci/helpers/show_system_versions.bash
       - name: login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/ci-multi-architecture-fusing.yml

@@ -39,7 +39,7 @@ jobs:
       - name: show system environs
         run: ./ci/helpers/show_system_versions.bash
       - name: login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

api/specs/web-server/_functions.py

@@ -7,15 +7,19 @@
 
 from typing import Annotated
 
+from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.functions import (
     FunctionToRegister,
     RegisteredFunctionGet,
+    RegisteredFunctionUpdate,
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.functions._controller._functions_rest_schemas import (
+    FunctionGetQueryParams,
     FunctionPathParams,
+    FunctionsListQueryParams,
 )
 
 router = APIRouter(
@@ -35,12 +39,32 @@ async def register_function(
 ) -> Envelope[RegisteredFunctionGet]: ...
 
 
+@router.get(
+    "/functions",
+    response_model=Envelope[list[RegisteredFunctionGet]],
+)
+async def list_functions(
+    _query: Annotated[as_query(FunctionsListQueryParams), Depends()],
+): ...
+
+
 @router.get(
     "/functions/{function_id}",
     response_model=Envelope[RegisteredFunctionGet],
 )
 async def get_function(
     _path: Annotated[FunctionPathParams, Depends()],
+    _query: Annotated[as_query(FunctionGetQueryParams), Depends()],
+): ...
+
+
+@router.patch(
+    "/functions/{function_id}",
+    response_model=Envelope[RegisteredFunctionGet],
+)
+async def update_function(
+    _body: RegisteredFunctionUpdate,
+    _path: Annotated[FunctionPathParams, Depends()],
 ): ...
 
 

api/specs/web-server/_users.py

@@ -10,8 +10,6 @@
 from models_library.api_schemas_webserver.users import (
     MyFunctionPermissionsGet,
     MyPermissionGet,
-    MyPhoneConfirm,
-    MyPhoneRegister,
     MyProfileRestGet,
     MyProfileRestPatch,
     MyTokenCreate,
@@ -32,6 +30,10 @@
     UserNotificationCreate,
     UserNotificationPatch,
 )
+from simcore_service_webserver.users._controller.rest._rest_schemas import (
+    MyPhoneConfirm,
+    MyPhoneRegister,
+)
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["users"])
 

api/specs/web-server/_users_admin.py

@@ -19,7 +19,7 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.users.schemas import PreRegisteredUserGet
+from simcore_service_webserver.users.schemas import UserAccountRestPreRegister
 
 router = APIRouter(prefix=f"/{API_VTAG}", tags=["users"])
 
@@ -69,4 +69,4 @@ async def search_user_accounts(
     response_model=Envelope[UserAccountGet],
     tags=_extra_tags,
 )
-async def pre_register_user_account(_body: PreRegisteredUserGet): ...
+async def pre_register_user_account(_body: UserAccountRestPreRegister): ...

packages/models-library/src/models_library/api_schemas_directorv2/computations.py

@@ -13,7 +13,7 @@
 
 from ..basic_types import IDStr
 from ..projects import ProjectID
-from ..projects_nodes_io import NodeID
+from ..projects_nodes_io import NodeID, SimcoreS3FileID
 from ..projects_pipeline import ComputationTask
 from ..users import UserID
 from ..wallets import WalletInfo
@@ -126,6 +126,30 @@ class TaskLogFileGet(BaseModel):
     ] = None
 
 
+class TaskLogFileIdGet(BaseModel):
+    task_id: NodeID
+    file_id: SimcoreS3FileID | None
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "task_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                    "file_id": "1c46752c-b096-11ea-a3c4-02420a00392e/3fa85f64-5717-4562-b3fc-2c963f66afa6/logs/task_logs.txt",
+                },
+                {
+                    "task_id": "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
+                    "file_id": "1c46752c-b096-11ea-a3c4-02420a00392e/6ba7b810-9dad-11d1-80b4-00c04fd430c8/logs/debug.log",
+                },
+                {
+                    "task_id": "6ba7b811-9dad-11d1-80b4-00c04fd430c8",
+                    "file_id": None,
+                },
+            ]
+        }
+    )
+
+
 class TasksSelection(BaseModel):
     nodes_ids: list[NodeID]
 

packages/models-library/src/models_library/api_schemas_long_running_tasks/tasks.py

@@ -2,7 +2,8 @@
 from datetime import datetime
 from typing import Any
 
-from pydantic import BaseModel, field_validator
+from common_library.exclude import Unset
+from pydantic import BaseModel, ConfigDict, model_validator
 
 from .base import TaskId, TaskProgress
 
@@ -20,15 +21,30 @@ class TaskResult(BaseModel):
 
 class TaskBase(BaseModel):
     task_id: TaskId
-    task_name: str
+    task_name: str | Unset = Unset.VALUE
+
+    @model_validator(mode="after")
+    def try_populate_task_name_from_task_id(self) -> "TaskBase":
+        # NOTE: currently this model is used to validate tasks coming from
+        # the celery backend and form long_running_tasks
+        # 1. if a task comes from Celery, it will keep it's given name
+        # 2. if a task comes from long_running_tasks, it will extract it form
+        #   the task_id, which looks like "{PREFIX}.{TASK_NAME}.UNIQUE|{UUID}"
+
+        if self.task_id and self.task_name == Unset.VALUE:
+            parts = self.task_id.split(".")
+            if len(parts) > 1:
+                self.task_name = urllib.parse.unquote(parts[1])
+
+        if self.task_name == Unset.VALUE:
+            self.task_name = self.task_id
+
+        return self
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
 
 class TaskGet(TaskBase):
     status_href: str
     result_href: str
     abort_href: str
-
-    @field_validator("task_name")
-    @classmethod
-    def unquote_str(cls, v) -> str:
-        return urllib.parse.unquote(v)

packages/models-library/src/models_library/api_schemas_rpc_async_jobs/async_jobs.py

@@ -30,6 +30,17 @@ class AsyncJobResult(BaseModel):
 
 
 class AsyncJobGet(BaseModel):
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "job_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                    "job_name": "export_data_task",
+                }
+            ]
+        }
+    )
+
     job_id: AsyncJobId
     job_name: AsyncJobName
 
@@ -42,6 +53,18 @@ class AsyncJobAbort(BaseModel):
 class AsyncJobFilter(AsyncJobFilterBase):
     """Data for controlling access to an async job"""
 
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                {
+                    "product_name": "osparc",
+                    "user_id": 123,
+                    "client_name": "web_client",
+                }
+            ]
+        },
+    )
+
     product_name: ProductName
     user_id: UserID
     client_name: Annotated[

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

@@ -5,6 +5,7 @@
 from models_library.rest_base import RequestParameters
 from pydantic import AliasGenerator, ConfigDict, Field, HttpUrl, SecretStr
 from pydantic.alias_generators import to_camel
+from pydantic.config import JsonDict
 
 from ..emails import LowerCaseEmailStr
 from ._base import InputSchema, OutputSchema
@@ -14,33 +15,39 @@ class AccountRequestInfo(InputSchema):
     form: dict[str, Any]
     captcha: str
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "example": {
+                    "form": {
+                        "firstName": "James",
+                        "lastName": "Maxwel",
+                        "email": "[email protected]",
+                        "phone": "+41 44 245 96 96",
+                        "company": "EM Com",
+                        "address": "Infinite Loop",
+                        "city": "Washington",
+                        "postalCode": "98001",
+                        "country": "Switzerland",
+                        "application": "Antenna_Design",
+                        "description": "Description of something",
+                        "hear": "Search_Engine",
+                        "privacyPolicy": True,
+                        "eula": True,
+                    },
+                    "captcha": "A12B34",
+                }
+            }
+        )
+
     model_config = ConfigDict(
         str_strip_whitespace=True,
         str_max_length=200,
         # NOTE: this is just informative. The format of the form is defined
         # currently in the front-end and it might change
         # SEE image in  https://github.com/ITISFoundation/osparc-simcore/pull/5378
-        json_schema_extra={
-            "example": {
-                "form": {
-                    "firstName": "James",
-                    "lastName": "Maxwel",
-                    "email": "[email protected]",
-                    "phone": "+1 123456789",
-                    "company": "EM Com",
-                    "address": "Infinite Loop",
-                    "city": "Washington",
-                    "postalCode": "98001",
-                    "country": "USA",
-                    "application": "Antenna_Design",
-                    "description": "Description of something",
-                    "hear": "Search_Engine",
-                    "privacyPolicy": True,
-                    "eula": True,
-                },
-                "captcha": "A12B34",
-            }
-        },
+        json_schema_extra=_update_json_schema_extra,
     )