lionagi 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

lionagi/core/session/directive_mixin.py

@@ -1,4 +1,5 @@
 # lionagi/core/session/directive_mixin.py
+from pydantic import BaseModel
 
 from lionagi.core.unit import Unit
 
@@ -33,13 +34,14 @@ class DirectiveMixin:
         default=None,
         timeout: float = None,
         timing: bool = False,
-        return_branch=False,
         images=None,
         image_path=None,
         template=None,
         verbose=True,
         formatter=None,
         format_kwargs=None,
+        pydantic_model: type[BaseModel] = None,
+        return_pydantic_model: bool = False,
         **kwargs,
     ):
         """
@@ -120,7 +122,7 @@ class DirectiveMixin:
 
             images = ImageUtil.read_image_to_base64(image_path)
 
-        return await directive.chat(
+        output = await directive.chat(
             instruction=instruction,
             context=context,
             sender=sender,
@@ -139,10 +141,19 @@ class DirectiveMixin:
             timeout=timeout,
             timing=timing,
             clear_messages=clear_messages,
-            return_branch=return_branch,
             images=images,
+            return_pydantic_model=return_pydantic_model,
+            pydantic_model=pydantic_model,
+            return_branch=False,
             **kwargs,
         )
+        if (
+            isinstance(output, tuple | list)
+            and len(output) == 2
+            and output[0] == output[1]
+        ):
+            output = output[0]
+        return output
 
     async def direct(
         self,

lionagi/core/unit/unit.py

@@ -1,5 +1,9 @@
+import logging
 from collections.abc import Callable
 
+from lionfuncs import to_dict
+from pydantic import BaseModel
+
 from lionagi.core.collections import iModel
 from lionagi.core.collections.abc import Directive
 from lionagi.core.report.form import Form
@@ -71,6 +75,8 @@ class Unit(Directive, DirectiveMixin):
         return_branch=False,
         formatter=None,
         format_kwargs={},
+        pydantic_model: type[BaseModel] = None,
+        return_pydantic_model: bool = False,
         **kwargs,
     ):
         """
@@ -100,7 +106,17 @@ class Unit(Directive, DirectiveMixin):
             Any: The processed response.
         """
         kwargs = {**retry_kwargs, **kwargs}
-        return await rcall(
+
+        if pydantic_model:
+            if form:
+                raise ValueError("Cannot use both form and pydantic_model.")
+            if requested_fields:
+                raise ValueError(
+                    "Cannot use both requested_fields and pydantic_model."
+                )
+            requested_fields = pydantic_model.model_json_schema()["properties"]
+
+        output, branch = await rcall(
             self._chat,
             instruction=instruction,
             context=context,
@@ -118,11 +134,27 @@ class Unit(Directive, DirectiveMixin):
             imodel=imodel,
             clear_messages=clear_messages,
             use_annotation=use_annotation,
-            return_branch=return_branch,
+            return_branch=True,
             formatter=formatter,
             format_kwargs=format_kwargs,
             **kwargs,
         )
+        if isinstance(output, tuple | list) and len(output) == 1:
+            output = output[0]
+
+        if isinstance(output, tuple | list) and len(output) == 2:
+            if output[0] == output[1]:
+                output = output[0]
+
+        if return_pydantic_model:
+            try:
+                a_ = to_dict(output, recursive=True, max_recursive_depth=3)
+                output = pydantic_model(**a_)
+                return output, branch if return_branch else output
+            except Exception as e:
+                logging.error(f"Error converting to pydantic model: {e}")
+
+        return output, branch if return_branch else output
 
     async def direct(
         self,

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{lionagi-0.3.0.dist-info → lionagi-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.3.0
+Version: 0.3.2
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: quantocean.li@gmail.com
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiocache (>=0.12.0,<0.13.0)
 Requires-Dist: ipython (>=8.0.0,<9.0.0)
-Requires-Dist: lion-core (>=0.3.15,<0.4.0)
+Requires-Dist: lion-core (>=0.3.17,<0.4.0)
 Requires-Dist: lion-openai (>=0.1.5,<0.2.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Description-Content-Type: text/markdown

{lionagi-0.3.0.dist-info → lionagi-0.3.2.dist-info}/RECORD

@@ -89,7 +89,7 @@ lionagi/core/rule/string.py,sha256=ZoTuqidyR_vS0BNKEZEj_Oc5Ie8hhy2qaBFGX5J4CrU,1
 lionagi/core/rule/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/core/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/core/session/branch.py,sha256=cs51rCG4OSPENVrniOlvKAKBXlcyLbzP032HuiCaIX8,14381
-lionagi/core/session/directive_mixin.py,sha256=Rsm8-hyLmcD9WesI8EpbCPSWcjW9jm64_Rb83TX_gdE,11717
+lionagi/core/session/directive_mixin.py,sha256=bUHuCDH70BZiPKutRXHXgb5vKSJPL9abQLaIkYnC0Kk,12100
 lionagi/core/session/session.py,sha256=cLieD42-g8s2ticNY2YyzAAwjwxkyk5q7M5dVlHlMBQ,10479
 lionagi/core/structure/__init__.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 lionagi/core/structure/chain.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -105,7 +105,7 @@ lionagi/core/unit/template/plan.py,sha256=i4FmKEB8eRsRCsTanvfoX-2RZ8SaM1qvLBluuY
 lionagi/core/unit/template/predict.py,sha256=-EIZQo0ZjGKy3MiM0AtqmbnJpbXcrwtSCON5n3jcyVo,3160
 lionagi/core/unit/template/score.py,sha256=ReUaIIr-NLjunSy4NNXQpIsH28NNceGBAUuPCRptzMc,3809
 lionagi/core/unit/template/select.py,sha256=VSpkphJl9bHSE8i0X6MMJD8LB5QwOj1UORHm8VDIRKE,3047
-lionagi/core/unit/unit.py,sha256=_8kV9vUsMLxQcQNp4UiKvCglULecYzINKp51TgMTKkg,14066
+lionagi/core/unit/unit.py,sha256=1kFz_rLM1f8OKn4pbwL2WiVyqTzyEPOmHL9OdIiwzHI,15252
 lionagi/core/unit/unit_form.py,sha256=zK_ij3Tod5FwMVdIIhdVoEFvD3br-YM9RPe7WsOIW2s,10980
 lionagi/core/unit/unit_mixin.py,sha256=c8GvHzgc65iJKQBKv71ET3afLPsIz5-Ce-4Eo6_bZiw,38823
 lionagi/core/unit/util.py,sha256=yEIf4ksWLB4X0IZNmwvIphvXiRbtWtGqbWCPnIt1u-s,2048
@@ -219,8 +219,8 @@ lionagi/lions/researcher/data_source/finhub_.py,sha256=W63daXgIwHJQ6TDMR2ALQIDk1
 lionagi/lions/researcher/data_source/google_.py,sha256=401SKHQaSpxiOUoXl7stadl4qeF7SIX72lUNK7bKesg,6797
 lionagi/lions/researcher/data_source/wiki_.py,sha256=UPoa2dk_y5sELu7_rkdme2auDpUmc_Dn0Avgjwr2X2g,3145
 lionagi/lions/researcher/data_source/yfinance_.py,sha256=snAf897J69MyAc6fcFjF0irrMjbAh81EZ3RvaFT3hxE,977
-lionagi/version.py,sha256=VrXpHDu3erkzwl_WXrqINBm9xWkcyUy53IQOj042dOs,22
-lionagi-0.3.0.dist-info/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.3.0.dist-info/METADATA,sha256=KXd51cEiQSFRu_38WPzaK_0lR47WJrc86x0qXSFAWZo,3149
-lionagi-0.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lionagi-0.3.0.dist-info/RECORD,,
+lionagi/version.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
+lionagi-0.3.2.dist-info/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.3.2.dist-info/METADATA,sha256=7DrVUgP-AuWQaUBz_bfuAEvjRRRPw-yAmeX7349rf40,3149
+lionagi-0.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lionagi-0.3.2.dist-info/RECORD,,