fix

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_directorv2/clusters.py

@@ -1,4 +1,4 @@
-from typing import TypeAlias
+from typing import Any, TypeAlias
 
 from pydantic import (
     AnyHttpUrl,
@@ -48,13 +48,12 @@ class WorkerMetrics(BaseModel):
 class UsedResources(DictModel[str, NonNegativeFloat]):
     @model_validator(mode="before")
     @classmethod
-    def ensure_negative_value_is_zero(cls, values):
+    def ensure_negative_value_is_zero(cls, values: dict[str, Any]):
         # dasks adds/remove resource values and sometimes
         # they end up being negative instead of 0
-        if v := values.get("__root__", {}):
-            for res_key, res_value in v.items():
-                if res_value < 0:
-                    v[res_key] = 0
+        for res_key, res_value in values.items():
+            if res_value < 0:
+                values[res_key] = 0
         return values
 
 

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

@@ -13,7 +13,7 @@
     WorkerMetrics,
 )
 from models_library.clusters import ClusterTypeInModel
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, ByteSize, TypeAdapter
 from simcore_postgres_database.models.clusters import ClusterType
 
 
@@ -61,11 +61,11 @@ def test_scheduler_constructor_with_no_workers_has_correct_dict(faker: Faker):
 
 def test_worker_constructor_corrects_negative_used_resources(faker: Faker):
     worker = Worker(
-        id=faker.pyint(min_value=1),
+        id=f"{faker.pyint(min_value=1)}",
         name=faker.name(),
         resources=TypeAdapter(AvailableResources).validate_python({}),
         used_resources=TypeAdapter(UsedResources).validate_python({"CPU": -0.0000234}),
-        memory_limit=faker.pyint(min_value=1),
+        memory_limit=ByteSize(faker.pyint(min_value=1)),
         metrics=WorkerMetrics.model_validate(
             {
                 "cpu": faker.pyfloat(min_value=0),