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

lionagi/core/session/session.py

@@ -1,14 +1,14 @@
 from collections import deque
 from typing import Tuple
 
-from lionagi.libs.sys_util import PATH_TYPE
+from pathlib import Path
 from lionagi.libs import BaseService, convert, dataframe
 
-from lionagi.core.schema import TOOL_TYPE, Tool, DataLogger
-from lionagi.core.tool import ToolManager
-from lionagi.core.mail import MailManager
-from lionagi.core.messages import System, Instruction
-from lionagi.core.branch import Branch
+from lionagi.core.generic import DataLogger
+from lionagi.core.tool import ToolManager, Tool, TOOL_TYPE
+from lionagi.core.mail.mail_manager import MailManager
+from lionagi.core.messages.schema import System, Instruction
+from lionagi.core.branch.branch import Branch
 from lionagi.core.flow.polyflow import PolyChat
 
 
@@ -41,7 +41,7 @@ class Session:
         tool_manager: ToolManager | None = None,
         messages: dataframe.ln_DataFrame | None = None,
         datalogger: None | DataLogger = None,
-        persist_path: PATH_TYPE | None = None,
+        persist_path: Path | str | None = None,
     ):
         """Initialize a new session with optional configuration for managing conversations.
 
@@ -226,7 +226,7 @@ class Session:
     @classmethod
     def from_csv(
         cls,
-        filepath: PATH_TYPE,
+        filepath: Path | str,
         system: dict | list | System | None = None,
         sender: str | None = None,
         llmconfig: dict[str, str | int | dict] | None = None,
@@ -272,7 +272,7 @@ class Session:
     @classmethod
     def from_json(
         cls,
-        filepath: PATH_TYPE,
+        filepath: Path | str,
         system: dict | list | System | None = None,
         sender: str | None = None,
         llmconfig: dict[str, str | int | dict] | None = None,
@@ -852,8 +852,8 @@ class Session:
 
     def take_branch(self, branch):
         self.branches[branch.branch_name] = branch
-        self.mail_manager.sources[branch.branch_name] = branch
-        self.mail_manager.mails[branch.branch_name] = {}
+        self.mail_manager.sources[branch.id_] = branch
+        self.mail_manager.mails[branch.id_] = {}
 
     def collect(self, from_: str | Branch | list[str | Branch] | None = None):
         """
@@ -872,16 +872,17 @@ class Session:
                 >>> session.collect()  # Collects from all branches
         """
         if from_ is None:
-            for branch in self.branches.keys():
-                self.mail_manager.collect(branch)
+            for branch in self.branches.values():
+                self.mail_manager.collect(branch.id_)
         else:
             if not isinstance(from_, list):
-                from_ = convert.to_list(from_)
+                from_ = [from_]
             for branch in from_:
-                if isinstance(branch, Branch):
-                    branch = branch.name
                 if isinstance(branch, str):
-                    self.mail_manager.collect(branch)
+                    branch = self.branches[branch]
+                    self.mail_manager.collect(branch.id_)
+                elif isinstance(branch, Branch):
+                    self.mail_manager.collect(branch.id_)
 
     def send(self, to_: str | Branch | list[str | Branch] | None = None):
         """
@@ -900,16 +901,17 @@ class Session:
                 >>> session.send()  # Sends to all branches
         """
         if to_ is None:
-            for branch in self.branches.keys():
-                self.mail_manager.send(branch)
+            for branch in self.branches.values():
+                self.mail_manager.send(branch.id_)
         else:
             if not isinstance(to_, list):
                 to_ = [to_]
             for branch in to_:
-                if isinstance(branch, Branch):
-                    branch = branch.name
                 if isinstance(branch, str):
-                    self.mail_manager.send(branch)
+                    branch = self.branches[branch]
+                    self.mail_manager.send(branch.id_)
+                if isinstance(branch, Branch):
+                    self.mail_manager.send(branch.id_)
 
     def collect_send_all(self, receive_all=False):
         """
@@ -980,4 +982,4 @@ class Session:
         if system:
             self.default_branch.add_message(system=system, sender=sender)
 
-        self.llmconfig = self.default_branch.llmconfig
+        self.llmconfig = self.default_branch.llmconfig

lionagi/core/tool/__init__.py

@@ -1,3 +1,5 @@
+from .tool import Tool, TOOL_TYPE
 from .tool_manager import ToolManager, func_to_tool
 
-__all__ = ["ToolManager", "func_to_tool"]
+
+__all__ = ["Tool", "TOOL_TYPE", "ToolManager", "func_to_tool"]

lionagi/core/tool/tool.py

@@ -0,0 +1,28 @@
+from typing import Any
+
+from pydantic import field_serializer
+from lionagi.core.generic import Node
+
+
+class Tool(Node):
+    """
+    Represents a tool, extending BaseNode with specific functionalities and configurations.
+
+    Attributes:
+        func: The main function or capability of the tool.
+        schema_: An optional schema defining the structure and constraints of data the tool works with.
+        manual: Optional documentation or manual for using the tool.
+        parser: An optional parser associated with the tool for data processing or interpretation.
+    """
+
+    func: Any
+    schema_: dict | None = None
+    manual: Any | None = None
+    parser: Any | None = None
+
+    @field_serializer("func")
+    def serialize_func(self, func):
+        return func.__name__
+
+
+TOOL_TYPE = bool | Tool | str | list[Tool | str | dict] | dict

lionagi/core/tool/tool_manager.py

@@ -1,9 +1,9 @@
-from typing import Tuple, Any, TypeVar, Callable
-
 import asyncio
 
+from typing import Tuple, Any, TypeVar, Callable
 from lionagi.libs import func_call, convert, ParseUtil
-from lionagi.core.schema import Tool, TOOL_TYPE
+
+from lionagi.core.tool.tool import Tool, TOOL_TYPE
 
 T = TypeVar("T", bound=Tool)
 
@@ -17,7 +17,7 @@ class ToolManager:
     calls.
 
     Attributes:
-            registry (dict[str, Tool]): A dictionary to hold registered tools, keyed by their names.
+        registry (dict[str, Tool]): A dictionary to hold registered tools, keyed by their names.
     """
 
     registry: dict = {}
@@ -27,10 +27,10 @@ class ToolManager:
         Checks if a tool name already exists in the registry.
 
         Args:
-                name (str): The name of the tool to check.
+            name (str): The name of the tool to check.
 
         Returns:
-                bool: True if the name exists, False otherwise.
+            bool: True if the name exists, False otherwise.
         """
         return name in self.registry
 
@@ -43,10 +43,10 @@ class ToolManager:
         Registers a tool in the registry. Raises a TypeError if the object is not an instance of Tool.
 
         Args:
-                tool (Tool): The tool instance to register.
+            tool (Tool): The tool instance to register.
 
         Raises:
-                TypeError: If the provided object is not an instance of Tool.
+            TypeError: If the provided object is not an instance of Tool.
         """
         if isinstance(tool, Callable):
             tool = func_to_tool(tool)[0]
@@ -60,13 +60,13 @@ class ToolManager:
         Invokes a registered tool's function with the given arguments. Supports both coroutine and regular functions.
 
         Args:
-                func_call (Tuple[str, Dict[str, Any]]): A tuple containing the function name and a dictionary of keyword arguments.
+            func_call (Tuple[str, Dict[str, Any]]): A tuple containing the function name and a dictionary of keyword arguments.
 
         Returns:
-                Any: The result of the function call.
+            Any: The result of the function call.
 
         Raises:
-                ValueError: If the function name is not registered or if there's an error during function invocation.
+            ValueError: If the function name is not registered or if there's an error during function invocation.
         """
         name, kwargs = func_calls
         if not self.name_existed(name):
@@ -93,13 +93,13 @@ class ToolManager:
         Extracts a function call and arguments from a response dictionary.
 
         Args:
-                response (dict): The response dictionary containing the function call information.
+            response (dict): The response dictionary containing the function call information.
 
         Returns:
-                Tuple[str, dict]: A tuple containing the function name and a dictionary of arguments.
+            Tuple[str, dict]: A tuple containing the function name and a dictionary of arguments.
 
         Raises:
-                ValueError: If the response does not contain valid function call information.
+            ValueError: If the response does not contain valid function call information.
         """
         try:
             func = response["action"][7:]
@@ -118,7 +118,7 @@ class ToolManager:
         Registers multiple tools in the registry.
 
         Args:
-                tools (list[Tool]): A list of tool instances to register.
+            tools (list[Tool]): A list of tool instances to register.
         """
         func_call.lcall(tools, self._register_tool)
 
@@ -127,7 +127,7 @@ class ToolManager:
         Generates a list of schemas for all registered tools.
 
         Returns:
-                list[dict[str, Any]]: A list of tool schemas.
+            list[dict[str, Any]]: A list of tool schemas.
 
         """
         return [tool.schema_ for tool in self.registry.values()]
@@ -137,14 +137,14 @@ class ToolManager:
         Parses tool information and generates a dictionary for tool invocation.
 
         Args:
-                tools: Tool information which can be a single Tool instance, a list of Tool instances, a tool name, or a list of tool names.
-                **kwargs: Additional keyword arguments.
+            tools: Tool information which can be a single Tool instance, a list of Tool instances, a tool name, or a list of tool names.
+            **kwargs: Additional keyword arguments.
 
         Returns:
-                dict: A dictionary containing tool schema information and any additional keyword arguments.
+            dict: A dictionary containing tool schema information and any additional keyword arguments.
 
         Raises:
-                ValueError: If a tool name is provided that is not registered.
+            ValueError: If a tool name is provided that is not registered.
         """
 
         def tool_check(tool):
@@ -154,7 +154,7 @@ class ToolManager:
                 return tool.schema_
             elif isinstance(tool, str):
                 if self.name_existed(tool):
-                    tool = self.registry[tool]
+                    tool: Tool = self.registry[tool]
                     return tool.schema_
                 else:
                     raise ValueError(f"Function {tool} is not registered.")
@@ -190,66 +190,66 @@ def func_to_tool(
     objects with structured metadata.
 
     Args:
-            func_ (Callable): The function to be transformed into a Tool object. This
-                                              function should have a docstring that follows the
-                                              specified docstring style for accurate schema generation.
-            parser (Optional[Any]): An optional parser object associated with the Tool.
-                                                            This parameter is currently not utilized in the
-                                                            transformation process but is included for future
-                                                            compatibility and extension purposes.
-            docstring_style (str): The format of the docstring to be parsed, indicating
-                                                       the convention used in the function's docstring.
-                                                       Supports 'google' for Google-style docstrings and
-                                                       'reST' for reStructuredText-style docstrings. The
-                                                       chosen style affects how the docstring is parsed and
-                                                       how the schema is generated.
+        func_ (Callable): The function to be transformed into a Tool object. This
+            function should have a docstring that follows the
+            specified docstring style for accurate schema generation.
+        parser (Optional[Any]): An optional parser object associated with the Tool.
+                  This parameter is currently not utilized in the
+                  transformation process but is included for future
+                  compatibility and extension purposes.
+        docstring_style (str): The format of the docstring to be parsed, indicating
+                 the convention used in the function's docstring.
+                 Supports 'google' for Google-style docstrings and
+                 'reST' for reStructuredText-style docstrings. The
+                 chosen style affects how the docstring is parsed and
+                 how the schema is generated.
 
     Returns:
-            Tool: An object representing the original function wrapped as a Tool, along
-                      with its generated schema. This Tool object can be used in systems that
-                      require detailed metadata about functions, facilitating tasks such as
-                      automatic documentation generation, user interface creation, or
-                      integration with other software tools.
+        Tool: An object representing the original function wrapped as a Tool, along
+            with its generated schema. This Tool object can be used in systems that
+            require detailed metadata about functions, facilitating tasks such as
+            automatic documentation generation, user interface creation, or
+            integration with other software tools.
 
     Examples:
-            >>> def example_function_google(param1: int, param2: str) -> bool:
-            ...     '''
-            ...     An example function using Google style docstrings.
-            ...
-            ...     Args:
-            ...         param1 (int): The first parameter, demonstrating an integer input_.
-            ...         param2 (str): The second parameter, demonstrating a string input_.
-            ...
-            ...     Returns:
-            ...         bool: A boolean value, illustrating the return type.
-            ...     '''
-            ...     return True
-            ...
-            >>> tool_google = func_to_tool(example_function_google, docstring_style='google')
-            >>> print(isinstance(tool_google, Tool))
-            True
-
-            >>> def example_function_reST(param1: int, param2: str) -> bool:
-            ...     '''
-            ...     An example function using reStructuredText (reST) style docstrings.
-            ...
-            ...     :param param1: The first parameter, demonstrating an integer input_.
-            ...     :type param1: int
-            ...     :param param2: The second parameter, demonstrating a string input_.
-            ...     :type param2: str
-            ...     :returns: A boolean value, illustrating the return type.
-            ...     :rtype: bool
-            ...     '''
-            ...     return True
-            ...
-            >>> tool_reST = func_to_tool(example_function_reST, docstring_style='reST')
-            >>> print(isinstance(tool_reST, Tool))
-            True
+        >>> def example_function_google(param1: int, param2: str) -> bool:
+        ...     '''
+        ...     An example function using Google style docstrings.
+        ...
+        ...     Args:
+        ...         param1 (int): The first parameter, demonstrating an integer input_.
+        ...         param2 (str): The second parameter, demonstrating a string input_.
+        ...
+        ...     Returns:
+        ...         bool: A boolean value, illustrating the return type.
+        ...     '''
+        ...     return True
+        ...
+        >>> tool_google = func_to_tool(example_function_google, docstring_style='google')
+        >>> print(isinstance(tool_google, Tool))
+        True
+
+        >>> def example_function_reST(param1: int, param2: str) -> bool:
+        ...     '''
+        ...     An example function using reStructuredText (reST) style docstrings.
+        ...
+        ...     :param param1: The first parameter, demonstrating an integer input_.
+        ...     :type param1: int
+        ...     :param param2: The second parameter, demonstrating a string input_.
+        ...     :type param2: str
+        ...     :returns: A boolean value, illustrating the return type.
+        ...     :rtype: bool
+        ...     '''
+        ...     return True
+        ...
+        >>> tool_reST = func_to_tool(example_function_reST, docstring_style='reST')
+        >>> print(isinstance(tool_reST, Tool))
+        True
 
     Note:
-            The transformation process relies heavily on the accuracy and completeness of
-            the function's docstring. Functions with incomplete or incorrectly formatted
-            docstrings may result in incomplete or inaccurate Tool schemas.
+        The transformation process relies heavily on the accuracy and completeness of
+        the function's docstring. Functions with incomplete or incorrectly formatted
+        docstrings may result in incomplete or inaccurate Tool schemas.
     """
 
     fs = []

lionagi/integrations/chunker/chunk.py

@@ -1,7 +1,7 @@
 from typing import Union, Callable
 
 from lionagi.libs import func_call
-from lionagi.core.schema import DataNode
+from lionagi.core.generic import Node
 from ..bridge.langchain_.langchain_bridge import LangchainBridge
 from ..bridge.llamaindex_.llama_index_bridge import LlamaIndexBridge
 
@@ -12,7 +12,7 @@ from ..loader.load_util import ChunkerType, file_to_chunks, _datanode_parser
 def datanodes_convert(documents, chunker_type):
 
     for i in range(len(documents)):
-        if type(documents[i]) == DataNode:
+        if type(documents[i]) == Node:
             if chunker_type == ChunkerType.LLAMAINDEX:
                 documents[i] = documents[i].to_llama_index()
             elif chunker_type == ChunkerType.LANGCHAIN:
@@ -25,7 +25,7 @@ def text_chunker(documents, args, kwargs):
     def chunk_node(node):
         chunks = file_to_chunks(node.to_dict(), *args, **kwargs)
         func_call.lcall(chunks, lambda chunk: chunk.pop("node_id"))
-        return [DataNode.from_obj({**chunk}) for chunk in chunks]
+        return [Node.from_obj({**chunk}) for chunk in chunks]
 
     return [chunk_node(doc) for doc in documents]
 
@@ -106,7 +106,7 @@ def _self_defined_chunker(
         ) from e
 
     if isinstance(to_datanode, bool) and to_datanode is True:
-        raise ValueError("Please define a valid parser to DataNode.")
+        raise ValueError("Please define a valid parser to Node.")
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes
@@ -127,7 +127,7 @@ def _llama_index_chunker(
     )
 
     if isinstance(to_datanode, bool) and to_datanode is True:
-        nodes = [DataNode.from_llama_index(i) for i in nodes]
+        nodes = [Node.from_llama_index(i) for i in nodes]
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes
@@ -148,9 +148,9 @@ def _langchain_chunker(
     )
     if isinstance(to_datanode, bool) and to_datanode is True:
         if isinstance(documents, str):
-            nodes = [DataNode(content=i) for i in nodes]
+            nodes = [Node(content=i) for i in nodes]
         else:
-            nodes = [DataNode.from_langchain(i) for i in nodes]
+            nodes = [Node.from_langchain(i) for i in nodes]
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes

lionagi/integrations/config/oai_configs.py

@@ -79,7 +79,7 @@ oai_audio_speech_schema = {
 oai_audio_transcriptions_llmconfig = {
     "model": "whisper-1",
     "language": None,
-    "prompt": None,
+    "format_prompt": None,
     "response_format": "json",
     "temperature": 0,
 }
@@ -88,7 +88,7 @@ oai_audio_transcriptions_schema = {
     "optional": [
         "response_format",
         "language",
-        "prompt",
+        "format_prompt",
         "response_format",
         "temperature",
     ],
@@ -99,14 +99,14 @@ oai_audio_transcriptions_schema = {
 # Audio ------------    translations
 oai_audio_translations_llmconfig = {
     "model": "whisper-1",
-    "prompt": None,
+    "format_prompt": None,
     "response_format": "json",
     "temperature": 0,
 }
 
 oai_audio_translations_schema = {
     "required": ["model"],
-    "optional": ["response_format", "speed", "prompt", "temperature"],
+    "optional": ["response_format", "speed", "format_prompt", "temperature"],
     "input_": "file",
     "config": oai_audio_translations_llmconfig,
 }

lionagi/integrations/loader/load.py

@@ -1,6 +1,6 @@
 from typing import Callable
 
-from lionagi.core.schema import DataNode
+from lionagi.core.generic import Node
 from ..bridge.langchain_.langchain_bridge import LangchainBridge
 from ..bridge.llamaindex_.llama_index_bridge import LlamaIndexBridge
 
@@ -9,14 +9,14 @@ from .load_util import dir_to_nodes, ReaderType, _datanode_parser
 
 def text_reader(args, kwargs):
     """
-    Reads text files from a directory and converts them to DataNode instances.
+    Reads text files from a directory and converts them to Node instances.
 
     Args:
         args: Positional arguments for the dir_to_nodes function.
         kwargs: Keyword arguments for the dir_to_nodes function.
 
     Returns:
-        A list of DataNode instances.
+        A list of Node instances.
 
     Example usage:
         >>> args = ['path/to/text/files']
@@ -96,7 +96,7 @@ def _plain_reader(reader, reader_args, reader_kwargs):
 def _langchain_reader(reader, reader_args, reader_kwargs, to_datanode: bool | Callable):
     nodes = LangchainBridge.langchain_loader(reader, reader_args, reader_kwargs)
     if isinstance(to_datanode, bool) and to_datanode is True:
-        nodes = [DataNode.from_langchain(i) for i in nodes]
+        nodes = [Node.from_langchain(i) for i in nodes]
 
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
@@ -115,7 +115,7 @@ def _llama_index_reader(
         reader, reader_args, reader_kwargs, load_args, load_kwargs
     )
     if isinstance(to_datanode, bool) and to_datanode is True:
-        nodes = [DataNode.from_llama_index(i) for i in nodes]
+        nodes = [Node.from_llama_index(i) for i in nodes]
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes
@@ -138,7 +138,7 @@ def _self_defined_reader(
         ) from e
 
     if isinstance(to_datanode, bool) and to_datanode is True:
-        raise ValueError("Please define a valid parser to DataNode.")
+        raise ValueError("Please define a valid parser to Node.")
     elif isinstance(to_datanode, Callable):
         nodes = _datanode_parser(nodes, to_datanode)
     return nodes

lionagi/integrations/loader/load_util.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import List, Union, Dict, Any, Tuple
 
 from lionagi.libs import convert, func_call
-from lionagi.core.schema import DataNode
+from lionagi.core.generic import Node
 
 
 class ReaderType(str, Enum):
@@ -62,11 +62,11 @@ def dir_to_nodes(
     recursive: bool = False,
     flatten: bool = True,
     clean_text: bool = True,
-) -> List[DataNode]:
+) -> List[Node]:
     """
-    Converts directory contents into DataNode objects based on specified file extensions.
+    Converts directory contents into Node objects based on specified file extensions.
 
-    This function first retrieves a list of file paths from the specified directory, matching the given file extension. It then reads the content of these files, optionally cleaning the text, and converts each file's content into a DataNode object.
+    This function first retrieves a list of file paths from the specified directory, matching the given file extension. It then reads the content of these files, optionally cleaning the text, and converts each file's content into a Node object.
 
     Parameters:
         dir (str): The directory path from which to read files.
@@ -76,17 +76,17 @@ def dir_to_nodes(
         clean_text (bool, optional): If True, cleans the text read from files. Defaults to True.
 
     Returns:
-        list: A list of DataNode objects created from the files in the specified directory.
+        list: A list of Node objects created from the files in the specified directory.
 
     Example:
         nodes = dir_to_nodes("/path/to/dir", ".txt", recursive=True)
         # This would read all .txt files in /path/to/dir and its subdirectories,
-        # converting them into DataNode objects.
+        # converting them into Node objects.
     """
 
     path_list = dir_to_path(dir, ext, recursive, flatten)
     files_info = func_call.lcall(path_list, read_text, clean=clean_text)
-    return func_call.lcall(files_info, lambda x: DataNode(content=x[0], metadata=x[1]))
+    return func_call.lcall(files_info, lambda x: Node(content=x[0], metadata=x[1]))
 
 
 def chunk_text(
@@ -263,4 +263,4 @@ def _datanode_parser(nodes, parser):
     try:
         return parser(nodes)
     except Exception as e:
-        raise ValueError(f"DataNode parser {parser} failed. Error:{e}") from e
+        raise ValueError(f"Node parser {parser} failed. Error:{e}") from e

lionagi/libs/ln_api.py

@@ -377,8 +377,8 @@ class APIUtil:
                 num_tokens += 2  # every reply is primed with <im_start>assistant
                 return num_tokens + completion_tokens
             else:
-                prompt = payload["prompt"]
-                if isinstance(prompt, str):  # single prompt
+                prompt = payload["format_prompt"]
+                if isinstance(prompt, str):  # single format_prompt
                     prompt_tokens = len(encoding.encode(prompt))
                     return prompt_tokens + completion_tokens
                 elif isinstance(prompt, list):  # multiple prompts
@@ -386,7 +386,7 @@ class APIUtil:
                     return prompt_tokens + completion_tokens * len(prompt)
                 else:
                     raise TypeError(
-                        'Expecting either string or list of strings for "prompt" field in completion request'
+                        'Expecting either string or list of strings for "format_prompt" field in completion request'
                     )
         elif api_endpoint == "embeddings":
             input = payload["input"]