[Breaking Change] Merge pull request #16 from XpressAI/fahreza/simple-tool-orchestrator

treo · web-flow · commit 8e35a81b851f · 2025-07-11T19:50:42.000+02:00
♻️ Rename StressToolUser -&gt; SimpleToolOrchestrator
diff --git a/docs/explanation/architecture/dependency-injection.md b/docs/explanation/architecture/dependency-injection.md
@@ -23,7 +23,7 @@ More subtly, the dependencies aren't visible from the outside. If you want to te
 Xaibo takes a different approach. Components declare their dependencies explicitly in their constructor signatures:
 
 ```python
-class StressingToolUser:
+class SimpleToolOrchestrator:
     def __init__(self,
                  response: ResponseProtocol,
                  llm: LLMProtocol,
@@ -53,13 +53,13 @@ modules:
     id: llm
     config:
       model: gpt-4
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
 ```
 
-The exchange system analyzes the constructor signatures of these modules, identifies their dependencies, and automatically creates the necessary connections. The `StressingToolUser` needs an `LLMProtocol`, and the `OpenAILLM` provides one, so the exchange system injects the LLM instance into the orchestrator.
+The exchange system analyzes the constructor signatures of these modules, identifies their dependencies, and automatically creates the necessary connections. The `SimpleToolOrchestrator` needs an `LLMProtocol`, and the `OpenAILLM` provides one, so the exchange system injects the LLM instance into the orchestrator.
 
 ## Automatic Dependency Resolution
 
diff --git a/docs/how-to/llm/switch-providers.md b/docs/how-to/llm/switch-providers.md
@@ -21,7 +21,7 @@ modules:
       api_key: ${OPENAI_API_KEY}  # Optional, uses env var by default
       temperature: 0.7
       max_tokens: 2000
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
@@ -50,7 +50,7 @@ modules:
       api_key: ${ANTHROPIC_API_KEY}
       temperature: 0.7
       max_tokens: 4000
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
@@ -80,7 +80,7 @@ modules:
       api_key: ${GOOGLE_API_KEY}
       temperature: 0.7
       max_tokens: 2000
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
@@ -111,7 +111,7 @@ modules:
       aws_secret_access_key: ${AWS_SECRET_ACCESS_KEY}
       temperature: 0.7
       max_tokens: 4000
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
@@ -139,7 +139,7 @@ modules:
       base_url: https://your-custom-endpoint.com/v1
       api_key: ${CUSTOM_API_KEY}
       timeout: 120.0
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
diff --git a/docs/how-to/memory/setup-vector-memory.md b/docs/how-to/memory/setup-vector-memory.md
@@ -52,7 +52,7 @@ modules:
     config:
       memory_file_path: "./agent_memory.pkl"
       
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       system_prompt: |
diff --git a/docs/how-to/tools/mcp-tools.md b/docs/how-to/tools/mcp-tools.md
@@ -24,7 +24,7 @@ modules:
           transport: stdio
           command: ["python", "-m", "mcp_server_filesystem"]
           args: ["--root", "/workspace"]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -146,7 +146,7 @@ modules:
           url: "ws://localhost:8080/mcp"
           headers:
             X-Database-Key: "your-db-key"
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       system_prompt: |
diff --git a/docs/how-to/tools/python-tools.md b/docs/how-to/tools/python-tools.md
@@ -56,7 +56,7 @@ modules:
     module: xaibo.primitives.modules.tools.PythonToolProvider
     config:
       tool_packages: [tools.my_tools]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -214,7 +214,7 @@ modules:
         - tools.my_tools
         - tools.advanced_tools
         - tools.robust_tools
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
 ```
 
diff --git a/docs/reference/agent-config.md b/docs/reference/agent-config.md
@@ -231,7 +231,7 @@ modules:
           command: ["python", "-m", "mcp_server_filesystem"]
           args: ["--root", "/workspace"]
   
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/docs/reference/modules/orchestrator.md b/docs/reference/modules/orchestrator.md
@@ -2,13 +2,13 @@
 
 Orchestrator modules coordinate agent behavior by managing interactions between LLMs, tools, and memory systems. They implement the core agent logic and decision-making processes.
 
-## StressingToolUser
+## SimpleToolOrchestrator
 
 An orchestrator that processes user messages by leveraging an LLM to generate responses and potentially use tools. If tool execution fails, it increases the temperature (stress level) for subsequent LLM calls, simulating cognitive stress.
 
-**Source**: [`src/xaibo/primitives/modules/orchestrator/stressing_tool_user.py`](https://github.com/xpressai/xaibo/blob/main/src/xaibo/primitives/modules/orchestrator/stressing_tool_user.py)
+**Source**: [`src/xaibo/primitives/modules/orchestrator/simple_tool_orchestrator.py`](https://github.com/xpressai/xaibo/blob/main/src/xaibo/primitives/modules/orchestrator/simple_tool_orchestrator.py)
 
-**Module Path**: `xaibo.primitives.modules.orchestrator.StressingToolUser`
+**Module Path**: `xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator`
 
 **Dependencies**: None
 
@@ -69,7 +69,7 @@ modules:
     config:
       tool_packages: [tools.weather, tools.calendar]
   
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 15
@@ -92,7 +92,7 @@ exchange:
 
 ### Behavior
 
-The StressingToolUser follows this process:
+The SimpleToolOrchestrator follows this process:
 
 1. **Conversation Setup**: Retrieves conversation history and adds system prompt if configured
 2. **User Message Processing**: Adds the user's message to the conversation
@@ -130,10 +130,10 @@ When tools are called:
 ### Example Usage
 
 ```python
-from xaibo.primitives.modules.orchestrator.stressing_tool_user import StressingToolUser
+from xaibo.primitives.modules.orchestrator.simple_tool_orchestrator import SimpleToolOrchestrator
 
 # Initialize with dependencies
-orchestrator = StressingToolUser(
+orchestrator = SimpleToolOrchestrator(
     response=response_handler,
     llm=llm_provider,
     tool_provider=tool_provider,
diff --git a/docs/tutorial/getting-started.md b/docs/tutorial/getting-started.md
@@ -80,7 +80,7 @@ modules:
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/docs/tutorial/understanding-protocols.md b/docs/tutorial/understanding-protocols.md
@@ -32,7 +32,7 @@ modules:
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -187,7 +187,7 @@ modules:
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -242,7 +242,7 @@ modules:
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -326,7 +326,7 @@ modules:
       tool_packages: [tools.math_tools]
   - module: xaibo.primitives.modules.tools.ToolCollector
     id: all-tools
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/examples/google_calendar_example/agents/example.yml b/examples/google_calendar_example/agents/example.yml
@@ -9,7 +9,7 @@ modules:
     module: xaibo.primitives.modules.tools.PythonToolProvider
     config:
       tool_packages: [tools.calendar_tools]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/examples/livekit_example/agents/example.yml b/examples/livekit_example/agents/example.yml
@@ -10,7 +10,7 @@ modules:
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/src/xaibo/cli/__init__.py b/src/xaibo/cli/__init__.py
@@ -355,7 +355,7 @@ def init(args, extra_args=[]):
     id: python-tools
     config:
       tool_packages: [tools.example]
-  - module: xaibo.primitives.modules.orchestrator.StressingToolUser
+  - module: xaibo.primitives.modules.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
@@ -401,7 +401,7 @@ def current_time():
 
 @pytest.mark.asyncio
 async def test_example_agent():
-     # Load the stressing tool user config
+     # Load the simple tool orchestrator config
     with open(r"./agents/example.yml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
diff --git a/src/xaibo/primitives/modules/orchestrator/__init__.py b/src/xaibo/primitives/modules/orchestrator/__init__.py
@@ -1 +1 @@
-from .stressing_tool_user import StressingToolUser
+from .simple_tool_orchestrator import SimpleToolOrchestrator
diff --git a/src/xaibo/primitives/modules/orchestrator/simple_tool_orchestrator.py b/src/xaibo/primitives/modules/orchestrator/simple_tool_orchestrator.py
@@ -4,7 +4,7 @@
 
 import json
 
-class StressingToolUser(TextMessageHandlerProtocol):
+class SimpleToolOrchestrator(TextMessageHandlerProtocol):
     """
     A text message handler that uses tools with increasing stress levels on failures.
     
@@ -30,7 +30,7 @@ def __init__(self,
                  history: ConversationHistoryProtocol,
                  config: dict = None):
         """
-        Initialize the StressingToolUser.
+        Initialize the SimpleToolOrchestrator.
         
         Args:
             response: Protocol for sending responses back to the user
diff --git a/src/xaibo_examples/agents/minimal-tool-user.yaml b/src/xaibo_examples/agents/minimal-tool-user.yaml
@@ -9,7 +9,7 @@ modules:
     id: simple-tools
     config:
       tool_packages: ['xaibo_examples.demo_tools.demo_tools']
-  - module: xaibo.primitives.orchestrator.StressingToolUser
+  - module: xaibo.primitives.orchestrator.SimpleToolOrchestrator
     id: orchestrator
     config:
       max_thoughts: 10
diff --git a/tests/agents/test_simple_tool_orchestrator.py b/tests/agents/test_simple_tool_orchestrator.py
@@ -15,8 +15,8 @@ def empty_conversation():
     return SimpleConversation()
 
 @pytest.mark.asyncio
-async def test_stressing_tool_user_instantiation(empty_conversation):
-    """Test instantiating a stressing tool user agent"""
+async def test_simple_tool_orchestrator_instantiation(empty_conversation):
+    """Test instantiating a simple tool orchestrator agent"""
     # Skip if no API key is available
     if not os.environ.get("OPENAI_API_KEY"):
         pytest.skip("OPENAI_API_KEY environment variable not set")
@@ -25,8 +25,8 @@ async def test_stressing_tool_user_instantiation(empty_conversation):
     test_dir = Path(__file__).parent
     resources_dir = test_dir.parent / "resources"
     
-    # Load the stressing tool user config
-    with open(resources_dir / "yaml" / "stressing_tool_user.yaml") as f:
+    # Load the simple tool orchestrator config
+    with open(resources_dir / "yaml" / "simple_tool_orchestrator.yaml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
 
@@ -49,8 +49,8 @@ async def test_stressing_tool_user_instantiation(empty_conversation):
 
 
 @pytest.mark.asyncio
-async def test_stressing_tool_user_current_time(caplog, empty_conversation):
-    """Test stressing tool user with current_time tool"""
+async def test_simple_tool_orchestrator_current_time(caplog, empty_conversation):
+    """Test simple tool orchestrator with current_time tool"""
     caplog.set_level(logging.DEBUG, 'xaibo.events')
 
     # Skip if no API key is available
@@ -61,8 +61,8 @@ async def test_stressing_tool_user_current_time(caplog, empty_conversation):
     test_dir = Path(__file__).parent
     resources_dir = test_dir.parent / "resources"
     
-    # Load the stressing tool user config
-    with open(resources_dir / "yaml" / "stressing_tool_user.yaml") as f:
+    # Load the simple tool orchestrator config
+    with open(resources_dir / "yaml" / "simple_tool_orchestrator.yaml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
     
@@ -87,8 +87,8 @@ async def test_stressing_tool_user_current_time(caplog, empty_conversation):
 
 
 @pytest.mark.asyncio
-async def test_stressing_tool_user_calendar(empty_conversation):
-    """Test stressing tool user with calendar tool"""
+async def test_simple_tool_orchestrator_calendar(empty_conversation):
+    """Test simple tool orchestrator with calendar tool"""
     # Skip if no API key is available
     if not os.environ.get("OPENAI_API_KEY"):
         pytest.skip("OPENAI_API_KEY environment variable not set")
@@ -97,8 +97,8 @@ async def test_stressing_tool_user_calendar(empty_conversation):
     test_dir = Path(__file__).parent
     resources_dir = test_dir.parent / "resources"
     
-    # Load the stressing tool user config
-    with open(resources_dir / "yaml" / "stressing_tool_user.yaml") as f:
+    # Load the simple tool orchestrator config
+    with open(resources_dir / "yaml" / "simple_tool_orchestrator.yaml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
     
@@ -127,8 +127,8 @@ async def test_stressing_tool_user_calendar(empty_conversation):
 
 
 @pytest.mark.asyncio
-async def test_stressing_tool_user_time_and_calendar(empty_conversation):
-    """Test stressing tool user with time and calendar tool"""
+async def test_simple_tool_orchestrator_time_and_calendar(empty_conversation):
+    """Test simple tool orchestrator with time and calendar tool"""
     # Skip if no API key is available
     if not os.environ.get("OPENAI_API_KEY"):
         pytest.skip("OPENAI_API_KEY environment variable not set")
@@ -137,8 +137,8 @@ async def test_stressing_tool_user_time_and_calendar(empty_conversation):
     test_dir = Path(__file__).parent
     resources_dir = test_dir.parent / "resources"
 
-    # Load the stressing tool user config
-    with open(resources_dir / "yaml" / "stressing_tool_user.yaml") as f:
+    # Load the simple tool orchestrator config
+    with open(resources_dir / "yaml" / "simple_tool_orchestrator.yaml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
 
@@ -169,8 +169,8 @@ def collect_events(event):
     assert "standup" in response.text.lower() or "focus time" in response.text.lower()
 
 @pytest.mark.asyncio
-async def test_stressing_tool_user_error_handling(empty_conversation):
-    """Test stressing tool user handles tool errors gracefully"""
+async def test_simple_tool_orchestrator_error_handling(empty_conversation):
+    """Test simple tool orchestrator handles tool errors gracefully"""
     # Skip if no API key is available
     if not os.environ.get("OPENAI_API_KEY"):
         pytest.skip("OPENAI_API_KEY environment variable not set")
@@ -180,8 +180,8 @@ async def test_stressing_tool_user_error_handling(empty_conversation):
     test_dir = Path(__file__).parent
     resources_dir = test_dir.parent / "resources"
     
-    # Load the stressing tool user config
-    with open(resources_dir / "yaml" / "stressing_tool_user.yaml") as f:
+    # Load the simple tool orchestrator config
+    with open(resources_dir / "yaml" / "simple_tool_orchestrator.yaml") as f:
         content = f.read()
         config = AgentConfig.from_yaml(content)
     
diff --git a/tests/core/test_reading.py b/tests/core/test_reading.py
diff --git a/tests/resources/yaml/simple_tool_orchestrator.yaml b/tests/resources/yaml/simple_tool_orchestrator.yaml
diff --git a/ui/src/routes/agents/[id]/monitoring/[recording_id]/+page.svelte b/ui/src/routes/agents/[id]/monitoring/[recording_id]/+page.svelte
diff --git a/ui/src/stories/AgentConfigRenderer.stories.svelte b/ui/src/stories/AgentConfigRenderer.stories.svelte
diff --git a/ui/src/stories/EventSequenceRenderer.stories.svelte b/ui/src/stories/EventSequenceRenderer.stories.svelte
diff --git a/ui/src/stories/Node.stories.svelte b/ui/src/stories/Node.stories.svelte
diff --git a/ui/src/stories/exampleData.ts b/ui/src/stories/exampleData.ts
