Merge remote-tracking branch 'origin/master' into HEAD

# Conflicts:
#	swarms/structs/agent_loader.py
#	swarms/utils/get_reasoning_efforts.py

Author: ayaangazali

examples/changelogs/v14-zena/08_computer_use_tools.py

@@ -24,7 +24,6 @@ A few examples reference other providers (`claude-sonnet-4-6` in the hierarchica
 | [05_auction_swarm.py](05_auction_swarm.py) | AuctionSwarm | Agents bidding on a task; default and custom scoring |
 | [06_groupchat_turn_based.py](06_groupchat_turn_based.py) | Turn-Based GroupChat | Single-speaker bidding with a recency penalty |
 | [07_hierarchical_swarm_recovery.py](07_hierarchical_swarm_recovery.py) | HierarchicalSwarm | Worker retry, task reassignment, planning, judge, director overrides |
-| [08_computer_use_tools.py](08_computer_use_tools.py) | Computer-Use Tools | Full toolset, and a read-only subset |
 | [09_class_to_pydantic.py](09_class_to_pydantic.py) | Pydantic Schemas | Schema from a constructor, and the round-trip back to an `Agent` |
 | [10_concurrent_workflow_on_error.py](10_concurrent_workflow_on_error.py) | ConcurrentWorkflow | `on_error` failure policy |
 | [11_graph_workflow.py](11_graph_workflow.py) | Performance | Fan-out/fan-in DAG on native rustworkx |

examples/changelogs/v14-zena/README.md

@@ -1,13 +1,3 @@
-"""
-Exception hierarchy for :class:`swarms.structs.agent.Agent`.
-
-These live here rather than in ``agent.py`` so that agent collaborators
-(``LLMManager``, ``SkillsManager``, ``MCPManager``, …) can raise and catch them
-without importing ``Agent`` itself, which would be circular. They remain
-importable from ``swarms.structs.agent`` for backwards compatibility.
-"""
-
-
 class AgentError(Exception):
     """Base class for all agent-related exceptions."""
 

examples/tools/computer-use/computer-use-example.py

@@ -10,17 +10,16 @@
     Dict,
     List,
     TypedDict,
-    TypeVar,
     Union,
 )
 
 import yaml
+from pydantic import BaseModel
 from tqdm import tqdm
 
 from swarms.agents.create_agents_from_yaml import (
     create_agents_from_yaml,
 )
-from swarms.schemas.swarms_api_schemas import AgentSpec
 from swarms.utils.types import ReturnTypes
 from swarms.structs.agent import Agent
 from swarms.utils.agent_loader_markdown import (
@@ -29,11 +28,6 @@
     MarkdownAgentLoader,
 )
 
-# Type variable for agent configuration
-AgentConfigType = TypeVar(
-    "AgentConfigType", bound=Union[AgentSpec, Dict[str, Any]]
-)
-
 
 class ModelName(str, Enum):
     """Valid model names for swarms agents"""
@@ -101,12 +95,11 @@ class AgentValidator:
 
     @staticmethod
     def validate_config(
-        config: Union[AgentSpec, Dict[str, Any]],
+        config: Union[BaseModel, Dict[str, Any]],
     ) -> AgentConfigDict:
-        """Validate and convert agent configuration from either AgentSpec or Dict"""
+        """Validate a config supplied as a pydantic model or a plain dict."""
         try:
-            # Convert AgentSpec to dict if needed
-            if isinstance(config, AgentSpec):
+            if isinstance(config, BaseModel):
                 config = config.model_dump()
 
             # Deferred: litellm must not load at `import swarms` time (#1754).
@@ -222,7 +215,7 @@ def file_type(self) -> FileType:
             raise ValueError(f"Unsupported file type: {ext}")
 
     def create_agent_file(
-        self, agents: List[Union[AgentSpec, Dict[str, Any]]]
+        self, agents: List[Union[BaseModel, Dict[str, Any]]]
     ) -> None:
         """Create a file with validated agent configurations"""
         validated_agents = []
@@ -291,7 +284,7 @@ def load_agents(self) -> List[Agent]:
         return agents
 
     def _process_agent(
-        self, agent_data: Union[AgentSpec, Dict[str, Any]]
+        self, agent_data: Union[BaseModel, Dict[str, Any]]
     ) -> Union[Agent, None]:
         """Process a single agent configuration"""
         try:

swarms/schemas/agent_errors.py

@@ -10,6 +10,7 @@
 )
 from typing import Union, Callable
 from swarms.utils.history_output_formatter import HistoryOutputType
+from swarms.utils.str_to_dict import str_to_dict
 
 tools = [
     {
@@ -129,20 +130,6 @@ def __init__(
             output_type="final",
         )
 
-    def convert_str_to_dict(self, response: str):
-        # Handle response whether it's a string or dictionary
-        if isinstance(response, str):
-            try:
-                import json
-
-                response = json.loads(response)
-            except json.JSONDecodeError:
-                raise ValueError(
-                    "Invalid JSON response from router agent"
-                )
-
-        return response
-
     def run(self, task: str, *args, **kwargs):
         """
         Runs the routing process for a given task.
@@ -164,9 +151,11 @@ def run(self, task: str, *args, **kwargs):
         response = self.router_agent.run(task=task)
 
         if isinstance(response, str):
-            response = self.convert_str_to_dict(response)
+            response = str_to_dict(response)
         else:
-            pass
+            raise ValueError(
+                f"Invalid response from router agent: response must be a string. Got {type(response)}."
+            )
 
         swarm_name = response.get("swarm_name")
         task_description = response.get("task_description")

swarms/schemas/swarms_api_schemas.py

@@ -18,14 +18,12 @@
     multi_base_model_to_openai_function,
 )
 from swarms.tools.tool_registry import ToolStorage, tool_registry
-from swarms.tools.computer_use import create_computer_use_tools
 from swarms.tools.tool_utils import (
     scrape_tool_func_docs,
     tool_find_by_name,
 )
 
 __all__ = [
-    "create_computer_use_tools",
     "scrape_tool_func_docs",
     "tool_find_by_name",
     "_remove_a_key",