agent-lab-sdk 0.1.40__py3-none-any.whl → 0.1.42__py3-none-any.whl

agent_lab_sdk/langgraph/checkpoint/agw_saver.py

@@ -220,24 +220,33 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
                 self._client = None
 
     # ----------------------- universal dump/load ---------------------
-    # def _safe_dump(self, obj: Any) -> Any:
-    #     """self.serde.dump → гарантированная JSON-строка."""
-    #     dumped = self.serde.dumps(obj)
-    #     if isinstance(dumped, (bytes, bytearray)):
-    #         return base64.b64encode(dumped).decode()  # str
-    #     return dumped  # уже json-совместимо
-
     def _safe_dump(self, obj: Any) -> Any:
-        """bytes → python-object; fallback base64 для реально бинарных данных."""
-        dumped = self.serde.dumps(obj)
+        """
+        JSON-first сериализация:
+        1) Пытаемся через self.serde.dumps(obj).
+           - Если вернул bytes: пробуем декодировать в JSON-строку и распарсить.
+           - Если не JSON/не UTF-8 — заворачиваем как base64-строку.
+           - Если вернул dict/list/scalar — они уже JSON-совместимы.
+        2) Если self.serde.dumps(obj) бросает исключение (например, для Send),
+           делаем типизированный фолбэк {"type": str, "blob": base64 | None}.
+        """
+        try:
+            dumped = self.serde.dumps(obj)
+        except Exception:
+            # typed fallback (как рекомендуют в LangGraph для нетривиальных типов)
+            # https://langchain-ai.github.io/langgraph/reference/checkpoints/
+            try:
+                t, b = self.serde.dumps_typed(obj)
+            except Exception:
+                # крайний случай: строковое представление
+                t, b = type(obj).__name__, str(obj).encode()
+            return {"type": t, "blob": base64.b64encode(b).decode() if b is not None else None}
+
         if isinstance(dumped, (bytes, bytearray)):
             try:
-                # 1) bytes → str
                 s = dumped.decode()
-                # 2) str JSON → python (list/dict/scalar)
                 return orjson.loads(s)
             except (UnicodeDecodeError, orjson.JSONDecodeError):
-                # не UTF-8 или не JSON → base64
                 return base64.b64encode(dumped).decode()
         return dumped
 
@@ -308,15 +317,116 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
         except Exception:
             return obj
 
-    # def _safe_load(self, obj: Any) -> Any:
-    #     """Обратная операция к _safe_dump."""
-    #     if isinstance(obj, str):
-    #         try:
-    #             return self.serde.load(base64.b64decode(obj))
-    #         except Exception:
-    #             # не base64 — обычная строка
-    #             return self.serde.load(obj)
-    #     return self.serde.load(obj)
+    # ----------------------- deep dump/load (leaf-first) -------------
+    @staticmethod
+    def _is_json_scalar(x: Any) -> bool:
+        return x is None or isinstance(x, (str, int, float, bool))
+
+    @staticmethod
+    def _coerce_key(k: Any) -> str:
+        return k if isinstance(k, str) else str(k)
+
+    def _safe_dump_deep(self, obj: Any, _seen: set[int] | None = None) -> Any:
+        """
+        Идём от листьев к корню:
+        - Для контейнеров рекурсируем внутрь и сохраняем форму контейнера.
+        - Для листьев вызываем _safe_dump (fallback на serde/typed + base64).
+        """
+        if _seen is None:
+            _seen = set()
+
+        if self._is_json_scalar(obj):
+            return obj
+
+        if isinstance(obj, dict):
+            oid = id(obj)
+            if oid in _seen:
+                return {"type": "Cycle", "blob": None}
+            _seen.add(oid)
+            return {
+                self._coerce_key(k): self._safe_dump_deep(v, _seen) for k, v in obj.items()
+            }
+
+        if isinstance(obj, (list, tuple, set)):
+            oid = id(obj)
+            if oid in _seen:
+                return ["<cycle>"]
+            _seen.add(oid)
+            return [self._safe_dump_deep(v, _seen) for v in obj]
+
+        # лист: доверяем универсальному дамперу
+        return self._safe_dump(obj)
+
+    def _safe_load_deep(self, obj: Any, _seen: set[int] | None = None) -> Any:
+        """
+        Обратная операция:
+        - Контейнеры сначала пробуем целиком скормить serde.loads(...).
+          Если вернулся НЕ JSON-контейнер (например, объект сообщения) — возвращаем его.
+          Иначе рекурсивно обходим внутрь и листья скармливаем _safe_load.
+        - typed {"type","blob"} обрабатываем как раньше.
+        """
+        if _seen is None:
+            _seen = set()
+
+        # Примитивы: просто через _safe_load (декод base64/bytes и т.п.)
+        if self._is_json_scalar(obj):
+            return self._safe_load(obj)
+
+        # dict
+        if isinstance(obj, dict):
+            # типизированная обёртка — сразу разворачиваем
+            if all(k in obj for k in TYPED_KEYS):
+                return self._safe_load(obj)
+
+            # 1) parse-first: пробуем целиком восстановить объект через serde
+            try:
+                parsed = self.serde.loads(orjson.dumps(obj))
+                # если получили не-JSON-контейнер (объект), возвращаем
+                if not isinstance(parsed, (dict, list, tuple, str, int, float, bool, type(None))):
+                    return parsed
+            except Exception:
+                pass
+
+            # 2) иначе — рекурсивно
+            oid = id(obj)
+            if oid in _seen:
+                return obj
+            _seen.add(oid)
+            return {k: self._safe_load_deep(v, _seen) for k, v in obj.items()}
+
+        # list
+        if isinstance(obj, list):
+            # parse-first: пытаемся восстановить весь список одной операцией
+            try:
+                parsed = self.serde.loads(orjson.dumps(obj))
+                if not isinstance(parsed, (dict, list, tuple, str, int, float, bool, type(None))):
+                    return parsed
+            except Exception:
+                pass
+
+            oid = id(obj)
+            if oid in _seen:
+                return obj
+            _seen.add(oid)
+            return [self._safe_load_deep(v, _seen) for v in obj]
+
+        # tuple — аналогично list, но вернём list (JSON-совместимо)
+        if isinstance(obj, tuple):
+            try:
+                parsed = self.serde.loads(orjson.dumps(obj))
+                if not isinstance(parsed, (dict, list, tuple, str, int, float, bool, type(None))):
+                    return parsed
+            except Exception:
+                pass
+
+            oid = id(obj)
+            if oid in _seen:
+                return obj
+            _seen.add(oid)
+            return [self._safe_load_deep(v, _seen) for v in obj]
+
+        # Всё остальное — лист, через _safe_load
+        return self._safe_load(obj)
 
     # ----------------------- config <-> api --------------------------
     def _to_api_config(self, cfg: RunnableConfig | None) -> Dict[str, Any]:
@@ -335,25 +445,21 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
 
     # --------------------- checkpoint (de)ser ------------------------
     def _encode_cp(self, cp: Checkpoint) -> Dict[str, Any]:
-        pending: list[Any] = []
-        for item in cp.get("pending_sends", []) or []:
-            try:
-                channel, value = item
-            except Exception:
-                pending.append(item)
-                continue
-            pending.append([channel, self._safe_dump(value)])
         return {
             "v": cp["v"],
             "id": cp["id"],
             "ts": cp["ts"],
-            "channelValues": {k: self._safe_dump(v) for k, v in cp["channel_values"].items()},
+            "channelValues": {
+                k: self._safe_dump_deep(v) for k, v in cp["channel_values"].items()
+            },
             "channelVersions": cp["channel_versions"],
             "versionsSeen": cp["versions_seen"],
-            "pendingSends": pending,
+            "pendingSends": [] # как в BasePostgresSaver, они внутри checkpoint не нужны
         }
 
     def _decode_cp(self, raw: Dict[str, Any]) -> Checkpoint:
+        # Поддерживаем приём pendingSends (если сервер их отдаёт),
+        # но сами их не шлём при записи.
         pending_sends: list[Tuple[str, Any]] = []
         for obj in raw.get("pendingSends", []) or []:
             if isinstance(obj, dict) and "channel" in obj:
@@ -361,18 +467,20 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
                 value_payload: Any = obj.get("value")
                 if value_payload is None and all(k in obj for k in TYPED_KEYS):
                     value_payload = {k: obj[k] for k in TYPED_KEYS}
-                pending_sends.append((channel, self._safe_load(value_payload)))
+                pending_sends.append((channel, self._safe_load_deep(value_payload)))
             elif isinstance(obj, (list, tuple)) and len(obj) >= 2:
                 channel = obj[0]
                 value_payload = obj[1]
-                pending_sends.append((channel, self._safe_load(value_payload)))
+                pending_sends.append((channel, self._safe_load_deep(value_payload)))
             else:
-                pending_sends.append(obj)  # сохраняем как есть, если формат неизвестен
+                pending_sends.append(obj)
         return Checkpoint(
             v=raw["v"],
             id=raw["id"],
             ts=raw["ts"],
-            channel_values={k: self._safe_load(v) for k, v in raw["channelValues"].items()},
+            channel_values={
+                k: self._safe_load_deep(v) for k, v in raw["channelValues"].items()
+            },
             channel_versions=raw["channelVersions"],
             versions_seen=raw["versionsSeen"],
             pending_sends=pending_sends,
@@ -405,13 +513,13 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
             return {}
         out: CheckpointMetadata = {}
         for k, v in md.items():
-            out[k] = self._enc_meta(v) if isinstance(v, dict) else self._safe_dump(v)  # type: ignore[assignment]
+            out[k] = self._enc_meta(v) if isinstance(v, dict) else self._safe_dump_deep(v)  # type: ignore[assignment]
         return out
 
     def _dec_meta(self, md: Any) -> Any:
         if isinstance(md, dict):
             return {k: self._dec_meta(v) for k, v in md.items()}
-        return self._safe_load(md)
+        return self._safe_load_deep(md)
 
     # ------------------------ HTTP wrapper ---------------------------
     async def _http(
@@ -522,7 +630,7 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
                         k in second for k in TYPED_KEYS
                     ):
                         third = second
-                    pending.append((first, second, self._safe_load(third)))
+                    pending.append((first, second, self._safe_load_deep(third)))
                 elif isinstance(w, (list, tuple)):
                     if len(w) == 3:
                         first, second, third = w
@@ -531,7 +639,7 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
                         third = None
                     else:
                         continue
-                    pending.append((first, second, self._safe_load(third)))
+                    pending.append((first, second, self._safe_load_deep(third)))
         return CheckpointTuple(
             config=self._decode_config(node.get("config")),
             checkpoint=self._decode_cp(node["checkpoint"]),
@@ -610,7 +718,7 @@ class AsyncAGWCheckpointSaver(BaseCheckpointSaver):
         task_id: str,
         task_path: str = "",
     ) -> None:
-        enc = [{"first": ch, "second": self._safe_dump(v)} for ch, v in writes]
+        enc = [{"first": ch, "second": self._safe_dump_deep(v)} for ch, v in writes]
         payload = {
             "config": self._to_api_config(cfg),
             "writes": enc,

{agent_lab_sdk-0.1.40.dist-info → agent_lab_sdk-0.1.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-lab-sdk
-Version: 0.1.40
+Version: 0.1.42
 Summary: SDK для работы с Agent Lab
 Author-email: Andrew Ohurtsov <andermirik@yandex.com>
 License: Proprietary and Confidential — All Rights Reserved

{agent_lab_sdk-0.1.40.dist-info → agent_lab_sdk-0.1.42.dist-info}/RECORD

@@ -1,6 +1,6 @@
 agent_lab_sdk/__init__.py,sha256=1Dlmv-wuz1QuciymKtYtX7jXzr_fkeGTe7aENfEDl3E,108
 agent_lab_sdk/langgraph/checkpoint/__init__.py,sha256=DnKwR1LwbaQ3qhb124lE-tnojrUIVcCdNzHEHwgpL5M,86
-agent_lab_sdk/langgraph/checkpoint/agw_saver.py,sha256=Srf8RYcW34_u2s54ABl0Jqm-_Z1gBH97gKqVY7QrKOQ,25631
+agent_lab_sdk/langgraph/checkpoint/agw_saver.py,sha256=8A0nfn2GOpCHlFijxC3VQSiTNotoOftSPjwpqX7kQiE,30392
 agent_lab_sdk/langgraph/checkpoint/serde.py,sha256=UTSYbTbhBeL1CAr-XMbaH3SSIx9TeiC7ak22duXvqkw,5175
 agent_lab_sdk/llm/__init__.py,sha256=Yo9MbYdHS1iX05A9XiJGwWN1Hm4IARGav9mNFPrtDeA,376
 agent_lab_sdk/llm/agw_token_manager.py,sha256=_bPPI8muaEa6H01P8hHQOJHiiivaLd8N_d3OT9UT_80,4787
@@ -15,8 +15,8 @@ agent_lab_sdk/schema/log_message.py,sha256=nadi6lZGRuDSPmfbYs9QPpRJUT9Pfy8Y7pGCv
 agent_lab_sdk/storage/__init__.py,sha256=HAtUoqg3k0irqPMewayadVA9aXJOmYSxRr6a5J1scT0,174
 agent_lab_sdk/storage/storage.py,sha256=ELpt7GRwFD-aWa6ctinfA_QwcvzWLvKS0Wz8FlxVqAs,2075
 agent_lab_sdk/storage/storage_v2.py,sha256=ONseynX59xzWK17dfzxZvnii2rpz3Oo2Zo9Ck-lcGnw,1997
-agent_lab_sdk-0.1.40.dist-info/licenses/LICENSE,sha256=_TRXHkF3S9ilWBPdZcHLI_S-PRjK0L_SeOb2pcPAdV4,417
-agent_lab_sdk-0.1.40.dist-info/METADATA,sha256=CnbGjkYor6CXT0xxc4PBCd1n14yNLmGeyGYaw_IAYVQ,19099
-agent_lab_sdk-0.1.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agent_lab_sdk-0.1.40.dist-info/top_level.txt,sha256=E1efqkJ89KNmPBWdLzdMHeVtH0dYyCo4fhnSb81_15I,14
-agent_lab_sdk-0.1.40.dist-info/RECORD,,
+agent_lab_sdk-0.1.42.dist-info/licenses/LICENSE,sha256=_TRXHkF3S9ilWBPdZcHLI_S-PRjK0L_SeOb2pcPAdV4,417
+agent_lab_sdk-0.1.42.dist-info/METADATA,sha256=-cgSfyjYUfwlxVTFWTpdYEAxd-pCmESXTubfOANl6_o,19099
+agent_lab_sdk-0.1.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agent_lab_sdk-0.1.42.dist-info/top_level.txt,sha256=E1efqkJ89KNmPBWdLzdMHeVtH0dYyCo4fhnSb81_15I,14
+agent_lab_sdk-0.1.42.dist-info/RECORD,,