Fix history export serialization quirk

Author: andystaples

durabletask/extensions/history_export/client.py

@@ -52,7 +52,6 @@
 
 from __future__ import annotations
 
-import json
 import time
 import uuid
 from collections.abc import Iterator
@@ -221,12 +220,8 @@ def get_job(self, job_id: str) -> ExportJobDescription | None:
         meta = self._client.get_entity(entity_id, include_state=True)
         if meta is None:
             return None
-        raw = meta.get_state(str)
-        if not raw:
-            return None
-        try:
-            state = json.loads(raw)
-        except (TypeError, ValueError):
+        state = meta.get_state()
+        if not state:
             return None
         if not isinstance(state, dict):
             return None
@@ -265,31 +260,24 @@ def list_jobs(
             # explicit entity-name check.
             if meta.id.entity != ENTITY_NAME.lower():
                 continue
-            raw = meta.get_state(str)
+            raw = meta.get_state()
             if not raw:
                 logger.warning(
                     "list_jobs: skipping export-job entity %r with no "
                     "persisted state", meta.id.key,
                 )
                 continue
-            try:
-                state = json.loads(raw)
-            except (TypeError, ValueError) as ex:
-                logger.warning(
-                    "list_jobs: skipping export-job entity %r; failed to "
-                    "parse state JSON (%s)", meta.id.key, ex,
-                )
-                continue
-            if not isinstance(state, dict):
+            if not isinstance(raw, dict):
                 logger.warning(
                     "list_jobs: skipping export-job entity %r; persisted "
                     "state is not a JSON object (got %s)",
-                    meta.id.key, type(state).__name__,
+                    meta.id.key, type(raw).__name__,
                 )
                 continue
+            state = cast("dict[str, Any]", raw)
             try:
                 desc = ExportJobDescription.from_state_dict(
-                    meta.id.key, cast("dict[str, Any]", state),
+                    meta.id.key, state,
                 )
             except (KeyError, ValueError) as ex:
                 logger.warning(

tests/durabletask/extensions/history_export/test_entity.py

@@ -10,7 +10,6 @@
 
 from __future__ import annotations
 
-import json
 from datetime import datetime, timezone
 from typing import Callable, Optional
 
@@ -88,9 +87,9 @@ def _create_payload() -> dict:
 
 
 def _state_dict(metadata) -> dict:
-    raw = metadata.get_state(str)
-    assert raw is not None
-    return json.loads(raw)
+    state = metadata.get_state()
+    assert isinstance(state, dict)
+    return state
 
 
 def _wait_for_state(
@@ -106,12 +105,8 @@ def _check() -> Optional[dict]:
         meta = c.get_entity(entity_id, include_state=True)
         if meta is None:
             return None
-        raw = meta.get_state(str)
-        if not raw:
-            return None
-        try:
-            state = json.loads(raw)
-        except (TypeError, ValueError):
+        state = meta.get_state()
+        if not isinstance(state, dict):
             return None
         return state if predicate(state) else None
 

tests/durabletask/test_data_converter.py

@@ -84,6 +84,10 @@ def serialize(self, value: Any) -> str | None:
         def deserialize(self, data: str | None, target_type: type | None = None) -> Any:
             return None if data is None else json.loads(data)
 
+        def coerce(self, value: Any, target_type: type | None = None) -> Any:
+            return value
+
     conv = UpperConverter()
     assert conv.serialize("hello") == '"HELLO"'
     assert conv.deserialize('"HELLO"') == "HELLO"
+    assert conv.coerce("HELLO") == "HELLO"

tests/durabletask/test_entity_executor.py

@@ -177,9 +177,8 @@ def from_json(cls, data):
         assert isinstance(result, Wrapped)
         assert result.n == 3
 
-    def test_get_state_invalid_coercion_raises_typeerror(self):
-        import pytest
-
+    def test_get_state_invalid_coercion_falls_back_to_raw(self):
+        # The default converter is best-effort: a coercion failure returns the
+        # raw value rather than raising.
         state = StateShim("not-an-int")
-        with pytest.raises(TypeError):
-            state.get_state(int)
+        assert state.get_state(int) == "not-an-int"