refactor and fix model

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_dynamic_sidecar/telemetry.py

@@ -8,8 +8,7 @@
     Field,
     NonNegativeFloat,
     NonNegativeInt,
-    root_validator,
-    validator,
+    model_validator,
 )
 
 from ..projects_nodes_io import NodeID
@@ -56,29 +55,13 @@ class DiskUsage(BaseModel):
     free: ByteSize = Field(description="remaining space")
 
     total: ByteSize = Field(description="total space = free + used")
-    used_percent: NonNegativeFloat = Field(
+    used_percent: float = Field(
         ge=0.00,
         le=100.00,
-        description="Percent of used space relative to the total space",
+        description="Percent of used space ree:ative to the total space",
     )
 
-    @validator("free")
-    @classmethod
-    def _free_positive(cls, v: float) -> float:
-        if v < 0:
-            msg = f"free={v} cannot be a negative value"
-            raise ValueError(msg)
-        return v
-
-    @validator("used")
-    @classmethod
-    def _used_positive(cls, v: float) -> float:
-        if v < 0:
-            msg = f"used={v} cannot be a negative value"
-            raise ValueError(msg)
-        return v
-
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     @classmethod
     def _check_total(cls, values: dict[str, Any]) -> dict[str, Any]:
         total = values["total"]

packages/models-library/tests/test_api_schemas_dynamic_sidecar_telemetry.py

@@ -42,8 +42,8 @@ def test_failing_validation():
     with pytest.raises(ValidationError) as exc:
         assert DiskUsage.from_efs_guardian(100, 10)
 
-    assert "free=" in f"{exc.value}"
-    assert "negative value" in f"{exc.value}"
+    assert "free" in f"{exc.value}"
+    assert "input_value=-90" in f"{exc.value}"
 
     with pytest.raises(ValidationError) as exc:
         assert DiskUsage(
@@ -52,8 +52,8 @@ def test_failing_validation():
             total=ByteSize(0),
             used_percent=-10,
         )
-    assert "used=" in f"{exc.value}"
-    assert "negative value" in f"{exc.value}"
+    assert "used" in f"{exc.value}"
+    assert "input_value=-10" in f"{exc.value}"
 
     with pytest.raises(ValidationError) as exc:
         DiskUsage(