Merge branch 'master' into fix-pydantic-userwarnings

Author: giancarloromeo

.env-devel

@@ -133,6 +133,11 @@ DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
 
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 
+WEBSERVER_LICENSES={}
+LICENSES_ITIS_VIP_SYNCER_ENABLED=false
+LICENSES_ITIS_VIP_API_URL=https://some-api/{category}
+LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
+
 # Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
 INVITATIONS_DEFAULT_PRODUCT=osparc
 INVITATIONS_HOST=invitations
@@ -371,7 +376,6 @@ 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/mergify.yml

@@ -1,9 +1,6 @@
-# NOTE: the PR is added to the queue when all checks have passed
-# and the CI is fully green.
-# If the PR is behind the queue will take care of updating it
 queue_rules:
   - name: default
-    queue_conditions:
+    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)
@@ -16,28 +13,57 @@ queue_rules:
       - "#changes-requested-reviews-by=0" # No changes requested
       - "#review-threads-unresolved=0" # All review threads resolved
 
-    merge_conditions:
+    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
 
-# NOTE: in case of flaky tests you above checks will fail
-# the PR will be removed from the queue.
-# This retries the checks, as soon as they become green,
-# the PR will be pusehd to the queu again
+
 pull_request_rules:
-  - name: retry CI on fails (used for flaky tests)
+  - 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: .github/workflows/ci-testing-deploy.yml
+            - 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-pull-request.yml

@@ -31,13 +31,15 @@ jobs:
           enable-cache: false
       - name: checkout source branch
         uses: actions/checkout@v4
-      - name: Regenerate specs and check
+      - name: Generate openapi specs
         run: |
           make devenv
           source .venv/bin/activate
           make openapi-specs
+      - name: Check openapi specs are up to date
+        run: |
           if ! ./ci/github/helpers/openapi-specs-diff.bash diff \
-            https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/refs/heads/${{ github.event.pull_request.head.ref }} \
+            https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/${{ github.event.after }} \
             .; then \
             echo "::error:: OAS are not up to date. Run 'make openapi-specs' to update them"; exit 1; \
           fi
@@ -57,7 +59,7 @@ jobs:
       - name: check api-server backwards compatibility
         run: |
           ./scripts/openapi-diff.bash breaking --fail-on ERR\
-            https://raw.githubusercontent.com/${{ github.event.pull_request.base.repo.full_name }}/refs/heads/${{ github.event.pull_request.base.ref }}/services/api-server/openapi.json \
+            https://raw.githubusercontent.com/${{ github.event.pull_request.base.repo.full_name }}/${{ github.event.after }}/services/api-server/openapi.json \
             /specs/services/api-server/openapi.json
 
   all-oas-breaking:
@@ -76,5 +78,5 @@ jobs:
       - name: Check openapi-specs backwards compatibility
         run: |
           ./ci/github/helpers/openapi-specs-diff.bash breaking \
-            https://raw.githubusercontent.com/${{ github.event.pull_request.base.repo.full_name }}/refs/heads/${{ github.event.pull_request.base.ref }} \
+            https://raw.githubusercontent.com/${{ github.event.pull_request.base.repo.full_name }}/${{ github.event.after }} \
             .

api/specs/web-server/_licensed_items.py

@@ -10,9 +10,10 @@
 
 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._common.exceptions_handlers import (
     _TO_HTTP_ERROR_MAP,
@@ -37,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()],
@@ -47,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/tests/requirements.txt

@@ -1,27 +1,27 @@
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.4
     # via aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.11
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
-attrs==24.2.0
+attrs==25.1.0
     # via
     #   aiohttp
     #   jsonschema
     #   referencing
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   -c ../../requirements/constraints.txt
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.1
     # via requests
-coverage==7.6.1
+coverage==7.6.10
     # via
     #   -r requirements.in
     #   pytest-cov
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
@@ -31,50 +31,54 @@ idna==3.10
     #   yarl
 iniconfig==2.0.0
     # via pytest
-isodate==0.6.1
+isodate==0.7.2
     # via openapi-core
 jsonschema==4.23.0
     # via
     #   openapi-core
     #   openapi-schema-validator
     #   openapi-spec-validator
-jsonschema-path==0.3.3
+jsonschema-path==0.3.4
     # via
     #   openapi-core
     #   openapi-spec-validator
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
     #   jsonschema
     #   openapi-schema-validator
 lazy-object-proxy==1.10.0
     # via openapi-spec-validator
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via werkzeug
-more-itertools==10.5.0
+more-itertools==10.6.0
     # via openapi-core
 multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
 openapi-core==0.19.4
     # via -r requirements.in
-openapi-schema-validator==0.6.2
+openapi-schema-validator==0.6.3
     # via
     #   openapi-core
     #   openapi-spec-validator
 openapi-spec-validator==0.7.1
     # via openapi-core
-packaging==24.1
+packaging==24.2
     # via
     #   pytest
     #   pytest-sugar
 parse==1.20.2
     # via openapi-core
-pathable==0.4.3
+pathable==0.4.4
     # via jsonschema-path
 pluggy==1.5.0
     # via pytest
-pytest==8.3.3
+propcache==0.2.1
+    # via
+    #   aiohttp
+    #   yarl
+pytest==8.3.4
     # via
     #   -r requirements.in
     #   pytest-asyncio
@@ -85,7 +89,7 @@ pytest-asyncio==0.23.8
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r requirements.in
 pytest-instafail==0.5.0
     # via -r requirements.in
@@ -97,28 +101,27 @@ pyyaml==6.0.2
     #   jsonschema-path
 referencing==0.35.1
     # via
+    #   -c ../../requirements/constraints.txt
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
 requests==2.32.3
     # via jsonschema-path
 rfc3339-validator==0.1.4
     # via openapi-schema-validator
-rpds-py==0.20.0
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
-six==1.16.0
-    # via
-    #   isodate
-    #   rfc3339-validator
-termcolor==2.4.0
+six==1.17.0
+    # via rfc3339-validator
+termcolor==2.5.0
     # via pytest-sugar
-urllib3==2.2.3
+urllib3==2.3.0
     # via
     #   -c ../../requirements/constraints.txt
     #   requests
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via openapi-core
-yarl==1.12.1
+yarl==1.18.3
     # via aiohttp