Merge remote-tracking branch 'upstream/master' into 2025/upgrade/postgres

Author: mrnicegyu11

.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"]
@@ -371,6 +371,7 @@ WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
+WEBSERVER_LICENSES=true
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
 WEBSERVER_META_MODELING=1

.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/mergify.yml

@@ -0,0 +1,69 @@
+queue_rules:
+  - name: default
+    queue_conditions: # condtions to be met to add the PR to the queue (manually or automatically)
+      # general prerequisits fo accept the PR in the queue
+      - label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
+      - label!=🤖-do-not-merge # block Mergify from merging the PR (added manually)
+      - base=master
+      - -draft # PR is not in draft state
+      - -conflict # No merge conflicts
+
+      # Check for required reviews
+      - "#approved-reviews-by>=2" # Requires 2 approving reviews
+      - "#changes-requested-reviews-by=0" # No changes requested
+      - "#review-threads-unresolved=0" # All review threads resolved
+
+    merge_conditions: # conditions to be met before being able to merge
+      # list of CI checks that need to pass
+      - check-success=system-test-environment-setup
+      - check-success=changes
+      - check-success=build-test-images
+      - check-success=build-test-images-frontend
+      - check-success=unit-tests
+      - check-success=integration-tests
+      - check-success=system-tests
+
+
+pull_request_rules:
+  - name: retry flaky tests (when PR is approved)
+    conditions:
+      - label=🤖-automerge
+      - label!=🤖-do-not-merge
+      - base=master
+
+      - -draft # PR is not in draft state
+      - -conflict # No merge conflicts
+      - "#approved-reviews-by>=2" # Requires 2 approving reviews
+      - "#changes-requested-reviews-by=0" # No changes requested
+      - "#review-threads-unresolved=0" # All review threads resolved
+
+      - or:
+          - check-failure=system-test-environment-setup
+          - check-failure=changes
+          - check-failure=build-test-images
+          - check-failure=build-test-images-frontend
+          - check-failure=unit-tests
+          - check-failure=integration-tests
+          - check-failure=system-tests
+    actions:
+      comment:
+        message: "Restarted CI due to failing tests"
+      github_actions:
+        workflow:
+          dispatch:
+            - workflow: ci-testing-deploy.yml
+
+  - name: Automatically add PR to queue if it meets conditions
+    conditions:
+      - "label=🤖-automerge"
+      - "label!=🤖-do-not-merge"
+      - "base=master"
+
+      - "-draft" # PR is not in draft state
+      - "-conflict" # PR has no conflicts
+      - "#approved-reviews-by>=2" # Requires 2 approvals
+      - "#changes-requested-reviews-by=0" # No requested changes
+      - "#review-threads-unresolved=0" # All review threads resolved
+    actions:
+      queue:
+        name: default

.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

.ruff.toml

@@ -1,5 +1,5 @@
 
-select = [
+lint.select = [
   "A",     # [https://pypi.org/project/flake8-builtins/]
   "ARG",   # [https://pypi.org/project/flake8-unused-arguments/]
   "ASYNC", # [https://pypi.org/project/flake8-async/]
@@ -40,7 +40,7 @@ select = [
   "W",     # [https://pypi.org/project/pycodestyle/] warnings
   "YTT",   # [https://pypi.org/project/flake8-2020/]
 ]
-ignore = [
+lint.ignore = [
   "E501",   # line too long, handled by black
   "S101",   # use of `assert` detected hanbled by pylance, does not support noseq
   "TID252", # [*] Relative imports from parent modules are banned
@@ -50,7 +50,7 @@ ignore = [
 target-version = "py311"
 
 
-[per-file-ignores]
+[lint.per-file-ignores]
 "**/{tests,pytest_simcore}/**" = [
   "T201",    # print found
   "ARG001",  # unused function argument
@@ -64,10 +64,10 @@ target-version = "py311"
   "FBT001",  # Boolean positional arg in function definition
 ]
 
-[flake8-pytest-style]
+[lint.flake8-pytest-style]
 fixture-parentheses = false
 parametrize-names-type = "csv"
 
 
-[pylint]
+[lint.pylint]
 max-args = 10

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/_licensed_items.py

@@ -10,12 +10,15 @@
 
 from _common import as_query
 from fastapi import APIRouter, Depends, status
-from models_library.api_schemas_webserver.licensed_items import LicensedItemGet
+from models_library.api_schemas_webserver.licensed_items import LicensedItemRestGet
 from models_library.generics import Envelope
 from models_library.rest_error import EnvelopedError
+from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsBodyParams,
     LicensedItemsListQueryParams,
     LicensedItemsPathParams,
@@ -35,7 +38,7 @@
 
 @router.get(
     "/catalog/licensed-items",
-    response_model=Envelope[list[LicensedItemGet]],
+    response_model=Page[LicensedItemRestGet],
 )
 async def list_licensed_items(
     _query: Annotated[as_query(LicensedItemsListQueryParams), Depends()],
@@ -45,7 +48,7 @@ async def list_licensed_items(
 
 @router.get(
     "/catalog/licensed-items/{licensed_item_id}",
-    response_model=Envelope[LicensedItemGet],
+    response_model=Envelope[LicensedItemRestGet],
 )
 async def get_licensed_item(
     _path: Annotated[LicensedItemsPathParams, Depends()],

api/specs/web-server/_licensed_items_checkouts.py

@@ -17,7 +17,9 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
 from simcore_service_webserver.licenses._licensed_items_checkouts_models import (
     LicensedItemCheckoutPathParams,
     LicensedItemsCheckoutsListQueryParams,

api/specs/web-server/_licensed_items_purchases.py

@@ -17,8 +17,10 @@
 from models_library.rest_error import EnvelopedError
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.licenses._exceptions_handlers import _TO_HTTP_ERROR_MAP
-from simcore_service_webserver.licenses._models import (
+from simcore_service_webserver.licenses._common.exceptions_handlers import (
+    _TO_HTTP_ERROR_MAP,
+)
+from simcore_service_webserver.licenses._common.models import (
     LicensedItemsPurchasesListQueryParams,
     LicensedItemsPurchasesPathParams,
 )

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)