Merge branch 'master' into feature/support-center

Author: odeimaiz

api/specs/web-server/_functions.py

@@ -10,12 +10,18 @@
 from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.functions import (
+    FunctionGroupAccessRightsGet,
+    FunctionGroupAccessRightsUpdate,
     FunctionToRegister,
     RegisteredFunctionGet,
     RegisteredFunctionUpdate,
 )
 from models_library.generics import Envelope
+from models_library.groups import GroupID
 from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.functions._controller._functions_rest import (
+    FunctionGroupPathParams,
+)
 from simcore_service_webserver.functions._controller._functions_rest_schemas import (
     FunctionGetQueryParams,
     FunctionPathParams,
@@ -75,3 +81,33 @@ async def update_function(
 async def delete_function(
     _path: Annotated[FunctionPathParams, Depends()],
 ): ...
+
+
+@router.get(
+    "/functions/{function_id}/groups",
+    response_model=Envelope[dict[GroupID, FunctionGroupAccessRightsGet]],
+)
+async def get_function_groups(
+    _path: Annotated[FunctionPathParams, Depends()],
+): ...
+
+
+@router.put(
+    "/functions/{function_id}/groups/{group_id}",
+    summary="Create or update a Function Group",
+    response_model=Envelope[FunctionGroupAccessRightsGet],
+)
+async def create_or_update_function_group(
+    _path: Annotated[FunctionGroupPathParams, Depends()],
+    _body: FunctionGroupAccessRightsUpdate,
+): ...
+
+
+@router.delete(
+    "/functions/{function_id}/groups/{group_id}",
+    summary="Delete a Function Group",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def delete_function_group(
+    _path: Annotated[FunctionGroupPathParams, Depends()],
+): ...

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

@@ -5,7 +5,6 @@
 
 from ..functions import (
     Function,
-    FunctionAccessRights,
     FunctionBase,
     FunctionClass,
     FunctionClassSpecificData,
@@ -49,6 +48,7 @@
     UnsupportedFunctionClassError,
     UnsupportedFunctionFunctionJobClassCombinationError,
 )
+from ..groups import GroupID
 from ..projects import ProjectID
 from ._base import InputSchema, OutputSchema
 
@@ -114,11 +114,23 @@
 ]
 
 
+class FunctionGroupAccessRightsGet(OutputSchema):
+    read: bool
+    write: bool
+    execute: bool
+
+
+class FunctionGroupAccessRightsUpdate(InputSchema):
+    read: bool
+    write: bool
+    execute: bool
+
+
 class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema):
     uid: Annotated[FunctionID, Field(alias="uuid")]
     created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
     modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
-    access_rights: FunctionAccessRights | None = None
+    access_rights: dict[GroupID, FunctionGroupAccessRightsGet]
     thumbnail: HttpUrl | None = None
 
 
@@ -127,7 +139,7 @@ class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
     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
+    access_rights: dict[GroupID, FunctionGroupAccessRightsGet]
     thumbnail: HttpUrl | None = None
 
 

packages/service-library/src/servicelib/fastapi/client_session.py

@@ -2,20 +2,25 @@
 
 import httpx
 from fastapi import FastAPI
+from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from settings_library.tracing import TracingSettings
 
 
 def setup_client_session(
     app: FastAPI,
     *,
     default_timeout: datetime.timedelta = datetime.timedelta(seconds=20),
-    max_keepalive_connections: int = 20
+    max_keepalive_connections: int = 20,
+    tracing_settings: TracingSettings | None,
 ) -> None:
     async def on_startup() -> None:
         session = httpx.AsyncClient(
             transport=httpx.AsyncHTTPTransport(http2=True),
             limits=httpx.Limits(max_keepalive_connections=max_keepalive_connections),
             timeout=default_timeout.total_seconds(),
         )
+        if tracing_settings:
+            setup_httpx_client_tracing(session)
         app.state.aiohttp_client_session = session
 
     async def on_shutdown() -> None: