Add extra serialization step similar to pydantic docs for circular references

Signed-off-by: Nijat Khanbabayev <[email protected]>

Author: NeejWeej

ccflow/base.py

@@ -4,7 +4,6 @@
 import copy
 import logging
 import pathlib
-import platform
 import sys
 import warnings
 from types import MappingProxyType
@@ -123,10 +122,14 @@ def type_(self) -> PyObjectPath:
 
     # https://docs.pydantic.dev/latest/concepts/serialization/#overriding-the-serialize_as_any-default-false
     def model_dump(self, **kwargs) -> dict[str, Any]:
-        return super().model_dump(serialize_as_any=True, **kwargs)
+        if not kwargs.get("serialize_as_any"):
+            kwargs["serialize_as_any"] = True
+        return super().model_dump(**kwargs)
 
     def model_dump_json(self, **kwargs) -> str:
-        return super().model_dump_json(serialize_as_any=True, **kwargs)
+        if not kwargs.get("serialize_as_any"):
+            kwargs["serialize_as_any"] = True
+        return super().model_dump_json(**kwargs)
 
     def __str__(self):
         # Because the standard string representation does not include class name
@@ -322,7 +325,8 @@ def _validate_name(cls, v):
     @model_serializer(mode="wrap")
     def _registry_serializer(self, handler):
         values = handler(self)
-        values["models"] = self._models
+        models_serialized = {k: model.model_dump(serialize_as_any=True, by_alias=True) for k, model in self._models.items()}
+        values["models"] = models_serialized
         return values
 
     @property

ccflow/callable.py

@@ -17,7 +17,18 @@
 from inspect import Signature, isclass, signature
 from typing import Any, ClassVar, Dict, Generic, List, Optional, Tuple, Type, TypeVar
 
-from pydantic import BaseModel as PydanticBaseModel, ConfigDict, Field, InstanceOf, PrivateAttr, TypeAdapter, field_validator, model_validator
+from pydantic import (
+    BaseModel as PydanticBaseModel,
+    ConfigDict,
+    Field,
+    InstanceOf,
+    PrivateAttr,
+    SerializerFunctionWrapHandler,
+    TypeAdapter,
+    field_validator,
+    model_serializer,
+    model_validator,
+)
 from typing_extensions import override
 
 from .base import (
@@ -426,6 +437,36 @@ def __call__(self) -> ResultType:
         else:
             return fn(self.context)
 
+    # When serialize_as_any=True, pydantic may detect repeated object ids in nested graphs
+    # (e.g., shared default lists) and raise a circular reference error during serialization.
+    # For computing cache keys, fall back to a minimal, stable representation if such an error occurs.
+    # This is similar to how we the pydantic docs here:
+    # https://docs.pydantic.dev/latest/concepts/forward_annotations/#cyclic-references
+    # handle cyclic references during serialization.
+    @model_serializer(mode="wrap")
+    def _serialize_model_evaluation_context(self, handler: SerializerFunctionWrapHandler):
+        try:
+            return handler(self)
+        except ValueError as exc:
+            msg = str(exc)
+            if "Circular reference" not in msg and "id repeated" not in msg:
+                raise
+            # Minimal, stable representation sufficient for cache-key tokenization
+            try:
+                model_repr = self.model.model_dump(mode="python", serialize_as_any=True, by_alias=True)
+            except Exception:
+                model_repr = repr(self.model)
+            try:
+                context_repr = self.context.model_dump(mode="python", serialize_as_any=True, by_alias=True)
+            except Exception:
+                context_repr = repr(self.context)
+            return dict(
+                fn=self.fn,
+                model=model_repr,
+                context=context_repr,
+                options=dict(self.options),
+            )
+
 
 class EvaluatorBase(_CallableModel, abc.ABC):
     """Base class for evaluators, which are higher-order models that evaluate ModelAndContext.