swarms 7.7.2__py3-none-any.whl → 7.7.4__py3-none-any.whl

swarms/structs/output_types.py

@@ -1,19 +1,6 @@
-from typing import Literal
-
-# Literal of output types
-OutputType = Literal[
-    "all",
-    "final",
-    "list",
-    "dict",
-    ".json",
-    ".md",
-    ".txt",
-    ".yaml",
-    ".toml",
-    "string",
-    "str",
-]
+from swarms.utils.history_output_formatter import (
+    HistoryOutputType as OutputType,
+)
 
 # Use the OutputType for type annotations
 output_type: OutputType

swarms/structs/stopping_conditions.py

@@ -36,3 +36,33 @@ def check_exit(s):
 
 def check_end(s):
     return "end" in s
+
+
+def check_stopping_conditions(input: str) -> str:
+    """
+    Checks a string against all stopping conditions and returns an appropriate message.
+
+    Args:
+        s (str): The input string to check
+
+    Returns:
+        str: A message indicating which stopping condition was met, or None if no condition was met
+    """
+    conditions = [
+        (check_done, "Task is done"),
+        (check_finished, "Task is finished"),
+        (check_complete, "Task is complete"),
+        (check_success, "Task succeeded"),
+        (check_failure, "Task failed"),
+        (check_error, "Task encountered an error"),
+        (check_stopped, "Task was stopped"),
+        (check_cancelled, "Task was cancelled"),
+        (check_exit, "Task exited"),
+        (check_end, "Task ended"),
+    ]
+
+    for check_func, message in conditions:
+        if check_func(input):
+            return message
+
+    return None

swarms/structs/swarm_arange.py

@@ -1,10 +1,13 @@
 import threading
-import time
 import uuid
 from typing import Any, Callable, Dict, List, Optional
 
 from swarms.utils.any_to_str import any_to_str
 from swarms.utils.loguru_logger import initialize_logger
+from swarms.structs.conversation import Conversation
+from swarms.utils.history_output_formatter import (
+    output_type,
+)
 
 logger = initialize_logger(log_folder="swarm_arange")
 
@@ -13,20 +16,6 @@ def swarm_id():
     return uuid.uuid4().hex
 
 
-class SwarmArrangeInput:
-    id: str = uuid.uuid4().hex
-    time_stamp: str = time.strftime("%Y-%m-%d %H:%M:%S")
-    name: str
-    description: str
-    swarms: List[Callable] = []
-    output_type: str
-    flow: str = ""
-
-
-class SwarmArrangeOutput:
-    input_config: SwarmArrangeInput = None
-
-
 class SwarmRearrange:
     """
     A class representing a swarm of swarms for rearranging tasks.
@@ -69,6 +58,7 @@ class SwarmRearrange:
             Callable[[str], str]
         ] = None,
         return_json: bool = False,
+        output_type: output_type = "dict-all-except-first",
         *args,
         **kwargs,
     ):
@@ -96,7 +86,9 @@ class SwarmRearrange:
         self.verbose = verbose
         self.human_in_the_loop = human_in_the_loop
         self.custom_human_in_the_loop = custom_human_in_the_loop
+        self.output_type = output_type
         self.return_json = return_json
+
         self.swarm_history = {swarm.name: [] for swarm in swarms}
         self.lock = threading.Lock()
         self.id = uuid.uuid4().hex if id is None else id
@@ -104,6 +96,9 @@ class SwarmRearrange:
         # Run the reliability checks
         self.reliability_checks()
 
+        # Conversation
+        self.conversation = Conversation()
+
     def reliability_checks(self):
         logger.info("Running reliability checks.")
         if not self.swarms:
@@ -283,6 +278,10 @@ class SwarmRearrange:
                                     current_task, img, *args, **kwargs
                                 )
                                 result = any_to_str(result)
+                                self.conversation.add(
+                                    role=swarm.name, content=result
+                                )
+
                                 logger.info(
                                     f"Swarm {swarm_name} returned result of type: {type(result)}"
                                 )
@@ -325,6 +324,10 @@ class SwarmRearrange:
                                 current_task, img, *args, **kwargs
                             )
                             result = any_to_str(result)
+
+                            self.conversation.add(
+                                role=swarm.name, content=result
+                            )
                             logger.info(
                                 f"Swarm {swarm_name} returned result of type: {type(result)}"
                             )

swarms/structs/swarm_router.py

@@ -5,7 +5,9 @@ from typing import Any, Callable, Dict, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field
 
-from swarms.prompts.ag_prompt import aggregator_system_prompt
+from swarms.prompts.multi_agent_collab_prompt import (
+    MULTI_AGENT_COLLAB_PROMPT_TWO,
+)
 from swarms.structs.agent import Agent
 from swarms.structs.concurrent_workflow import ConcurrentWorkflow
 from swarms.structs.csv_to_agent import AgentLoader
@@ -66,6 +68,38 @@ class SwarmLog(BaseModel):
     documents: List[Document] = []
 
 
+class SwarmRouterConfig(BaseModel):
+    """Configuration model for SwarmRouter."""
+
+    name: str = Field(
+        description="Name identifier for the SwarmRouter instance",
+    )
+    description: str = Field(
+        description="Description of the SwarmRouter's purpose",
+    )
+    # max_loops: int = Field(
+    #     description="Maximum number of execution loops"
+    # )
+    swarm_type: SwarmType = Field(
+        description="Type of swarm to use",
+    )
+    rearrange_flow: Optional[str] = Field(
+        description="Flow configuration string"
+    )
+    rules: Optional[str] = Field(
+        description="Rules to inject into every agent"
+    )
+    multi_agent_collab_prompt: bool = Field(
+        description="Whether to enable multi-agent collaboration prompts",
+    )
+    task: str = Field(
+        description="The task to be executed by the swarm",
+    )
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
 class SwarmRouter:
     """
     A class that dynamically routes tasks to different swarm types based on user selection or automatic matching.
@@ -157,6 +191,7 @@ class SwarmRouter:
         load_agents_from_csv: bool = False,
         csv_file_path: str = None,
         return_entire_history: bool = True,
+        multi_agent_collab_prompt: bool = True,
         *args,
         **kwargs,
     ):
@@ -179,14 +214,18 @@ class SwarmRouter:
         self.load_agents_from_csv = load_agents_from_csv
         self.csv_file_path = csv_file_path
         self.return_entire_history = return_entire_history
+        self.multi_agent_collab_prompt = multi_agent_collab_prompt
 
+        # Reliability check
+        self.reliability_check()
+
+        # Load agents from CSV
         if self.load_agents_from_csv:
             self.agents = AgentLoader(
                 csv_path=self.csv_file_path
             ).load_agents()
 
-        self.reliability_check()
-
+        # Log initialization
         self._log(
             "info",
             f"SwarmRouter initialized with swarm type: {swarm_type}",
@@ -345,7 +384,6 @@ class SwarmRouter:
                 name=self.name,
                 description=self.description,
                 agents=self.agents,
-                aggregator_system_prompt=aggregator_system_prompt.get_prompt(),
                 aggregator_agent=self.agents[-1],
                 layers=self.max_loops,
                 output_type=self.output_type,
@@ -421,6 +459,17 @@ class SwarmRouter:
                 f"Invalid swarm type: {self.swarm_type} try again with a valid swarm type such as 'SequentialWorkflow' or 'ConcurrentWorkflow' or 'auto' or 'AgentRearrange' or 'MixtureOfAgents' or 'SpreadSheetSwarm'"
             )
 
+    def update_system_prompt_for_agent_in_swarm(self):
+        # Use list comprehension for faster iteration
+        [
+            setattr(
+                agent,
+                "system_prompt",
+                agent.system_prompt + MULTI_AGENT_COLLAB_PROMPT_TWO,
+            )
+            for agent in self.agents
+        ]
+
     def _log(
         self,
         level: str,
@@ -464,6 +513,9 @@ class SwarmRouter:
         """
         self.swarm = self._create_swarm(task, *args, **kwargs)
 
+        if self.multi_agent_collab_prompt is True:
+            self.update_system_prompt_for_agent_in_swarm()
+
         try:
             logger.info(
                 f"Running task on {self.swarm_type} swarm with task: {task}"