ai-mirow-projects
/
swarms
mirror of https://github.com/kyegomez/swarms
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui.py and spreadsheet_swarm.py updated

Browse Source
pull/713/head
harshalmore31 1 week ago
parent 5b51a99ffe
commit 869ffa0652
2 changed files with 55 additions and 80 deletions
Show Stats Download Patch File Download Diff File

129
swarms/structs/spreadsheet_swarm.py
Unescape View File

@ -1,6 +1,6 @@
import asyncio import asyncio
import csv import csv
import datetime from datetime import datetime
import os import os
import uuid import uuid
from typing import Dict, List, Union from typing import Dict, List, Union
@ -16,23 +16,8 @@ from swarms.utils.loguru_logger import initialize_logger
logger = initialize_logger(log_folder="spreadsheet_swarm") logger = initialize_logger(log_folder="spreadsheet_swarm")
time = datetime.datetime.now().isoformat() # Replace timestamp-based time with a UUID for file naming
uuid_hex = uuid.uuid4().hex run_id = uuid.uuid4().hex # Unique identifier for each run
# --------------- NEW CHANGE START ---------------
# Format time variable to be compatible across operating systems
formatted_time = datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
# --------------- NEW CHANGE END ---------------
class AgentConfig(BaseModel):
"""Configuration for an agent loaded from CSV"""
agent_name: str
description: str
system_prompt: str
task: str
class AgentOutput(BaseModel): class AgentOutput(BaseModel):
agent_name: str agent_name: str
@ -43,13 +28,13 @@ class AgentOutput(BaseModel):
class SwarmRunMetadata(BaseModel): class SwarmRunMetadata(BaseModel):
run_id: str = Field( run_id: str = Field(
default_factory=lambda: f"spreadsheet_swarm_run_{uuid_hex}" default_factory=lambda: f"spreadsheet_swarm_run_{run_id}"
) )
name: str name: str
description: str description: str
agents: List[str] agents: List[str]
start_time: str = Field( start_time: str = Field(
default_factory=lambda: time, default_factory=lambda: str(datetime.now().timestamp()), # Numeric timestamp
description="The start time of the swarm run.", description="The start time of the swarm run.",
) )
end_time: str end_time: str
@ -80,7 +65,7 @@ class SpreadSheetSwarm(BaseSwarm):
def __init__( def __init__(
self, self,
name: str = "Spreadsheet-Swarm", name: str = "Spreadsheet-Swarm",
description: str = "A swarm that that processes tasks concurrently using multiple agents and saves the metadata to a CSV file.", description: str = "A swarm that processes tasks concurrently using multiple agents and saves the metadata to a CSV file.",
agents: Union[Agent, List[Agent]] = [], agents: Union[Agent, List[Agent]] = [],
autosave_on: bool = True, autosave_on: bool = True,
save_file_path: str = None, save_file_path: str = None,
@ -103,22 +88,19 @@ class SpreadSheetSwarm(BaseSwarm):
self.autosave_on = autosave_on self.autosave_on = autosave_on
self.max_loops = max_loops self.max_loops = max_loops
self.workspace_dir = workspace_dir self.workspace_dir = workspace_dir
self.load_path = load_path
self.agent_configs: Dict[str, AgentConfig] = {}
# --------------- NEW CHANGE START --------------- # Create a timestamp without colons or periods
# The save_file_path now uses the formatted_time and uuid_hex timestamp = datetime.now().isoformat().replace(":", "_").replace(".", "_")
self.save_file_path = (
f"spreadsheet_swarm_run_id_{uuid_hex}.csv" # Use this timestamp in the CSV filename
) self.save_file_path = f"spreadsheet_swarm_{timestamp}_run_id_{run_id}.csv"
# --------------- NEW CHANGE END ---------------
self.metadata = SwarmRunMetadata( self.metadata = SwarmRunMetadata(
run_id=f"spreadsheet_swarm_run_{time}", run_id=f"spreadsheet_swarm_run_{run_id}",
name=name, name=name,
description=description, description=description,
agents=[agent.name for agent in agents], agents=[agent.name for agent in agents],
start_time=time, start_time=str(datetime.now().timestamp()), # Numeric timestamp
end_time="", end_time="",
tasks_completed=0, tasks_completed=0,
outputs=[], outputs=[],
@ -184,22 +166,10 @@ class SpreadSheetSwarm(BaseSwarm):
), ),
docs=[row["docs"]] if "docs" in row else "", docs=[row["docs"]] if "docs" in row else "",
dynamic_temperature_enabled=True, dynamic_temperature_enabled=True,
max_loops=( max_loops=row["max_loops"] if "max_loops" in row else 1,
row["max_loops"] user_name=row["user_name"] if "user_name" in row else "user",
if "max_loops" in row
else 1
),
user_name=(
row["user_name"]
if "user_name" in row
else "user"
),
# output_type="str", # output_type="str",
stopping_token=( stopping_token=row["stopping_token"] if "stopping_token" in row else None,
row["stopping_token"]
if "stopping_token" in row
else None
),
) )
# Add agent to swarm # Add agent to swarm
@ -283,6 +253,7 @@ class SpreadSheetSwarm(BaseSwarm):
print(log_agent_data(self.metadata.model_dump())) print(log_agent_data(self.metadata.model_dump()))
return self.metadata.model_dump_json(indent=4) return self.metadata.model_dump_json(indent=4)
def run(self, task: str = None, *args, **kwargs): def run(self, task: str = None, *args, **kwargs):
""" """
Run the swarm with the specified task. Run the swarm with the specified task.
@ -296,11 +267,30 @@ class SpreadSheetSwarm(BaseSwarm):
str: The JSON representation of the swarm metadata. str: The JSON representation of the swarm metadata.
""" """
try: logger.info(f"Running the swarm with task: {task}")
return asyncio.run(self._run(task, *args, **kwargs)) self.metadata.start_time = str(datetime.now().timestamp()) # Numeric timestamp
except Exception as e:
logger.error(f"Error running swarm: {e}") # Check if we're already in an event loop
raise e if asyncio.get_event_loop().is_running():
# If so, create and run tasks directly using `create_task` without `asyncio.run`
task_future = asyncio.create_task(self._run_tasks(task, *args, **kwargs))
asyncio.get_event_loop().run_until_complete(task_future)
else:
# If no event loop is running, run using `asyncio.run`
asyncio.run(self._run_tasks(task, *args, **kwargs))
self.metadata.end_time = str(datetime.now().timestamp()) # Numeric timestamp
# Synchronously save metadata
logger.info("Saving metadata to CSV and JSON...")
asyncio.run(self._save_metadata())
if self.autosave_on:
self.data_to_json_file()
print(log_agent_data(self.metadata.model_dump()))
return self.metadata.model_dump_json(indent=4)
async def _run_tasks(self, task: str, *args, **kwargs): async def _run_tasks(self, task: str, *args, **kwargs):
""" """
@ -370,7 +360,7 @@ class SpreadSheetSwarm(BaseSwarm):
agent_name=agent_name, agent_name=agent_name,
task=task, task=task,
result=result, result=result,
timestamp=time, timestamp=str(datetime.now().timestamp()), # Numeric timestamp
) )
) )
@ -391,7 +381,7 @@ class SpreadSheetSwarm(BaseSwarm):
create_file_in_folder( create_file_in_folder(
folder_path=f"{self.workspace_dir}/Spreedsheet-Swarm-{self.name}/{self.name}", folder_path=f"{self.workspace_dir}/Spreedsheet-Swarm-{self.name}/{self.name}",
file_name=f"spreedsheet-swarm-{uuid_hex}_metadata.json", file_name=f"spreedsheet-swarm-{self.metadata.run_id}_metadata.json",
content=out, content=out,
) )
@ -406,38 +396,19 @@ class SpreadSheetSwarm(BaseSwarm):
""" """
Save the swarm metadata to a CSV file. Save the swarm metadata to a CSV file.
""" """
logger.info( logger.info(f"Saving swarm metadata to: {self.save_file_path}")
f"Saving swarm metadata to: {self.save_file_path}"
)
run_id = uuid.uuid4() run_id = uuid.uuid4()
# Check if file exists before opening it # Check if file exists before opening it
file_exists = os.path.exists(self.save_file_path) file_exists = os.path.exists(self.save_file_path)
async with aiofiles.open( async with aiofiles.open(self.save_file_path, mode="a") as file:
self.save_file_path, mode="a"
) as file:
writer = csv.writer(file)
# Write header if file doesn't exist # Write header if file doesn't exist
if not file_exists: if not file_exists:
await writer.writerow( header = "Run ID,Agent Name,Task,Result,Timestamp\n"
[ await file.write(header)
"Run ID",
"Agent Name",
"Task",
"Result",
"Timestamp",
]
)
# Write each output as a new row
for output in self.metadata.outputs: for output in self.metadata.outputs:
await writer.writerow( row = f"{run_id},{output.agent_name},{output.task},{output.result},{output.timestamp}\n"
[ await file.write(row)
str(run_id),
output.agent_name,
output.task,
output.result,
output.timestamp,
]
)

4
swarms/structs/ui/ui.py
Unescape View File

@ -1636,6 +1636,10 @@ def create_app():
# Save API key to .env # Save API key to .env
env_path = find_dotenv() env_path = find_dotenv()
if not env_path:
env_path = os.path.join(os.getcwd(), ".env")
with open(env_path, "w") as f:
f.write("")
if provider == "openai": if provider == "openai":
set_key(env_path, "OPENAI_API_KEY", api_key) set_key(env_path, "OPENAI_API_KEY", api_key)
elif provider == "anthropic": elif provider == "anthropic":

Write Preview
Loading…
Cancel
Save