Refactor agent config loading and update examples

Author: virrius

agents.yaml.example

@@ -12,7 +12,7 @@
 agents:
   # Example 1: Simple custom research agent with overrides
   custom_research_agent:
-    base_class: "SGRResearchAgent"
+    base_class: "sgr_deep_research.core.SGRResearchAgent"
 
     # Optional: Override LLM settings for this agent
     llm:

config.yaml.example

@@ -53,3 +53,10 @@ mcp:
     #   url: "https://your-mcp-server.com/mcp"
     #   headers:
     #     Authorization: "Bearer your-token"
+
+
+# Note: The 'agents' field is optional and can be loaded from either:
+# - This config.yaml file
+# - Any separate file by GlobalConfig.definitions_from_yaml method
+# See examples in agents.yaml.example for agent configuration options
+agents:

sgr_deep_research/core/agent_config.py

@@ -38,11 +38,31 @@ def from_yaml(cls, yaml_path: str) -> Self:
         if not yaml_path.exists():
             raise FileNotFoundError(f"Configuration file not found: {yaml_path}")
         config_data = yaml.safe_load(yaml_path.read_text(encoding="utf-8"))
+        main_config_agents = config_data.pop("agents", {})
         if cls._instance is None:
-            cls._instance = cls(**config_data)
+            cls._instance = cls(
+                **config_data,
+            )
         else:
             cls._initialized = False
             cls._instance = cls(**config_data, agents=cls._instance.agents)
+        # agents should be initialized last to allow merging
+        cls._definitions_from_dict({"agents": main_config_agents})
+        return cls._instance
+
+    @classmethod
+    def _definitions_from_dict(cls, agents_data: dict) -> Self:
+        for agent_name, agent_config in agents_data.get("agents").items():
+            agent_config["name"] = agent_name
+
+        custom_agents = Definitions(**agents_data).agents
+
+        # Check for agents that will be overridden
+        overridden = set(cls._instance.agents.keys()) & set(custom_agents.keys())
+        if overridden:
+            logger.warning(f"Loaded agents will override existing agents: " f"{', '.join(sorted(overridden))}")
+
+        cls._instance.agents.update(custom_agents)
         return cls._instance
 
     @classmethod
@@ -68,18 +88,4 @@ def definitions_from_yaml(cls, agents_yaml_path: str) -> Self:
         if not yaml_data.get("agents"):
             raise ValueError(f"Agents definitions file must contain 'agents' key: {agents_yaml_path}")
 
-        for agent_name, agent_config in yaml_data.get("agents").items():
-            agent_config["name"] = agent_name
-
-        custom_agents = Definitions(**yaml_data).agents
-
-        # Check for agents that will be overridden
-        overridden = set(cls._instance.agents.keys()) & set(custom_agents.keys())
-        if overridden:
-            logger.warning(
-                f"Custom agents from {agents_yaml_path.name} will override existing agents: "
-                f"{', '.join(sorted(overridden))}"
-            )
-
-        cls._instance.agents.update(custom_agents)
-        return cls._instance
+        return cls._definitions_from_dict(yaml_data)