revert and fix

Author: sanderegg

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

@@ -4,13 +4,7 @@
 import networkx as nx
 from models_library.projects import ProjectID
 from models_library.projects_state import RunningState
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    SerializationInfo,
-    field_serializer,
-    field_validator,
-)
+from pydantic import BaseModel, ConfigDict, field_validator
 from simcore_postgres_database.models.comp_pipeline import StateType
 
 from ..utils.db import DB_TO_RUNNING_STATE
@@ -21,13 +15,6 @@ class CompPipelineAtDB(BaseModel):
     dag_adjacency_list: dict[str, list[str]]  # json serialization issue if using NodeID
     state: RunningState
 
-    @field_serializer("project_id")
-    @staticmethod
-    def _convert_uuid_to_str(v: ProjectID, info: SerializationInfo) -> str | ProjectID:
-        if info.context == "asyncpg":
-            return f"{v}"
-        return v
-
     @field_validator("state", mode="before")
     @classmethod
     def _convert_state_from_state_type_enum_if_needed(cls, v):

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

@@ -52,15 +52,10 @@ async def _(**pipeline_kwargs) -> CompPipelineAtDB:
             "state": StateType.NOT_STARTED,
         }
         pipeline_config.update(**pipeline_kwargs)
-        CompPipelineAtDB.model_validate(pipeline_config).model_dump(context="asyncpg")
         async with sqlalchemy_async_engine.begin() as conn:
             result = await conn.execute(
                 comp_pipeline.insert()
-                .values(
-                    **CompPipelineAtDB.model_validate(pipeline_config).model_dump(
-                        context="asyncpg"
-                    )
-                )
+                .values(**pipeline_config)
                 .returning(sa.literal_column("*"))
             )
             assert result

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

@@ -101,7 +101,7 @@ async def tasks(
     create_tasks: Callable[..., Awaitable[list[CompTaskAtDB]]],
 ) -> list[CompTaskAtDB]:
     await create_pipeline(
-        project_id=project.uuid,
+        project_id=f"{project.uuid}",
         dag_adjacency_list=fake_workbench_adjacency,
     )
     comp_tasks = await create_tasks(user, project)