Merge branch 'master' into is1647/collaboration-features-1

Author: matusdrobuliak66

.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

.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_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,
     )
 
 

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

@@ -1,9 +1,11 @@
+import datetime
 from typing import Annotated, TypeAlias
 
 from pydantic import Field
 
 from ..functions import (
     Function,
+    FunctionAccessRights,
     FunctionBase,
     FunctionClass,
     FunctionClassSpecificData,
@@ -23,6 +25,7 @@
     FunctionOutputs,
     FunctionOutputSchema,
     FunctionSchemaClass,
+    FunctionUpdate,
     JSONFunctionInputSchema,
     JSONFunctionOutputSchema,
     ProjectFunction,
@@ -46,6 +49,7 @@
     UnsupportedFunctionClassError,
     UnsupportedFunctionFunctionJobClassCombinationError,
 )
+from ..projects import ProjectID
 from ._base import InputSchema, OutputSchema
 
 __all__ = [
@@ -113,7 +117,13 @@
 class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema): ...
 
 
-class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema): ...
+class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
+    uid: Annotated[FunctionID, Field(alias="uuid")]
+    project_id: Annotated[ProjectID, Field(alias="templateId")]
+    created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
+    modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
+    access_rights: FunctionAccessRights | None = None
+    thumbnail: str | None = None
 
 
 class SolverFunctionToRegister(SolverFunction, InputSchema): ...
@@ -131,3 +141,6 @@ class ProjectFunctionToRegister(ProjectFunction, InputSchema): ...
     RegisteredProjectFunctionGet | RegisteredSolverFunctionGet,
     Field(discriminator="function_class"),
 ]
+
+
+class RegisteredFunctionUpdate(FunctionUpdate, InputSchema): ...

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

@@ -207,27 +207,6 @@ def _validate_user_name(cls, value: str):
         return value
 
 
-#
-# PHONE REGISTRATION
-#
-
-
-class MyPhoneRegister(InputSchema):
-    phone: Annotated[
-        str,
-        StringConstraints(strip_whitespace=True, min_length=1),
-        Field(description="Phone number to register"),
-    ]
-
-
-class MyPhoneConfirm(InputSchema):
-    code: Annotated[
-        str,
-        StringConstraints(strip_whitespace=True, pattern=r"^[A-Za-z0-9]+$"),
-        Field(description="Alphanumeric confirmation code"),
-    ]
-
-
 #
 # USER
 #
@@ -407,4 +386,5 @@ def from_domain_model(cls, permission: UserPermission) -> Self:
 
 
 class MyFunctionPermissionsGet(OutputSchema):
+    read_functions: bool
     write_functions: bool

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

@@ -99,6 +99,12 @@ class FunctionBase(BaseModel):
 class RegisteredFunctionBase(FunctionBase):
     uid: FunctionID
     created_at: datetime.datetime
+    modified_at: datetime.datetime
+
+
+class FunctionUpdate(BaseModel):
+    title: str | None = None
+    description: str | None = None
 
 
 class ProjectFunction(FunctionBase):
@@ -250,6 +256,7 @@ class FunctionDB(BaseModel):
 class RegisteredFunctionDB(FunctionDB):
     uuid: FunctionID
     created: datetime.datetime
+    modified: datetime.datetime
 
 
 class FunctionJobCollectionDB(BaseModel):