fix: jobparameters and jobattributes pydantic models

Author: aldbr

diracx-core/src/diracx/core/models.py

@@ -9,7 +9,7 @@
 from enum import StrEnum
 from typing import Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from typing_extensions import TypedDict
 
 
@@ -75,7 +75,7 @@ class SearchParams(BaseModel):
     # TODO: Add more validation
 
 
-class JobParameters(BaseModel, extra="forbid"):
+class JobParameters(BaseModel):
     """All the parameters that can be set for a job."""
 
     timestamp: datetime | None = None
@@ -95,8 +95,25 @@ class JobParameters(BaseModel, extra="forbid"):
     job_type: str | None = Field(None, alias="JobType")
     job_status: str | None = Field(None, alias="JobStatus")
 
-
-class JobAttributes(BaseModel, extra="forbid"):
+    @field_validator(
+        "cpu_normalization_factor", "norm_cpu_time_s", "total_cpu_time_s", mode="before"
+    )
+    @classmethod
+    def convert_cpu_fields_to_int(cls, v):
+        """Convert string representation of float to integer for CPU-related fields."""
+        if v is None:
+            return v
+        if isinstance(v, str):
+            try:
+                return int(float(v))
+            except (ValueError, TypeError) as e:
+                raise ValueError(f"Cannot convert '{v}' to integer") from e
+        if isinstance(v, (int, float)):
+            return int(v)
+        return v
+
+
+class JobAttributes(BaseModel):
     """All the attributes that can be set for a job."""
 
     job_type: str | None = Field(None, alias="JobType")
@@ -121,7 +138,7 @@ class JobAttributes(BaseModel, extra="forbid"):
     accounted_flag: bool | str | None = Field(None, alias="AccountedFlag")
 
 
-class JobMetaData(JobAttributes, JobParameters, extra="forbid"):
+class JobMetaData(JobAttributes, JobParameters):
     """A model that combines both JobAttributes and JobParameters."""
 
 

diracx-logic/src/diracx/logic/jobs/status.py

@@ -541,6 +541,14 @@ async def set_job_parameters_or_attributes(
             if pname in JOB_PARAMETERS_ALIASES:
                 param_updates[job_id][pname] = pvalue
 
+            # If the field is not in either known aliases, default to treating it as a parameter
+            # This allows for more flexible metadata handling
+            # WARNING: This is a fragile fallback that can lead to unexpected behavior
+            # as attributes and parameters are not strictly defined...
+            # See https://github.com/DIRACGrid/diracx/pull/626 for further details
+            elif pname not in JOB_ATTRIBUTES_ALIASES:
+                param_updates[job_id][pname] = pvalue
+
     # Bulk set job attributes if required
     attr_updates = {k: v for k, v in attr_updates.items() if v}
     if attr_updates: