continue fixing

Author: giancarloromeo

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

@@ -14,7 +14,7 @@ async def http_error_handler(_: Request, exc: HTTPException) -> JSONResponse:
 
 def make_http_error_handler_for_exception(
     status_code: int, exception_cls: type[BaseException]
-) -> Callable[[Request, type[BaseException]], Awaitable[JSONResponse]]:
+) -> Callable[[Request, Exception], Awaitable[JSONResponse]]:
     """
     Produces a handler for BaseException-type exceptions which converts them
     into an error JSON response with a given status code

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

@@ -230,8 +230,8 @@ def to_db_model(self, **exclusion_rules) -> dict[str, Any]:
                     "state": "NOT_STARTED",
                     "progress": 0.44,
                     "last_heartbeat": None,
-                    "created": "2022-05-20 13:28:31.139+00",
-                    "modified": "2023-06-23 15:58:32.833081+00",
+                    "created": "2022-05-20T13:28:31.139",
+                    "modified": "2023-06-23T15:58:32.83308",
                     "pricing_info": {
                         "pricing_plan_id": 1,
                         "pricing_unit_id": 1,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_public.py

@@ -293,7 +293,7 @@ def _get_client(self, dynamic_sidecar_endpoint: AnyHttpUrl) -> Client:
         return Client(
             app=self._app,
             async_client=self._async_client,
-            base_url=dynamic_sidecar_endpoint,
+            base_url=f"{dynamic_sidecar_endpoint}",
         )
 
     async def _await_for_result(

services/director-v2/tests/unit/test_utils_distributed_identifier.py

@@ -10,7 +10,7 @@
 from uuid import UUID, uuid4
 
 import pytest
-from pydantic import BaseModel, NonNegativeInt, StrBytes
+from pydantic import BaseModel, NonNegativeInt
 from pytest_mock import MockerFixture
 from servicelib.redis import RedisClientSDK
 from servicelib.utils import logged_gather
@@ -132,8 +132,8 @@ def _serialize_identifier(cls, identifier: UserDefinedID) -> str:
         return f"{identifier._id}"  # noqa: SLF001
 
     @classmethod
-    def _deserialize_cleanup_context(cls, raw: StrBytes) -> AnEmptyTextCleanupContext:
-        return AnEmptyTextCleanupContext.parse_raw(raw)
+    def _deserialize_cleanup_context(cls, raw: str | bytes) -> AnEmptyTextCleanupContext:
+        return AnEmptyTextCleanupContext.model_validate_json(raw)
 
     @classmethod
     def _serialize_cleanup_context(

services/director-v2/tests/unit/with_dbs/test_api_route_computations_tasks.py

@@ -9,6 +9,7 @@
 from uuid import uuid4
 
 import httpx
+from pydantic import TypeAdapter
 import pytest
 from faker import Faker
 from fastapi import FastAPI, status
@@ -21,7 +22,6 @@
 from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.users import UserID
-from pydantic import parse_raw_as
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_director_v2.core.settings import AppSettings
@@ -162,7 +162,7 @@ async def test_get_all_tasks_log_files(
 
     # test expected response according to OAS!
     assert resp.status_code == status.HTTP_200_OK
-    log_files = parse_raw_as(list[TaskLogFileGet], resp.text)
+    log_files = TypeAdapter(list[TaskLogFileGet]).validate_json(resp.text)
     assert log_files
     assert all(l.download_link for l in log_files)
 

services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py

@@ -41,7 +41,7 @@
     RabbitResourceTrackingStoppedMessage,
 )
 from models_library.users import UserID
-from pydantic import TypeAdapter, parse_raw_as
+from pydantic import TypeAdapter
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.rabbitmq import RabbitMQClient
@@ -732,7 +732,7 @@ async def _return_1st_task_running(job_ids: list[str]) -> list[DaskClientTaskSta
     assert messages[0].service_uuid == exp_started_task.node_id
 
     def _parser(x) -> RabbitResourceTrackingMessages:
-        return parse_raw_as(RabbitResourceTrackingMessages, x)
+        return TypeAdapter(RabbitResourceTrackingMessages).validate_json(x)
 
     messages = await _assert_message_received(
         resource_tracking_rabbit_client_parser,