swarms 7.5.7__tar.gz → 7.5.9__tar.gz

{swarms-7.5.7 → swarms-7.5.9}/PKG-INFO

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

{swarms-7.5.7 → swarms-7.5.9}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "swarms"
-version = "7.5.7"
+version = "7.5.9"
 description = "Swarms - TGSC"
 license = "MIT"
 authors = ["Kye Gomez <kye@apac.ai>"]

{swarms-7.5.7 → swarms-7.5.9}/swarms/structs/agent_builder.py

@@ -1,13 +1,11 @@
 import os
-from typing import List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 from loguru import logger
 from pydantic import BaseModel, Field
 
 from swarms.structs.agent import Agent
-from swarms.utils.any_to_str import any_to_str
 from swarms.utils.function_caller_model import OpenAIFunctionCaller
-from swarms.utils.litellm_tokenizer import count_tokens
 
 BOSS_SYSTEM_PROMPT = """
 # Swarm Intelligence Orchestrator
@@ -148,13 +146,17 @@ class AgentsBuilder:
         description: str = "This is a swarm that creates swarms",
         verbose: bool = True,
         max_loops: int = 1,
+        model_name: str = "gpt-4o",
+        return_dictionary: bool = True,
     ):
         self.name = name
         self.description = description
         self.verbose = verbose
         self.max_loops = max_loops
         self.agents_pool = []
-
+        self.model_name = model_name
+        self.return_dictionary = return_dictionary
+        
         logger.info(
             f"Initialized AutoSwarmBuilder: {name} {description}"
         )
@@ -174,11 +176,11 @@ class AgentsBuilder:
             The output from the swarm's execution
         """
         logger.info(f"Running swarm on task: {task}")
-        agents, tokens = self._create_agents(
+        agents = self._create_agents(
             task, image_url, *args, **kwargs
         )
 
-        return agents, tokens
+        return agents
 
     def _create_agents(self, task: str, *args, **kwargs):
         """Create the necessary agents for a task.
@@ -197,23 +199,28 @@ class AgentsBuilder:
             api_key=os.getenv("OPENAI_API_KEY"),
             temperature=0.1,
             base_model=Agents,
-            model_name="gpt-4o",
+            model_name=self.model_name,
+            max_tokens = 8192,
         )
 
         agents_dictionary = model.run(task)
-
+        print(agents_dictionary)
+        
+        print(type(agents_dictionary))
         logger.info("Agents successfully created")
         logger.info(f"Agents: {len(agents_dictionary.agents)}")
 
-        total_tokens = any_to_str(agents_dictionary)
-
-        tokens = count_tokens(total_tokens)
-        # logger.info(f"Tokens: {tokens}")
-
-        # # Convert dictionary to SwarmConfig if needed
-        # if isinstance(agents_dictionary, dict):
-        #     agents_dictionary = Agents(**agents_dictionary)
-
+        if self.return_dictionary:
+            logger.info("Returning dictionary")
+            
+            # Convert swarm config to dictionary
+            agents_dictionary = agents_dictionary.model_dump()
+            return agents_dictionary
+        else:
+            logger.info("Returning agents")
+            return self.create_agents(agents_dictionary)
+    
+    def create_agents(self, agents_dictionary: Any):
         # Create agents from config
         agents = []
         for agent_config in agents_dictionary.agents:
@@ -235,7 +242,7 @@ class AgentsBuilder:
             )
             agents.append(agent)
 
-        return agents, tokens
+        return agents
 
     def build_agent(
         self,
@@ -278,3 +285,10 @@ class AgentsBuilder:
         )
 
         return agent
+
+
+# if __name__ == "__main__":
+#     builder = AgentsBuilder(model_name="gpt-4o")
+#     agents = builder.run("Create a swarm that can write a book about the history of the world")
+#     print(agents)
+#     print(type(agents))

swarms-7.5.9/swarms/utils/str_to_dict.py

@@ -0,0 +1,27 @@
+import json
+from typing import Dict
+
+
+def str_to_dict(s: str, retries: int = 3) -> Dict:
+    """
+    Converts a JSON string to 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

swarms-7.5.7/swarms/utils/str_to_dict.py

@@ -1,51 +0,0 @@
-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))