Merge remote-tracking branch 'upstream/master' into pr-osparc-ooil-extensions

Author: Andrei Neagu

.env-devel

@@ -334,7 +334,6 @@ LOGIN_ACCOUNT_DELETION_RETENTION_DAYS=31
 LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
 LOGIN_REGISTRATION_INVITATION_REQUIRED=0
 PROJECTS_INACTIVITY_INTERVAL=00:00:20
-PROJECTS_TRASH_RETENTION_DAYS=7
 PROJECTS_MAX_COPY_SIZE_BYTES=30Gib
 PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES=5
 REST_SWAGGER_API_DOC_ENABLED=1
@@ -353,6 +352,7 @@ TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=http://jaeger:4318
 TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
 TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
 TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
+TRASH_RETENTION_DAYS=7
 TWILIO_ACCOUNT_SID=DUMMY
 TWILIO_AUTH_TOKEN=DUMMY
 TWILIO_COUNTRY_CODES_W_ALPHANUMERIC_SID_SUPPORT=["41"]

.github/dependabot.yml

@@ -11,6 +11,9 @@ updates:
       - sanderegg
     assignees:
       - pcrespov
+      - sanderegg
+    labels:
+      - t:maintenance
     ignore:
       - dependency-name: docker-compose
         versions:
@@ -26,32 +29,10 @@ updates:
       - dependency-name: httpx
         versions:
           - 0.17.0
-  - package-ecosystem: pip
-    directory: "/packages/service-library"
-    schedule:
-      interval: weekly
-      time: "04:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - pcrespov
-      - sanderegg
-    assignees:
-      - pcrespov
-    ignore:
       - dependency-name: openapi-core
         versions:
           - "> 0.12.0, < 1"
-  - package-ecosystem: pip
-    directory: "/packages/postgres-database"
-    schedule:
-      interval: weekly
-      time: "04:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - pcrespov
-      - sanderegg
-    assignees:
-      - pcrespov
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -62,3 +43,5 @@ updates:
       - pcrespov
     assignees:
       - sanderegg
+    labels:
+      - t:maintenance

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

@@ -1730,15 +1730,13 @@ jobs:
       matrix:
         python: ["3.11"]
         os: [ubuntu-22.04]
-        docker_buildx: [v0.10.4]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - name: setup docker buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
         with:
-          version: ${{ matrix.docker_buildx }}
           driver: docker-container
       - name: setup python environment
         uses: actions/setup-python@v5

api/specs/web-server/_folders.py

@@ -19,14 +19,14 @@
 from models_library.generics import Envelope
 from models_library.rest_error import EnvelopedError
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.folders._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.folders._models import (
+from simcore_service_webserver.folders._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.folders._common.models import (
     FolderSearchQueryParams,
     FoldersListQueryParams,
     FoldersPathParams,
-)
-from simcore_service_webserver.folders._workspaces_handlers import (
-    _FolderWorkspacesPathParams,
+    FolderWorkspacesPathParams,
 )
 
 router = APIRouter(
@@ -109,6 +109,6 @@ async def delete_folder(
     tags=["workspaces"],
 )
 async def move_folder_to_workspace(
-    _path: Annotated[_FolderWorkspacesPathParams, Depends()],
+    _path: Annotated[FolderWorkspacesPathParams, Depends()],
 ):
     ...

api/specs/web-server/_projects_wallet.py

@@ -8,15 +8,20 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
+from typing import Annotated
 
 from _common import assert_handler_signature_against_model
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.wallets import WalletGet
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from models_library.wallets import WalletID
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.projects._common.models import ProjectPathParams
+from simcore_service_webserver.projects._wallets_handlers import (
+    _PayProjectDebtBody,
+    _ProjectWalletPathParams,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -51,3 +56,17 @@ async def connect_wallet_to_project(
 
 
 assert_handler_signature_against_model(connect_wallet_to_project, ProjectPathParams)
+
+
+@router.post(
+    "/projects/{project_id}/wallet/{wallet_id}:pay-debt",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def pay_project_debt(
+    _path: Annotated[_ProjectWalletPathParams, Depends()],
+    _body: Annotated[_PayProjectDebtBody, Depends()],
+):
+    ...
+
+
+assert_handler_signature_against_model(connect_wallet_to_project, ProjectPathParams)

api/specs/web-server/_trash.py

@@ -10,12 +10,12 @@
 from fastapi import APIRouter, Depends, status
 from models_library.trash import RemoveQueryParams
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.folders._models import (
+from simcore_service_webserver.folders._common.models import (
     FoldersPathParams,
     FolderTrashQueryParams,
 )
-from simcore_service_webserver.projects._trash_handlers import ProjectPathParams
-from simcore_service_webserver.workspaces._models import (
+from simcore_service_webserver.projects._trash_rest import ProjectPathParams
+from simcore_service_webserver.workspaces._common.models import (
     WorkspacesPathParams,
     WorkspaceTrashQueryParams,
 )

api/specs/web-server/_workspaces.py

@@ -19,14 +19,16 @@
 from models_library.generics import Envelope
 from models_library.rest_error import EnvelopedError
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.folders._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.workspaces._groups_api import WorkspaceGroupGet
-from simcore_service_webserver.workspaces._models import (
+from simcore_service_webserver.folders._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.workspaces._common.models import (
     WorkspacesGroupsBodyParams,
     WorkspacesGroupsPathParams,
     WorkspacesListQueryParams,
     WorkspacesPathParams,
 )
+from simcore_service_webserver.workspaces._groups_service import WorkspaceGroupGet
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",

ci/helpers/install_pylint.bash

@@ -16,7 +16,7 @@ PYLINT_VERSION="$(grep pylint== $REQUIREMENTS | awk '{print $1}')"
 uv pip install "$PYLINT_VERSION"
 
 # Minimal packages to pass linter
-echo "$CURDIR/requirements.txt"
-uv pip install -r "$CURDIR/requirements.txt"
+echo "$CURDIR/requirements/requirements.txt"
+uv pip install -r "$CURDIR/requirements/requirements.txt"
 
 echo "INFO:" "$(pylint --version)" "@" "$(command -v pylint)"

ci/helpers/requirements/Makefile

@@ -0,0 +1,6 @@
+#
+# Targets to pip-compile requirements
+#
+include ../../../requirements/base.Makefile
+
+# Add here any extra explicit dependency: e.g. _migration.txt: _base.txt

ci/helpers/requirements.in renamed to ci/helpers/requirements/requirements.in

@@ -2,7 +2,8 @@
 #
 # Installing these void e.g. E0611: No name 'UploadFile' in module 'fastapi' (no-name-in-module)
 #
---constraint ../../requirements/constraints.txt
+--constraint ../../../requirements/constraints.txt
 
 aiohttp
 fastapi
+docker