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

lionagi/__init__.py

@@ -6,11 +6,8 @@ import logging
 from .version import __version__
 from dotenv import load_dotenv
 
-
-from .libs import *
-from .core import *
-from .integrations import *
-
+from .core import direct, Branch, Session, Structure, Tool, BaseAgent
+from .integrations.provider.services import Services
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)

lionagi/core/__init__.py

@@ -1,5 +1,8 @@
-from .tool import func_to_tool
-from .session import Branch, Session
-
+from . import *
 
-__all__ = ["Session", "Branch", "func_to_tool"]
+from .branch import Branch, ExecutableBranch
+from .session import Session
+from .schema import Tool, Structure, ActionNode, Relationship
+from .agent import BaseAgent
+from .messages import Instruction, System, Response
+from .tool import func_to_tool

lionagi/core/agent/__init__.py

@@ -0,0 +1,3 @@
+from .base_agent import BaseAgent
+
+__all__ = ["BaseAgent"]

lionagi/core/agent/base_agent.py

@@ -0,0 +1,46 @@
+from lionagi.core.mail.schema import StartMail
+from lionagi.core.schema.base_node import BaseRelatableNode
+from lionagi.core.mail.mail_manager import MailManager
+
+from lionagi.libs import func_call, AsyncUtil
+
+
+class BaseAgent(BaseRelatableNode):
+    def __init__(self, structure, executable_obj, output_parser=None) -> None:
+
+        super().__init__()
+        self.structure = structure
+        self.executable = executable_obj
+        self.start = StartMail()
+        self.mailManager = MailManager([self.structure, self.executable, self.start])
+        self.output_parser = output_parser
+        self.start_context = None
+
+    async def mail_manager_control(self, refresh_time=1):
+        while not self.structure.execute_stop or not self.executable.execute_stop:
+            await AsyncUtil.sleep(refresh_time)
+        self.mailManager.execute_stop = True
+
+    async def execute(self, context=None):
+        self.start_context = context
+        self.start.trigger(
+            context=context,
+            structure_id=self.structure.id_,
+            executable_id=self.executable.id_,
+        )
+        await func_call.mcall(
+            [0.1, 0.1, 0.1, 0.1],
+            [
+                self.structure.execute,
+                self.executable.execute,
+                self.mailManager.execute,
+                self.mail_manager_control,
+            ],
+        )
+
+        self.structure.execute_stop = False
+        self.executable.execute_stop = False
+        self.mailManager.execute_stop = False
+
+        if self.output_parser:
+            return self.output_parser(self)

lionagi/core/branch/__init__.py

@@ -0,0 +1,4 @@
+from .branch import Branch
+from .executable_branch import ExecutableBranch
+
+__all__ = ["Branch", "ExecutableBranch"]

lionagi/core/branch/base_branch.py

@@ -1,21 +1,19 @@
 from abc import ABC
 from typing import Any
 
-from lionagi.libs.sys_util import SysUtil, PATH_TYPE
+from lionagi.libs.sys_util import PATH_TYPE
+from lionagi.libs import convert, dataframe, SysUtil
 
-import lionagi.libs.ln_convert as convert
-import lionagi.libs.ln_dataframe as dataframe
-
-from lionagi.core.schema.base_node import BaseRelatableNode
-from lionagi.core.schema.data_logger import DataLogger, DLog
-from lionagi.core.messages.schema import (
+from ..schema.base_node import BaseRelatableNode
+from ..schema.data_logger import DataLogger, DLog
+from ..messages.schema import (
     BranchColumns,
     System,
+    Response,
     Instruction,
     BaseMessage,
 )
-from lionagi.core.branch.util import MessageUtil
-from lionagi.libs.ln_parse import ParseUtil
+from .util import MessageUtil
 
 
 class BaseBranch(BaseRelatableNode, ABC):
@@ -24,9 +22,9 @@ class BaseBranch(BaseRelatableNode, ABC):
     and logging functionality.
 
     Attributes:
-        messages (dataframe.ln_DataFrame): Holds the messages in the branch.
-        datalogger (DataLogger): Logs data related to the branch's operation.
-        persist_path (PATH_TYPE): Filesystem path for data persistence.
+            messages (dataframe.ln_DataFrame): Holds the messages in the branch.
+            datalogger (DataLogger): Logs data related to the branch's operation.
+            persist_path (PATH_TYPE): Filesystem path for data persistence.
     """
 
     _columns: list[str] = BranchColumns.COLUMNS.value
@@ -36,6 +34,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         messages: dataframe.ln_DataFrame | None = None,
         datalogger: DataLogger | None = None,
         persist_path: PATH_TYPE | None = None,
+        name=None,
         **kwargs,
     ) -> None:
         super().__init__(**kwargs)
@@ -47,9 +46,8 @@ class BaseBranch(BaseRelatableNode, ABC):
         else:
             self.messages = dataframe.ln_DataFrame(columns=self._columns)
 
-        self.datalogger = (
-            datalogger if datalogger else DataLogger(persist_path=persist_path)
-        )
+        self.datalogger = datalogger or DataLogger(persist_path=persist_path)
+        self.name = name
 
     def add_message(
         self,
@@ -58,17 +56,18 @@ class BaseBranch(BaseRelatableNode, ABC):
         context: str | dict[str, Any] | None = None,
         response: dict | list | BaseMessage | None = None,
         output_fields=None,
+        recipient=None,
         **kwargs,
     ) -> None:
         """
         Adds a message to the branch.
 
         Args:
-            system: Information for creating a System message.
-            instruction: Information for creating an Instruction message.
-            context: Context information for the message.
-            response: Response data for creating a message.
-            **kwargs: Additional keyword arguments for message creation.
+                system: Information for creating a System message.
+                instruction: Information for creating an Instruction message.
+                context: Context information for the message.
+                response: Response data for creating a message.
+                **kwargs: Additional keyword arguments for message creation.
         """
         _msg = MessageUtil.create_message(
             system=system,
@@ -76,9 +75,28 @@ class BaseBranch(BaseRelatableNode, ABC):
             context=context,
             response=response,
             output_fields=output_fields,
+            recipient=recipient,
             **kwargs,
         )
 
+        if isinstance(_msg, System):
+            self.system_node = _msg
+
+        # sourcery skip: merge-nested-ifs
+        if isinstance(_msg, Instruction):
+            if recipient is None and self.name is not None:
+                _msg.recipient = self.name
+
+        if isinstance(_msg, Response):
+            if "action_response" in _msg.content.keys():
+                if recipient is None and self.name is not None:
+                    _msg.recipient = self.name
+                if recipient is not None and self.name is None:
+                    _msg.recipient = recipient
+            if "response" in _msg.content.keys():
+                if self.name is not None:
+                    _msg.sender = self.name
+
         _msg.content = _msg.msg_content
         self.messages.loc[len(self.messages)] = _msg.to_pd_series()
 
@@ -90,11 +108,11 @@ class BaseBranch(BaseRelatableNode, ABC):
         optionally including sender information.
 
         Args:
-            with_sender: Flag to include sender information in the output.
+                with_sender: Flag to include sender information in the output.
 
         Returns:
-            A list of message dictionaries, each with 'role' and 'content' keys,
-            and optionally prefixed by 'Sender' if with_sender is True.
+                A list of message dictionaries, each with 'role' and 'content' keys,
+                and optionally prefixed by 'Sender' if with_sender is True.
         """
 
         message = []
@@ -125,7 +143,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves all chat messages without sender information.
 
         Returns:
-            A list of dictionaries representing chat messages.
+                A list of dictionaries representing chat messages.
         """
 
         return self._to_chatcompletion_message()
@@ -136,7 +154,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves all chat messages, including sender information.
 
         Returns:
-            A list of dictionaries representing chat messages, each prefixed with its sender.
+                A list of dictionaries representing chat messages, each prefixed with its sender.
         """
 
         return self._to_chatcompletion_message(with_sender=True)
@@ -147,7 +165,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves the last message from the branch as a pandas Series.
 
         Returns:
-            A pandas Series representing the last message in the branch.
+                A pandas Series representing the last message in the branch.
         """
 
         return MessageUtil.get_message_rows(self.messages, n=1, from_="last")
@@ -158,7 +176,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Extracts the content of the last message in the branch.
 
         Returns:
-            A dictionary representing the content of the last message.
+                A dictionary representing the content of the last message.
         """
 
         return convert.to_dict(self.messages.content.iloc[-1])
@@ -169,7 +187,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves the first message marked with the 'system' role.
 
         Returns:
-            A pandas Series representing the first 'system' message in the branch.
+                A pandas Series representing the first 'system' message in the branch.
         """
 
         return MessageUtil.get_message_rows(
@@ -182,7 +200,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves the last message marked with the 'assistant' role.
 
         Returns:
-            A pandas Series representing the last 'assistant' (response) message in the branch.
+                A pandas Series representing the last 'assistant' (response) message in the branch.
         """
 
         return MessageUtil.get_message_rows(
@@ -195,7 +213,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Extracts the content of the last 'assistant' (response) message.
 
         Returns:
-            A dictionary representing the content of the last 'assistant' message.
+                A dictionary representing the content of the last 'assistant' message.
         """
 
         return convert.to_dict(self.last_response.content.iloc[-1])
@@ -206,7 +224,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Filters and retrieves all messages sent by 'action_request'.
 
         Returns:
-            A pandas DataFrame containing all 'action_request' messages.
+                A pandas DataFrame containing all 'action_request' messages.
         """
 
         return convert.to_df(self.messages[self.messages.sender == "action_request"])
@@ -217,7 +235,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Filters and retrieves all messages sent by 'action_response'.
 
         Returns:
-            A pandas DataFrame containing all 'action_response' messages.
+                A pandas DataFrame containing all 'action_response' messages.
         """
 
         return convert.to_df(self.messages[self.messages.sender == "action_response"])
@@ -228,7 +246,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Retrieves all messages marked with the 'assistant' role.
 
         Returns:
-            A pandas DataFrame containing all messages with an 'assistant' role.
+                A pandas DataFrame containing all messages with an 'assistant' role.
         """
 
         return convert.to_df(self.messages[self.messages.role == "assistant"])
@@ -239,20 +257,24 @@ class BaseBranch(BaseRelatableNode, ABC):
         Filters 'assistant' role messages excluding 'action_request' and 'action_response'.
 
         Returns:
-            A pandas DataFrame of 'assistant' messages excluding action requests/responses.
+                A pandas DataFrame of 'assistant' messages excluding action requests/responses.
         """
 
         a_responses = self.responses[self.responses.sender != "action_response"]
         a_responses = a_responses[a_responses.sender != "action_request"]
         return convert.to_df(a_responses)
 
+    @property
+    def last_assistant_response(self):
+        return self.assistant_responses.iloc[-1]
+
     @property
     def info(self) -> dict[str, Any]:
         """
         Summarizes branch information, including message counts by role.
 
         Returns:
-            A dictionary containing counts of messages categorized by their role.
+                A dictionary containing counts of messages categorized by their role.
         """
 
         return self._info()
@@ -263,7 +285,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Provides a summary of message counts categorized by sender.
 
         Returns:
-            A dictionary with senders as keys and counts of their messages as values.
+                A dictionary with senders as keys and counts of their messages as values.
         """
 
         return self._info(use_sender=True)
@@ -274,8 +296,8 @@ class BaseBranch(BaseRelatableNode, ABC):
         Provides a detailed description of the branch, including a summary of messages.
 
         Returns:
-            A dictionary with a summary of total messages, a breakdown by role, and
-            a preview of the first five messages.
+                A dictionary with a summary of total messages, a breakdown by role, and
+                a preview of the first five messages.
         """
 
         return {
@@ -322,13 +344,13 @@ class BaseBranch(BaseRelatableNode, ABC):
         Exports the branch messages to a CSV file.
 
         Args:
-            filepath: Destination path for the CSV file. Defaults to 'messages.csv'.
-            dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
-            timestamp: If True, appends a timestamp to the filename. Defaults to True.
-            time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
-            verbose: If True, prints a message upon successful export. Defaults to True.
-            clear: If True, clears the messages after exporting. Defaults to True.
-            **kwargs: Additional keyword arguments for pandas.DataFrame.to_csv().
+                filepath: Destination path for the CSV file. Defaults to 'messages.csv'.
+                dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
+                timestamp: If True, appends a timestamp to the filename. Defaults to True.
+                time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
+                verbose: If True, prints a message upon successful export. Defaults to True.
+                clear: If True, clears the messages after exporting. Defaults to True.
+                **kwargs: Additional keyword arguments for pandas.DataFrame.to_csv().
         """
 
         if not filename.endswith(".csv"):
@@ -349,7 +371,7 @@ class BaseBranch(BaseRelatableNode, ABC):
             if clear:
                 self.clear_messages()
         except Exception as e:
-            raise ValueError(f"Error in saving to csv: {e}")
+            raise ValueError(f"Error in saving to csv: {e}") from e
 
     def to_json_file(
         self,
@@ -365,13 +387,13 @@ class BaseBranch(BaseRelatableNode, ABC):
         Exports the branch messages to a JSON file.
 
         Args:
-            filename: Destination path for the JSON file. Defaults to 'messages.json'.
-            dir_exist_ok: If False, an error is raised if the dirctory exists. Defaults to True.
-            timestamp: If True, appends a timestamp to the filename. Defaults to True.
-            time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
-            verbose: If True, prints a message upon successful export. Defaults to True.
-            clear: If True, clears the messages after exporting. Defaults to True.
-            **kwargs: Additional keyword arguments for pandas.DataFrame.to_json().
+                filename: Destination path for the JSON file. Defaults to 'messages.json'.
+                dir_exist_ok: If False, an error is raised if the dirctory exists. Defaults to True.
+                timestamp: If True, appends a timestamp to the filename. Defaults to True.
+                time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
+                verbose: If True, prints a message upon successful export. Defaults to True.
+                clear: If True, clears the messages after exporting. Defaults to True.
+                **kwargs: Additional keyword arguments for pandas.DataFrame.to_json().
         """
 
         if not filename.endswith(".json"):
@@ -394,7 +416,7 @@ class BaseBranch(BaseRelatableNode, ABC):
             if clear:
                 self.clear_messages()
         except Exception as e:
-            raise ValueError(f"Error in saving to json: {e}")
+            raise ValueError(f"Error in saving to json: {e}") from e
 
     def log_to_csv(
         self,
@@ -412,13 +434,13 @@ class BaseBranch(BaseRelatableNode, ABC):
         Exports the data logger contents to a CSV file.
 
         Args:
-            filename: Destination path for the CSV file. Defaults to 'log.csv'.
-            dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
-            timestamp: If True, appends a timestamp to the filename. Defaults to True.
-            time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
-            verbose: If True, prints a message upon successful export. Defaults to True.
-            clear: If True, clears the logger after exporting. Defaults to True.
-            **kwargs: Additional keyword arguments for pandas.DataFrame.to_csv().
+                filename: Destination path for the CSV file. Defaults to 'log.csv'.
+                dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
+                timestamp: If True, appends a timestamp to the filename. Defaults to True.
+                time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
+                verbose: If True, prints a message upon successful export. Defaults to True.
+                clear: If True, clears the logger after exporting. Defaults to True.
+                **kwargs: Additional keyword arguments for pandas.DataFrame.to_csv().
         """
         self.datalogger.to_csv_file(
             filename=filename,
@@ -448,13 +470,13 @@ class BaseBranch(BaseRelatableNode, ABC):
         Exports the data logger contents to a JSON file.
 
         Args:
-            filename: Destination path for the JSON file. Defaults to 'log.json'.
-            dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
-            timestamp: If True, appends a timestamp to the filename. Defaults to True.
-            time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
-            verbose: If True, prints a message upon successful export. Defaults to True.
-            clear: If True, clears the logger after exporting. Defaults to True.
-            **kwargs: Additional keyword arguments for pandas.DataFrame.to_json().
+                filename: Destination path for the JSON file. Defaults to 'log.json'.
+                dir_exist_ok: If False, an error is raised if the directory exists. Defaults to True.
+                timestamp: If True, appends a timestamp to the filename. Defaults to True.
+                time_prefix: If True, prefixes the filename with a timestamp. Defaults to False.
+                verbose: If True, prints a message upon successful export. Defaults to True.
+                clear: If True, clears the logger after exporting. Defaults to True.
+                **kwargs: Additional keyword arguments for pandas.DataFrame.to_json().
         """
 
         self.datalogger.to_json_file(
@@ -491,14 +513,14 @@ class BaseBranch(BaseRelatableNode, ABC):
             if verbose:
                 print(f"Loaded {len(df)} logs from {filename}")
         except Exception as e:
-            raise ValueError(f"Error in loading log: {e}")
+            raise ValueError(f"Error in loading log: {e}") from e
 
     def remove_message(self, node_id: str) -> None:
         """
         Removes a message from the branch based on its node ID.
 
         Args:
-            node_id: The unique identifier of the message to be removed.
+                node_id: The unique identifier of the message to be removed.
         """
         MessageUtil.remove_message(self.messages, node_id)
 
@@ -507,9 +529,9 @@ class BaseBranch(BaseRelatableNode, ABC):
         Updates a specific column of a message identified by node_id with a new value.
 
         Args:
-            value: The new value to update the message with.
-            node_id: The unique identifier of the message to update.
-            column: The column of the message to update.
+                value: The new value to update the message with.
+                node_id: The unique identifier of the message to update.
+                column: The column of the message to update.
         """
 
         index = self.messages[self.messages["node_id"] == node_id].index[0]
@@ -525,8 +547,8 @@ class BaseBranch(BaseRelatableNode, ABC):
         Updates the first system message with new content and/or sender.
 
         Args:
-            system: The new system message content or a System object.
-            sender: The identifier of the sender for the system message.
+                system: The new system message content or a System object.
+                sender: The identifier of the sender for the system message.
         """
 
         if len(self.messages[self.messages["role"] == "system"]) == 0:
@@ -548,7 +570,7 @@ class BaseBranch(BaseRelatableNode, ABC):
         Removes the last 'n' messages from the branch.
 
         Args:
-            steps: The number of messages to remove from the end.
+                steps: The number of messages to remove from the end.
         """
 
         self.messages = dataframe.remove_last_n_rows(self.messages, steps)
@@ -620,10 +642,10 @@ class BaseBranch(BaseRelatableNode, ABC):
         Helper method to generate summaries of messages either by role or sender.
 
         Args:
-            use_sender: If True, summary is categorized by sender. Otherwise, by role.
+                use_sender: If True, summary is categorized by sender. Otherwise, by role.
 
         Returns:
-            A dictionary summarizing the count of messages either by role or sender.
+                A dictionary summarizing the count of messages either by role or sender.
         """
 
         messages = self.messages["sender"] if use_sender else self.messages["role"]

lionagi/core/branch/branch.py

@@ -2,27 +2,22 @@ from collections import deque
 from typing import Any, Union, TypeVar, Callable
 
 from lionagi.libs.sys_util import PATH_TYPE
-from lionagi.libs.ln_api import StatusTracker, BaseService
-from lionagi.libs import ln_convert as convert
-from lionagi.libs import ln_dataframe as dataframe
+from lionagi.libs import StatusTracker, BaseService, convert, dataframe
 
-from lionagi.core.schema.base_node import TOOL_TYPE, Tool
-from lionagi.core.schema.data_logger import DataLogger
-from lionagi.core.tool.tool_manager import ToolManager, func_to_tool
+from ..schema import TOOL_TYPE, Tool, DataLogger
+from ..tool import ToolManager, func_to_tool
 
-from lionagi.core.branch.base_branch import BaseBranch
-from lionagi.core.messages.schema import System
-from lionagi.core.mail.schema import BaseMail
-
-from lionagi.core.branch.util import MessageUtil
+from ..messages import System
+from ..mail import BaseMail
 
+from .util import MessageUtil
+from .base_branch import BaseBranch
 from .branch_flow_mixin import BranchFlowMixin
 
 from dotenv import load_dotenv
 
 load_dotenv()
 
-
 T = TypeVar("T", bound=Tool)
 
 
@@ -30,7 +25,7 @@ class Branch(BaseBranch, BranchFlowMixin):
 
     def __init__(
         self,
-        branch_name: str | None = None,
+        name: str | None = None,
         system: dict | list | System | None = None,
         messages: dataframe.ln_DataFrame | None = None,
         service: BaseService | None = None,
@@ -38,8 +33,7 @@ class Branch(BaseBranch, BranchFlowMixin):
         llmconfig: dict[str, str | int | dict] | None = None,
         tools: list[Callable | Tool] | None = None,
         datalogger: None | DataLogger = None,
-        persist_path: PATH_TYPE | None = None,
-        # instruction_sets=None,
+        persist_path: PATH_TYPE | None = None,  # instruction_sets=None,
         tool_manager: ToolManager | None = None,
         **kwargs,
     ):
@@ -49,15 +43,15 @@ class Branch(BaseBranch, BranchFlowMixin):
             messages=messages,
             datalogger=datalogger,
             persist_path=persist_path,
+            name=name,
             **kwargs,
         )
 
         # add branch name
-        self.branch_name = branch_name
         self.sender = sender or "system"
 
         # add tool manager and register tools
-        self.tool_manager = tool_manager if tool_manager else ToolManager()
+        self.tool_manager = tool_manager or ToolManager()
         if tools:
             try:
                 tools_ = []
@@ -70,7 +64,7 @@ class Branch(BaseBranch, BranchFlowMixin):
 
                 self.register_tools(tools_)
             except Exception as e:
-                raise TypeError(f"Error in registering tools: {e}")
+                raise TypeError(f"Error in registering tools: {e}") from e
 
         # add service and llmconfig
         self.service, self.llmconfig = self._add_service(service, llmconfig)
@@ -91,22 +85,21 @@ class Branch(BaseBranch, BranchFlowMixin):
     def from_csv(
         cls,
         filepath,
-        branch_name: str | None = None,
+        name: str | None = None,
         service: BaseService | None = None,
         llmconfig: dict[str, str | int | dict] | None = None,
         tools: TOOL_TYPE | None = None,
         datalogger: None | DataLogger = None,
-        persist_path: PATH_TYPE | None = None,
-        # instruction_sets=None,
+        persist_path: PATH_TYPE | None = None,  # instruction_sets=None,
         tool_manager: ToolManager | None = None,
         read_kwargs=None,
         **kwargs,
     ):
 
-        self = cls._from_csv(
+        return cls._from_csv(
             filepath=filepath,
             read_kwargs=read_kwargs,
-            branch_name=branch_name,
+            name=name,
             service=service,
             llmconfig=llmconfig,
             tools=tools,
@@ -117,28 +110,25 @@ class Branch(BaseBranch, BranchFlowMixin):
             **kwargs,
         )
 
-        return self
-
     @classmethod
     def from_json_string(
         cls,
         filepath,
-        branch_name: str | None = None,
+        name: str | None = None,
         service: BaseService | None = None,
         llmconfig: dict[str, str | int | dict] | None = None,
         tools: TOOL_TYPE | None = None,
         datalogger: None | DataLogger = None,
-        persist_path: PATH_TYPE | None = None,
-        # instruction_sets=None,
+        persist_path: PATH_TYPE | None = None,  # instruction_sets=None,
         tool_manager: ToolManager | None = None,
         read_kwargs=None,
         **kwargs,
     ):
 
-        self = cls._from_json(
+        return cls._from_json(
             filepath=filepath,
             read_kwargs=read_kwargs,
-            branch_name=branch_name,
+            name=name,
             service=service,
             llmconfig=llmconfig,
             tools=tools,
@@ -149,8 +139,6 @@ class Branch(BaseBranch, BranchFlowMixin):
             **kwargs,
         )
 
-        return self
-
     def messages_describe(self) -> dict[str, Any]:
 
         return dict(
@@ -301,7 +289,7 @@ class Branch(BaseBranch, BranchFlowMixin):
         Check if the conversation has been invoked with an action response.
 
         Returns:
-            bool: True if the conversation has been invoked, False otherwise.
+                bool: True if the conversation has been invoked, False otherwise.
 
         """
         content = self.messages.iloc[-1]["content"]
@@ -312,5 +300,5 @@ class Branch(BaseBranch, BranchFlowMixin):
                 "output",
             }:
                 return True
-        except:
+        except Exception:
             return False