maybe awaiting

Author: sanderegg

packages/postgres-database/src/simcore_postgres_database/utils_projects_metadata.py

@@ -3,6 +3,7 @@
 from typing import Any
 
 import sqlalchemy as sa
+from common_library.async_tools import maybe_await
 from common_library.errors_classes import OsparcErrorMixin
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -93,7 +94,7 @@ async def get(connection: DBConnection, project_uuid: uuid.UUID) -> ProjectMetad
         .where(projects.c.uuid == f"{project_uuid}")
     )
     result = await connection.execute(get_stmt)
-    row = await result.first()
+    row = await maybe_await(result.first())
     if row is None:
         raise DBProjectNotFoundError(project_uuid=project_uuid)
     return ProjectMetadata.model_validate(row)
@@ -203,7 +204,7 @@ async def set_project_ancestors(
 
     try:
         result = await connection.execute(upsert_stmt)
-        row = await result.first()
+        row = await maybe_await(result.first())
         assert row  # nosec
         return ProjectMetadata.model_validate(row)
 

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

@@ -181,11 +181,18 @@ def _backward_compatible_null_value(cls, v: HardwareInfo | None) -> HardwareInfo
         return v
 
     def to_db_model(self, **exclusion_rules) -> dict[str, Any]:
+        # mode json is used to ensure the UUIDs are converted to strings
         comp_task_dict = self.model_dump(
             mode="json", by_alias=True, exclude_unset=True, **exclusion_rules
         )
+        # Convert state to DB enum value
         if "state" in comp_task_dict:
             comp_task_dict["state"] = RUNNING_STATE_TO_DB[comp_task_dict["state"]].value
+        # but now the datetimes are strings which are not compatible with the DB
+        # so we need to convert them back to datetime objects
+        for field in ["start", "end", "last_heartbeat", "created", "modified"]:
+            if field in comp_task_dict and isinstance(comp_task_dict[field], str):
+                comp_task_dict[field] = dt.datetime.fromisoformat(comp_task_dict[field])
         return comp_task_dict
 
     model_config = ConfigDict(