swarms 7.5.6__py3-none-any.whl → 7.5.7__py3-none-any.whl

swarms/agents/__init__.py

@@ -7,7 +7,7 @@ from swarms.agents.create_agents_from_yaml import (
 from swarms.agents.i_agent import IterativeReflectiveExpansion
 from swarms.agents.reasoning_agents import (
     ReasoningAgentRouter,
-    agent_types as reasoning_agent_types,
+    agent_types,
 )
 from swarms.agents.reasoning_duo import ReasoningDuo
 from swarms.structs.stopping_conditions import (
@@ -40,5 +40,5 @@ __all__ = [
     "SelfConsistencyAgent",
     "ReasoningDuo",
     "ReasoningAgentRouter",
-    "reasoning_agent_types",
+    "agent_types",
 ]

swarms/structs/agent.py

@@ -83,7 +83,15 @@ def exists(val):
 # Agent output types
 # agent_output_type = Union[BaseModel, dict, str]
 agent_output_type = Literal[
-    "string", "str", "list", "json", "dict", "yaml", "json_schema"
+    "string",
+    "str",
+    "list",
+    "json",
+    "dict",
+    "yaml",
+    "json_schema",
+    "memory-list",
+    "memory-dict",
 ]
 ToolUsageType = Union[BaseModel, Dict[str, Any]]
 
@@ -461,10 +469,11 @@ class Agent:
         self.role = role
         self.no_print = no_print
         self.tools_list_dictionary = tools_list_dictionary
+
         # Initialize the short term memory
         self.short_memory = Conversation(
             system_prompt=system_prompt,
-            time_enabled=True,
+            time_enabled=False,
             user=user_name,
             rules=rules,
             *args,
@@ -586,13 +595,36 @@ class Agent:
         from swarms.utils.litellm_wrapper import LiteLLM
 
         if self.model_name is None:
-            raise ValueError("Model name cannot be None")
+            # raise ValueError("Model name cannot be None")
+            logger.warning(
+                "Model name is not provided, using gpt-4o-mini. You can configure any model from litellm if desired."
+            )
+            self.model_name = "gpt-4o-mini"
 
         try:
             if self.llm_args is not None:
                 llm = LiteLLM(
                     model_name=self.model_name, **self.llm_args
                 )
+            elif self.tools_list_dictionary is not None:
+
+                length_of_tools_list_dictionary = len(
+                    self.tools_list_dictionary
+                )
+
+                if length_of_tools_list_dictionary > 0:
+
+                    parallel_tool_calls = True
+
+                llm = LiteLLM(
+                    model_name=self.model_name,
+                    temperature=self.temperature,
+                    max_tokens=self.max_tokens,
+                    system_prompt=self.system_prompt,
+                    tools_list_dictionary=self.tools_list_dictionary,
+                    tool_choice="auto",
+                    parallel_tool_calls=parallel_tool_calls,
+                )
             else:
                 llm = LiteLLM(
                     model_name=self.model_name,
@@ -1107,6 +1139,14 @@ class Agent:
                 return yaml.safe_dump(
                     self.agent_output.model_dump(), sort_keys=False
                 )
+
+            elif self.output_type == "memory-list":
+                return self.short_memory.return_messages_as_list()
+
+            elif self.output_type == "memory-dict":
+                return (
+                    self.short_memory.return_messages_as_dictionary()
+                )
             elif self.return_history is True:
                 history = self.short_memory.get_str()
 
@@ -1639,7 +1679,7 @@ class Agent:
             ):
                 self.short_memory = Conversation(
                     system_prompt=self.system_prompt,
-                    time_enabled=True,
+                    time_enabled=False,
                     user=self.user_name,
                     rules=self.rules,
                 )

swarms/structs/base_swarm.py

@@ -137,7 +137,7 @@ class BaseSwarm(ABC):
 
         # Initialize conversation
         self.conversation = Conversation(
-            time_enabled=True, rules=self.rules, *args, **kwargs
+            time_enabled=False, rules=self.rules, *args, **kwargs
         )
 
         # Handle callbacks

swarms/structs/conversation.py

@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING
 from swarms.utils.any_to_str import any_to_str
 from swarms.utils.formatter import formatter
 from swarms.utils.litellm_tokenizer import count_tokens
+import threading
 
 if TYPE_CHECKING:
     from swarms.structs.agent import (
@@ -17,53 +18,25 @@ if TYPE_CHECKING:
 
 class Conversation(BaseStructure):
     """
-    A class structure to represent a conversation in a chatbot. This class is used to store the conversation history.
-    And, it can be used to save the conversation history to a file, load the conversation history from a file, and
-    display the conversation history. We can also use this class to add the conversation history to a database, query
-    the conversation history from a database, delete the conversation history from a database, update the conversation
-    history from a database, and get the conversation history from a database.
-
-
-    Args:
-        time_enabled (bool): Whether to enable timestamps for the conversation history. Default is False.
-        database (AbstractDatabase): The database to use for storing the conversation history. Default is None.
-        autosave (bool): Whether to autosave the conversation history to a file. Default is None.
-        save_filepath (str): The filepath to save the conversation history to. Default is None.
-
-
-    Methods:
-        add(role: str, content: str): Add a message to the conversation history.
-        delete(index: str): Delete a message from the conversation history.
-        update(index: str, role, content): Update a message in the conversation history.
-        query(index: str): Query a message in the conversation history.
-        search(keyword: str): Search for a message in the conversation history.
-        display_conversation(detailed: bool = False): Display the conversation history.
-        export_conversation(filename: str): Export the conversation history to a file.
-        import_conversation(filename: str): Import a conversation history from a file.
-        count_messages_by_role(): Count the number of messages by role.
-        return_history_as_string(): Return the conversation history as a string.
-        save_as_json(filename: str): Save the conversation history as a JSON file.
-        load_from_json(filename: str): Load the conversation history from a JSON file.
-        search_keyword_in_conversation(keyword: str): Search for a keyword in the conversation history.
-        pretty_print_conversation(messages): Pretty print the conversation history.
-        add_to_database(): Add the conversation history to the database.
-        query_from_database(query): Query the conversation history from the database.
-        delete_from_database(): Delete the conversation history from the database.
-        update_from_database(): Update the conversation history from the database.
-        get_from_database(): Get the conversation history from the database.
-        execute_query_from_database(query): Execute a query on the database.
-        fetch_all_from_database(): Fetch all from the database.
-        fetch_one_from_database(): Fetch one from the database.
-
-    Examples:
-        >>> from swarms import Conversation
-        >>> conversation = Conversation()
-        >>> conversation.add("user", "Hello, how are you?")
-        >>> conversation.add("assistant", "I am doing well, thanks.")
-        >>> conversation.display_conversation()
-        user: Hello, how are you?
-        assistant: I am doing well, thanks.
-
+    A class to manage a conversation history, allowing for the addition, deletion,
+    and retrieval of messages, as well as saving and loading the conversation
+    history in various formats.
+
+    Attributes:
+        system_prompt (Optional[str]): The system prompt for the conversation.
+        time_enabled (bool): Flag to enable time tracking for messages.
+        autosave (bool): Flag to enable automatic saving of conversation history.
+        save_filepath (str): File path for saving the conversation history.
+        tokenizer (Any): Tokenizer for counting tokens in messages.
+        context_length (int): Maximum number of tokens allowed in the conversation history.
+        rules (str): Rules for the conversation.
+        custom_rules_prompt (str): Custom prompt for rules.
+        user (str): The user identifier for messages.
+        auto_save (bool): Flag to enable auto-saving of conversation history.
+        save_as_yaml (bool): Flag to save conversation history as YAML.
+        save_as_json_bool (bool): Flag to save conversation history as JSON.
+        token_count (bool): Flag to enable token counting for messages.
+        conversation_history (list): List to store the history of messages.
     """
 
     def __init__(
@@ -84,6 +57,24 @@ class Conversation(BaseStructure):
         *args,
         **kwargs,
     ):
+        """
+        Initializes the Conversation object with the provided parameters.
+
+        Args:
+            system_prompt (Optional[str]): The system prompt for the conversation.
+            time_enabled (bool): Flag to enable time tracking for messages.
+            autosave (bool): Flag to enable automatic saving of conversation history.
+            save_filepath (str): File path for saving the conversation history.
+            tokenizer (Any): Tokenizer for counting tokens in messages.
+            context_length (int): Maximum number of tokens allowed in the conversation history.
+            rules (str): Rules for the conversation.
+            custom_rules_prompt (str): Custom prompt for rules.
+            user (str): The user identifier for messages.
+            auto_save (bool): Flag to enable auto-saving of conversation history.
+            save_as_yaml (bool): Flag to save conversation history as YAML.
+            save_as_json_bool (bool): Flag to save conversation history as JSON.
+            token_count (bool): Flag to enable token counting for messages.
+        """
         super().__init__()
         self.system_prompt = system_prompt
         self.time_enabled = time_enabled
@@ -121,53 +112,68 @@ class Conversation(BaseStructure):
         *args,
         **kwargs,
     ):
-        """Add a message to the conversation history
+        """Add a message to the conversation history.
 
         Args:
-            role (str): The role of the speaker
-            content (str): The content of the message
-
+            role (str): The role of the speaker (e.g., 'User', 'System').
+            content (Union[str, dict, list]): The content of the message to be added.
         """
         now = datetime.datetime.now()
         timestamp = now.strftime("%Y-%m-%d %H:%M:%S")
 
-        tokens = count_tokens(any_to_str(content))
+        # Base message with role
+        message = {
+            "role": role,
+        }
 
+        # Handle different content types
         if isinstance(content, dict) or isinstance(content, list):
-
-            message = {
-                "role": role,
-                "content": content,
-                "token_count": int(tokens),
-            }
-
+            message["content"] = content
         else:
-            message = {
-                "role": role,
-                "content": f"Time: {timestamp} \n {content}",
-                "token_count": int(tokens),
-            }
+            message["content"] = f"Time: {timestamp} \n {content}"
 
+        # Add the message to history immediately without waiting for token count
         self.conversation_history.append(message)
 
-        if self.autosave:
+        # If token counting is enabled, do it in a separate thread
+        if self.token_count is True:
+            # Define a function to count tokens and update the message
+            def count_tokens_thread():
+                tokens = count_tokens(any_to_str(content))
+                # Update the message that's already in the conversation history
+                message["token_count"] = int(tokens)
+
+                # If autosave is enabled, save after token count is updated
+                if self.autosave:
+                    self.save_as_json(self.save_filepath)
+
+            # Start a new thread for token counting
+            token_thread = threading.Thread(
+                target=count_tokens_thread
+            )
+            token_thread.daemon = (
+                True  # Make thread terminate when main program exits
+            )
+            token_thread.start()
+        elif self.autosave:
+            # If token counting is disabled but autosave is enabled, save immediately
             self.save_as_json(self.save_filepath)
 
     def delete(self, index: str):
-        """Delete a message from the conversation history
+        """Delete a message from the conversation history.
 
         Args:
-            index (str): index of the message to delete
+            index (str): Index of the message to delete.
         """
         self.conversation_history.pop(index)
 
     def update(self, index: str, role, content):
-        """Update a message in the conversation history
+        """Update a message in the conversation history.
 
         Args:
-            index (str): index of the message to update
-            role (_type_): role of the speaker
-            content (_type_): content of the message
+            index (str): Index of the message to update.
+            role (str): Role of the speaker.
+            content (Union[str, dict]): New content of the message.
         """
         self.conversation_history[index] = {
             "role": role,
@@ -175,24 +181,24 @@ class Conversation(BaseStructure):
         }
 
     def query(self, index: str):
-        """Query a message in the conversation history
+        """Query a message in the conversation history.
 
         Args:
-            index (str): index of the message to query
+            index (str): Index of the message to query.
 
         Returns:
-            str: the message
+            dict: The message with its role and content.
         """
         return self.conversation_history[index]
 
     def search(self, keyword: str):
-        """Search for a message in the conversation history
+        """Search for a message in the conversation history.
 
         Args:
-            keyword (str): Keyword to search for
+            keyword (str): Keyword to search for.
 
         Returns:
-            str: description
+            list: List of messages containing the keyword.
         """
         return [
             msg
@@ -201,10 +207,10 @@ class Conversation(BaseStructure):
         ]
 
     def display_conversation(self, detailed: bool = False):
-        """Display the conversation history
+        """Display the conversation history.
 
         Args:
-            detailed (bool, optional): detailed. Defaults to False.
+            detailed (bool, optional): Flag to display detailed information. Defaults to False.
         """
         for message in self.conversation_history:
             formatter.print_panel(
@@ -212,20 +218,20 @@ class Conversation(BaseStructure):
             )
 
     def export_conversation(self, filename: str, *args, **kwargs):
-        """Export the conversation history to a file
+        """Export the conversation history to a file.
 
         Args:
-            filename (str): filename to export to
+            filename (str): Filename to export to.
         """
         with open(filename, "w") as f:
             for message in self.conversation_history:
                 f.write(f"{message['role']}: {message['content']}\n")
 
     def import_conversation(self, filename: str):
-        """Import a conversation history from a file
+        """Import a conversation history from a file.
 
         Args:
-            filename (str): filename to import from
+            filename (str): Filename to import from.
         """
         with open(filename) as f:
             for line in f:
@@ -233,7 +239,11 @@ class Conversation(BaseStructure):
                 self.add(role, content.strip())
 
     def count_messages_by_role(self):
-        """Count the number of messages by role"""
+        """Count the number of messages by role.
+
+        Returns:
+            dict: A dictionary with counts of messages by role.
+        """
         counts = {
             "system": 0,
             "user": 0,
@@ -245,10 +255,10 @@ class Conversation(BaseStructure):
         return counts
 
     def return_history_as_string(self):
-        """Return the conversation history as a string
+        """Return the conversation history as a string.
 
         Returns:
-            str: the conversation history
+            str: The conversation history formatted as a string.
         """
         return "\n".join(
             [
@@ -258,39 +268,41 @@ class Conversation(BaseStructure):
         )
 
     def get_str(self):
+        """Get the conversation history as a string.
+
+        Returns:
+            str: The conversation history.
+        """
         return self.return_history_as_string()
 
     def save_as_json(self, filename: str = None):
-        """Save the conversation history as a JSON file
+        """Save the conversation history as a JSON file.
 
         Args:
-            filename (str): Save the conversation history as a JSON file
+            filename (str): Filename to save the conversation history.
         """
-        # Create the directory if it does not exist
-        # os.makedirs(os.path.dirname(filename), exist_ok=True)
         if filename is not None:
             with open(filename, "w") as f:
                 json.dump(self.conversation_history, f)
 
     def load_from_json(self, filename: str):
-        """Load the conversation history from a JSON file
+        """Load the conversation history from a JSON file.
 
         Args:
-            filename (str): filename to load from
+            filename (str): Filename to load from.
         """
-        # Load the conversation history from a JSON file
         if filename is not None:
             with open(filename) as f:
                 self.conversation_history = json.load(f)
 
     def search_keyword_in_conversation(self, keyword: str):
-        """Search for a keyword in the conversation history
+        """Search for a keyword in the conversation history.
 
         Args:
-            keyword (str): keyword to search for
+            keyword (str): Keyword to search for.
 
         Returns:
-            str: description
+            list: List of messages containing the keyword.
         """
         return [
             msg
@@ -299,10 +311,10 @@ class Conversation(BaseStructure):
         ]
 
     def pretty_print_conversation(self, messages):
-        """Pretty print the conversation history
+        """Pretty print the conversation history.
 
         Args:
-            messages (str): messages to print
+            messages (list): List of messages to print.
         """
         role_to_color = {
             "system": "red",
@@ -383,15 +395,31 @@ class Conversation(BaseStructure):
         self.conversation_history = truncated_history
 
     def clear(self):
+        """Clear the conversation history."""
         self.conversation_history = []
 
     def to_json(self):
+        """Convert the conversation history to a JSON string.
+
+        Returns:
+            str: The conversation history as a JSON string.
+        """
         return json.dumps(self.conversation_history)
 
     def to_dict(self):
+        """Convert the conversation history to a dictionary.
+
+        Returns:
+            list: The conversation history as a list of dictionaries.
+        """
         return self.conversation_history
 
     def to_yaml(self):
+        """Convert the conversation history to a YAML string.
+
+        Returns:
+            str: The conversation history as a YAML string.
+        """
         return yaml.dump(self.conversation_history)
 
     def get_visible_messages(self, agent: "Agent", turn: int):
@@ -422,17 +450,30 @@ class Conversation(BaseStructure):
         return visible_messages
 
     def get_last_message_as_string(self):
-        # fetch the last message from the conversation history with the agent name and the message of the agent
+        """Fetch the last message from the conversation history.
+
+        Returns:
+            str: The last message formatted as 'role: content'.
+        """
         return f"{self.conversation_history[-1]['role']}: {self.conversation_history[-1]['content']}"
 
     def return_messages_as_list(self):
-        # we must concat the role and the content of the message
+        """Return the conversation messages as a list of formatted strings.
+
+        Returns:
+            list: List of messages formatted as 'role: content'.
+        """
         return [
             f"{message['role']}: {message['content']}"
             for message in self.conversation_history
         ]
 
     def return_messages_as_dictionary(self):
+        """Return the conversation messages as a list of dictionaries.
+
+        Returns:
+            list: List of dictionaries containing role and content of each message.
+        """
         return [
             {
                 "role": message["role"],
@@ -443,15 +484,32 @@ class Conversation(BaseStructure):
 
     def add_tool_output_to_agent(self, role: str, tool_output: dict):
         """
-        Add a tool output to the conversation history
+        Add a tool output to the conversation history.
+
+        Args:
+            role (str): The role of the tool.
+            tool_output (dict): The output from the tool to be added.
         """
         self.add(role, tool_output)
 
     def return_json(self):
+        """Return the conversation messages as a JSON string.
+
+        Returns:
+            str: The conversation messages formatted as a JSON string.
+        """
         return json.dumps(
             self.return_messages_as_dictionary(), indent=4
         )
 
+    def get_final_message(self):
+        """Return the final message from the conversation history.
+
+        Returns:
+            str: The final message formatted as 'role: content'.
+        """
+        return f"{self.conversation_history[-1]['role']}: {self.conversation_history[-1]['content']}"
+
 
 # # Example usage
 # # conversation = Conversation()

swarms/structs/groupchat.py

@@ -236,7 +236,7 @@ class GroupChat:
         self.agents = agents
         self.speaker_fn = speaker_fn
         self.max_loops = max_loops
-        self.conversation = Conversation(time_enabled=True)
+        self.conversation = Conversation(time_enabled=False)
         self.rules = rules
 
         self.reliability_check()

swarms/structs/hiearchical_swarm.py

@@ -257,7 +257,7 @@ class HierarchicalSwarm(BaseSwarm):
         self.return_all_history = return_all_history
         self.output_type = output_type
         self.director_model_name = director_model_name
-        self.conversation = Conversation(time_enabled=True)
+        self.conversation = Conversation(time_enabled=False)
         self.current_loop = 0
         self.agent_outputs = {}  # Store agent outputs for each loop
 

swarms/structs/majority_voting.py

@@ -163,7 +163,7 @@ class MajorityVoting:
         self.output_type = output_type
 
         self.conversation = Conversation(
-            time_enabled=True, *args, **kwargs
+            time_enabled=False, *args, **kwargs
         )
 
         self.initialize_majority_voting()

swarms/structs/multi_agent_collab.py

@@ -153,7 +153,7 @@ class MultiAgentCollaboration(BaseSwarm):
 
         # Conversation
         self.conversation = Conversation(
-            time_enabled=True, *args, **kwargs
+            time_enabled=False, *args, **kwargs
         )
 
     def default_select_next_speaker(

swarms/structs/output_types.py

@@ -11,4 +11,6 @@ OutputType = Literal[
     ".txt",
     ".yaml",
     ".toml",
+    "string",
+    "str",
 ]

swarms/structs/tree_swarm.py

@@ -282,7 +282,7 @@ class ForestSwarm:
         self.shared_memory = shared_memory
         self.save_file_path = f"forest_swarm_{uuid.uuid4().hex}.json"
         self.conversation = Conversation(
-            time_enabled=True,
+            time_enabled=False,
             auto_save=True,
             save_filepath=self.save_file_path,
             rules=rules,

swarms/utils/history_output_formatter.py

@@ -10,5 +10,9 @@ def history_output_formatter(
         return conversation.to_dict()
     elif type == "string" or type == "str":
         return conversation.get_str()
+    elif type == "final":
+        return conversation.get_final_message()
+    elif type == "json":
+        return conversation.to_json()
     else:
         raise ValueError(f"Invalid type: {type}")

swarms/utils/litellm_wrapper.py

@@ -1,5 +1,11 @@
+import asyncio
+from typing import List
+
+from loguru import logger
+
+
 try:
-    from litellm import completion
+    from litellm import completion, acompletion
 except ImportError:
     import subprocess
     import sys
@@ -33,6 +39,9 @@ class LiteLLM:
         max_tokens: int = 4000,
         ssl_verify: bool = False,
         max_completion_tokens: int = 4000,
+        tools_list_dictionary: List[dict] = None,
+        tool_choice: str = "auto",
+        parallel_tool_calls: bool = False,
         *args,
         **kwargs,
     ):
@@ -53,8 +62,9 @@ class LiteLLM:
         self.max_tokens = max_tokens
         self.ssl_verify = ssl_verify
         self.max_completion_tokens = max_completion_tokens
-
-        self.max_completion_tokens = max_tokens
+        self.tools_list_dictionary = tools_list_dictionary
+        self.tool_choice = tool_choice
+        self.parallel_tool_calls = parallel_tool_calls
 
     def _prepare_messages(self, task: str) -> list:
         """
@@ -77,7 +87,7 @@ class LiteLLM:
 
         return messages
 
-    def run(self, task: str, tools: list = [], *args, **kwargs):
+    def run(self, task: str, *args, **kwargs):
         """
         Run the LLM model for the given task.
 
@@ -93,23 +103,45 @@ class LiteLLM:
 
             messages = self._prepare_messages(task)
 
-            response = completion(
-                model=self.model_name,
-                messages=messages,
-                stream=self.stream,
-                temperature=self.temperature,
-                max_tokens=self.max_tokens,
-                *args,
-                **kwargs,
-            )
-
-            content = response.choices[
-                0
-            ].message.content  # Accessing the content
-
-            return content
+            if self.tools_list_dictionary is not None:
+                response = completion(
+                    model=self.model_name,
+                    messages=messages,
+                    stream=self.stream,
+                    temperature=self.temperature,
+                    max_tokens=self.max_tokens,
+                    tools=self.tools_list_dictionary,
+                    tool_choice=self.tool_choice,
+                    parallel_tool_calls=self.parallel_tool_calls,
+                    *args,
+                    **kwargs,
+                )
+
+                return (
+                    response.choices[0]
+                    .message.tool_calls[0]
+                    .function.arguments
+                )
+
+            else:
+                response = completion(
+                    model=self.model_name,
+                    messages=messages,
+                    stream=self.stream,
+                    temperature=self.temperature,
+                    max_tokens=self.max_tokens,
+                    *args,
+                    **kwargs,
+                )
+
+                content = response.choices[
+                    0
+                ].message.content  # Accessing the content
+
+                return content
         except Exception as error:
-            print(error)
+            logger.error(f"Error in LiteLLM: {error}")
+            raise error
 
     def __call__(self, task: str, *args, **kwargs):
         """
@@ -124,3 +156,88 @@ class LiteLLM:
             str: The content of the response from the model.
         """
         return self.run(task, *args, **kwargs)
+
+    async def arun(self, task: str, *args, **kwargs):
+        """
+        Run the LLM model for the given task.
+
+        Args:
+            task (str): The task to run the model for.
+            *args: Additional positional arguments to pass to the model.
+            **kwargs: Additional keyword arguments to pass to the model.
+
+        Returns:
+            str: The content of the response from the model.
+        """
+        try:
+            messages = self._prepare_messages(task)
+
+            if self.tools_list_dictionary is not None:
+                response = await acompletion(
+                    model=self.model_name,
+                    messages=messages,
+                    stream=self.stream,
+                    temperature=self.temperature,
+                    max_tokens=self.max_tokens,
+                    tools=self.tools_list_dictionary,
+                    tool_choice=self.tool_choice,
+                    parallel_tool_calls=self.parallel_tool_calls,
+                    *args,
+                    **kwargs,
+                )
+
+                content = (
+                    response.choices[0]
+                    .message.tool_calls[0]
+                    .function.arguments
+                )
+
+                # return response
+
+            else:
+                response = await acompletion(
+                    model=self.model_name,
+                    messages=messages,
+                    stream=self.stream,
+                    temperature=self.temperature,
+                    max_tokens=self.max_tokens,
+                    *args,
+                    **kwargs,
+                )
+
+                content = response.choices[
+                    0
+                ].message.content  # Accessing the content
+
+            return content
+        except Exception as error:
+            logger.error(f"Error in LiteLLM: {error}")
+            raise error
+
+    def batched_run(self, tasks: List[str], batch_size: int = 10):
+        """
+        Run the LLM model for the given tasks in batches.
+        """
+        logger.info(
+            f"Running tasks in batches of size {batch_size}. Total tasks: {len(tasks)}"
+        )
+        results = []
+        for task in tasks:
+            logger.info(f"Running task: {task}")
+            results.append(self.run(task))
+        logger.info("Completed all tasks.")
+        return results
+
+    def batched_arun(self, tasks: List[str], batch_size: int = 10):
+        """
+        Run the LLM model for the given tasks in batches.
+        """
+        logger.info(
+            f"Running asynchronous tasks in batches of size {batch_size}. Total tasks: {len(tasks)}"
+        )
+        results = []
+        for task in tasks:
+            logger.info(f"Running asynchronous task: {task}")
+            results.append(asyncio.run(self.arun(task)))
+        logger.info("Completed all asynchronous tasks.")
+        return results

swarms/utils/str_to_dict.py

@@ -0,0 +1,51 @@
+import json
+from typing import Dict
+import asyncio
+
+
+async def async_str_to_dict(s: str, retries: int = 3) -> Dict:
+    """
+    Asynchronously converts a JSON-formatted string to a dictionary.
+
+    Args:
+        s (str): The JSON string to be converted.
+        retries (int): The number of times to retry parsing the string in case of a JSONDecodeError. Default is 3.
+
+    Returns:
+        Dict: The parsed dictionary from the JSON string.
+
+    Raises:
+        json.JSONDecodeError: If the string cannot be parsed into a dictionary after the specified number of retries.
+    """
+    for attempt in range(retries):
+        try:
+            # Run json.loads directly since it's fast enough
+            return json.loads(s)
+        except json.JSONDecodeError as e:
+            if attempt < retries - 1:
+                continue  # Retry on failure
+            else:
+                raise e  # Raise the error if all retries fail
+
+
+def str_to_dict(s: str, retries: int = 3) -> Dict:
+    """
+    Converts a JSON string to dictionary, handling both sync and async contexts.
+
+    Args:
+        s (str): The JSON string to be converted.
+        retries (int): The number of times to retry parsing the string in case of a JSONDecodeError. Default is 3.
+
+    Returns:
+        Dict: The parsed dictionary from the JSON string.
+    """
+    # For simplicity and reliability, just try to parse the JSON directly first
+    try:
+        return json.loads(s)
+    except json.JSONDecodeError:
+        # If direct parsing fails, try the async path
+        try:
+            return async_str_to_dict(s, retries).__await__()
+        except (AttributeError, RuntimeError):
+            # If we can't await (not in async context), use run
+            return asyncio.run(async_str_to_dict(s, retries))

{swarms-7.5.6.dist-info → swarms-7.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swarms
-Version: 7.5.6
+Version: 7.5.7
 Summary: Swarms - TGSC
 Home-page: https://github.com/kyegomez/swarms
 License: MIT

{swarms-7.5.6.dist-info → swarms-7.5.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 swarms/__init__.py,sha256=DDfir3E4H8z1PlQqpc2HzovJQtNvIAzye4Fs165J0o8,512
-swarms/agents/__init__.py,sha256=HVR2hOuRVM_XcHtnbLwrrmhlrfBkhdDnZR-GHrVEqMI,1070
+swarms/agents/__init__.py,sha256=7MJORblMZSbJMNhcKfmVeYC_9EfK6OBW9wdZkFqUwzc,1035
 swarms/agents/agent_print.py,sha256=SXqWA2ZzXwRFdv8hkuYwOPMTasvaGTG6U29413qRCAA,918
 swarms/agents/ape_agent.py,sha256=1kz_65LJgjLlY1yv2WLBeVMs7sP9BgEVWk0w1f67YLc,1563
 swarms/agents/auto_generate_swarm_config.py,sha256=7eJ873xS7PJmyreMaa5Uub8qFu-qIinuyMuogB2Ehjc,8474
@@ -75,7 +75,7 @@ swarms/schemas/agent_input_schema.py,sha256=qhPyThMx2on91yG9mzNdP_08GpMh1IRDHDwF
 swarms/schemas/agent_step_schemas.py,sha256=a14gb58vR0xOwB_fwSJQbN6yb9HddEaT30E6hUrzEQA,2573
 swarms/schemas/base_schemas.py,sha256=UvBLVWg2qRen4tK5GJz50v42SiX95EQ5qK7hfyAHTEU,3267
 swarms/structs/__init__.py,sha256=iPQmbvhyBMobHP1SXIxncVdpsMDnPWwcAEZz_TEORt0,4354
-swarms/structs/agent.py,sha256=1AObxdhxtY_UwnQklDS9rXi0tNlJwgywQUczAc0BnyU,94970
+swarms/structs/agent.py,sha256=tcGFYvQGdv-2VD9kaQvIKcdBxhv4H9WhWmEMzNcFeYc,96232
 swarms/structs/agent_builder.py,sha256=c-SVjfntqO7B3_VSANxw7Swu53PNVoJCmbqK9F8Nns0,11597
 swarms/structs/agent_registry.py,sha256=il507cO1NF-d4ChyANVLuWrN8bXsEAi8_7bLJ_sTU6A,12112
 swarms/structs/agent_roles.py,sha256=8XEw6RjOOZelaZaWt4gXaYQm5WMLEhSO7W6Z8sQjmFg,582
@@ -87,30 +87,30 @@ swarms/structs/async_workflow.py,sha256=7YWsLPyGY-1-mMxoIXWQ0FnYH6F227nxsS9PFAJo
 swarms/structs/auto_swarm.py,sha256=AHWswlEWDL_i3V8IP362tx6pi_B2arlZhALykrkI5OA,8215
 swarms/structs/auto_swarm_builder.py,sha256=vPM5Kq59D_FvuWJB8hxgHuEvTXsxDxovlBnHGVQsM4o,10938
 swarms/structs/base_structure.py,sha256=GDu4QJQQmhU7IyuFJHIh9UVThACCva-L7uoMbVD9l4s,15901
-swarms/structs/base_swarm.py,sha256=oJe6_C6Kr9yd4Qye7JAsmriTdeFnLfgEkJbxbZU6Ik0,24032
+swarms/structs/base_swarm.py,sha256=_pggyl32BoEq-W2Cg-03h0z9xpPT_wXFjss4Yvysoxc,24033
 swarms/structs/base_workflow.py,sha256=DTfFwX3AdFYxACDYwUDqhsbcDZnITlg5TeEYyxmJBCc,11414
 swarms/structs/concat.py,sha256=utezSxNyh1mIwXgdf8-dJ803NDPyEy79WE8zJHuooGk,732
 swarms/structs/concurrent_workflow.py,sha256=8myerrLcOfEDGPlfp4xYbf79qBBAzxh80zrw1Dv7OXY,15525
-swarms/structs/conversation.py,sha256=yX1BoKPW3q7m0-LIiP2Osc_k7bE2bSjdq4rlYFD_OuU,16120
+swarms/structs/conversation.py,sha256=7oh3x5XFyscnG1TAIMyL1BKJ4jC-unDEv-RFRVmxJO8,17966
 swarms/structs/csv_to_agent.py,sha256=ug9JqQFPguXeU9JQpSUXuVtOpHYdJhlpKJUJBovo694,9443
 swarms/structs/de_hallucination_swarm.py,sha256=Aa1kIJLmyXXrFl6qpmAq6mfkSaItQYD0MPgQ_e-nPvc,10305
 swarms/structs/graph_swarm.py,sha256=HPHlLWwdSPSe4o-I06ZOIgtBg72a06llEnv8-aglf3Q,20962
 swarms/structs/graph_workflow.py,sha256=TAaUG_J3898hhghPOp0WEAV3Zf0in6s48ZSVbSTX-vQ,8629
-swarms/structs/groupchat.py,sha256=GscqlpGrtlZ31AD1r5fZXY6nTgAtRGbbt8kc1KY6G3g,15905
-swarms/structs/hiearchical_swarm.py,sha256=TIjoppfLrdUTDMnEuTuBqttvFzbQZlEfgsTcPs_h9zo,35272
-swarms/structs/majority_voting.py,sha256=bDP5VOrG89bbkAodtwQErB4MASJ3ZGJUA6LiBevb2w0,10120
+swarms/structs/groupchat.py,sha256=oLaWLuZ0ObHVXN9k3K8CpLSDSZwnCHBgJHsdGmHqAS8,15906
+swarms/structs/hiearchical_swarm.py,sha256=-qepZLY7RLxHlT4dU-dMEWSKnfBHEVrFr6HRn8lGh1Q,35273
+swarms/structs/majority_voting.py,sha256=1-FQGMxDwg5mYeoP5rXTgiXEXF8Yc4vTc93ByGoInK4,10121
 swarms/structs/malt.py,sha256=0ZOuLfOzaJ4vAVOM6J1aZ3yWAiKxfMkNIBNp8pjsEqE,19392
 swarms/structs/matrix_swarm.py,sha256=qHuhOYrTyOv6ujHMe8PrQT-h-WmaCPCfX4ghv5L8UFI,9765
 swarms/structs/meme_agent_persona_generator.py,sha256=b3kKlumhsV4KV88-GS3CUnGO1UfKTU3fT8SAMj0ZlwQ,10645
 swarms/structs/mixture_of_agents.py,sha256=OGCTvyRQjHk9os4ZDYixdbDIIMeLMxfseeznS9rzdko,10574
 swarms/structs/model_router.py,sha256=V5pZHYlxSmCvAA2Gsns7LaCz8dXtRi7pCvb-oLGHYIY,12739
-swarms/structs/multi_agent_collab.py,sha256=2pvMBQvdkKrMIdS9tlvKQNvWSiebEdD4ozqOKpIT-rw,7730
+swarms/structs/multi_agent_collab.py,sha256=odh2NQRR23LidsphCxUfAke369lDdgL__w3Xovu9jkA,7731
 swarms/structs/multi_agent_exec.py,sha256=NbR-CnxxBuCa0Ll3Os9wfKdkIsQiCpqsTgFX9hWRefw,17421
 swarms/structs/multi_agent_orchestrator.py,sha256=MsCqBGrirhbdx4aZqY_1MRa9hRqt_ZF3HLmt7JCsINI,13399
 swarms/structs/octotools.py,sha256=GZo0qtFM69W7vvewk6_k09vicgw0c0_v7MiPvEZCagE,31406
 swarms/structs/omni_agent_types.py,sha256=RdKLfZ-lXDJrEa0aJT_Rfx9TypJQo8SISqKz4fnLkAk,230
 swarms/structs/output_type.py,sha256=56bALerdISngZ86Q-7LLlmHZw6edAFkea2bPlKdM_oE,279
-swarms/structs/output_types.py,sha256=SVPi9UNMBaVZFS5E9eq_87CiHrkOoSFLij2TQ8kvXaU,188
+swarms/structs/output_types.py,sha256=i56WfkzUR6YgP1qINJ8t-By8OVS_sdbO64IvCmV-pbM,213
 swarms/structs/pulsar_swarm.py,sha256=4_L0GqPBgnA3AJajpNLgO4IAG6U36nIntFK9WNJScv8,15968
 swarms/structs/queue_swarm.py,sha256=8vcA-rh280midcdgfA5IwJzBmMgdn71nRH6KndWu-DA,6770
 swarms/structs/rearrange.py,sha256=KVBZVvoTd5vA7-kzpFHHpoQWzss0NZurCI1K-QR-MJc,28638
@@ -131,7 +131,7 @@ swarms/structs/swarm_router.py,sha256=V8qEojE0XkqZQKcrm_9w7NCou0uiesSAIgeuPbahRl
 swarms/structs/swarming_architectures.py,sha256=VvkSA9nQnF91V2C5-ALwSY1peZckeM1G4pPeQS7IVsE,13109
 swarms/structs/swarms_api.py,sha256=Pv-X-GkQ05gGPvTy8c_LES_IC8CBO9d2RPIssIjuqB8,13759
 swarms/structs/talk_hier.py,sha256=npyEuL52SCgQmMynIvGjfatNqOz4toq0EyhEtSNmQhQ,25649
-swarms/structs/tree_swarm.py,sha256=UAzRJ6J91XC8W3ND9_cmoSmUhYoD4epl-rbn2ocQlOs,12499
+swarms/structs/tree_swarm.py,sha256=AnIxrt0KhWxAQN8uGjfCcOq-XCmsuTJiH8Ex4mXy8V8,12500
 swarms/structs/utils.py,sha256=Mo6wHQYOB8baWZUKnAJN5Dsgubpo81umNwJIEDitb2A,1873
 swarms/structs/various_alt_swarms.py,sha256=qdBuOF31UjatlKRu-9bxwyRQzIjohRhTv_63YoUeYEY,27866
 swarms/structs/workspace_manager.py,sha256=t0OgUP9dDU7xS6N3mAT2PbXvjHTsUK3nf2mxppcfZ70,5473
@@ -164,20 +164,21 @@ swarms/utils/disable_logging.py,sha256=-YXBrTMTLlXWCW-MhuY4XI6Q8KeEfBUJ_gmRWs1X8
 swarms/utils/file_processing.py,sha256=QjQCIPTcwicQlfy656BXBYpIzMR0s2343E7ftnok5Uo,4865
 swarms/utils/formatter.py,sha256=YykmcuWXkxvQ7a2Vq6OzWuqUDiIwro6VrtSt4ITbXcU,4194
 swarms/utils/function_caller_model.py,sha256=ZfgCMzOizNnuZipYLclTziECNHszH9p8RQcUq7VNr4Q,4156
-swarms/utils/history_output_formatter.py,sha256=iKmhiYjdVeZcLHfiU7I1BymZm3A5_miIgcdcekeEhuk,421
+swarms/utils/history_output_formatter.py,sha256=TmYMMVsWmn8vtmXacuw8iujZnwdxaRnT8fGM8d9uJo8,558
 swarms/utils/litellm_tokenizer.py,sha256=0AAj4NffBe2eHii_3_5SpQAhSiBbunJR8MzaBTIm7hg,484
-swarms/utils/litellm_wrapper.py,sha256=5JzxF5rfm92MIDHXelcYYkhAG6Vg0V-WRRHwY1o1Fxc,3741
+swarms/utils/litellm_wrapper.py,sha256=YmSwDPK97szRNrE81_9nTyh4q_VaVAJxH11VIwKUQb4,7778
 swarms/utils/loguru_logger.py,sha256=hIoSK3NHLpe7eAmjHRURrEYzNXYC2gbR7_Vv63Yaydk,685
 swarms/utils/markdown_message.py,sha256=RThHNnMf6ZLTlYK4vKn3yuewChaxWAYAWb0Xm_pTyIU,652
 swarms/utils/pandas_utils.py,sha256=AA0wNWM05CrNovW7x9aY63Zhw7CIGMERmxvjH2Q-Jjc,2567
 swarms/utils/parse_code.py,sha256=XFOLymbdP3HzMZuqsj7pwUyisvUmTm0ev9iThR_ambI,1987
 swarms/utils/pdf_to_text.py,sha256=nkySOS_sJ4Jf4RP5SoDpMB5WfjJ_GGc5z8gJfn2cxOM,1311
+swarms/utils/str_to_dict.py,sha256=DXIokhuWN8OiX-7r6FtskrfnMcJXiCIFpZbLzD-N_tU,1778
 swarms/utils/swarm_reliability_checks.py,sha256=MsgUULt3HYg72D0HifZNmtCyJYpLA2UDA2wQixI-NbA,2562
 swarms/utils/try_except_wrapper.py,sha256=appEGu9Afy3TmdkNNXUgQ9yU9lj2j0uNkIoW0JhVzzY,3917
 swarms/utils/visualizer.py,sha256=0ylohEk62MAS6iPRaDOV03m9qo2k5J56tWlKJk_46p4,16927
 swarms/utils/wrapper_clusterop.py,sha256=PMSCVM7ZT1vgj1D_MYAe835RR3SMLYxA-si2JS02yNQ,4220
-swarms-7.5.6.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
-swarms-7.5.6.dist-info/METADATA,sha256=0qmkVA4FDlnoR1bzuwy9fo5z5xhtwMLZjTwJ557CaIU,103019
-swarms-7.5.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-swarms-7.5.6.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
-swarms-7.5.6.dist-info/RECORD,,
+swarms-7.5.7.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
+swarms-7.5.7.dist-info/METADATA,sha256=GDdLsEvLpTArX7_bjP6y75c3GEV_bV5e3M45c9ZnYlk,103019
+swarms-7.5.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+swarms-7.5.7.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
+swarms-7.5.7.dist-info/RECORD,,