Merge branch 'master' into pr-osparc-move-service-extras-to-catalog2

Author: GitHK

.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

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

ci/helpers/requirements.txt renamed to ci/helpers/requirements/requirements.txt

@@ -1,9 +1,4 @@
-# This file was autogenerated by uv via the following command:
-#    uv pip compile requirements.in -o requirements.txt
 aiohttp==3.9.5
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   -r requirements.in
 aiosignal==1.3.1
     # via aiohttp
 annotated-types==0.7.0
@@ -12,36 +7,43 @@ anyio==4.3.0
     # via starlette
 attrs==23.2.0
     # via aiohttp
+certifi==2024.12.14
+    # via requests
+charset-normalizer==3.4.1
+    # via requests
+docker==7.1.0
 fastapi==0.115.0
-    # via -r requirements.in
 frozenlist==1.4.1
     # via
     #   aiohttp
     #   aiosignal
 idna==3.7
     # via
     #   anyio
+    #   requests
     #   yarl
 multidict==6.0.5
     # via
     #   aiohttp
     #   yarl
-pydantic==2.9.2
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   fastapi
-pydantic-core==2.23.4
+pydantic==2.10.5
+    # via fastapi
+pydantic-core==2.27.2
     # via pydantic
+requests==2.32.3
+    # via docker
 sniffio==1.3.1
     # via anyio
 starlette==0.38.6
-    # via
-    #   -c ../../requirements/constraints.txt
-    #   fastapi
-typing-extensions==4.11.0
+    # via fastapi
+typing-extensions==4.12.2
     # via
     #   fastapi
     #   pydantic
     #   pydantic-core
+urllib3==2.3.0
+    # via
+    #   docker
+    #   requests
 yarl==1.9.4
     # via aiohttp

packages/common-library/tests/test_pydantic_fields_extension.py

@@ -69,4 +69,4 @@ class MyModel(BaseModel):
     ],
 )
 def test_field_fn(fn: Callable[[Any], Any], expected: Any, name: str):
-    assert expected == fn(MyModel.model_fields[name])
+    assert expected == fn(MyModel.model_fields.get(name))

packages/models-library/src/models_library/user_preferences.py

@@ -98,19 +98,30 @@ def to_db(self) -> dict:
 
     @classmethod
     def update_preference_default_value(cls, new_default: Any) -> None:
-        expected_type = get_type(cls.model_fields["value"])
+        expected_type = get_type(
+            cls.model_fields["value"]  # pylint: disable=unsubscriptable-object
+        )
         detected_type = type(new_default)
         if expected_type != detected_type:
             msg = (
                 f"Error, {cls.__name__} {expected_type=} differs from {detected_type=}"
             )
             raise TypeError(msg)
 
-        if cls.model_fields["value"].default is None:
-            cls.model_fields["value"].default_factory = lambda: new_default
+        if (
+            cls.model_fields["value"].default  # pylint: disable=unsubscriptable-object
+            is None
+        ):
+            cls.model_fields[  # pylint: disable=unsubscriptable-object
+                "value"
+            ].default_factory = lambda: new_default
         else:
-            cls.model_fields["value"].default = new_default
-            cls.model_fields["value"].default_factory = None
+            cls.model_fields[  # pylint: disable=unsubscriptable-object
+                "value"
+            ].default = new_default
+            cls.model_fields[  # pylint: disable=unsubscriptable-object
+                "value"
+            ].default_factory = None
 
         cls.model_rebuild(force=True)
 

packages/models-library/tests/test_rest_ordering.py

@@ -197,7 +197,7 @@ def test_ordering_query_model_class__defaults():
     model = OrderQueryParamsModel.model_validate({"order_by": {"field": "name"}})
     assert model.order_by
     assert model.order_by.field == "name"
-    assert model.order_by.direction == OrderBy.model_fields["direction"].default
+    assert model.order_by.direction == OrderBy.model_fields.get("direction").default
 
     # direction alone is invalid
     with pytest.raises(ValidationError) as err_info:

packages/postgres-database/docker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base