lionagi 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

lionagi/core/collections/model.py

@@ -26,6 +26,8 @@ load_dotenv()
 
 _oai_price_map = {
     "gpt-4o": (5, 15),
+    "gpt-4o-2024-08-06": (2.5, 10),
+    "gpt-4o-mini": (0.15, 0.6),
     "gpt-4-turbo": (10, 30),
     "gpt-3.5-turbo": (0.5, 1.5),
 }
@@ -322,6 +324,38 @@ class iModel:
         node.add_field("embedding", embed["data"][0]["embedding"])
         node._meta_insert("embedding_meta", payload)
 
+    async def format_structure(
+        self,
+        data: str | dict,
+        json_schema: dict | str = None,
+        request_fields: dict | list = None,
+        **kwargs,
+    ) -> dict:
+        if json_schema:
+            kwargs["response_format"] = {
+                "type": "json_schema",
+                "json_schema": json_schema,
+            }
+            kwargs["model"] = kwargs.pop("model", "gpt-4o-mini")
+        if not request_fields and not json_schema:
+            raise ValueError("Either request_fields or json_schema must be provided")
+        request_fields = request_fields or json_schema["properties"]
+
+        messages = [
+            {
+                "role": "system",
+                "content": "You are a helpful json formatting assistant.",
+            },
+            {
+                "role": "user",
+                "content": f"can you please format the given data into given json schema?"
+                f"--- data --- {data} |||| ----json fields required --- {request_fields}",
+            },
+        ]
+
+        result = await self.call_chat_completion(messages, **kwargs)
+        return result["choices"][0]["message"]["content"]
+
     def to_dict(self):
         """
         Converts the model instance to a dictionary representation.

lionagi/core/session/branch.py

@@ -58,7 +58,7 @@ class Branch(Node, DirectiveMixin):
     messages: Pile = Field(None)
     progress: Progression = Field(None)
     tool_manager: ToolManager = Field(None)
-    system: System = Field(None)
+    system: System | None = Field(None)
     user: str = Field(None)
     mailbox: Exchange[Mail] = Field(None)
     imodel: iModel = Field(None)
@@ -110,14 +110,14 @@ class Branch(Node, DirectiveMixin):
             system (System): The system message to set.
             sender (str, optional): The sender of the system message.
         """
-        system = system or "You are a helpful assistant."
-        if len(self.progress) == 0:
-            self.add_message(system=system, sender=sender)
-        else:
-            _msg = System(system=system, sender=sender)
-            _msg.recipient = self.ln_id
-            self._remove_system()
-            self.system = _msg
+        if system is not None:
+            if len(self.progress) == 0:
+                self.add_message(system=system, sender=sender)
+            else:
+                _msg = System(system=system, sender=sender)
+                _msg.recipient = self.ln_id
+                self._remove_system()
+                self.system = _msg
 
     def add_message(
         self,

lionagi/core/session/directive_mixin.py

@@ -51,6 +51,10 @@ class DirectiveMixin:
         return_branch=False,
         images=None,
         image_path=None,
+        template=None,
+        verbose=True,
+        formatter=None,
+        format_kwargs=None,
         **kwargs,
     ):
         """
@@ -114,7 +118,15 @@ class DirectiveMixin:
             >>> print(result)
         """
 
-        directive = Unit(self, imodel=imodel, rulebook=rulebook)
+        directive = Unit(
+            self,
+            imodel=imodel,
+            rulebook=rulebook,
+            template=template,
+            verbose=verbose,
+            formatter=formatter,
+            format_kwargs=format_kwargs,
+        )
         if system:
             self.add_message(system=system)
 
@@ -174,7 +186,10 @@ class DirectiveMixin:
         directive=None,
         images=None,
         image_path=None,
-        verbose=False,
+        template=None,
+        verbose=True,
+        formatter=None,
+        format_kwargs=None,
         **kwargs,
     ):
         """
@@ -220,7 +235,14 @@ class DirectiveMixin:
 
             images = ImageUtil.read_image_to_base64(image_path)
 
-        _directive = Unit(self, imodel=imodel, rulebook=rulebook, verbose=verbose)
+        _directive = Unit(
+            self,
+            imodel=imodel,
+            rulebook=rulebook,
+            verbose=verbose,
+            formatter=formatter,
+            format_kwargs=format_kwargs,
+        )
 
         idx = len(self.progress)
         if directive and isinstance(directive, str):
@@ -232,6 +254,7 @@ class DirectiveMixin:
                 reason=reason,
                 confidence=confidence,
                 images=images,
+                template=template,
                 **kwargs,
             )
 
@@ -269,6 +292,7 @@ class DirectiveMixin:
             plan_num_step=plan_num_step,
             predict_num_sentences=predict_num_sentences,
             images=images,
+            template=template,
             **kwargs,
         )
 

lionagi/core/unit/unit.py

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from typing import Callable
 from lionagi.libs.ln_convert import strip_lower
 from lionagi.libs.ln_func_call import rcall
 from lionagi.core.collections.abc import Directive
@@ -40,7 +41,14 @@ class Unit(Directive, DirectiveMixin):
     default_template = UnitForm
 
     def __init__(
-        self, branch, imodel: iModel = None, template=None, rulebook=None, verbose=False
+        self,
+        branch,
+        imodel: iModel = None,
+        template=None,
+        rulebook=None,
+        verbose=False,
+        formatter: Callable = None,
+        format_kwargs: dict = {},
     ) -> None:
         self.branch = branch
         if imodel and isinstance(imodel, iModel):
@@ -49,7 +57,11 @@ class Unit(Directive, DirectiveMixin):
         else:
             self.imodel = branch.imodel
         self.form_template = template or self.default_template
-        self.validator = Validator(rulebook=rulebook) if rulebook else Validator()
+        rule_config = {"formatter": formatter, "format_kwargs": format_kwargs}
+        if rulebook:
+            rule_config["rulebook"] = rulebook
+
+        self.validator = Validator(**rule_config)
         self.verbose = verbose
 
     async def chat(
@@ -71,6 +83,8 @@ class Unit(Directive, DirectiveMixin):
         clear_messages=False,
         use_annotation=True,
         return_branch=False,
+        formatter=None,
+        format_kwargs={},
         **kwargs,
     ):
         """
@@ -119,6 +133,8 @@ class Unit(Directive, DirectiveMixin):
             clear_messages=clear_messages,
             use_annotation=use_annotation,
             return_branch=return_branch,
+            formatter=formatter,
+            format_kwargs=format_kwargs,
             **kwargs,
         )
 

lionagi/core/unit/unit_mixin.py

@@ -257,7 +257,6 @@ class DirectiveMixin(ABC):
         form: Form = None,
         return_form: bool = True,
         strict: bool = False,
-        rulebook: Any = None,
         use_annotation: bool = True,
         template_name: str = None,
         costs=None,
@@ -274,7 +273,6 @@ class DirectiveMixin(ABC):
             form: Form data.
             return_form: Flag indicating if form should be returned.
             strict: Flag indicating if strict validation should be applied.
-            rulebook: Rulebook instance for validation.
             use_annotation: Flag indicating if annotations should be used.
             template_name: Template name for form.
 
@@ -295,8 +293,7 @@ class DirectiveMixin(ABC):
         response_ = self._process_model_response(_msg, requested_fields)
 
         if form:
-            validator = Validator(rulebook=rulebook) if rulebook else self.validator
-            form = await validator.validate_response(
+            form = await self.validator.validate_response(
                 form=form,
                 response=response_,
                 strict=strict,
@@ -332,7 +329,6 @@ class DirectiveMixin(ABC):
         invoke_tool: bool = True,
         return_form: bool = True,
         strict: bool = False,
-        rulebook: Any = None,
         imodel: Any = None,
         use_annotation: bool = True,
         branch: Any = None,
@@ -356,7 +352,6 @@ class DirectiveMixin(ABC):
             invoke_tool: Flag indicating if tools should be invoked.
             return_form: Flag indicating if form should be returned.
             strict: Flag indicating if strict validation should be applied.
-            rulebook: Rulebook instance for validation.
             imodel: Model instance.
             use_annotation: Flag indicating if annotations should be used.
             branch: Branch instance.
@@ -400,9 +395,8 @@ class DirectiveMixin(ABC):
             form=form,
             return_form=return_form,
             strict=strict,
-            rulebook=rulebook,
             use_annotation=use_annotation,
-            costs=imodel.costs,
+            costs=imodel.costs or (0, 0),
         )
 
         return out_, branch if return_branch else out_
@@ -421,13 +415,14 @@ class DirectiveMixin(ABC):
         invoke_tool=True,
         return_form=True,
         strict=False,
-        rulebook=None,
         imodel=None,
         images: Optional[str] = None,
         clear_messages=False,
         use_annotation=True,
         timeout: float = None,
         return_branch=False,
+        formatter=None,
+        format_kwargs={},
         **kwargs,
     ):
         """
@@ -470,13 +465,14 @@ class DirectiveMixin(ABC):
             invoke_tool=invoke_tool,
             return_form=return_form,
             strict=strict,
-            rulebook=rulebook,
             imodel=imodel,
             use_annotation=use_annotation,
             timeout=timeout,
             branch=branch,
             clear_messages=clear_messages,
             return_branch=return_branch,
+            formatter=formatter,
+            format_kwargs=format_kwargs,
             **kwargs,
         )
 
@@ -609,7 +605,9 @@ class DirectiveMixin(ABC):
         clear_messages=False,
         return_branch=False,
         images: Optional[str] = None,
-        verbose=None,
+        verbose=True,
+        formatter=None,
+        format_kwargs=None,
         **kwargs,
     ):
         """

lionagi/core/validator/validator.py

@@ -14,10 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, Dict, List, Union
+import asyncio
+from typing import Any, Dict, List, Union, Callable
 from lionagi.libs import SysUtil
 from lionagi.libs.ln_func_call import lcall
 from lionagi.core.collections.abc import FieldError
+from lionagi.core.collections.model import iModel
 from ..rule.base import Rule
 from ..rule._default import DEFAULT_RULES
 from ..rule.rulebook import RuleBook
@@ -56,6 +58,8 @@ class Validator:
         order: List[str] = None,
         init_config: Dict[str, Dict] = None,
         active_rules: Dict[str, Rule] = None,
+        formatter: Callable = None,
+        format_kwargs: dict = {},
     ):
         """
         Initialize the Validator.
@@ -75,6 +79,8 @@ class Validator:
         )
         self.active_rules: Dict[str, Rule] = active_rules or self._initiate_rules()
         self.validation_log = []
+        self.formatter = formatter
+        self.format_kwargs = format_kwargs
 
     def _initiate_rules(self) -> Dict[str, Rule]:
         """
@@ -207,9 +213,16 @@ class Validator:
             if len(form.requested_fields) == 1:
                 response = {form.requested_fields[0]: response}
             else:
-                raise ValueError(
-                    "Response is a string, but form has multiple fields to be filled"
-                )
+                if self.formatter:
+                    if asyncio.iscoroutinefunction(self.formatter):
+                        response = await self.formatter(response, **self.format_kwargs)
+                        print("formatter used")
+                    else:
+                        response = self.formatter(response, **self.format_kwargs)
+                        print("formatter used")
+
+        if not isinstance(response, dict):
+            raise ValueError(f"The form response format is invalid for filling.")
 
         dict_ = {}
         for k, v in response.items():

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.2.5"
+__version__ = "0.2.7"

{lionagi-0.2.5.dist-info → lionagi-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.2.5
+Version: 0.2.7
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: Haiyang Li <ocean@lionagi.ai>
@@ -237,7 +237,7 @@ Requires-Dist: boto3 >=1.34.131
 ### an AGentic Intelligence Operating System
 
 ```
-pip install lionagi==0.2.5
+pip install lionagi==0.2.6
 ```
 
 **Powerful Intelligent Workflow Automation**

{lionagi-0.2.5.dist-info → lionagi-0.2.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lionagi/__init__.py,sha256=amQal6CUIv4QDI4Qmb0M5qwTbn3_F430Wl5vaSNG6-U,1952
-lionagi/version.py,sha256=Xsa3ayOMVkhUWm4t06YeyHE0apjpZefxLH4ylp0CDtU,22
+lionagi/version.py,sha256=XHypfHSPdgXFKmOdoewn7czU670gt8InhHhzlP5j_aA,22
 lionagi/core/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 lionagi/core/_setting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/core/_setting/_setting.py,sha256=p23fHtrzIZlQ8s8CDZICn8C6k7mdB_088nIDx19JaqM,1907
@@ -23,7 +23,7 @@ lionagi/core/collections/__init__.py,sha256=5374e0qHH75IUvW-xA3Dte25N_oc_YXjtu7e
 lionagi/core/collections/_logger.py,sha256=_jwZe6BsRaWB2YkHwG01jmiudJkoi5u90Ry3KKa9T-o,12104
 lionagi/core/collections/exchange.py,sha256=Skx2al0PtNkzdaApb8DdbOO0ukC19kSQnlskHpAHJHw,4832
 lionagi/core/collections/flow.py,sha256=0tBeVJhENXjVFjtOlrEHXvI4q-rgTyD-kcE7X29AqDE,13189
-lionagi/core/collections/model.py,sha256=RQYuvZachSYJi8owQ44GPSZXV22l-KdWqJAL40CG2PE,14846
+lionagi/core/collections/model.py,sha256=U9yFhQ31NH24HwJjnnRxOfZcnUWq8Vuk_iF0r8SZc5A,16079
 lionagi/core/collections/pile.py,sha256=MF2G846TolIiKZkY0mjSOvD7Bc3__Fb_z-WiiLG1lbM,29444
 lionagi/core/collections/progression.py,sha256=eDhSbsQWb9TVsNExaJAN27tjoyb6QEKWPxBZKUbNbs0,7295
 lionagi/core/collections/util.py,sha256=JRu_gCDYopqIUByEtJgnJNkeoWnhge7XbSFejrdbIec,1962
@@ -82,8 +82,8 @@ lionagi/core/rule/rulebook.py,sha256=HlJCIjhsRB0yJs-uF85aK9bJasCDI0K845UGmymzD9Q
 lionagi/core/rule/string.py,sha256=8nSxEhHUFs-gWM1MW5fiNuDP1Yd_IIZ2ipBVphgCmQ0,1487
 lionagi/core/rule/util.py,sha256=qqtUqt4BL_sikW2XZ73NDzb3p-Awu4za_2B5mZvzFdA,1042
 lionagi/core/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lionagi/core/session/branch.py,sha256=6ySBqEZHYbQ1AKJmcoBtU9MwF5WT5wAr3z2NB6TF8gg,14761
-lionagi/core/session/directive_mixin.py,sha256=SgLFQwZyqnP6pCoZU1YBJuO6olnSBKZ6FIfl-Je3uVQ,11724
+lionagi/core/session/branch.py,sha256=338N-jw-AfnjksYFo2WiLIeXdzxOYJ_qZBxMuk-U8bU,14769
+lionagi/core/session/directive_mixin.py,sha256=vCoOIA_AYEH7M1ptDBUaOtSuxC5KQSAnsKn9X-LpjFs,12275
 lionagi/core/session/session.py,sha256=uESwIyGfRrX8Ii03-QIQYUlQKR7lsJWREdSZrHxfNW4,11012
 lionagi/core/structure/__init__.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 lionagi/core/structure/chain.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -92,9 +92,9 @@ lionagi/core/structure/graph.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzI
 lionagi/core/structure/tree.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 lionagi/core/unit/__init__.py,sha256=cxASNHNw2wK-SO9a4FQTjKDOOpT3HRE_qFD5GEvHdbQ,88
 lionagi/core/unit/parallel_unit.py,sha256=DB5PjGMin2PkXc4qR7u6zEMxkj8WVgtSfdMoPhSby0A,9332
-lionagi/core/unit/unit.py,sha256=V-0qOUtW5v5XHNUGJl9aE1j8fxYVWwLulrxySkN814w,12986
+lionagi/core/unit/unit.py,sha256=hnXSjHPc9TXOfPv-sUV1T8LIUhmjXODpIZr9Sj9cGwE,13364
 lionagi/core/unit/unit_form.py,sha256=1WDBXDprnsyz8OEbDH7LLRceldhvZHmswVoZb1CV80E,11580
-lionagi/core/unit/unit_mixin.py,sha256=E8GY7eAjtvlfYW4Thpd-XoOeAZMLYC13HMyC2erCueE,39314
+lionagi/core/unit/unit_mixin.py,sha256=-Jy3KxhETyQYGUxo2xZQByHjGuckzeHLU1CaMknwu5k,39163
 lionagi/core/unit/util.py,sha256=GqErzoWlUeSBtl3qcjqMONJoNK7i1DYJ_S3JW6MnEp8,1994
 lionagi/core/unit/template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/core/unit/template/action.py,sha256=AETiRQKDvjB-EEyi-i6u3UqQ8650HbDkUaSSNxQJ8P0,2791
@@ -104,7 +104,7 @@ lionagi/core/unit/template/predict.py,sha256=LdsKgoXs-yQIb6VfFD08CphAn33SJWUlLF8
 lionagi/core/unit/template/score.py,sha256=vTiSzL80YDQERVEQT-VNc_wKWbVJyLfvBa2DSexKyLg,4368
 lionagi/core/unit/template/select.py,sha256=n9u1Yer_fWPYZDzAnlYpSECo_hk7B0gTaEGSta6i8is,3604
 lionagi/core/validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lionagi/core/validator/validator.py,sha256=ngThQTzNSOa6N0mKrAQuhwM_gb_IWhF58OefOyUjTK8,12012
+lionagi/core/validator/validator.py,sha256=ohlaNxxoi7KCY_1BIyTt03JegpqmGIhuqnIdtHL2nDE,12618
 lionagi/core/work/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/core/work/work.py,sha256=oVbx0b8arvXSjDZa2Rs1s37_Fiue6gbR0Tt4oL7Dzkk,2532
 lionagi/core/work/work_edge.py,sha256=o6bCDjQIfBjnnpbd7ZVNLGuRQgmvLDwPah58TaTK0eU,3408
@@ -251,8 +251,8 @@ lionagi/tests/test_core/test_structure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 lionagi/tests/test_core/test_structure/test_base_structure.py,sha256=qsaYP745fFIst5ZNiPFb9-ATScLyUFqQ5UQzyyBgJPM,9388
 lionagi/tests/test_core/test_structure/test_graph.py,sha256=hLsTZmZMs9vCZW-KiOwYY3npk6WxaVU6zZSA9-ltDvQ,2162
 lionagi/tests/test_core/test_structure/test_tree.py,sha256=PvMJXDsNPpJFgEQCan-5Q5JREgMrBOpYIaWcwHd-WDY,1944
-lionagi-0.2.5.dist-info/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.2.5.dist-info/METADATA,sha256=svScDN5_cqlfWuaNVwMnRnTUdf5Sx8MY4f1hk03HXjc,16276
-lionagi-0.2.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-lionagi-0.2.5.dist-info/top_level.txt,sha256=szvch_d2jE1Lu9ZIKsl26Ll6BGfYfbOgt5lm-UpFSo4,8
-lionagi-0.2.5.dist-info/RECORD,,
+lionagi-0.2.7.dist-info/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.2.7.dist-info/METADATA,sha256=WI8pyy3AHxkvSBmxFFQKtYGoL-tCXEplXj6xU9rzcWs,16276
+lionagi-0.2.7.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+lionagi-0.2.7.dist-info/top_level.txt,sha256=szvch_d2jE1Lu9ZIKsl26Ll6BGfYfbOgt5lm-UpFSo4,8
+lionagi-0.2.7.dist-info/RECORD,,

{lionagi-0.2.5.dist-info → lionagi-0.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any