pydantic2 migration made integration tests green

packages/models-library/src/models_library/api_schemas_catalog/services.py

@@ -205,10 +205,7 @@ class ServiceUpdate(ServiceMetaDataEditable, ServiceAccessRights):
 class ServiceGet(
     ServiceMetaDataPublished, ServiceAccessRights, ServiceMetaDataEditable
 ):  # pylint: disable=too-many-ancestors
-    owner: LowerCaseEmailStr | None = Field(
-        None,
-        description="None when the owner email cannot be found in the database",
-    )
+    owner: LowerCaseEmailStr | None
 
     model_config = ConfigDict(
         extra="ignore",

packages/pytest-simcore/src/pytest_simcore/docker_compose.py

@@ -96,8 +96,8 @@ def testing_environ_vars(env_devel_file: Path) -> EnvVarsDict:
 
     # ensure OpenTelemetry is not enabled
     env_devel |= {
-        x: "null"
-        for x in (
+        tracing_setting: "null"
+        for tracing_setting in (
             "AGENT_TRACING",
             "API_SERVER_TRACING",
             "AUTOSCALING_TRACING",

services/director-v2/src/simcore_service_director_v2/api/errors/validation_error.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from fastapi.openapi.constants import REF_PREFIX

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/sidecar.py

@@ -2,6 +2,7 @@
 import warnings
 from enum import Enum
 from pathlib import Path
+from typing import Annotated
 
 from models_library.basic_types import BootModeEnum, PortInt
 from models_library.docker import DockerPlacementConstraint
@@ -104,12 +105,17 @@ class DynamicSidecarSettings(BaseCustomSettings, MixinLoggingSettings):
         ),
         description="dynamic-sidecar's service 'endpoint_spec' with {'Mode': 'dnsrr'}",
     )
-    DYNAMIC_SIDECAR_SC_BOOT_MODE: BootModeEnum = Field(
-        ...,
-        description="Boot mode used for the dynamic-sidecar services"
-        "By defaults, it uses the same boot mode set for the director-v2",
-        validation_alias=AliasChoices("DYNAMIC_SIDECAR_SC_BOOT_MODE", "SC_BOOT_MODE"),
-    )
+    DYNAMIC_SIDECAR_SC_BOOT_MODE: Annotated[
+        BootModeEnum,
+        Field(
+            ...,
+            description="Boot mode used for the dynamic-sidecar services"
+            "By defaults, it uses the same boot mode set for the director-v2",
+            validation_alias=AliasChoices(
+                "DYNAMIC_SIDECAR_SC_BOOT_MODE", "SC_BOOT_MODE"
+            ),
+        ),
+    ]
 
     DYNAMIC_SIDECAR_LOG_LEVEL: str = Field(
         "WARNING",

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -4,6 +4,7 @@
 
 import datetime
 from functools import cached_property
+from typing import Annotated
 
 from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.basic_types import LogLevel, PortInt, VersionTag
@@ -194,28 +195,29 @@ class AppSettings(BaseApplicationSettings, MixinLoggingSettings):
     )
 
     # App modules settings ---------------------
-    DIRECTOR_V2_STORAGE: StorageSettings = Field(
-        json_schema_extra={"auto_default_from_env": True}
-    )
+    DIRECTOR_V2_STORAGE: Annotated[
+        StorageSettings, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
     DIRECTOR_V2_NODE_PORTS_STORAGE_AUTH: StorageAuthSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}
     )
 
-    DIRECTOR_V2_CATALOG: CatalogSettings | None = Field(
-        json_schema_extra={"auto_default_from_env": True}
-    )
+    DIRECTOR_V2_CATALOG: Annotated[
+        CatalogSettings | None, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
 
     DIRECTOR_V0: DirectorV0Settings = Field(
         json_schema_extra={"auto_default_from_env": True}
     )
 
-    DYNAMIC_SERVICES: DynamicServicesSettings = Field(
-        json_schema_extra={"auto_default_from_env": True}
-    )
+    DYNAMIC_SERVICES: Annotated[
+        DynamicServicesSettings,
+        Field(json_schema_extra={"auto_default_from_env": True}),
+    ]
 
-    POSTGRES: PostgresSettings = Field(
-        json_schema_extra={"auto_default_from_env": True}
-    )
+    POSTGRES: Annotated[
+        PostgresSettings, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
 
     REDIS: RedisSettings = Field(json_schema_extra={"auto_default_from_env": True})
 

services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py

@@ -119,9 +119,9 @@ def create_as_initially_ok(cls) -> "Status":
 
 
 class DockerContainerInspect(BaseModel):
-    container_state: ContainerState = Field(
-        ..., description="current state of container"
-    )
+    container_state: Annotated[
+        ContainerState, Field(..., description="current state of container")
+    ]
     name: str = Field(..., description="docker name of the container")
     id: str = Field(..., description="docker id of the container")
 

services/director-v2/src/simcore_service_director_v2/utils/osparc_variables.py

@@ -4,7 +4,7 @@
 from typing import Any, Final, NamedTuple, TypeAlias
 
 from models_library.utils.specs_substitution import SubstitutionValue
-from pydantic import NonNegativeInt, TypeAdapter
+from pydantic import NonNegativeInt
 from servicelib.utils import logged_gather
 
 ContextDict: TypeAlias = dict[str, Any]

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -56,7 +56,6 @@
 from simcore_service_webserver.socketio.plugin import setup_socketio
 from simcore_service_webserver.users.plugin import setup_users
 from sqlalchemy import func, select
-from tenacity import AsyncRetrying, stop_after_delay, wait_fixed
 
 log = logging.getLogger(__name__)
 
@@ -345,16 +344,9 @@ async def disconnect_user_from_socketio(
     await sio.disconnect()
     assert not sio.sid
     await asyncio.sleep(0)  # just to ensure there is a context switch
-
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(0.1), stop=stop_after_delay(5), reraise=True
-    ):
-        with attempt:
-            assert not await socket_registry.find_keys(("socket_id", sio.get_sid()))
-            assert sid not in await socket_registry.find_resources(
-                resource_key, "socket_id"
-            )
-            assert not await socket_registry.find_resources(resource_key, "socket_id")
+    assert not await socket_registry.find_keys(("socket_id", sio.get_sid()))
+    assert sid not in await socket_registry.find_resources(resource_key, "socket_id")
+    assert not await socket_registry.find_resources(resource_key, "socket_id")
 
 
 async def assert_users_count(
@@ -485,6 +477,7 @@ async def test_t1_while_guest_is_connected_no_resources_are_removed(
     await assert_project_in_db(aiopg_engine, empty_guest_user_project)
 
 
+@pytest.mark.flaky(max_runs=3)
 async def test_t2_cleanup_resources_after_browser_is_closed(
     disable_garbage_collector_task: None,
     client: TestClient,

tests/environment-setup/requirements/ci.txt

@@ -12,4 +12,5 @@
 # installs this repo's packages
 pytest-simcore @ ../../packages/pytest-simcore/
 simcore-settings-library @ ../../packages/settings-library/
+simcore-common-library @ ../../packages/common-library/
 simcore-service-library @ ../../packages/service-library/

tests/environment-setup/requirements/dev.txt

@@ -12,4 +12,5 @@
 # installs this repo's packages
 --editable ../../packages/pytest-simcore/
 --editable ../../packages/settings-library/
+--editable ../../packages/common-library/
 --editable ../../packages/service-library/