continue fixing

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/director_v2/settings.py

@@ -6,7 +6,7 @@
 
 from aiohttp import ClientSession, ClientTimeout, web
 from models_library.basic_types import VersionTag
-from pydantic import Field, PositiveInt
+from pydantic import AliasChoices, Field, PositiveInt
 from servicelib.aiohttp.application_keys import APP_CLIENT_SESSION_KEY
 from settings_library.base import BaseCustomSettings
 from settings_library.basic_types import PortInt
@@ -36,9 +36,9 @@ def base_url(self) -> URL:
     DIRECTOR_V2_RESTART_DYNAMIC_SERVICE_TIMEOUT: PositiveInt = Field(
         1 * _MINUTE,
         description="timeout of containers restart",
-        envs=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_RESTART_DYNAMIC_SERVICE_TIMEOUT",
-        ],
+        ),
     )
 
     DIRECTOR_V2_STORAGE_SERVICE_UPLOAD_DOWNLOAD_TIMEOUT: PositiveInt = Field(
@@ -49,9 +49,9 @@ def base_url(self) -> URL:
             "such payloads it is required to have long timeouts which "
             "allow the service to finish the operation."
         ),
-        envs=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_DYNAMIC_SERVICE_DATA_UPLOAD_DOWNLOAD_TIMEOUT",
-        ],
+        ),
     )
 
     def get_service_retrieve_timeout(self) -> ClientTimeout:

services/web/server/src/simcore_service_webserver/meta_modeling/_results.py

@@ -110,5 +110,5 @@ def extract_project_results(workbench: dict[str, Any]) -> ExtractedResults:
             values = node["outputs"]
             results[noid], labels[noid] = values, label
 
-    res = ExtractedResults(progress=progress, labels=labels, values=results)  # type: ignore[arg-type]
+    res = ExtractedResults(progress=progress, labels=labels, values=results)
     return res

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -18,7 +18,7 @@
 from models_library.projects_nodes_io import DownloadLink, NodeID, PortLink
 from models_library.projects_ui import StudyUI
 from models_library.services import ServiceKey, ServiceVersion
-from pydantic import AnyUrl, HttpUrl, parse_obj_as
+from pydantic import AnyUrl, HttpUrl, TypeAdapter
 from servicelib.logging_utils import log_decorator
 
 from ..projects.db import ProjectDBAPI
@@ -32,10 +32,10 @@
 _logger = logging.getLogger(__name__)
 
 
-_FILE_PICKER_KEY: ServiceKey = parse_obj_as(
-    ServiceKey, "simcore/services/frontend/file-picker"
+_FILE_PICKER_KEY: ServiceKey = TypeAdapter(ServiceKey).validate_python(
+    "simcore/services/frontend/file-picker"
 )
-_FILE_PICKER_VERSION: ServiceVersion = parse_obj_as(ServiceVersion, "1.0.0")
+_FILE_PICKER_VERSION: ServiceVersion = TypeAdapter(ServiceVersion).validate_python("1.0.0")
 
 
 def _generate_nodeids(project_id: ProjectID) -> tuple[NodeID, NodeID]:
@@ -55,12 +55,12 @@ def _create_file_picker(download_link: str, output_label: str | None):
     # also to name the file in case it is downloaded
 
     data = {}
-    data["downloadLink"] = url = parse_obj_as(AnyUrl, download_link)
+    data["downloadLink"] = url = TypeAdapter(AnyUrl).validate_python(download_link)
     if output_label:
         data["label"] = Path(output_label).name
     elif url.path:
         data["label"] = Path(url.path).name
-    output = DownloadLink.parse_obj(data)
+    output = DownloadLink.model_validate(data)
 
     output_id = "outFile"
     node = Node(
@@ -69,7 +69,7 @@ def _create_file_picker(download_link: str, output_label: str | None):
         label="File Picker",
         inputs={},
         inputNodes=[],
-        outputs={output_id: output},  # type: ignore[dict-item]
+        outputs={output_id: output},
         progress=0,
     )
     return node, output_id
@@ -94,12 +94,12 @@ def _create_project(
         uuid=project_id,
         name=name,
         description=description,
-        thumbnail=thumbnail,  # type: ignore[arg-type]
+        thumbnail=thumbnail,
         prjOwner=owner.email,
         accessRights={owner.primary_gid: access_rights},  # type: ignore[dict-item]
         creationDate=DateTimeStr(now_str()),
         lastChangeDate=DateTimeStr(now_str()),
-        workbench=workbench,  # type: ignore[arg-type]
+        workbench=workbench,
         ui=StudyUI(workbench=workbench_ui),  # type: ignore[arg-type]
     )
 
@@ -153,7 +153,7 @@ def _create_project_with_filepicker_and_service(
         version=viewer_info.version,
         label=viewer_info.label,
         inputs={
-            viewer_info.input_port_key: PortLink(  # type: ignore[dict-item]
+            viewer_info.input_port_key: PortLink(
                 nodeUuid=file_picker_id,
                 output=file_picker_output_id,
             )

services/web/server/src/simcore_service_webserver/studies_dispatcher/settings.py

@@ -1,10 +1,10 @@
 from datetime import timedelta
-from typing import Any, ClassVar
 
 from aiohttp import web
 from common_library.pydantic_validators import validate_numeric_string_as_timedelta
-from pydantic import TypeAdapter, field_validator, ConfigDict, ByteSize, HttpUrl
+from pydantic import TypeAdapter, field_validator, ByteSize, HttpUrl
 from pydantic.fields import Field
+from pydantic_settings import SettingsConfigDict
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
 from settings_library.base import BaseCustomSettings
 
@@ -54,7 +54,7 @@ def is_login_required(self):
     _validate_studies_guest_account_lifetime = validate_numeric_string_as_timedelta(
         "STUDIES_GUEST_ACCOUNT_LIFETIME"
     )
-    model_config = ConfigDict(
+    model_config = SettingsConfigDict(
         json_schema_extra={
             "example": {
                 "STUDIES_GUEST_ACCOUNT_LIFETIME": "2 1:10:00",  # 2 days 1h and 10 mins