removed submit column

Author: sanderegg

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

@@ -128,7 +128,6 @@ class CompTaskAtDB(BaseModel):
         description="the hex digest of the resolved inputs +outputs hash at the time when the last outputs were generated",
     )
     image: Image
-    submit: dt.datetime
     start: dt.datetime | None = None
     end: dt.datetime | None = None
     state: RunningState
@@ -163,7 +162,7 @@ def _convert_state_from_state_type_enum_if_needed(cls, v):
             return RunningState(DB_TO_RUNNING_STATE[StateType(v)])
         return v
 
-    @field_validator("start", "end", "submit")
+    @field_validator("start", "end")
     @classmethod
     def _ensure_utc(cls, v: dt.datetime | None) -> dt.datetime | None:
         if v is not None and v.tzinfo is None:
@@ -228,7 +227,6 @@ def to_db_model(self, **exclusion_rules) -> dict[str, Any]:
                         }
                     },
                     "image": image_example,
-                    "submit": "2021-03-01 13:07:34.19161",
                     "node_class": "INTERACTIVE",
                     "state": "NOT_STARTED",
                     "progress": 0.44,

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks/_utils.py

@@ -145,12 +145,12 @@ async def _get_node_infos(
             None,
         )
 
-    result: tuple[ServiceMetaDataPublished, ServiceExtras, SimcoreServiceLabels] = (
-        await asyncio.gather(
-            _get_service_details(catalog_client, user_id, product_name, node),
-            director_client.get_service_extras(node.key, node.version),
-            director_client.get_service_labels(node),
-        )
+    result: tuple[
+        ServiceMetaDataPublished, ServiceExtras, SimcoreServiceLabels
+    ] = await asyncio.gather(
+        _get_service_details(catalog_client, user_id, product_name, node),
+        director_client.get_service_extras(node.key, node.version),
+        director_client.get_service_labels(node),
     )
     return result
 
@@ -246,9 +246,9 @@ async def _get_pricing_and_hardware_infos(
     return pricing_info, hardware_info
 
 
-_RAM_SAFE_MARGIN_RATIO: Final[float] = (
-    0.1  # NOTE: machines always have less available RAM than advertised
-)
+_RAM_SAFE_MARGIN_RATIO: Final[
+    float
+] = 0.1  # NOTE: machines always have less available RAM than advertised
 _CPUS_SAFE_MARGIN: Final[float] = 0.1
 
 
@@ -266,11 +266,11 @@ async def _update_project_node_resources_from_hardware_info(
     if not hardware_info.aws_ec2_instances:
         return
     try:
-        unordered_list_ec2_instance_types: list[EC2InstanceTypeGet] = (
-            await get_instance_type_details(
-                rabbitmq_rpc_client,
-                instance_type_names=set(hardware_info.aws_ec2_instances),
-            )
+        unordered_list_ec2_instance_types: list[
+            EC2InstanceTypeGet
+        ] = await get_instance_type_details(
+            rabbitmq_rpc_client,
+            instance_type_names=set(hardware_info.aws_ec2_instances),
         )
 
         assert unordered_list_ec2_instance_types  # nosec
@@ -439,7 +439,6 @@ async def generate_tasks_list_from_project(
             inputs=node.inputs,
             outputs=node.outputs,
             image=image,
-            submit=arrow.utcnow().datetime,
             state=task_state,
             internal_id=internal_id,
             node_class=to_node_class(node.key),

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

@@ -485,9 +485,8 @@ def pipeline_test_params(
                     state=RunningState.NOT_STARTED,
                     internal_id=3,
                     node_class=NodeClass.COMPUTATIONAL,
-                    submit=datetime.datetime.now(tz=datetime.timezone.utc),
-                    created=datetime.datetime.now(tz=datetime.timezone.utc),
-                    modified=datetime.datetime.now(tz=datetime.timezone.utc),
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
                     last_heartbeat=None,
                     progress=1.00,
                 )
@@ -536,9 +535,8 @@ def pipeline_test_params(
                     state=RunningState.NOT_STARTED,
                     internal_id=3,
                     node_class=NodeClass.COMPUTATIONAL,
-                    submit=datetime.datetime.now(tz=datetime.timezone.utc),
-                    created=datetime.datetime.now(tz=datetime.timezone.utc),
-                    modified=datetime.datetime.now(tz=datetime.timezone.utc),
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
                     last_heartbeat=None,
                 ),
                 CompTaskAtDB.model_construct(
@@ -550,9 +548,8 @@ def pipeline_test_params(
                     state=RunningState.NOT_STARTED,
                     internal_id=3,
                     node_class=NodeClass.COMPUTATIONAL,
-                    submit=datetime.datetime.now(tz=datetime.timezone.utc),
-                    created=datetime.datetime.now(tz=datetime.timezone.utc),
-                    modified=datetime.datetime.now(tz=datetime.timezone.utc),
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
                     last_heartbeat=None,
                 ),
                 CompTaskAtDB.model_construct(
@@ -564,9 +561,8 @@ def pipeline_test_params(
                     state=RunningState.NOT_STARTED,
                     internal_id=3,
                     node_class=NodeClass.COMPUTATIONAL,
-                    submit=datetime.datetime.now(tz=datetime.timezone.utc),
-                    created=datetime.datetime.now(tz=datetime.timezone.utc),
-                    modified=datetime.datetime.now(tz=datetime.timezone.utc),
+                    created=datetime.datetime.now(tz=datetime.UTC),
+                    modified=datetime.datetime.now(tz=datetime.UTC),
                     last_heartbeat=None,
                     progress=1.00,
                 ),