Merge remote-tracking branch 'upstream/master' into is5646/extract-projects-workbench-column

Author: giancarloromeo

.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"]

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/_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

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/src/common_library/exclude.py

@@ -8,6 +8,10 @@ class UnSet:
 UnSet.VALUE = UnSet()
 
 
+def is_unset(v: Any) -> bool:
+    return isinstance(v, UnSet)
+
+
 def as_dict_exclude_unset(**params) -> dict[str, Any]:
     return {k: v for k, v in params.items() if not isinstance(v, UnSet)}
 

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))