open-swarm 0.1.1745019858__tar.gz → 0.1.1745019957__tar.gz

{open_swarm-0.1.1745019858 → open_swarm-0.1.1745019957}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-swarm
-Version: 0.1.1745019858
+Version: 0.1.1745019957
 Summary: Open Swarm: Orchestrating AI Agent Swarms with Django
 Project-URL: Homepage, https://github.com/yourusername/open-swarm
 Project-URL: Documentation, https://github.com/yourusername/open-swarm/blob/main/README.md

{open_swarm-0.1.1745019858 → open_swarm-0.1.1745019957}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "open-swarm"
-version = "0.1.1745019858"
+version = "0.1.1745019957"
 description = "Open Swarm: Orchestrating AI Agent Swarms with Django"
 readme = "README.md"
 requires-python = ">=3.10"

{open_swarm-0.1.1745019858 → open_swarm-0.1.1745019957}/src/swarm/blueprints/chatbot/blueprint_chatbot.py

@@ -19,6 +19,12 @@ if not os.environ.get("SWARM_DEBUG"):
 else:
     logging.basicConfig(level=logging.DEBUG)
 
+# Set logging to WARNING by default unless SWARM_DEBUG=1
+if not os.environ.get("SWARM_DEBUG"):
+    logging.basicConfig(level=logging.WARNING)
+else:
+    logging.basicConfig(level=logging.DEBUG)
+
 # Ensure src is in path for BlueprintBase import
 project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 src_path = os.path.join(project_root, 'src')
@@ -180,50 +186,47 @@ You are a helpful and friendly chatbot. Respond directly to the user's input in
         logger.debug("Chatbot agent created.")
         return chatbot_agent
 
-    def render_prompt(self, template_name: str, context: dict) -> str:
-        return f"User request: {context.get('user_request', '')}\nHistory: {context.get('history', '')}\nAvailable tools: {', '.join(context.get('available_tools', []))}"
-
     async def run(self, messages: List[Dict[str, Any]], **kwargs) -> Any:
         """Main execution entry point for the Chatbot blueprint."""
         logger.info("ChatbotBlueprint run method called.")
-        last_user_message = next((m['content'] for m in reversed(messages) if m['role'] == 'user'), None)
-        if not last_user_message:
-            yield {"messages": [{"role": "assistant", "content": "I need a user message to proceed."}]}
-            return
-        prompt_context = {
-            "user_request": last_user_message,
-            "history": messages[:-1],
-            "available_tools": ["chat"]
-        }
-        rendered_prompt = self.render_prompt("chatbot_prompt.j2", prompt_context)
-        yield {
-            "messages": [
-                {
-                    "role": "assistant",
-                    "content": f"[Chatbot LLM] Would respond to: {rendered_prompt}"
-                }
-            ]
-        }
-        return
+        instruction = messages[-1].get("content", "") if messages else ""
+        async for chunk in self._run_non_interactive(instruction, **kwargs):
+            yield chunk
+        logger.info("ChatbotBlueprint run method finished.")
+
+    async def _run_non_interactive(self, instruction: str, **kwargs) -> Any:
+        mcp_servers = kwargs.get("mcp_servers", [])
+        agent = self.create_starting_agent(mcp_servers=mcp_servers)
+        from agents import Runner
+        import os
+        model_name = os.getenv("LITELLM_MODEL") or os.getenv("DEFAULT_LLM") or "gpt-3.5-turbo"
+        try:
+            result = await Runner.run(agent, instruction)
+            yield {"messages": [{"role": "assistant", "content": getattr(result, 'final_output', str(result))}]}
+        except Exception as e:
+            logger.error(f"Error during non-interactive run: {e}", exc_info=True)
+            yield {"messages": [{"role": "assistant", "content": f"An error occurred: {e}"}]}
 
 # Standard Python entry point
 if __name__ == "__main__":
+    import sys
     import asyncio
-    import json
-    parser = argparse.ArgumentParser(description='Chatbot Blueprint Runner')
-    parser.add_argument('instruction', nargs=argparse.REMAINDER, help='Instruction for Chatbot to process (all args after -- are joined as the prompt)')
-    args = parser.parse_args()
-    instruction_args = args.instruction
-    if instruction_args and instruction_args[0] == '--':
-        instruction_args = instruction_args[1:]
-    instruction = ' '.join(instruction_args).strip() if instruction_args else None
-    if instruction:
-        blueprint = ChatbotBlueprint(blueprint_id="chatbot")
-        async def runner():
-            async for chunk in blueprint._run_non_interactive(instruction):
-                msg = chunk["messages"][0]["content"]
-                if not msg.startswith("An error occurred:"):
-                    print(msg)
-        asyncio.run(runner())
+    # --- AUTO-PYTHONPATH PATCH FOR AGENTS ---
+    import os
+    project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../..'))
+    src_path = os.path.join(project_root, 'src')
+    if src_path not in sys.path:
+        sys.path.insert(0, src_path)
+    if '--instruction' in sys.argv:
+        instruction = sys.argv[sys.argv.index('--instruction') + 1]
     else:
         print("Interactive mode not supported in this script.")
+        sys.exit(1)
+
+    blueprint = ChatbotBlueprint(blueprint_id="chatbot")
+    async def runner():
+        async for chunk in blueprint._run_non_interactive(instruction):
+            msg = chunk["messages"][0]["content"]
+            if not msg.startswith("An error occurred:"):
+                print(msg)
+    asyncio.run(runner())

{open_swarm-0.1.1745019858 → open_swarm-0.1.1745019957}/src/swarm/extensions/blueprint/cli_handler.py

@@ -24,7 +24,7 @@ logger = logging.getLogger("swarm.cli")
 project_root = Path(__file__).parent.parent.parent.parent  # /home/chatgpt/open-swarm
 dotenv_path = project_root / ".env"
 load_dotenv(dotenv_path=dotenv_path, override=True)
-print("[DEBUG] LITELLM_API_KEY:", os.environ.get("LITELLM_API_KEY"))
+# print("[DEBUG] LITELLM_API_KEY:", os.environ.get("LITELLM_API_KEY"))
 # print(f"[DEBUG] Loaded .env from: {dotenv_path}")
 # print(f"[DEBUG] LITELLM_MODEL={os.environ.get('LITELLM_MODEL')}")
 # print(f"[DEBUG] LITELLM_BASE_URL={os.environ.get('LITELLM_BASE_URL')}")
@@ -73,7 +73,6 @@ async def _run_blueprint_async_with_shutdown(blueprint: 'BlueprintBase', instruc
         sys.exit(1)
 
 
-
 def run_blueprint_cli(
     blueprint_cls: Type['BlueprintBase'],
     swarm_version: str,

{open_swarm-0.1.1745019858 → open_swarm-0.1.1745019957}/tests/blueprints/test_chatbot.py

@@ -54,22 +54,17 @@ def chatbot_blueprint_instance():
 
 import traceback
 
-# Resolved merge conflicts by keeping the latest test logic from test/blueprint-test-updates branch.
-import pytest
-from swarm.blueprints.chatbot.blueprint_chatbot import ChatbotBlueprint
-
-@pytest.mark.asyncio
-async def test_chatbot_agent_creation():
-    blueprint = ChatbotBlueprint(blueprint_id="chatbot")
-    agent = blueprint.create_starting_agent([])
-    assert agent.name == "ChatbotAgent"
-    assert hasattr(agent, "instructions")
-
-@pytest.mark.asyncio
-async def test_chatbot_cli_execution():
-    blueprint = ChatbotBlueprint(blueprint_id="chatbot")
-    # Simulate CLI execution (mock if needed)
-    assert True
+def test_chatbot_agent_creation(chatbot_blueprint_instance):
+    """Test that the ChatbotBlueprint creates a valid agent instance."""
+    try:
+        blueprint = chatbot_blueprint_instance
+        agent = blueprint.create_starting_agent(mcp_servers=[])
+        assert agent is not None
+        assert hasattr(agent, "run")
+    except Exception as e:
+        # print("[DEBUG][test_chatbot_agent_creation] Exception:", e)
+        traceback.print_exc()
+        raise
 
 @pytest.mark.asyncio
 async def test_chatbot_run_conversation(chatbot_blueprint_instance):
@@ -89,3 +84,5 @@ async def test_chatbot_run_conversation(chatbot_blueprint_instance):
         # Assert
         mock_runner_run.assert_called_once()
         # Need to capture stdout/stderr or check console output mock
+
+# Keep the main branch's logic for chatbot blueprint tests. Integrate any unique improvements from the feature branch only if they do not conflict with stability or test coverage.