lionagi 0.17.11__py3-none-any.whl → 0.18.0__py3-none-any.whl

lionagi/libs/schema/minimal_yaml.py

@@ -0,0 +1,98 @@
+from __future__ import annotations
+
+from typing import Any
+
+import orjson
+import yaml
+
+# --- YAML Dumper with minimal, readable settings --------------------------------
+
+
+class MinimalDumper(yaml.SafeDumper):
+    # Disable anchors/aliases (&id001, *id001) for repeated objects.
+    def ignore_aliases(self, data: Any) -> bool:  # type: ignore[override]
+        return True
+
+
+def _represent_str(dumper: yaml.SafeDumper, data: str):
+    # Use block scalars for multiline text; plain style otherwise.
+    if "\n" in data:
+        return dumper.represent_scalar(
+            "tag:yaml.org,2002:str", data, style="|"
+        )
+    return dumper.represent_scalar("tag:yaml.org,2002:str", data)
+
+
+MinimalDumper.add_representer(str, _represent_str)
+
+# --- Optional pruning of empty values -------------------------------------------
+
+
+def _is_empty(x: Any) -> bool:
+    """
+    Define 'empty' for pruning. Keeps 0 and False.
+    - None or '' (after strip) are empty
+    - Empty containers are empty
+    """
+    if x is None:
+        return True
+    if isinstance(x, str):
+        return x.strip() == ""
+    if isinstance(x, dict):
+        return len(x) == 0
+    if isinstance(x, (list, tuple, set)):
+        return len(x) == 0
+    # Keep numbers (including 0) and booleans (including False)
+    return False
+
+
+def _prune(x: Any) -> Any:
+    """Recursively remove empty leaves and empty containers produced thereby."""
+    if isinstance(x, dict):
+        pruned = {k: _prune(v) for k, v in x.items() if not _is_empty(v)}
+        # Remove keys that became empty after recursion
+        return {k: v for k, v in pruned.items() if not _is_empty(v)}
+    if isinstance(x, list):
+        pruned_list = [_prune(v) for v in x if not _is_empty(v)]
+        return [v for v in pruned_list if not _is_empty(v)]
+    if isinstance(x, tuple):
+        pruned_list = [_prune(v) for v in x if not _is_empty(v)]
+        return tuple(v for v in pruned_list if not _is_empty(v))
+    if isinstance(x, set):
+        pruned_set = {_prune(v) for v in x if not _is_empty(v)}
+        return {v for v in pruned_set if not _is_empty(v)}
+    return x
+
+
+# --- Public API ------------------------------------------------------------------
+
+
+def minimal_yaml(
+    value: Any,
+    *,
+    drop_empties: bool = True,
+    indent: int = 2,
+    line_width: int = 2**31 - 1,  # avoid PyYAML inserting line-wraps
+    sort_keys: bool = False,
+) -> str:
+    """
+    Convert any Python value (dict/list/scalars) to a minimal, readable YAML string.
+    - Lists -> YAML sequences with '- '
+    - Dicts -> 'key: value' mappings
+    - Multiline strings -> block scalars (|)
+    - Optional pruning of empty values (keeps 0 and False)
+    - No aliases/anchors
+    """
+    if isinstance(value, str):
+        value = orjson.loads(value)
+
+    data = _prune(value) if drop_empties else value
+    return yaml.dump(
+        data,
+        Dumper=MinimalDumper,
+        default_flow_style=False,  # block style
+        sort_keys=sort_keys,  # preserve insertion order
+        allow_unicode=True,
+        indent=indent,
+        width=line_width,
+    )

lionagi/ln/types.py

@@ -232,10 +232,13 @@ class Params:
         dict_.update(kw_)
         return dict_
 
-    def to_dict(self) -> dict[str, str]:
+    def to_dict(self, exclude: set[str] = None) -> dict[str, str]:
         data = {}
+        exclude = exclude or set()
         for k in self.allowed():
-            if not self._is_sentinel(v := getattr(self, k, Undefined)):
+            if k not in exclude and not self._is_sentinel(
+                v := getattr(self, k, Undefined)
+            ):
                 data[k] = v
         return data
 
@@ -249,6 +252,12 @@ class Params:
             return False
         return hash(self) == hash(other)
 
+    def with_updates(self, **kwargs: Any) -> DataClass:
+        """Return a new instance with updated fields."""
+        dict_ = self.to_dict()
+        dict_.update(kwargs)
+        return type(self)(**dict_)
+
 
 @dataclass(slots=True)
 class DataClass:
@@ -296,11 +305,13 @@ class DataClass:
         for k in self.allowed():
             _validate_strict(k)
 
-    def to_dict(self) -> dict[str, str]:
+    def to_dict(self, exclude: set[str] = None) -> dict[str, str]:
         data = {}
-        print(self.allowed())
+        exclude = exclude or set()
         for k in type(self).allowed():
-            if not self._is_sentinel(v := getattr(self, k)):
+            if k not in exclude and not self._is_sentinel(
+                v := getattr(self, k)
+            ):
                 data[k] = v
         return data
 
@@ -311,6 +322,22 @@ class DataClass:
             return True
         return is_sentinel(value)
 
+    def with_updates(self, **kwargs: Any) -> DataClass:
+        """Return a new instance with updated fields."""
+        dict_ = self.to_dict()
+        dict_.update(kwargs)
+        return type(self)(**dict_)
+
+    def __hash__(self) -> int:
+        from ._hash import hash_dict
+
+        return hash_dict(self.to_dict())
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, DataClass):
+            return False
+        return hash(self) == hash(other)
+
 
 KeysLike = Sequence[str] | KeysDict
 

lionagi/models/field_model.py

@@ -513,6 +513,15 @@ class FieldModel(Params):
                     # These are FieldTemplate markers, don't pass to FieldInfo
                     pass
                 else:
+                    # Filter out unserializable objects from json_schema_extra
+                    # to avoid Pydantic serialization errors when generating JSON schema
+                    from pydantic import BaseModel
+
+                    # Skip model classes and other unserializable types
+                    if isinstance(meta.value, type):
+                        # Skip type objects (including model classes) - they can't be serialized
+                        continue
+
                     # Any other metadata goes in json_schema_extra
                     if "json_schema_extra" not in field_kwargs:
                         field_kwargs["json_schema_extra"] = {}