lionagi 0.3.3__tar.gz → 0.3.5__tar.gz

{lionagi-0.3.3 → lionagi-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.3.3
+Version: 0.3.5
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: quantocean.li@gmail.com

{lionagi-0.3.3 → lionagi-0.3.5}/lionagi/core/unit/unit.py

@@ -12,7 +12,7 @@ from lionagi.libs.ln_func_call import rcall
 
 from .unit_form import UnitForm
 from .unit_mixin import DirectiveMixin
-from .util import retry_kwargs
+from .util import break_down_annotation, retry_kwargs
 
 
 class Unit(Directive, DirectiveMixin):
@@ -75,7 +75,7 @@ class Unit(Directive, DirectiveMixin):
         return_branch=False,
         formatter=None,
         format_kwargs={},
-        pydantic_model: type[BaseModel] = None,
+        pydantic_model: type[BaseModel] | BaseModel = None,
         return_pydantic_model: bool = False,
         **kwargs,
     ):
@@ -114,7 +114,11 @@ class Unit(Directive, DirectiveMixin):
                 raise ValueError(
                     "Cannot use both requested_fields and pydantic_model."
                 )
-            requested_fields = pydantic_model.model_json_schema()["properties"]
+            requested_fields = break_down_annotation(pydantic_model)
+            context = {
+                "info": context,
+                "return_guidance": pydantic_model.model_json_schema(),
+            }
 
         output, branch = await rcall(
             self._chat,
@@ -148,8 +152,13 @@ class Unit(Directive, DirectiveMixin):
 
         if return_pydantic_model:
             try:
-                a_ = to_dict(output, recursive=True, max_recursive_depth=3)
-                output = pydantic_model(**a_)
+                a_ = to_dict(
+                    output,
+                    recursive=True,
+                    max_recursive_depth=5,
+                    fuzzy_parse=True,
+                )
+                output = pydantic_model.model_validate(a_)
                 return output, branch if return_branch else output
             except Exception as e:
                 logging.error(f"Error converting to pydantic model: {e}")

{lionagi-0.3.3 → lionagi-0.3.5}/lionagi/core/unit/util.py

@@ -1,3 +1,8 @@
+import inspect
+from typing import get_args
+
+from pydantic import BaseModel
+
 retry_kwargs = {
     "retries": 0,  # kwargs for rcall, number of retries if failed
     "delay": 0,  # number of seconds to delay before retrying
@@ -74,3 +79,25 @@ async def _direct(
         )
 
     return await directive.direct(form=form, return_form=True, **kwargs)
+
+
+def break_down_annotation(model: type[BaseModel]):
+
+    def _ispydantic_model(x):
+        return inspect.isclass(x) and issubclass(x, BaseModel)
+
+    if not _ispydantic_model(model):
+        return model
+
+    out = {}
+    for k, v in model.__annotations__.items():
+        if _ispydantic_model(v):
+            out[k] = break_down_annotation(v)
+        elif "list" in str(v) and get_args(v):
+            v = get_args(v)[0]
+            if _ispydantic_model(v):
+                v = break_down_annotation(v)
+            out[k] = [v]
+        else:
+            out[k] = v
+    return out

lionagi-0.3.5/lionagi/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.5"

{lionagi-0.3.3 → lionagi-0.3.5}/pyproject.toml

@@ -7,7 +7,7 @@ classifiers=[
 
 [tool.poetry]
 name = "lionagi"
-version = "0.3.3"
+version = "0.3.5"
 description = "Towards automated general intelligence."
 authors = ["HaiyangLi <quantocean.li@gmail.com>"]
 readme = "README.md"

lionagi-0.3.3/lionagi/version.py

@@ -1 +0,0 @@
-__version__ = "0.3.3"