Merge branch 'master' into 7634-opentelemetry-instrument-rpc-clients

Author: bisgaard-itis

.github/workflows/ci-testing-deploy.yml

@@ -109,6 +109,10 @@ jobs:
               - 'mypy.ini'
             common-library:
               - 'packages/common-library/**'
+              - 'packages/pytest-simcore/**'
+              - 'services/docker-compose*'
+              - 'scripts/mypy/*'
+              - 'mypy.ini'
             notifications-library:
               - 'packages/notifications-library/**'
               - 'packages/postgres-database/**'
@@ -1695,7 +1699,11 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - name: install uv
-        uses: yezz123/setup-uv@v4
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: "0.6.x"
+          enable-cache: false
+          cache-dependency-glob: "**/common-library/requirements/ci.txt"
       - name: show system version
         run: ./ci/helpers/show_system_versions.bash
       - name: install
@@ -1705,6 +1713,9 @@ jobs:
       - name: test
         run: ./ci/github/unit-testing/common-library.bash test
       - uses: codecov/codecov-action@v5
+        if: ${{ !cancelled() }}
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           flags: unittests #optional
 

.vscode/extensions.json

@@ -5,7 +5,7 @@
     "DevSoft.svg-viewer-vscode",
     "eamodio.gitlens",
     "exiasr.hadolint",
-    "ms-azuretools.vscode-docker",
+    "ms-azuretools.vscode-containers",
     "ms-python.black-formatter",
     "ms-python.pylint",
     "ms-python.python",

api/specs/web-server/_auth.py

@@ -260,8 +260,8 @@ async def email_confirmation(code: str):
 
 @router.get(
     "/auth/captcha",
-    operation_id="request_captcha",
+    operation_id="create_captcha",
     status_code=status.HTTP_200_OK,
     responses={status.HTTP_200_OK: {"content": {"image/png": {}}}},
 )
-async def request_captcha(): ...
+async def create_captcha(): ...

api/specs/web-server/_computations.py

@@ -6,17 +6,17 @@
 from models_library.api_schemas_webserver.computations import (
     ComputationGet,
     ComputationPathParams,
+    ComputationRunIterationsLatestListQueryParams,
+    ComputationRunIterationsListQueryParams,
     ComputationRunPathParams,
     ComputationRunRestGet,
-    ComputationRunWithFiltersListQueryParams,
     ComputationStart,
     ComputationStarted,
     ComputationTaskRestGet,
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.director_v2._controller.computations_rest import (
-    ComputationRunListQueryParams,
     ComputationTaskListQueryParams,
     ComputationTaskPathParams,
 )
@@ -71,7 +71,9 @@ async def stop_computation(_path: Annotated[ComputationPathParams, Depends()]):
     response_model=Page[ComputationRunRestGet],
 )
 async def list_computations_latest_iteration(
-    _query: Annotated[as_query(ComputationRunWithFiltersListQueryParams), Depends()],
+    _query: Annotated[
+        as_query(ComputationRunIterationsLatestListQueryParams), Depends()
+    ],
 ): ...
 
 
@@ -80,7 +82,7 @@ async def list_computations_latest_iteration(
     response_model=Page[ComputationRunRestGet],
 )
 async def list_computation_iterations(
-    _query: Annotated[as_query(ComputationRunListQueryParams), Depends()],
+    _query: Annotated[as_query(ComputationRunIterationsListQueryParams), Depends()],
     _path: Annotated[ComputationRunPathParams, Depends()],
 ): ...
 

api/specs/web-server/_functions.py

@@ -0,0 +1,53 @@
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, status
+from models_library.api_schemas_webserver.functions import (
+    FunctionToRegister,
+    RegisteredFunctionGet,
+)
+from models_library.generics import Envelope
+from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.functions._controller._functions_rest_schemas import (
+    FunctionPathParams,
+)
+
+router = APIRouter(
+    prefix=f"/{API_VTAG}",
+    tags=[
+        "functions",
+    ],
+)
+
+
+@router.post(
+    "/functions",
+    response_model=Envelope[RegisteredFunctionGet],
+)
+async def register_function(
+    _body: FunctionToRegister,
+) -> Envelope[RegisteredFunctionGet]: ...
+
+
+@router.get(
+    "/functions/{function_id}",
+    response_model=Envelope[RegisteredFunctionGet],
+)
+async def get_function(
+    _path: Annotated[FunctionPathParams, Depends()],
+): ...
+
+
+@router.delete(
+    "/functions/{function_id}",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def delete_function(
+    _path: Annotated[FunctionPathParams, Depends()],
+): ...

api/specs/web-server/_users.py

@@ -7,20 +7,25 @@
 from enum import Enum
 from typing import Annotated
 
+from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.users import (
     MyPermissionGet,
     MyProfileGet,
     MyProfilePatch,
     MyTokenCreate,
     MyTokenGet,
-    UserForAdminGet,
+    UserAccountApprove,
+    UserAccountGet,
+    UserAccountReject,
+    UserAccountSearchQueryParams,
     UserGet,
-    UsersForAdminSearchQueryParams,
+    UsersAccountListQueryParams,
     UsersSearch,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
 from models_library.generics import Envelope
+from models_library.rest_pagination import Page
 from models_library.user_preferences import PreferenceIdentifier
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.users._common.schemas import PreRegisteredUserGet
@@ -144,20 +149,46 @@ async def search_users(_body: UsersSearch): ...
 
 
 @router.get(
-    "/admin/users:search",
-    response_model=Envelope[list[UserForAdminGet]],
+    "/admin/user-accounts",
+    response_model=Page[UserAccountGet],
     tags=_extra_tags,
 )
-async def search_users_for_admin(
-    _query: Annotated[UsersForAdminSearchQueryParams, Depends()],
+async def list_users_accounts(
+    _query: Annotated[as_query(UsersAccountListQueryParams), Depends()],
+): ...
+
+
+@router.post(
+    "/admin/user-accounts:approve",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=_extra_tags,
+)
+async def approve_user_account(_body: UserAccountApprove): ...
+
+
+@router.post(
+    "/admin/user-accounts:reject",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=_extra_tags,
+)
+async def reject_user_account(_body: UserAccountReject): ...
+
+
+@router.get(
+    "/admin/user-accounts:search",
+    response_model=Envelope[list[UserAccountGet]],
+    tags=_extra_tags,
+)
+async def search_user_accounts(
+    _query: Annotated[UserAccountSearchQueryParams, Depends()],
 ):
     # NOTE: see `Search` in `Common Custom Methods` in https://cloud.google.com/apis/design/custom_methods
     ...
 
 
 @router.post(
-    "/admin/users:pre-register",
-    response_model=Envelope[UserForAdminGet],
+    "/admin/user-accounts:pre-register",
+    response_model=Envelope[UserAccountGet],
     tags=_extra_tags,
 )
-async def pre_register_user_for_admin(_body: PreRegisteredUserGet): ...
+async def pre_register_user_account(_body: PreRegisteredUserGet): ...

api/specs/web-server/openapi.py

@@ -35,6 +35,7 @@
         "_computations",
         "_exporter",
         "_folders",
+        "_functions",
         "_long_running_tasks",
         "_long_running_tasks_legacy",
         "_licensed_items",

api/tests/requirements.txt

@@ -85,10 +85,8 @@ pytest==8.3.5
     #   pytest-cov
     #   pytest-instafail
     #   pytest-sugar
-pytest-asyncio==0.23.8
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   -r requirements.in
+pytest-asyncio==0.26.0
+    # via -r requirements.in
 pytest-cov==6.0.0
     # via -r requirements.in
 pytest-instafail==0.5.0

packages/aws-library/requirements/_test.txt

@@ -196,10 +196,8 @@ pytest==8.3.5
     #   pytest-instafail
     #   pytest-mock
     #   pytest-sugar
-pytest-asyncio==0.23.8
-    # via
-    #   -c requirements/../../../requirements/constraints.txt
-    #   -r requirements/_test.in
+pytest-asyncio==0.26.0
+    # via -r requirements/_test.in
 pytest-benchmark==5.1.0
     # via -r requirements/_test.in
 pytest-cov==6.0.0

packages/aws-library/setup.cfg

@@ -15,6 +15,7 @@ test = pytest
 
 [tool:pytest]
 asyncio_mode = auto
+asyncio_default_fixture_loop_scope = function
 
 [mypy]
 plugins =