lionagi 0.0.316__py3-none-any.whl → 0.1.1__py3-none-any.whl

lionagi/core/flow/monoflow/ReAct.py

@@ -6,9 +6,9 @@ process instructions, system messages, and invoke tools during the conversation.
 """
 
 from typing import Callable
-from .chat import MonoChat
-from lionagi.core.schema import Tool
-from lionagi.core.messages import Instruction
+from lionagi.core.flow.monoflow.chat import MonoChat
+from lionagi.core.tool import Tool
+from lionagi.core.messages.schema import Instruction
 
 
 class MonoReAct(MonoChat):
@@ -46,8 +46,7 @@ class MonoReAct(MonoChat):
     """
 
     ACTION_PROMPT = """
-    You have {num_steps} steps left in the current task. If further actions are needed, invoke tool usage.
-    If you are done, present the final result to the user without further tool usage.
+    You have {num_steps} steps left in the current task. invoke tool usage.
     """
 
     OUTPUT_PROMPT = "Notice: Present the final output to the user. Original user instruction: {instruction}"
@@ -127,15 +126,15 @@ class MonoReAct(MonoChat):
 
     def _create_followup_config(self, tools, tool_choice="auto", **kwargs):
         """
-        Creates the configuration for the followup steps based on the provided tools and parameters.
+        Creates the configuration for the followup chat based on the provided tools and parameters.
 
         Args:
-            tools (Optional[Any]): Specifies tools to be invoked during the followup steps.
+            tools (Optional[Any]): Specifies tools to be invoked during the followup chat.
             tool_choice (str): The choice of tools to use (default: "auto").
-            **kwargs: Additional keyword arguments for the followup configuration.
+            **kwargs: Additional keyword arguments for the followup chat configuration.
 
         Returns:
-            dict: The configuration for the followup steps.
+            dict: The configuration for the followup chat.
 
         Raises:
             ValueError: If no tools are found and registered.
@@ -159,7 +158,7 @@ class MonoReAct(MonoChat):
         system=None,
         tools=None,
         num_rounds: int = 1,
-        auto=False,
+        auto=True,
         reason_prompt=None,
         action_prompt=None,
         output_prompt=None,
@@ -188,6 +187,7 @@ class MonoReAct(MonoChat):
             The result of the reasoning and action steps.
         """
         config = self._create_followup_config(tools, **kwargs)
+        kwargs.pop("tools", None)
 
         i = 0
         _out = ""
@@ -220,19 +220,19 @@ class MonoReAct(MonoChat):
 
             _out = await self.chat(_prompt, sender=sender, **config)
 
-            if auto and not self.branch._is_invoked():
+            if not self.branch._is_invoked():
                 return _out if out else None
 
             i += 1
 
-        if auto:
-            if not self.branch._is_invoked():
-                return _out if out else None
 
-            _prompt = self._get_prompt(
-                prompt=output_prompt,
-                default=self.OUTPUT_PROMPT,
-                instruction=instruction,
-            )
-            _out = await self.chat(_prompt, sender=sender, **kwargs)
+        if not self.branch._is_invoked():
             return _out if out else None
+
+        _prompt = self._get_prompt(
+            prompt=output_prompt,
+            default=self.OUTPUT_PROMPT,
+            instruction=instruction,
+        )
+        _out = await self.chat(_prompt, sender=sender, **kwargs)
+        return _out if out else None

lionagi/core/flow/monoflow/chat.py

@@ -7,7 +7,7 @@ during the chat conversation. It extends the BaseMonoFlow and MonoChatMixin clas
 
 from typing import Any
 
-from lionagi.core.flow.base.baseflow import BaseMonoFlow
+from lionagi.core.flow.baseflow import BaseMonoFlow
 from lionagi.core.flow.monoflow.chat_mixin import MonoChatMixin
 
 
@@ -24,7 +24,7 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
             Initializes the MonoChat instance.
 
         async chat(self, instruction=None, context=None, sender=None, system=None, tools=False,
-                   out=True, invoke=True, output_fields=None, prompt_template=None, **kwargs) -> Any:
+                   out=True, invoke=True, output_fields=None, form=None, **kwargs) -> Any:
             Performs a chat conversation with an LLM, processing instructions and system messages,
             and optionally invoking tools.
     """
@@ -48,7 +48,7 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
         out: bool = True,
         invoke: bool = True,
         output_fields=None,
-        prompt_template=None,
+        form=None,
         **kwargs,
     ) -> Any:
         """
@@ -64,7 +64,7 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
             out (bool): If True, outputs the chat response.
             invoke (bool): If True, invokes tools as part of the chat.
             output_fields (Optional[Any]): The output fields for the chat.
-            prompt_template (Optional[Any]): The prompt template for the chat.
+            form (Optional[Any]): The prompt template for the chat.
             **kwargs: Arbitrary keyword arguments for chat completion.
 
         Returns:
@@ -79,7 +79,7 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
             context=context,
             sender=sender,
             system=system,
-            prompt_template=prompt_template,
+            form=form,
             tools=tools,
             output_fields=output_fields,
             **kwargs,
@@ -91,5 +91,5 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
             invoke=invoke,
             out=out,
             output_fields=output_fields,
-            prompt_template=prompt_template,
+            form=form,
         )

lionagi/core/flow/monoflow/chat_mixin.py

@@ -5,14 +5,10 @@ This module contains mixins for configuring and invoking chatbots.
 from abc import ABC
 from typing import Any
 
+import re
+from lionagi.libs import nested, func_call, convert, StringMatch, ParseUtil
+from lionagi.core.tool.tool import TOOL_TYPE
 from lionagi.core.messages.schema import Instruction
-from lionagi.core.schema.base_node import TOOL_TYPE
-from lionagi.libs import (
-    ln_nested as nested,
-    ln_func_call as func_call,
-    ln_convert as convert,
-)
-from lionagi.libs.ln_parse import ParseUtil, StringMatch
 
 
 class MonoChatConfigMixin(ABC):
@@ -21,8 +17,8 @@ class MonoChatConfigMixin(ABC):
 
     Methods:
         _create_chat_config(self, instruction=None, context=None, sender=None, system=None,
-                            output_fields=None, prompt_template=None, tools=False, **kwargs) -> Any:
-            Creates a chat configuration based on the provided parameters.
+        output_fields=None, form=None, tools=False, **kwargs) -> Any:
+        Creates a chat configuration based on the provided parameters.
     """
 
     def _create_chat_config(
@@ -32,7 +28,7 @@ class MonoChatConfigMixin(ABC):
         sender: str | None = None,
         system: str | dict[str, Any] | None = None,
         output_fields=None,
-        prompt_template=None,
+        form=None,
         tools: TOOL_TYPE = False,
         **kwargs,
     ) -> Any:
@@ -45,7 +41,7 @@ class MonoChatConfigMixin(ABC):
             sender (str): The sender of the message (optional).
             system (str | dict[str, Any]): The system message for the chatbot (optional).
             output_fields: The output fields for the chatbot (optional).
-            prompt_template: The prompt template for the chatbot (optional).
+            form: The prompt template for the chatbot (optional).
             tools (TOOL_TYPE): The tools for the chatbot (default: False).
             **kwargs: Additional keyword arguments for the chat configuration.
 
@@ -55,7 +51,7 @@ class MonoChatConfigMixin(ABC):
         if system:
             self.branch.change_first_system_message(system)
 
-        if not prompt_template:
+        if not form:
             self.branch.add_message(
                 instruction=instruction,
                 context=context,
@@ -63,7 +59,7 @@ class MonoChatConfigMixin(ABC):
                 output_fields=output_fields,
             )
         else:
-            instruct_ = Instruction.from_prompt_template(prompt_template)
+            instruct_ = Instruction.from_form(form)
             self.branch.add_message(instruction=instruct_)
 
         if "tool_parsed" in kwargs:
@@ -85,8 +81,8 @@ class MonoChatInvokeMixin(ABC):
     Mixin class for invoking chatbots.
 
     Methods:
-        async _output(self, invoke, out, output_fields, func_calls_=None, prompt_template=None,
-                      return_template=True):
+        async _output(self, invoke, out, output_fields, func_calls_=None, form=None,
+                    return_template=True):
             Processes the output of the chatbot.
 
         _return_response(content_, output_fields) -> Any:
@@ -108,7 +104,7 @@ class MonoChatInvokeMixin(ABC):
         out,
         output_fields,
         func_calls_=None,
-        prompt_template=None,
+        form=None,
         return_template=True,
     ):
         """
@@ -119,7 +115,7 @@ class MonoChatInvokeMixin(ABC):
             out: Flag indicating whether to return the output.
             output_fields: The output fields for the chatbot.
             func_calls_: The function calls for invoking the tools (optional).
-            prompt_template: The prompt template for the chatbot (optional).
+            form: The prompt template for the chatbot (optional).
             return_template (bool): Flag indicating whether to return the prompt template (default: True).
         """
 
@@ -132,9 +128,10 @@ class MonoChatInvokeMixin(ABC):
                 pass
 
         response_ = self._return_response(content_, output_fields)
-        if prompt_template:
-            prompt_template._process_response(response_)
-            return prompt_template if return_template else prompt_template.out
+
+        if form:
+            form._process_response(response_)
+            return form if return_template else form.outputs
 
         if out:
             return response_
@@ -159,24 +156,17 @@ class MonoChatInvokeMixin(ABC):
 
         if output_fields:
             try:
-                if isinstance(out_, dict):
-                    out_ = convert.to_str(out_.values())
-
-                if isinstance(out_, str):
-                    try:
-                        out_ = ParseUtil.md_to_json(out_)
-                    except Exception:
-                        out_ = ParseUtil.md_to_json(out_.replace("'", '"'))
-
-                out_ = StringMatch.correct_keys(output_fields=output_fields, out_=out_)
+                return StringMatch.force_validate_dict(
+                    out_, keys=list(output_fields.keys())
+                )
             except Exception:
                 pass
 
         if isinstance(out_, str):
             try:
-                out_ = ParseUtil.md_to_json(out_)
-                out_ = StringMatch.correct_keys(output_fields=output_fields, out_=out_)
-                return out_
+                match = re.search(r"```json\n({.*?})\n```", out_, re.DOTALL)
+                if match:
+                    out_ = ParseUtil.fuzzy_parse_json(match.group(1))
             except Exception:
                 pass
 

lionagi/core/flow/monoflow/followup.py

@@ -6,9 +6,9 @@ process instructions, system messages, and invoke tools during the conversation.
 """
 
 from typing import Callable
-from lionagi.core.messages import Instruction
-from lionagi.core.schema import Tool
-from .chat import MonoChat
+from lionagi.core.messages.schema import Instruction
+from lionagi.core.tool.tool import Tool
+from lionagi.core.flow.monoflow.chat import MonoChat
 
 
 class MonoFollowup(MonoChat):
@@ -150,7 +150,7 @@ class MonoFollowup(MonoChat):
         system=None,
         tools=None,
         max_followup: int = 1,
-        auto=False,
+        auto=True,
         followup_prompt=None,
         output_prompt=None,
         out=True,
@@ -196,19 +196,18 @@ class MonoFollowup(MonoChat):
             else:
                 _out = await self.chat(_prompt, sender=sender, **config)
 
-            if auto and not self.branch._is_invoked():
+            if not self.branch._is_invoked():
                 return _out if out else None
 
             i += 1
 
-        if auto:
-            if not self.branch._is_invoked():
-                return _out if out else None
-
-            _prompt = self._get_prompt(
-                prompt=output_prompt,
-                default=self.OUTPUT_PROMPT,
-                instruction=instruction,
-            )
-            _out = await self.chat(_prompt, sender=sender, **kwargs)
+        if not self.branch._is_invoked():
             return _out if out else None
+
+        _prompt = self._get_prompt(
+            prompt=output_prompt,
+            default=self.OUTPUT_PROMPT,
+            instruction=instruction,
+        )
+        _out = await self.chat(_prompt, sender=sender, **kwargs)
+        return _out if out else None

lionagi/core/flow/polyflow/chat.py

@@ -8,13 +8,10 @@ created branches within the session.
 
 from typing import Any
 
-from lionagi.libs import ln_convert as convert
-from lionagi.libs.ln_async import AsyncUtil
-
+from lionagi.libs import convert, AsyncUtil
 from lionagi.core.messages.schema import Instruction
 from lionagi.core.branch.branch import Branch
-
-from lionagi.core.flow.base.baseflow import BasePolyFlow
+from lionagi.core.flow.baseflow import BasePolyFlow
 
 
 class PolyChat(BasePolyFlow):
@@ -22,17 +19,23 @@ class PolyChat(BasePolyFlow):
     A class for performing parallel chat conversations with multiple branches.
 
     Methods:
-        __init__(self, session) -> None:
+        __init__(self, session: Any) -> None:
             Initializes the PolyChat instance.
 
-        async parallel_chat(self, instruction, num_instances=1, context=None, sender=None, branch_system=None,
-                             messages=None, tools=False, out=True, invoke=True, output_fields=None,
-                             persist_path=None, branch_config=None, explode=False, **kwargs) -> Any:
+        async parallel_chat(self, instruction: Union[Instruction, str], num_instances: int = 1,
+                             context: Optional[Any] = None, sender: Optional[str] = None,
+                             branch_system: Optional[Any] = None, messages: Optional[Any] = None,
+                             tools: bool = False, out: bool = True, invoke: bool = True,
+                             output_fields: Optional[Any] = None, persist_path: Optional[str] = None,
+                             branch_config: Optional[dict] = None, explode: bool = False, **kwargs) -> Any:
             Performs parallel chat conversations with multiple branches.
 
-        async _parallel_chat(self, instruction, num_instances=1, context=None, sender=None, messages=None,
-                              tools=False, out=True, invoke=True, output_fields=None, persist_path=None,
-                              branch_config={}, explode=False, include_mapping=True, default_key="response",
+        async _parallel_chat(self, instruction: Union[Instruction, str], num_instances: int = 1,
+                              context: Optional[Any] = None, sender: Optional[str] = None,
+                              messages: Optional[Any] = None, tools: bool = False, out: bool = True,
+                              invoke: bool = True, output_fields: Optional[Any] = None,
+                              persist_path: Optional[str] = None, branch_config: dict = {},
+                              explode: bool = False, include_mapping: bool = True, default_key: str = "response",
                               **kwargs) -> Any:
             Internal method for performing parallel chat conversations with multiple branches.
     """

lionagi/core/{prompt/action_template.py → form/action_form.py}

@@ -1,13 +1,13 @@
 from typing import Any
 from lionagi.integrations.bridge.pydantic_.pydantic_bridge import Field
 
-from .scored_template import ScoredTemplate
+from lionagi.core.form.scored_form import ScoredForm
 
 
 class ActionRequest: ...
 
 
-class ActionedTemplate(ScoredTemplate):
+class ActionForm(ScoredForm):
 
     action_needed: bool | None = Field(
         False, description="true if actions are needed else false"

lionagi/core/{prompt → form}/field_validator.py

@@ -9,8 +9,16 @@ maps data types to their corresponding validation functions.
 from lionagi.libs import convert, StringMatch, ParseUtil
 
 
-def _has_action_keys(dict_):
-    return list(dict_.keys()) >= ["function", "arguments"]
+def check_dict_field(x, keys: list[str] | dict, fix_=True, **kwargs):
+    if isinstance(x, dict):
+        return x
+    if fix_:
+        try:
+            x = convert.to_str(x)
+            return StringMatch.force_validate_dict(x, keys=keys, **kwargs)
+        except Exception as e:
+            raise ValueError("Invalid dict field type.") from e
+    raise ValueError(f"Default value for DICT must be a dict, got {type(x).__name__}")
 
 
 def check_action_field(x, fix_=True, **kwargs):
@@ -27,26 +35,6 @@ def check_action_field(x, fix_=True, **kwargs):
         raise ValueError("Invalid action field type.") from e
 
 
-def _fix_action_field(x, discard_=True):
-    corrected = []
-    if isinstance(x, str):
-        x = ParseUtil.fuzzy_parse_json(x)
-
-    try:
-        x = convert.to_list(x)
-
-        for i in x:
-            i = convert.to_dict(i)
-            if _has_action_keys(i):
-                corrected.append(i)
-            elif not discard_:
-                raise ValueError(f"Invalid action field: {i}")
-    except Exception as e:
-        raise ValueError(f"Invalid action field: {e}") from e
-
-    return corrected
-
-
 def check_number_field(x, fix_=True, **kwargs):
     """
     Checks if the given value is a valid numeric field.
@@ -171,6 +159,30 @@ def check_enum_field(x, choices, fix_=True, **kwargs):
     return x
 
 
+def _has_action_keys(dict_):
+    return list(dict_.keys()) >= ["function", "arguments"]
+
+
+def _fix_action_field(x, discard_=True):
+    corrected = []
+    if isinstance(x, str):
+        x = ParseUtil.fuzzy_parse_json(x)
+
+    try:
+        x = convert.to_list(x)
+
+        for i in x:
+            i = convert.to_dict(i)
+            if _has_action_keys(i):
+                corrected.append(i)
+            elif not discard_:
+                raise ValueError(f"Invalid action field: {i}")
+    except Exception as e:
+        raise ValueError(f"Invalid action field: {e}") from e
+
+    return corrected
+
+
 def _fix_number_field(x, *args, **kwargs):
     """
     Attempts to fix an invalid numeric field value.
@@ -209,17 +221,13 @@ def _fix_bool_field(x):
         ValueError: If the value cannot be converted into a valid boolean value.
     """
     try:
-        x = convert.to_str(x)
-        if (
-            convert.strip_lower(x) in ["true", "1", "correct", "yes"]
-            or convert.to_num(x) == 1
-        ):
+        x = convert.strip_lower(convert.to_str(x))
+        if x in ["true", "1", "correct", "yes"]:
             return True
-        elif (
-            convert.strip_lower(x) in ["false", "0", "incorrect", "no", "none", "n/a"]
-            or convert.to_num(x) == 0
-        ):
+
+        elif x in ["false", "0", "incorrect", "no", "none", "n/a"]:
             return False
+
         raise ValueError(f"Failed to convert {x} into a boolean value")
     except Exception as e:
         raise ValueError(f"Failed to convert {x} into a boolean value") from e
@@ -275,4 +283,5 @@ validation_funcs = {
     "str": check_str_field,
     "enum": check_enum_field,
     "action": check_action_field,
+    "dict": check_dict_field,
 }