lionagi 0.0.306__py3-none-any.whl → 0.0.307__py3-none-any.whl

lionagi/core/flow/monoflow/chat.py

@@ -25,18 +25,18 @@ class MonoChat(BaseMonoFlow, MonoChatMixin):
         a chat conversation with LLM, processing instructions and system messages, optionally invoking tools.
 
         Args:
-            branch: The Branch instance to perform chat operations.
-            instruction (Union[Instruction, str]): The instruction for the chat.
-            context (Optional[Any]): Additional context for the chat.
-            sender (Optional[str]): The sender of the chat message.
-            system (Optional[Union[System, str, Dict[str, Any]]]): System message to be processed.
-            tools (Union[bool, Tool, List[Tool], str, List[str]]): Specifies tools to be invoked.
-            out (bool): If True, outputs the chat response.
-            invoke (bool): If True, invokes tools as part of the chat.
-            **kwargs: Arbitrary keyword arguments for chat completion.
+                branch: The Branch instance to perform chat operations.
+                instruction (Union[Instruction, str]): The instruction for the chat.
+                context (Optional[Any]): Additional context for the chat.
+                sender (Optional[str]): The sender of the chat message.
+                system (Optional[Union[System, str, Dict[str, Any]]]): System message to be processed.
+                tools (Union[bool, Tool, List[Tool], str, List[str]]): Specifies tools to be invoked.
+                out (bool): If True, outputs the chat response.
+                invoke (bool): If True, invokes tools as part of the chat.
+                **kwargs: Arbitrary keyword arguments for chat completion.
 
         Examples:
-            >>> await ChatFlow.chat(branch, "Ask about user preferences")
+                >>> await ChatFlow.chat(branch, "Ask about user preferences")
         """
 
         config = self._create_chat_config(

lionagi/core/flow/monoflow/chat_mixin.py

@@ -36,32 +36,33 @@ class MonoChatConfigMixin(ABC):
         if "tool_parsed" in kwargs:
             kwargs.pop("tool_parsed")
             tool_kwarg = {"tools": tools}
-            kwargs = {**tool_kwarg, **kwargs}
-        else:
-            if tools and self.branch.has_tools:
-                kwargs = self.branch.tool_manager.parse_tool(tools=tools, **kwargs)
+            kwargs = tool_kwarg | kwargs
+        elif tools and self.branch.has_tools:
+            kwargs = self.branch.tool_manager.parse_tool(tools=tools, **kwargs)
 
         config = {**self.branch.llmconfig, **kwargs}
         if sender is not None:
-            config.update({"sender": sender})
+            config["sender"] = sender
 
         return config
 
 
 class MonoChatInvokeMixin(ABC):
     async def _output(self, invoke, out, output_fields, func_calls_=None):
+        # sourcery skip: use-contextlib-suppress
         content_ = self.branch.last_message_content
 
         if invoke:
             try:
                 await self._invoke_tools(content_, func_calls_=func_calls_)
-            except:
+            except Exception:
                 pass
         if out:
             return self._return_response(content_, output_fields)
 
     @staticmethod
     def _return_response(content_, output_fields):
+        # sourcery skip: assign-if-exp, use-contextlib-suppress
         out_ = ""
 
         if len(content_.items()) == 1 and len(nested.get_flattened_keys(content_)) == 1:
@@ -75,7 +76,7 @@ class MonoChatInvokeMixin(ABC):
                 else:
                     out_ = ParseUtil.md_to_json(out_)
                 out_ = StringMatch.correct_keys(output_fields=output_fields, out_=out_)
-            except:
+            except Exception:
                 pass
 
         return out_
@@ -118,9 +119,9 @@ class MonoChatInvokeMixin(ABC):
 
     async def _call_chatcompletion(self, sender=None, with_sender=False, **kwargs):
         messages = (
-            self.branch.chat_messages
-            if not with_sender
-            else self.branch.chat_messages_with_sender
+            self.branch.chat_messages_with_sender
+            if with_sender
+            else self.branch.chat_messages
         )
         payload, completion = await self.branch.service.serve_chat(
             messages=messages, **kwargs

lionagi/core/flow/monoflow/followup.py

@@ -41,16 +41,17 @@ class MonoFollowup(MonoChat):
         try:
             try:
                 return default.format(num_followup=num_followup)
-            except:
+            except Exception:
                 return default.format(instruction=instruction)
-        except:
+        except Exception:
             return default
 
     def _create_followup_config(self, tools, **kwargs):
 
-        if tools is not None:
-            if isinstance(tools, list) and isinstance(tools[0], Tool):
-                self.branch.tool_manager.register_tools(tools)
+        if tools is not None and (
+            isinstance(tools, list) and isinstance(tools[0], Tool)
+        ):
+            self.branch.tool_manager.register_tools(tools)
 
         if not self.branch.tool_manager.has_tools:
             raise ValueError("No tools found, You need to register tools")

lionagi/core/flow/polyflow/__init__.py

@@ -0,0 +1 @@
+from .chat import PolyChat

lionagi/core/flow/polyflow/chat.py

@@ -6,7 +6,6 @@ from lionagi.libs.ln_async import AsyncUtil
 from lionagi.core.messages.schema import Instruction
 from lionagi.core.branch.branch import Branch
 
-
 from lionagi.core.flow.base.baseflow import BasePolyFlow
 
 
@@ -28,7 +27,7 @@ class PolyChat(BasePolyFlow):
         invoke: bool = True,
         output_fields=None,
         persist_path=None,
-        branch_config={},
+        branch_config=None,
         explode=False,
         **kwargs,
     ) -> Any:
@@ -36,6 +35,8 @@ class PolyChat(BasePolyFlow):
         parallel chat
         """
 
+        if branch_config is None:
+            branch_config = {}
         return await self._parallel_chat(
             instruction,
             num_instances=num_instances,
@@ -67,6 +68,8 @@ class PolyChat(BasePolyFlow):
         persist_path=None,
         branch_config={},
         explode=False,
+        include_mapping=True,
+        default_key="response",
         **kwargs,
     ) -> Any:
         """
@@ -102,7 +105,16 @@ class PolyChat(BasePolyFlow):
             )
 
             branches[branch_.id_] = branch_
-            return res_
+            if include_mapping:
+                return {
+                    "instruction": ins_ or instruction,
+                    "context": cxt_ or context,
+                    "branch_id": branch_.id_,
+                    default_key: res_,
+                }
+
+            else:
+                return res_
 
         async def _inner_2(i, ins_=None, cxt_=None):
             """returns num_instances of branches performing for same task/context"""

lionagi/core/mail/mail_manager.py

@@ -1,7 +1,7 @@
 from collections import deque
-from lionagi.core.schema.base_node import BaseNode
-from lionagi.core.mail.schema import BaseMail
-from lionagi.libs.ln_async import AsyncUtil
+from lionagi.libs import AsyncUtil
+from ..schema import BaseNode
+from .schema import BaseMail
 
 
 class MailManager:
@@ -12,12 +12,12 @@ class MailManager:
     and deletion of sources, and it handles the collection and dispatch of mails to and from these sources.
 
     Attributes:
-        sources (Dict[str, Any]): A dictionary mapping source identifiers to their attributes.
-        mails (Dict[str, Dict[str, deque]]): A nested dictionary storing queued mail items, organized by recipient
-            and sender.
+            sources (Dict[str, Any]): A dictionary mapping source identifiers to their attributes.
+            mails (Dict[str, Dict[str, deque]]): A nested dictionary storing queued mail items, organized by recipient
+                    and sender.
     """
 
-    def __init__(self, sources: list[BaseNode]):
+    def __init__(self, sources):
         self.sources = {}
         self.mails = {}
         self.add_sources(sources)
@@ -26,12 +26,12 @@ class MailManager:
     def add_sources(self, sources):
         if isinstance(sources, dict):
             for _, v in sources.items():
-                if not v.id_ in self.sources:
+                if v.id_ not in self.sources:
                     self.sources[v.id_] = v
                     self.mails[v.id_] = {}
         elif isinstance(sources, list):
             for v in sources:
-                if not v.id_ in self.sources:
+                if v.id_ not in self.sources:
                     self.sources[v.id_] = v
                     self.mails[v.id_] = {}
 
@@ -73,15 +73,14 @@ class MailManager:
             raise ValueError(f"Recipient source {recipient_id} does not exist.")
         if not self.mails[recipient_id]:
             return
-        else:
-            for key in list(self.mails[recipient_id].keys()):
-                mails_deque = self.mails[recipient_id].pop(key)
-                if key not in self.sources[recipient_id].pending_ins:
-                    self.sources[recipient_id].pending_ins[key] = mails_deque
-                else:
-                    while mails_deque:
-                        mail_ = mails_deque.popleft()
-                        self.sources[recipient_id].pending_ins[key].append(mail_)
+        for key in list(self.mails[recipient_id].keys()):
+            mails_deque = self.mails[recipient_id].pop(key)
+            if key not in self.sources[recipient_id].pending_ins:
+                self.sources[recipient_id].pending_ins[key] = mails_deque
+            else:
+                while mails_deque:
+                    mail_ = mails_deque.popleft()
+                    self.sources[recipient_id].pending_ins[key].append(mail_)
 
     def collect_all(self):
         for ids in self.sources:
@@ -95,4 +94,4 @@ class MailManager:
         while not self.execute_stop:
             self.collect_all()
             self.send_all()
-            await AsyncUtil.sleep(refresh_time)
+            await AsyncUtil.sleep(refresh_time)

lionagi/core/mail/schema.py

@@ -10,10 +10,11 @@ class MailCategory(str, Enum):
     SERVICE = "service"
     MODEL = "model"
     NODE = "node"
-    CONTEXT = "context"
+    NODE_LIST = "node_list"
     NODE_ID = "node_id"
     START = "start"
     END = "end"
+    CONDITION = "condition"
 
 
 class BaseMail:
@@ -34,14 +35,14 @@ class BaseMail:
             raise ValueError(
                 f"Invalid request title. Valid titles are "
                 f"{list(MailCategory)}, Error: {e}"
-            )
+            ) from e
         self.package = package
 
 
 class StartMail(BaseRelatableNode):
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         self.pending_outs = deque()
 
     def trigger(self, context, structure_id, executable_id):

lionagi/core/messages/schema.py

@@ -1,12 +1,11 @@
 from enum import Enum
 
-from lionagi.libs import ln_nested as nested
-from lionagi.libs import ln_convert as convert
-
-from lionagi.core.schema.data_node import DataNode
+from lionagi.libs import nested, convert
+from ..schema import DataNode
 
 _message_fields = ["node_id", "timestamp", "role", "sender", "recipient", "content"]
 
+
 # ToDo: actually implement the new message classes
 
 
@@ -99,9 +98,9 @@ class BaseMessage(DataNode):
     Represents a message in a chatbot-like system, inheriting from BaseNode.
 
     Attributes:
-        role (str | None): The role of the entity sending the message, e.g., 'user', 'system'.
-        sender (str | None): The identifier of the sender of the message.
-        content (Any): The actual content of the message.
+            role (str | None): The role of the entity sending the message, e.g., 'user', 'system'.
+            sender (str | None): The identifier of the sender of the message.
+            content (Any): The actual content of the message.
     """
 
     role: str | None = None
@@ -114,7 +113,7 @@ class BaseMessage(DataNode):
         Constructs and returns a dictionary representation of the message.
 
         Returns:
-            A dictionary representation of the message with 'role' and 'content' keys.
+                A dictionary representation of the message with 'role' and 'content' keys.
         """
         return self._to_message()
 
@@ -124,7 +123,7 @@ class BaseMessage(DataNode):
         Gets the 'content' field of the message.
 
         Returns:
-            The 'content' part of the message.
+                The 'content' part of the message.
         """
         return self.msg["content"]
 
@@ -133,14 +132,13 @@ class BaseMessage(DataNode):
         Constructs and returns a dictionary representation of the message.
 
         Returns:
-            dict: A dictionary representation of the message with 'role' and 'content' keys.
+                dict: A dictionary representation of the message with 'role' and 'content' keys.
         """
-        out = {"role": self.role, "content": convert.to_str(self.content)}
-        return out
+        return {"role": self.role, "content": convert.to_str(self.content)}
 
     def __str__(self):
         content_preview = (
-            (str(self.content)[:75] + "...")
+            f"{str(self.content)[:75]}..."
             if self.content and len(self.content) > 75
             else str(self.content)
         )
@@ -162,7 +160,7 @@ class Instruction(BaseMessage):
         sender: str | None = None,
         output_fields=None,
         recipient=None,
-    ):
+    ):  # sourcery skip: avoid-builtin-shadow
         super().__init__(
             role="user",
             sender=sender or "user",
@@ -256,13 +254,13 @@ class Response(BaseMessage):
                         content_key = content_key or "response"
                         sender = sender or "assistant"
                         recipient = recipient or "user"
-                except:
+                except Exception:
                     content_ = response["content"]
                     content_key = content_key or "response"
                     sender = sender or "assistant"
                     recipient = recipient or "user"
 
-        except:
+        except Exception:
             sender = sender or "action_response"
             content_ = response
             content_key = content_key or "action_response"
@@ -281,13 +279,13 @@ class Response(BaseMessage):
         Processes an action request response and extracts relevant information.
 
         Args:
-            response (dict): The response dictionary containing tool calls and other information.
+                response (dict): The response dictionary containing tool calls and other information.
 
         Returns:
-            list: A list of dictionaries, each representing a function call with action and arguments.
+                list: A list of dictionaries, each representing a function call with action and arguments.
 
         Raises:
-            ValueError: If the response does not conform to the expected format for action requests.
+                ValueError: If the response does not conform to the expected format for action requests.
         """
         try:
             tool_count = 0
@@ -300,7 +298,7 @@ class Response(BaseMessage):
                     _path2 = ["tool_calls", tool_count, "function", "arguments"]
 
                     func_content = {
-                        "action": ("action_" + nested.nget(response, _path1)),
+                        "action": f"action_{nested.nget(response, _path1)}",
                         "arguments": nested.nget(response, _path2),
                     }
                     func_list.append(func_content)

lionagi/core/schema/__init__.py

@@ -1,10 +1,9 @@
-from .base_node import BaseNode, BaseRelatableNode, Tool
+from .base_node import BaseNode, BaseRelatableNode, Tool, TOOL_TYPE
 from .data_node import DataNode
 from .data_logger import DLog, DataLogger
 from .structure import Relationship, Graph, Structure
 from .action_node import ActionNode
 
-
 __all__ = [
     "BaseNode",
     "BaseRelatableNode",
@@ -16,4 +15,5 @@ __all__ = [
     "Graph",
     "Structure",
     "ActionNode",
+    "TOOL_TYPE",
 ]

lionagi/core/schema/action_node.py

@@ -1,11 +1,13 @@
 from enum import Enum
 
-from lionagi.core.schema.base_node import BaseNode
+from .base_node import BaseNode
 
 
 class ActionSelection(BaseNode):
 
-    def __init__(self, action: str = "chat", action_kwargs={}):
+    def __init__(self, action: str = "chat", action_kwargs=None):
+        if action_kwargs is None:
+            action_kwargs = {}
         super().__init__()
         self.action = action
         self.action_kwargs = action_kwargs
@@ -13,7 +15,13 @@ class ActionSelection(BaseNode):
 
 class ActionNode(BaseNode):
 
-    def __init__(self, instruction, action: str = "chat", tools=[], action_kwargs={}):
+    def __init__(
+        self, instruction, action: str = "chat", tools=None, action_kwargs=None
+    ):
+        if tools is None:
+            tools = []
+        if action_kwargs is None:
+            action_kwargs = {}
         super().__init__()
         self.instruction = instruction
         self.action = action