diff --git a/examples/deployment/cron_job_examples/callback_cron_example.py b/examples/deployment/cron_job_examples/callback_cron_example.py index b6293350..3ddd8e58 100644 --- a/examples/deployment/cron_job_examples/callback_cron_example.py +++ b/examples/deployment/cron_job_examples/callback_cron_example.py @@ -27,48 +27,66 @@ def create_sample_agent(): # Example 1: Simple output transformation callback -def transform_output_callback(output: Any, task: str, metadata: Dict) -> Dict: +def transform_output_callback( + output: Any, task: str, metadata: Dict +) -> Dict: """Transform the agent output into a structured format. - + Args: output: The original output from the agent task: The task that was executed metadata: Job metadata including execution count, timestamp, etc. - + Returns: Dict: Transformed output with additional metadata """ return { "original_output": output, - "transformed_at": datetime.fromtimestamp(metadata["timestamp"]).isoformat(), + "transformed_at": datetime.fromtimestamp( + metadata["timestamp"] + ).isoformat(), "execution_number": metadata["execution_count"], "task_executed": task, - "job_status": "running" if metadata["is_running"] else "stopped", - "uptime_seconds": metadata["uptime"] if metadata["start_time"] else 0 + "job_status": ( + "running" if metadata["is_running"] else "stopped" + ), + "uptime_seconds": ( + metadata["uptime"] if metadata["start_time"] else 0 + ), } # Example 2: Output filtering and enhancement callback -def filter_and_enhance_callback(output: Any, task: str, metadata: Dict) -> Dict: +def filter_and_enhance_callback( + output: Any, task: str, metadata: Dict +) -> Dict: """Filter and enhance the output based on execution count and content. - + Args: output: The original output from the agent task: The task that was executed metadata: Job metadata - + Returns: Dict: Filtered and enhanced output """ # Only include outputs that contain certain keywords if isinstance(output, str): - if any(keyword in output.lower() for keyword in ["important", "key", "significant", "trend"]): + if any( + keyword in output.lower() + for keyword in [ + "important", + "key", + "significant", + "trend", + ] + ): enhanced_output = { "content": output, "priority": "high", "execution_id": metadata["execution_count"], "timestamp": metadata["timestamp"], - "analysis_type": "priority_content" + "analysis_type": "priority_content", } else: enhanced_output = { @@ -76,7 +94,7 @@ def filter_and_enhance_callback(output: Any, task: str, metadata: Dict) -> Dict: "priority": "normal", "execution_id": metadata["execution_count"], "timestamp": metadata["timestamp"], - "analysis_type": "standard_content" + "analysis_type": "standard_content", } else: enhanced_output = { @@ -84,43 +102,45 @@ def filter_and_enhance_callback(output: Any, task: str, metadata: Dict) -> Dict: "priority": "unknown", "execution_id": metadata["execution_count"], "timestamp": metadata["timestamp"], - "analysis_type": "non_string_content" + "analysis_type": "non_string_content", } - + return enhanced_output # Example 3: Real-time monitoring callback class MonitoringCallback: """Callback class that provides real-time monitoring capabilities.""" - + def __init__(self): self.output_history = [] self.error_count = 0 self.success_count = 0 self.last_execution_time = None - - def __call__(self, output: Any, task: str, metadata: Dict) -> Dict: + + def __call__( + self, output: Any, task: str, metadata: Dict + ) -> Dict: """Monitor and track execution metrics. - + Args: output: The original output from the agent task: The task that was executed metadata: Job metadata - + Returns: Dict: Output with monitoring information """ current_time = time.time() - + # Calculate execution time if self.last_execution_time: execution_time = current_time - self.last_execution_time else: execution_time = 0 - + self.last_execution_time = current_time - + # Track success/error if output and output != "Error": self.success_count += 1 @@ -128,7 +148,7 @@ class MonitoringCallback: else: self.error_count += 1 status = "error" - + # Store in history (keep last 100) monitoring_data = { "output": output, @@ -138,40 +158,49 @@ class MonitoringCallback: "timestamp": metadata["timestamp"], "task": task, "metrics": { - "success_rate": self.success_count / (self.success_count + self.error_count), - "total_executions": self.success_count + self.error_count, + "success_rate": self.success_count + / (self.success_count + self.error_count), + "total_executions": self.success_count + + self.error_count, "error_count": self.error_count, - "success_count": self.success_count - } + "success_count": self.success_count, + }, } - + self.output_history.append(monitoring_data) if len(self.output_history) > 100: self.output_history.pop(0) - + return monitoring_data - + def get_summary(self) -> Dict: """Get monitoring summary.""" return { "total_executions": self.success_count + self.error_count, "success_count": self.success_count, "error_count": self.error_count, - "success_rate": self.success_count / (self.success_count + self.error_count) if (self.success_count + self.error_count) > 0 else 0, + "success_rate": ( + self.success_count + / (self.success_count + self.error_count) + if (self.success_count + self.error_count) > 0 + else 0 + ), "history_length": len(self.output_history), - "last_execution_time": self.last_execution_time + "last_execution_time": self.last_execution_time, } # Example 4: API integration callback -def api_webhook_callback(output: Any, task: str, metadata: Dict) -> Dict: +def api_webhook_callback( + output: Any, task: str, metadata: Dict +) -> Dict: """Callback that could send output to an external API. - + Args: output: The original output from the agent task: The task that was executed metadata: Job metadata - + Returns: Dict: Output with API integration metadata """ @@ -182,45 +211,47 @@ def api_webhook_callback(output: Any, task: str, metadata: Dict) -> Dict: "job_id": metadata["job_id"], "execution_id": metadata["execution_count"], "timestamp": metadata["timestamp"], - "task": task + "task": task, } - + # Simulate API call (replace with actual HTTP request) - logger.info(f"Would send to API: {json.dumps(api_payload, indent=2)}") - + logger.info( + f"Would send to API: {json.dumps(api_payload, indent=2)}" + ) + return { "output": output, "api_status": "sent", "api_payload": api_payload, - "execution_id": metadata["execution_count"] + "execution_id": metadata["execution_count"], } def main(): """Demonstrate different callback usage patterns.""" logger.info("🚀 Starting Callback CronJob Examples") - + # Create the agent agent = create_sample_agent() - + # Example 1: Simple transformation callback logger.info("📝 Example 1: Simple Output Transformation") transform_cron = CronJob( agent=agent, interval="15seconds", job_id="transform-example", - callback=transform_output_callback + callback=transform_output_callback, ) - + # Example 2: Filtering and enhancement callback logger.info("🔍 Example 2: Output Filtering and Enhancement") filter_cron = CronJob( agent=agent, interval="20seconds", job_id="filter-example", - callback=filter_and_enhance_callback + callback=filter_and_enhance_callback, ) - + # Example 3: Monitoring callback logger.info("📊 Example 3: Real-time Monitoring") monitoring_callback = MonitoringCallback() @@ -228,85 +259,98 @@ def main(): agent=agent, interval="25seconds", job_id="monitoring-example", - callback=monitoring_callback + callback=monitoring_callback, ) - + # Example 4: API integration callback logger.info("🌐 Example 4: API Integration") api_cron = CronJob( agent=agent, interval="30seconds", job_id="api-example", - callback=api_webhook_callback + callback=api_webhook_callback, ) - + # Start all cron jobs logger.info("â–ļī¸ Starting all cron jobs...") - + # Start them in separate threads to run concurrently import threading - + def run_cron(cron_job, task): try: cron_job.run(task=task) except KeyboardInterrupt: cron_job.stop() - + # Start each cron job in its own thread threads = [] tasks = [ "Analyze the current market trends and provide key insights", "What are the most important factors affecting today's economy?", "Provide a summary of recent technological developments", - "Analyze the impact of current events on business operations" + "Analyze the impact of current events on business operations", ] - - for i, (cron_job, task) in enumerate([ - (transform_cron, tasks[0]), - (filter_cron, tasks[1]), - (monitoring_cron, tasks[2]), - (api_cron, tasks[3]) - ]): + + for i, (cron_job, task) in enumerate( + [ + (transform_cron, tasks[0]), + (filter_cron, tasks[1]), + (monitoring_cron, tasks[2]), + (api_cron, tasks[3]), + ] + ): thread = threading.Thread( target=run_cron, args=(cron_job, task), daemon=True, - name=f"cron-thread-{i}" + name=f"cron-thread-{i}", ) thread.start() threads.append(thread) - + logger.info("✅ All cron jobs started successfully!") logger.info("📊 Press Ctrl+C to stop and see monitoring summary") - + try: # Let them run for a while time.sleep(120) # Run for 2 minutes - + # Show monitoring summary logger.info("📈 Monitoring Summary:") - logger.info(json.dumps(monitoring_callback.get_summary(), indent=2)) - + logger.info( + json.dumps(monitoring_callback.get_summary(), indent=2) + ) + # Show execution stats for each cron job for cron_job, name in [ (transform_cron, "Transform"), (filter_cron, "Filter"), (monitoring_cron, "Monitoring"), - (api_cron, "API") + (api_cron, "API"), ]: stats = cron_job.get_execution_stats() - logger.info(f"{name} Cron Stats: {json.dumps(stats, indent=2)}") - + logger.info( + f"{name} Cron Stats: {json.dumps(stats, indent=2)}" + ) + except KeyboardInterrupt: logger.info("⏚ī¸ Stopping all cron jobs...") - + # Stop all cron jobs - for cron_job in [transform_cron, filter_cron, monitoring_cron, api_cron]: + for cron_job in [ + transform_cron, + filter_cron, + monitoring_cron, + api_cron, + ]: cron_job.stop() - + # Show final monitoring summary logger.info("📊 Final Monitoring Summary:") - logger.info(json.dumps(monitoring_callback.get_summary(), indent=2)) + logger.info( + json.dumps(monitoring_callback.get_summary(), indent=2) + ) if __name__ == "__main__": diff --git a/examples/deployment/cron_job_examples/simple_callback_example.py b/examples/deployment/cron_job_examples/simple_callback_example.py index 5ffe8c58..401381c3 100644 --- a/examples/deployment/cron_job_examples/simple_callback_example.py +++ b/examples/deployment/cron_job_examples/simple_callback_example.py @@ -6,7 +6,6 @@ in CronJob to customize output while the job is running. """ import json -import time from datetime import datetime from loguru import logger @@ -26,42 +25,46 @@ def create_simple_agent(): def simple_callback(output, task, metadata): """Simple callback that adds metadata to the output. - + Args: output: The original output from the agent task: The task that was executed metadata: Job metadata (execution count, timestamp, etc.) - + Returns: dict: Enhanced output with metadata """ return { "agent_output": output, "execution_number": metadata["execution_count"], - "timestamp": datetime.fromtimestamp(metadata["timestamp"]).isoformat(), + "timestamp": datetime.fromtimestamp( + metadata["timestamp"] + ).isoformat(), "task": task, - "job_id": metadata["job_id"] + "job_id": metadata["job_id"], } def main(): """Demonstrate basic callback usage.""" logger.info("🚀 Starting Simple Callback Example") - + # Create agent and cron job with callback agent = create_simple_agent() - + cron_job = CronJob( agent=agent, interval="10seconds", job_id="simple-callback-example", - callback=simple_callback + callback=simple_callback, ) - + logger.info("â–ļī¸ Starting cron job with callback...") - logger.info("📝 The callback will enhance each output with metadata") + logger.info( + "📝 The callback will enhance each output with metadata" + ) logger.info("⏚ī¸ Press Ctrl+C to stop") - + try: # Start the cron job cron_job.run( @@ -70,7 +73,7 @@ def main(): except KeyboardInterrupt: logger.info("⏚ī¸ Stopping cron job...") cron_job.stop() - + # Show execution statistics stats = cron_job.get_execution_stats() logger.info("📊 Final Statistics:") diff --git a/examples/mcp/agent_mcp.py b/examples/mcp/agent_examples/agent_mcp.py similarity index 100% rename from examples/mcp/agent_mcp.py rename to examples/mcp/agent_examples/agent_mcp.py diff --git a/examples/mcp/mcp_examples/agent_mcp.py b/examples/mcp/agent_examples/agent_mcp_old.py similarity index 100% rename from examples/mcp/mcp_examples/agent_mcp.py rename to examples/mcp/agent_examples/agent_mcp_old.py diff --git a/examples/mcp/agent_multi_mcp_connections.py b/examples/mcp/agent_examples/agent_multi_mcp_connections.py similarity index 100% rename from examples/mcp/agent_multi_mcp_connections.py rename to examples/mcp/agent_examples/agent_multi_mcp_connections.py diff --git a/examples/mcp/mcp_examples/agent_use/agent_tools_dict_example.py b/examples/mcp/agent_examples/agent_tools_dict_example.py similarity index 100% rename from examples/mcp/mcp_examples/agent_use/agent_tools_dict_example.py rename to examples/mcp/agent_examples/agent_tools_dict_example.py diff --git a/examples/mcp/mcp_examples/agent_use/mcp_exampler.py b/examples/mcp/agent_examples/mcp_exampler.py similarity index 100% rename from examples/mcp/mcp_examples/agent_use/mcp_exampler.py rename to examples/mcp/agent_examples/mcp_exampler.py diff --git a/examples/mcp/client.py b/examples/mcp/mcp_utils/client.py similarity index 100% rename from examples/mcp/client.py rename to examples/mcp/mcp_utils/client.py diff --git a/examples/mcp/mcp_examples/utils/find_tools_on_mcp.py b/examples/mcp/mcp_utils/utils/find_tools_on_mcp.py similarity index 100% rename from examples/mcp/mcp_examples/utils/find_tools_on_mcp.py rename to examples/mcp/mcp_utils/utils/find_tools_on_mcp.py diff --git a/examples/mcp/mcp_examples/utils/mcp_execute_example.py b/examples/mcp/mcp_utils/utils/mcp_execute_example.py similarity index 100% rename from examples/mcp/mcp_examples/utils/mcp_execute_example.py rename to examples/mcp/mcp_utils/utils/mcp_execute_example.py diff --git a/examples/mcp/mcp_examples/utils/mcp_load_tools_example.py b/examples/mcp/mcp_utils/utils/mcp_load_tools_example.py similarity index 100% rename from examples/mcp/mcp_examples/utils/mcp_load_tools_example.py rename to examples/mcp/mcp_utils/utils/mcp_load_tools_example.py diff --git a/examples/mcp/mcp_examples/utils/mcp_multiserver_tool_fetch.py b/examples/mcp/mcp_utils/utils/mcp_multiserver_tool_fetch.py similarity index 100% rename from examples/mcp/mcp_examples/utils/mcp_multiserver_tool_fetch.py rename to examples/mcp/mcp_utils/utils/mcp_multiserver_tool_fetch.py diff --git a/examples/mcp/mcp_utils/mcp_test.py b/examples/mcp/servers/mcp_test.py similarity index 98% rename from examples/mcp/mcp_utils/mcp_test.py rename to examples/mcp/servers/mcp_test.py index 8f6ec37b..2d644cd8 100644 --- a/examples/mcp/mcp_utils/mcp_test.py +++ b/examples/mcp/servers/mcp_test.py @@ -1,4 +1,3 @@ -# crypto_price_server.py from mcp.server.fastmcp import FastMCP import requests @@ -113,4 +112,4 @@ def get_htx_crypto_price(symbol: str) -> str: if __name__ == "__main__": - mcp.run(transport="sse") + mcp.run() diff --git a/examples/mcp/mcp_utils/okx_crypto_server.py b/examples/mcp/servers/okx_crypto_server.py similarity index 100% rename from examples/mcp/mcp_utils/okx_crypto_server.py rename to examples/mcp/servers/okx_crypto_server.py diff --git a/examples/mcp/test.py b/examples/mcp/servers/test.py similarity index 100% rename from examples/mcp/test.py rename to examples/mcp/servers/test.py diff --git a/swarms/agents/agent_judge.py b/swarms/agents/agent_judge.py index 27801012..54b11527 100644 --- a/swarms/agents/agent_judge.py +++ b/swarms/agents/agent_judge.py @@ -36,12 +36,13 @@ def get_reward(input: str) -> int: "excellent", "perfect", ] - + if any(word in input.lower() for word in words): return 1 else: return 0 + def get_agent_judge_prompt() -> str: """ Returns the main system prompt for the agent judge. @@ -373,7 +374,7 @@ class AgentJudge: return get_reward(self.conversation.get_str()) else: return self.conversation.get_str() - except Exception as e: + except Exception as e: error_message = f"AgentJudge: {self.agent_name} encountered an error: {e}\n Traceback: {traceback.format_exc()}" raise AgentJudgeExecutionError(error_message) diff --git a/swarms/structs/cron_job.py b/swarms/structs/cron_job.py index 4af41010..0e858a11 100644 --- a/swarms/structs/cron_job.py +++ b/swarms/structs/cron_job.py @@ -260,16 +260,16 @@ class CronJob: """ try: logger.debug(f"Executing task for job {self.job_id}") - + # Execute the agent if isinstance(self.agent, Callable): original_output = self.agent.run(task=task, **kwargs) else: original_output = self.agent(task, **kwargs) - + # Increment execution count self.execution_count += 1 - + # Prepare metadata for callback metadata = { "job_id": self.job_id, @@ -278,22 +278,28 @@ class CronJob: "task": task, "kwargs": kwargs, "start_time": self.start_time, - "is_running": self.is_running + "is_running": self.is_running, } - + # Apply callback if provided if self.callback: try: - customized_output = self.callback(original_output, task, metadata) - logger.debug(f"Callback applied to job {self.job_id}, execution {self.execution_count}") + customized_output = self.callback( + original_output, task, metadata + ) + logger.debug( + f"Callback applied to job {self.job_id}, execution {self.execution_count}" + ) return customized_output except Exception as callback_error: - logger.warning(f"Callback failed for job {self.job_id}: {callback_error}") + logger.warning( + f"Callback failed for job {self.job_id}: {callback_error}" + ) # Return original output if callback fails return original_output - + return original_output - + except Exception as e: logger.error( f"Task execution failed for job {self.job_id}: {str(e)}" @@ -406,17 +412,17 @@ class CronJob: def set_callback(self, callback: Callable[[Any, str, dict], Any]): """Set or update the callback function for output customization. - + Args: callback: Function to customize output processing. Signature: callback(output: Any, task: str, metadata: dict) -> Any """ self.callback = callback logger.info(f"Callback updated for job {self.job_id}") - + def get_execution_stats(self) -> dict: """Get execution statistics for the cron job. - + Returns: dict: Statistics including execution count, start time, running status, etc. """ @@ -425,8 +431,12 @@ class CronJob: "is_running": self.is_running, "execution_count": self.execution_count, "start_time": self.start_time, - "uptime": time.time() - self.start_time if self.start_time else 0, - "interval": self.interval + "uptime": ( + time.time() - self.start_time + if self.start_time + else 0 + ), + "interval": self.interval, }