diracx-client 0.0.1a48__tar.gz → 0.0.1a49__tar.gz

{diracx_client-0.0.1a48 → diracx_client-0.0.1a49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-client
-Version: 0.0.1a48
+Version: 0.0.1a49
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_client-0.0.1a48 → diracx_client-0.0.1a49}/src/diracx/client/_generated/models/_models.py

@@ -413,6 +413,9 @@ class JobCommand(_serialization.Model):
 class JobMetaData(_serialization.Model):
     """A model that combines both JobAttributes and JobParameters.
 
+    :ivar additional_properties: Unmatched properties from the message are deserialized to this
+     collection.
+    :vartype additional_properties: dict[str, any]
     :ivar timestamp: Timestamp.
     :vartype timestamp: ~datetime.datetime
     :ivar cpu_normalization_factor: Cpunormalizationfactor.
@@ -486,6 +489,7 @@ class JobMetaData(_serialization.Model):
     """
 
     _attribute_map = {
+        "additional_properties": {"key": "", "type": "{object}"},
         "timestamp": {"key": "timestamp", "type": "iso-8601"},
         "cpu_normalization_factor": {"key": "CPUNormalizationFactor", "type": "int"},
         "norm_cpu_time_s": {"key": "NormCPUTime(s)", "type": "int"},
@@ -526,6 +530,7 @@ class JobMetaData(_serialization.Model):
     def __init__(  # pylint: disable=too-many-locals
         self,
         *,
+        additional_properties: Optional[Dict[str, Any]] = None,
         timestamp: Optional[datetime.datetime] = None,
         cpu_normalization_factor: Optional[int] = None,
         norm_cpu_time_s: Optional[int] = None,
@@ -564,6 +569,9 @@ class JobMetaData(_serialization.Model):
         **kwargs: Any
     ) -> None:
         """
+        :keyword additional_properties: Unmatched properties from the message are deserialized to this
+         collection.
+        :paramtype additional_properties: dict[str, any]
         :keyword timestamp: Timestamp.
         :paramtype timestamp: ~datetime.datetime
         :keyword cpu_normalization_factor: Cpunormalizationfactor.
@@ -636,6 +644,7 @@ class JobMetaData(_serialization.Model):
         :paramtype accounted_flag: ~_generated.models.JobMetaDataAccountedFlag
         """
         super().__init__(**kwargs)
+        self.additional_properties = additional_properties
         self.timestamp = timestamp
         self.cpu_normalization_factor = cpu_normalization_factor
         self.norm_cpu_time_s = norm_cpu_time_s

{diracx_client-0.0.1a48 → diracx_client-0.0.1a49}/src/diracx/client/patches/jobs/aio.py

@@ -11,12 +11,13 @@ __all__ = [
     "JobsOperations",
 ]
 
-from typing import Any, Unpack
+from typing import IO, Any, Dict, Union, Unpack, cast
 
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ..._generated.aio.operations._operations import JobsOperations as _JobsOperations
-from .common import make_search_body, make_summary_body, SearchKwargs, SummaryKwargs
+from diracx.client._generated.models._models import JobMetaData
+from .common import make_search_body, make_summary_body, SearchKwargs, SummaryKwargs, prepare_body_for_patch
 
 # We're intentionally ignoring overrides here because we want to change the interface.
 # mypy: disable-error-code=override
@@ -32,3 +33,20 @@ class JobsOperations(_JobsOperations):
     async def summary(self, **kwargs: Unpack[SummaryKwargs]) -> list[dict[str, Any]]:
         """TODO"""
         return await super().summary(**make_summary_body(**kwargs))
+
+    @distributed_trace_async
+    async def patch_metadata(  # type: ignore[override]
+        self,
+        body: Union[Dict[str | int, JobMetaData | Dict[str, Any]], IO[bytes], bytes],
+        **kwargs: Any,
+    ) -> None:
+        """Patch Metadata.
+
+        Accepts job ids as str|int and metadata as dicts with pythonic or wire keys.
+        Unknown keys are emitted via `additional_properties`.
+        TODO: Remove this method once we have structured and known job parameters.
+        """
+        prepared = prepare_body_for_patch(body)
+        # Cast to Any to accommodate generated signature expecting Dict[str, JobMetaData]
+        # while still allowing bytes/IO at runtime.
+        await super().patch_metadata(cast(Any, prepared), **kwargs)

{diracx_client-0.0.1a48 → diracx_client-0.0.1a49}/src/diracx/client/patches/jobs/common.py

@@ -2,16 +2,19 @@
 
 from __future__ import annotations
 
+from diracx.client._generated.models._models import JobMetaData
+
 __all__ = [
     "make_search_body",
     "SearchKwargs",
     "make_summary_body",
     "SummaryKwargs",
+    "prepare_body_for_patch",
 ]
 
 import json
-from io import BytesIO
-from typing import Any, IO, TypedDict, Unpack, cast, Literal
+from io import BytesIO, IOBase
+from typing import Any, IO, Dict, TypedDict, Union, Unpack, cast, Literal
 
 from diracx.core.models import SearchSpec
 
@@ -83,3 +86,49 @@ def make_summary_body(**kwargs: Unpack[SummaryKwargs]) -> UnderlyingSummaryArgs:
     result: UnderlyingSummaryArgs = {"body": BytesIO(json.dumps(body).encode("utf-8"))}
     result.update(cast(ResponseExtra, kwargs))
     return result
+
+
+def prepare_body_for_patch(
+    body: Union[Dict[str | int, JobMetaData | Dict[str, Any]], IO[bytes], bytes]
+) -> Union[Dict[str, JobMetaData], IO[bytes], bytes]:
+    """Return a body suitable for the generated serializer.
+
+    - If bytes/IO: pass through (caller handles serialization).
+    - If dict: coerce each value to JobMetaData and inject extras.
+    - Accepts pythonic keys (e.g., 'job_type') or wire keys (e.g., 'JobType').
+    """
+    if isinstance(body, (IOBase, bytes)):
+        return body
+    if not isinstance(body, dict):
+        raise TypeError("body must be a dict[job_id -> JobMetaData|dict] or IO[bytes]")
+
+    attr_map = JobMetaData._attribute_map  # type: ignore[attr-defined]
+    py_names = set(attr_map.keys())
+    wire_to_py = {spec["key"]: py for py, spec in attr_map.items()}
+
+    out: Dict[str, JobMetaData] = {}
+    for job_id, metadata in body.items():
+        if isinstance(metadata, JobMetaData):
+            obj = metadata
+        elif isinstance(metadata, dict):
+            init_kwargs: Dict[str, Any] = {}
+            extras: Dict[str, Any] = {}
+            for k, v in metadata.items():
+                # known with no alias
+                if k in py_names:
+                    init_kwargs[k] = v
+                # known with alias
+                elif k in wire_to_py:
+                    init_kwargs[wire_to_py[k]] = v
+                # unknown -> additional_properties
+                else:
+                    extras[k] = v
+            obj = JobMetaData(**init_kwargs)
+            if extras:
+                obj.additional_properties = extras
+        else:
+            raise TypeError(f"metadata for job {job_id!r} must be dict or JobMetaData, not {type(metadata).__name__}")
+
+        out[str(job_id)] = obj
+
+    return out

{diracx_client-0.0.1a48 → diracx_client-0.0.1a49}/src/diracx/client/patches/jobs/sync.py

@@ -11,12 +11,13 @@ __all__ = [
     "JobsOperations",
 ]
 
-from typing import Any, Unpack
+from typing import IO, Any, Dict, Union, Unpack, cast
 
 from azure.core.tracing.decorator import distributed_trace
 
 from ..._generated.operations._operations import JobsOperations as _JobsOperations
-from .common import make_search_body, make_summary_body, SearchKwargs, SummaryKwargs
+from diracx.client._generated.models._models import JobMetaData
+from .common import make_search_body, make_summary_body, SearchKwargs, SummaryKwargs, prepare_body_for_patch
 
 # We're intentionally ignoring overrides here because we want to change the interface.
 # mypy: disable-error-code=override
@@ -32,3 +33,20 @@ class JobsOperations(_JobsOperations):
     def summary(self, **kwargs: Unpack[SummaryKwargs]) -> list[dict[str, Any]]:
         """TODO"""
         return super().summary(**make_summary_body(**kwargs))
+
+    @distributed_trace
+    def patch_metadata(  # type: ignore[override]
+        self,
+        body: Union[Dict[str | int, JobMetaData | Dict[str, Any]], IO[bytes], bytes],
+        **kwargs: Any,
+    ) -> None:
+        """Patch Metadata.
+
+        Accepts job ids as str|int and metadata as dicts with pythonic or wire keys.
+        Unknown keys are emitted via `additional_properties`.
+        TODO: Remove this method once we have structured and known job parameters.
+        """
+        prepared = prepare_body_for_patch(body)
+        # Cast to Any to accommodate generated signature expecting Dict[str, JobMetaData]
+        # while still allowing bytes/IO at runtime.
+        super().patch_metadata(cast(Any, prepared), **kwargs)