swarms 7.5.8__py3-none-any.whl → 7.5.9__py3-none-any.whl

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.8.dist-info → swarms-7.5.9.dist-info}/METADATA

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

{swarms-7.5.8.dist-info → swarms-7.5.9.dist-info}/RECORD

@@ -76,7 +76,7 @@ swarms/schemas/agent_step_schemas.py,sha256=a14gb58vR0xOwB_fwSJQbN6yb9HddEaT30E6
 swarms/schemas/base_schemas.py,sha256=UvBLVWg2qRen4tK5GJz50v42SiX95EQ5qK7hfyAHTEU,3267
 swarms/structs/__init__.py,sha256=iPQmbvhyBMobHP1SXIxncVdpsMDnPWwcAEZz_TEORt0,4354
 swarms/structs/agent.py,sha256=tcGFYvQGdv-2VD9kaQvIKcdBxhv4H9WhWmEMzNcFeYc,96232
-swarms/structs/agent_builder.py,sha256=c-SVjfntqO7B3_VSANxw7Swu53PNVoJCmbqK9F8Nns0,11597
+swarms/structs/agent_builder.py,sha256=YYsGjyNAObopDFfgE9jvP_G1puGQD-lQ32JqgDnhdEM,12097
 swarms/structs/agent_registry.py,sha256=il507cO1NF-d4ChyANVLuWrN8bXsEAi8_7bLJ_sTU6A,12112
 swarms/structs/agent_roles.py,sha256=8XEw6RjOOZelaZaWt4gXaYQm5WMLEhSO7W6Z8sQjmFg,582
 swarms/structs/agent_router.py,sha256=YZw5AaK2yTvxkOA7ouED_4MoYgn0XZggvo1wrglp-4E,13017
@@ -177,8 +177,8 @@ swarms/utils/swarm_reliability_checks.py,sha256=MsgUULt3HYg72D0HifZNmtCyJYpLA2UD
 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.8.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
-swarms-7.5.8.dist-info/METADATA,sha256=lJSeodACjbbgfGxL5k0FJG3aVUZXftiTfhRD7JtSnXs,103019
-swarms-7.5.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-swarms-7.5.8.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
-swarms-7.5.8.dist-info/RECORD,,
+swarms-7.5.9.dist-info/LICENSE,sha256=jwRtEmTWjLrEsvFB6QFdYs2cEeZPRMdj-UMOFkPF8_0,11363
+swarms-7.5.9.dist-info/METADATA,sha256=92H77NpiHOd-fJRABYyx9RZEVuxVKn2brNGkds33c3A,103019
+swarms-7.5.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+swarms-7.5.9.dist-info/entry_points.txt,sha256=2K0rTtfO1X1WaO-waJlXIKw5Voa_EpAL_yU0HXE2Jgc,47
+swarms-7.5.9.dist-info/RECORD,,