open-swarm 0.1.1745274976__py3-none-any.whl → 0.1.1748636259__py3-none-any.whl

open_swarm-0.1.1748636259.dist-info/METADATA

@@ -0,0 +1,188 @@
+Metadata-Version: 2.4
+Name: open-swarm
+Version: 0.1.1748636259
+Summary: A tool for orchestrating Swarm using both CLI and API.
+Author-email: Matthew Hand <matthewhandau@gmail.com>
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiofiles>=24.1.0
+Requires-Dist: aiohttp>=3.11.11
+Requires-Dist: asyncio>=3.4.3
+Requires-Dist: asynctest>=0.13.0
+Requires-Dist: channels>=4.2.0
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: django<5.0,>=4.2
+Requires-Dist: django-allauth>=65.3.1
+Requires-Dist: django-template-debug>=0.3.5
+Requires-Dist: djangorestframework>=3.15.2
+Requires-Dist: flask>=3.1.0
+Requires-Dist: jmespath>=1.0.1
+Requires-Dist: jsonschema-pydantic>=0.6
+Requires-Dist: mcp>=1.2.0
+Requires-Dist: openai>=1.58.1
+Requires-Dist: python-dotenv>=1.0.1
+Requires-Dist: redis>=5.2.1
+Requires-Dist: requests>=2.32.3
+Requires-Dist: whitenoise>=6.8.2
+Requires-Dist: drf-spectacular>=0.23.0
+Requires-Dist: pyinstaller>=6.12.0
+Requires-Dist: tiktoken>=0.9.0
+Requires-Dist: django-cors-headers>=4.7.0
+Requires-Dist: cachetools>=5.5.2
+Requires-Dist: openai-agents
+Provides-Extra: dev
+Requires-Dist: pytest>=8.3.4; extra == "dev"
+Requires-Dist: pytest-asyncio>=0.25.1; extra == "dev"
+Requires-Dist: pytest-cov>=6.0.0; extra == "dev"
+Requires-Dist: pytest-django>=4.9.0; extra == "dev"
+Requires-Dist: pytest-mock>=3.14.0; extra == "dev"
+Requires-Dist: python-semantic-release>=9.20.0; extra == "dev"
+Provides-Extra: experimental
+Requires-Dist: nemoguardrails>=0.11.0; extra == "experimental"
+Dynamic: license-file
+
+Open-Swarm Update - 20250328
+
+This project is now repurposed due to OpenAI officially supporting the Swarm framework under the new name "openai-agents(-python)".
+
+Open-swarm now utilizes the openai-agents framework for enhanced capabilities, and the MCP logic has been offloaded to the openai-agents framework.
+
+Key focus areas of this open-swarm framework include:
+- **Blueprints**: A blueprint can be converted into an OpenAI-compatible REST endpoint (analogous to `/v1/chat/completions`, but with agents) and/or into CLI utilities on the shell.
+- **Config Loader**: Blueprints and configuration management form a core aspect of the project.
+
+Installation:
+-------------
+Open-swarm is available via PyPI. To install, run:
+```
+pip install open-swarm
+```
+
+Usage:
+------
+In development, after cloning the repository (`github.com/matthewhand/open-swarm`), you can run a blueprint directly with:
+```
+uv run blueprints/mcp_demo/blueprint_mcp_demo.py
+```
+
+To run the blueprint with a specific instruction (for example, to list its tools), execute:
+```
+uv run blueprints/mcp_demo/blueprint_mcp_demo.py --instruction "list your tools"
+```
+
+Alternatively, you can run the blueprint as an API endpoint using the swarm-api utility:
+```
+swarm-api --blueprint mcp_demo
+```
+
+In production, you can use the swarm-cli utility to manage and run blueprints. For example, to add an example blueprint:
+```
+swarm-cli add github:matthewhand/open-swarm/blueprints/mcp_demo
+```
+This command saves the blueprint to:
+```
+~/.swarm/blueprints/mcp_demo/
+```
+After adding the blueprint, you can convert it into a standalone CLI utility with:
+```
+swarm-cli install mcp_demo
+```
+
+Building a Basic Blueprint & Config File:
+------------------------------------------
+You can create your own blueprint to extend open-swarm's capabilities. Here is a walkthrough:
+
+1. **Create a Blueprint File:**
+   - In the `blueprints/` directory, create a new Python file, for example `blueprints/my_blueprint.py`.
+   - Define a new class that inherits from `BlueprintBase` and implement the required abstract methods, such as `metadata` and `create_agents()`. For instance:
+     ```
+     from swarm.extensions.blueprint.blueprint_base import BlueprintBase
+
+     class MyBlueprint(BlueprintBase):
+         @property
+         def metadata(self):
+             return {
+                 "title": "MyBlueprint",
+                 "env_vars": [],
+                 "required_mcp_servers": [],
+                 "max_context_tokens": 8000,
+                 "max_context_messages": 50
+             }
+
+         def create_agents(self):
+             # Create and return agents as a dictionary.
+             return {"MyAgent": ...}  # Implement your agent creation logic here.
+
+     if __name__ == "__main__":
+         MyBlueprint.main()
+     ```
+
+2. **Create a Configuration File:**
+   - Create a configuration file (e.g., `swarm_config.json`) at the root of the project. This file can include settings for LLM models and MCP servers. For example:
+     ```
+     {
+       "llm": {
+         "default": {
+           "provider": "openai",
+           "model": "gpt-4",
+           "api_key": "your-openai-api-key",
+           "base_url": null
+         }
+       },
+       "mcpServers": {
+         "mcp_llms_txt_server": {
+           "command": "echo",
+           "args": [],
+           "env": {}
+         },
+         "everything_server": {
+           "command": "echo",
+           "args": [],
+           "env": {}
+         }
+       }
+     }
+     ```
+
+3. **Running Your Blueprint:**
+   - To run your blueprint in development mode, use:
+     ```
+     uv run blueprints/my_blueprint.py
+     ```
+   - Ensure your configuration file is properly loaded by your blueprint (this might require modifications in your blueprint's initialization logic or passing a `--config` parameter).
+
+Installation & Deployment via swarm-cli:
+--------------------------------------------
+After creating your blueprint and config file, you can manage it with the swarm-cli utility. For example:
+- **Adding your blueprint:**
+  ```
+  swarm-cli add github:matthewhand/open-swarm/blueprints/my_blueprint
+  ```
+- **Installing as a standalone CLI utility:**
+  ```
+  swarm-cli install my_blueprint
+  ```
+
+Examples:
+---------
+**Blueprint "mcp_demo":**
+
+The blueprint located in `blueprints/mcp_demo` demonstrates a key design principle:
+- It creates a primary agent named **Sage** that leverages the MCP framework to incorporate external capabilities.
+- **Sage** uses another agent, **Explorer**, as a tool to extend its functionality.
+
+This hierarchical agent design illustrates how blueprints can compose agents that call on subagents as tools. This model serves as a prototype for creating powerful agent-driven workflows and can be deployed both as a REST endpoint and as a CLI tool.
+
+Production Environment:
+-----------------------
+After installing the package via pip, you can manage blueprints with `swarm-cli` and launch them as standalone utilities or REST services.
+
+For help with swarm-cli:
+```
+swarm-cli --help
+```
+
+For help with swarm-api:
+```
+swarm-api --help

open_swarm-0.1.1748636259.dist-info/RECORD

@@ -0,0 +1,82 @@
+open_swarm-0.1.1748636259.dist-info/licenses/LICENSE,sha256=BU9bwRlnOt_JDIb6OT55Q4leLZx9RArDLTFnlDIrBEI,1062
+swarm/__init__.py,sha256=aT-yyX84tiZhihp0RAXYTADCo9dhOnmolQVfn4_NQa8,46
+swarm/apps.py,sha256=up4C3m2JeyXeUcH-wYeReCuiOBVJ6404w9OfaRChLwM,2568
+swarm/auth.py,sha256=WcajB6lrA2cSA-Ho1lnBEs9_MNtDx713sxHRvIXx9fQ,2415
+swarm/consumers.py,sha256=wESLamkhbi4SEZt9k3yx6eU9ufOIZMCAL-OAXjJBGXE,5056
+swarm/messages.py,sha256=CwADrjlj-uVmm-so1xIZvN1UkEWdzSn_hu7slfhuS8w,6549
+swarm/models.py,sha256=Ix0WEYYqza2lbOEBNesikRCs3XGUPWmqQyMWzZYUaxM,1494
+swarm/serializers.py,sha256=EPvQHvUZtnOKX5ltddNFPGnWaJGxFDWFbofTa39oxgE,363
+swarm/settings.py,sha256=7VUVuzNdmA-QdUwE9nzn2e4a1BIEe21ULNqHt5k00xc,7872
+swarm/tool_executor.py,sha256=KHM2mTGgbbTgWNN3fbV5c4MDY238OTLwaaqtkczFHFQ,12385
+swarm/urls.py,sha256=i7qIwlSMsMSMrOhkbiUfTEL7tdhRFY4g5prfBimKOX0,4085
+swarm/util.py,sha256=G4x2hXopHhB7IdGCkUXGoykYWyiICnjxg7wcr-WqL8I,4644
+swarm/wsgi.py,sha256=REM_u4HpMCkO0ddrOUXgtY-ITL-VTbRB1-WHvFJAtAU,408
+swarm/agent/__init__.py,sha256=YESGu_UXEBxrlQwghodUMN0vmXZDwWMU7DclCUvoklA,104
+swarm/agent/agent.py,sha256=-lGc05pGmveptO4oZoJq_L6XoTAIpxE8knTc6jxRmEQ,1680
+swarm/extensions/__init__.py,sha256=SadbzfxckByaaqzuKPfXMvqmj45-dcMlavlfQYhGnzE,56
+swarm/extensions/blueprint/__init__.py,sha256=-nAm6l7-42eAJYhWkQlcfq2hQB5ipxg2YIyiQRttX3c,1583
+swarm/extensions/blueprint/agent_utils.py,sha256=YWpANYTaFKAK4inWSirRlvzbHwQAH1wNkgW0esHKIeg,542
+swarm/extensions/blueprint/blueprint_base.py,sha256=8ZZxoLBRGi-p_va6nkPwQryYPEr34ISKKbNV8d4odnU,22215
+swarm/extensions/blueprint/blueprint_discovery.py,sha256=ihrIHo4mDaSAUVREXD1y26d5UmPnxVZtBwDGcDJeYrU,5139
+swarm/extensions/blueprint/blueprint_utils.py,sha256=Ef_pu-RYomqzFjMg6LOSPSdbYFCbYXjEoSvK1OT49Eo,702
+swarm/extensions/blueprint/common_utils.py,sha256=jeKcN3lMdrpOYWIpErH3L5am13jHjaImpVvk2b0mps4,462
+swarm/extensions/blueprint/django_utils.py,sha256=ObtkmF1JW4H2OEYa7vC6ussUsMBtDsZTTVeHGHI-GOQ,17457
+swarm/extensions/blueprint/interactive_mode.py,sha256=vGmMuAgC93TLjMi2RkXQ2FkWfIUblyOTFGHmVdGKLSQ,4572
+swarm/extensions/blueprint/output_utils.py,sha256=8OtVE3gEvPeeTu4Juo6Ad6omSlMqSuAtckXXx7P1CyQ,4022
+swarm/extensions/blueprint/spinner.py,sha256=3J0ZrNzoI5O5qR7hnCeRM3dZx2fLb_H3zkoj_AYt5LQ,3394
+swarm/extensions/blueprint/modes/rest_mode.py,sha256=KZuB_j2NfomER7CmlsLBqRipU3DymKY-9RpoGilMH0I,1357
+swarm/extensions/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+swarm/extensions/cli/blueprint_runner.py,sha256=CG6XfOiDWuc84I_qefBpkwxEs7JcIbvNJqce9jBYUxo,9158
+swarm/extensions/cli/cli_args.py,sha256=Lws6Q3I-DNpzq9qSRN8ylUXg-lWly1SuqDSQF9n50bw,2980
+swarm/extensions/cli/interactive_shell.py,sha256=ocHBP975uqJU5LQyM2IiMVW5lQ387lgYHe3sme9ucX4,1322
+swarm/extensions/cli/main.py,sha256=NnmovA7h1Rj1eDQVYe9AN6-eraIbIclHesNVmQPjdk4,1002
+swarm/extensions/cli/selection.py,sha256=etdG6hJFgnLuvD_sVJvXg8qFcgjzCjyL-vYyxWcU0TI,2002
+swarm/extensions/cli/utils.py,sha256=amDW-jbiM12N-t72j2S0cHP3Mxgoo3nrcwq6CwN9HFY,3290
+swarm/extensions/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+swarm/extensions/cli/commands/blueprint_management.py,sha256=dLNLLoTjInXQ1m9zRyNxu8NacDgwqYY50GvnhSiMQ_I,1116
+swarm/extensions/cli/commands/config_management.py,sha256=RFu9AP437aqUnyy8RDoyoZgW0WfT7h88_CQJaUnCR9E,480
+swarm/extensions/cli/commands/edit_config.py,sha256=O2Y-BKOSx7shSc-kspyseEQvtIeyQBUCD7Aj3r9dirw,2325
+swarm/extensions/cli/commands/list_blueprints.py,sha256=TyZv_dqM_UTK84-s-Dp7UWUcvWHXsNuxnCRNNNymWio,768
+swarm/extensions/cli/commands/validate_env.py,sha256=VXBjx9etvj4Re8qLwIPoHr4g5VwbwBCBdsr8gGLLYHI,1958
+swarm/extensions/cli/commands/validate_envvars.py,sha256=7-BDPYzV7wsga7kOggHNuCscI-7z-oPjMEBhq-ndDXA,1588
+swarm/extensions/cli/utils/discover_commands.py,sha256=aJdU3kSmLlpBxzGdfOA88AaCwpknHSD2cE0piCHZRUY,1053
+swarm/extensions/cli/utils/env_setup.py,sha256=k7QxRjzIGx5HC6RVZP9QSaaXEKMkcKCewD66u0e7qfE,496
+swarm/extensions/config/__init__.py,sha256=WjmGxMU5k3S40TNQxTfByYcT2YAchq_5gzXFWDLrLzU,141
+swarm/extensions/config/config_loader.py,sha256=A3XCIeLvD7Akp7D1rz-JsBfnW5AvulE-nN-Fop2VsLI,13666
+swarm/extensions/config/config_manager.py,sha256=bBT-NGbRdsXoJ-lxZM5kjAf5FvVVGRVdbbCQJiCX1_0,9951
+swarm/extensions/config/server_config.py,sha256=iBlQOaFQmkEPNLmVpAQvXlSWhTsu-YMIjEf-H-7QfUU,1882
+swarm/extensions/config/setup_wizard.py,sha256=yAZ7MOgc8ZGti2kjZ72G6QLFBI0lbhXAa7Wi7SeXDYo,4567
+swarm/extensions/config/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+swarm/extensions/config/utils/logger.py,sha256=sUkKdZsjRiCGGCEPfZ4YqeZDbiaUeGFOa3mdbVOTmvU,1242
+swarm/extensions/launchers/__init__.py,sha256=RR4up00HKqXOOToxb63mKZ2o9fq-o75bUw7dZuxkAVk,56
+swarm/extensions/launchers/build_launchers.py,sha256=Eh3ODR9L4KinG1GDK4-lF3NE0EZ-ArCrP3fxtGYhXgs,433
+swarm/extensions/launchers/build_swarm_wrapper.py,sha256=c_9oR3To4M2cZyc1uYSiysHLhUGX5FkCAQk9AG7Va2Q,231
+swarm/extensions/launchers/swarm_api.py,sha256=f8olTI5JVdayp923etVQWsP8WRquPG5Mw3Q40ItN6kY,2877
+swarm/extensions/launchers/swarm_cli.py,sha256=ar0LxctmxUwhkVbKWLfGEcZB9c77qdPsf1Y33-UNgpY,14184
+swarm/extensions/launchers/swarm_wrapper.py,sha256=3K58yqPN4Ct0c7zfSDKRIGdL1Q7WOBXmAVHXT-aaPj4,1004
+swarm/llm/chat_completion.py,sha256=MfeyU7RXJHs8_TBMKxEd7QCnFWjKW7nmWwiNVGMUM0k,9564
+swarm/migrations/0010_initial_chat_models.py,sha256=qJbvLReRBEOE08FkxjOWMcwu7Ny4epNI_eG1PF8wcWM,1900
+swarm/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+swarm/repl/__init__.py,sha256=hNU3HxjJJi6w5xgx34n3253QJPspFltrK7AM0G_1TlE,32
+swarm/repl/repl.py,sha256=sfVdSiDrStpZyxZehPn0nAxqaja2eySL9v9CfWhZEVc,2609
+swarm/utils/color_utils.py,sha256=utIfZ6ptGEdpHxIZiZ4gtfo5lLqZKQL5g0F8mEwMhTo,1184
+swarm/utils/context_utils.py,sha256=2Eu372CsuDTt6ikZ0w3OkLrFp4t9hKdgU5Kkc8faDDM,19315
+swarm/utils/general_utils.py,sha256=K3_Uy-189XSpLOxKGxl14fa2n7B0ZH28HgysL6vWG-M,7919
+swarm/utils/logger.py,sha256=g-ynqO3jqKx2rT2keiECsZ13aywFPsFlJAvo-SOeGlw,1679
+swarm/utils/logger_setup.py,sha256=2A9bXicV03yAPpgMFJGQt5ePB1tLwdkk7sCo-0OiglU,714
+swarm/utils/message_sequence.py,sha256=7Xa7YwGPgojfkrGcl-SbeR_BWwzXGDYNqAxq8F6XhDc,8616
+swarm/utils/message_utils.py,sha256=oNTD7pfmnnu_Br24pR2VEX9afIZwFLwg2HJBLXs1blY,4074
+swarm/utils/redact.py,sha256=L2lo927S575Ay7Jz6pUlK47Sxxzpd9IMybnDm6-WlC8,2955
+swarm/views/__init__.py,sha256=AcLk0R7Y69FhIVgJK2hZs8M_gCR-h_5iqUywz89yuHM,1223
+swarm/views/api_views.py,sha256=MXt_sWQYUIYgy6gTHSVIeSrszvhtkD-sxQiGBmdbQAg,1815
+swarm/views/chat_views.py,sha256=Jvwu8Y9sX2t2KkshBBAchXu6dRH8UDV8RAT3zXowVKg,3471
+swarm/views/core_views.py,sha256=VCv5BEBqUMz6OmQC4RkkIk1qq46f5f7Jyx4MqCaoENo,5229
+swarm/views/message_views.py,sha256=sDUnXyqKXC8WwIIMAlWf00s2_a2T9c75Na5FvYMJwBM,1596
+swarm/views/model_views.py,sha256=2bfqF8LOhgWDRFvm5FeovQDdLcZOS9OfkJLvSC0FDvs,6206
+swarm/views/utils.py,sha256=qNt1U5QKC2SFpViqdYwFU2mouklK0MR3W4I979-ES5s,23816
+swarm/views/web_views.py,sha256=ExQQeJpZ8CkLZQC_pXKOOmdnEy2qR3wEBP4LLp27DPU,7404
+open_swarm-0.1.1748636259.dist-info/METADATA,sha256=FsCN1cQScciTDm9aoSzy1O1UabvjSpL87pQBPzxDWGA,6626
+open_swarm-0.1.1748636259.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+open_swarm-0.1.1748636259.dist-info/entry_points.txt,sha256=tHIcZBvy_sbp_nqZcLG3NSgElG6vEZcUvR5U5325qak,126
+open_swarm-0.1.1748636259.dist-info/top_level.txt,sha256=ETN-2phSZezexCGmKSre_aUhRK0XI9Rzz7Fw5TCsLsQ,6
+open_swarm-0.1.1748636259.dist-info/RECORD,,

{open_swarm-0.1.1745274976.dist-info → open_swarm-0.1.1748636259.dist-info}/WHEEL

@@ -1,4 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
+

open_swarm-0.1.1748636259.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+swarm-api = swarm.extensions.launchers.swarm_api:main
+swarm-cli = swarm.extensions.launchers.swarm_cli:main

open_swarm-0.1.1748636259.dist-info/top_level.txt

@@ -0,0 +1 @@
+swarm

swarm/agent/agent.py

@@ -0,0 +1,49 @@
+# src/swarm/agent/agent.py
+
+from typing import Callable, Dict, Any, List
+import json
+
+class Agent:
+    def __init__(self, name: str, instructions: str):
+        self.name = name
+        self.instructions = instructions
+        self.tools: Dict[str, Dict[str, Any]] = {}
+    
+    def register_tool(self, name: str, func: Callable[..., Any], description: str = ""):
+        """
+        Registers a tool with the agent.
+        
+        Args:
+            name (str): Name of the tool.
+            func (Callable[..., Any]): The function implementing the tool.
+            description (str): Description of the tool.
+        """
+        self.tools[name] = {
+            "func": func,
+            "description": description
+        }
+    
+    async def process(self, query: str) -> str:
+        """
+        Processes a user query by determining which tool to invoke.
+        
+        Args:
+            query (str): The user's query in JSON format specifying the tool and arguments.
+        
+        Returns:
+            str: The response from the tool execution.
+        """
+        try:
+            request = json.loads(query)
+            tool_name = request.get("tool")
+            arguments = request.get("arguments", {})
+            if tool_name in self.tools:
+                tool_func = self.tools[tool_name]["func"]
+                result = await tool_func(**arguments)
+                return result
+            else:
+                return f"Tool '{tool_name}' not found."
+        except json.JSONDecodeError:
+            return "Invalid query format. Expected JSON with 'tool' and 'arguments'."
+        except Exception as e:
+            return f"Error processing query: {e}"

swarm/auth.py

@@ -1,121 +1,56 @@
-import logging
 import os
-from rest_framework.authentication import BaseAuthentication, SessionAuthentication
-# Import BasePermission for creating custom permissions
-from rest_framework.permissions import BasePermission
-from rest_framework import exceptions
-from django.conf import settings
-from django.utils.translation import gettext_lazy as _
-# Import AnonymousUser
+import logging
 from django.contrib.auth.models import AnonymousUser
-# Keep get_user_model if CustomSessionAuthentication needs it or for future user mapping
-from django.contrib.auth import get_user_model
+from rest_framework.authentication import TokenAuthentication  # type: ignore
+from rest_framework.exceptions import AuthenticationFailed  # type: ignore
 
-logger = logging.getLogger('swarm.auth')
-User = get_user_model()
+logger = logging.getLogger(__name__)
 
-# ==============================================================================
-# Authentication Classes (Determine *who* the user is)
-# ==============================================================================
+class EnvAuthenticatedUser(AnonymousUser):
+    """ Custom user class that is always authenticated. """
+    @property
+    def is_authenticated(self) -> bool:  # type: ignore[override]
+        return True  # Ensure Django recognizes this user as authenticated
 
-# --- Static Token Authentication ---
-class StaticTokenAuthentication(BaseAuthentication):
+class EnvOrTokenAuthentication(TokenAuthentication):
     """
-    Authenticates requests based on a static API token passed in a header
-    (Authorization: Bearer <token> or X-API-Key: <token>).
-
-    Returns (AnonymousUser, token) on success. This allows permission classes
-    to check request.auth to see if token authentication succeeded, even though
-    no specific user model is associated with the token.
+    Custom authentication that allows:
+    1. If API_AUTH_TOKEN is set, it enforces token authentication.
+    2. Else if ENABLE_API_AUTH is False/Unset, authentication is bypassed.
+    3. Otherwise, falls back to Django's TokenAuthentication.
     """
-    keyword = 'Bearer'
-
     def authenticate(self, request):
-        """
-        Attempts to authenticate using a static token.
-        """
-        logger.debug("[Auth][StaticToken] Attempting static token authentication.")
-        # Retrieve the expected token from settings.
-        expected_token = getattr(settings, 'SWARM_API_KEY', None)
-
-        # If no token is configured in settings, this method cannot authenticate.
-        if not expected_token:
-            logger.error("[Auth][StaticToken] SWARM_API_KEY is not set in Django settings. Cannot use static token auth.")
-            return None # Indicate authentication method did not run or failed pre-check
-
-        # Extract the provided token from standard Authorization header or custom X-API-Key header.
-        provided_token = None
-        auth_header = request.META.get('HTTP_AUTHORIZATION', '').split()
-        if len(auth_header) == 2 and auth_header[0].lower() == self.keyword.lower():
-            provided_token = auth_header[1]
-            logger.debug("[Auth][StaticToken] Found token in Authorization header.")
-        else:
-            provided_token = request.META.get('HTTP_X_API_KEY')
-            if provided_token:
-                logger.debug("[Auth][StaticToken] Found token in X-API-Key header.")
-
-        # If no token was found in either header, authentication fails for this method.
-        if not provided_token:
-            logger.debug("[Auth][StaticToken] No token found in relevant headers.")
-            return None # Indicate authentication method did not find credentials
-
-        # Compare the provided token with the expected token.
-        # NOTE: For production, consider using a constant-time comparison function
-        #       to mitigate timing attacks if the token is highly sensitive.
-        if provided_token == expected_token:
-            logger.info("[Auth][StaticToken] Static token authentication successful.")
-            # Return AnonymousUser and the token itself as request.auth.
-            # This signals successful authentication via token without linking to a specific User model.
-            return (AnonymousUser(), provided_token)
-        else:
-            # Token was provided but did not match. Raise AuthenticationFailed.
-            logger.warning(f"[Auth][StaticToken] Invalid static token provided.")
-            raise exceptions.AuthenticationFailed(_("Invalid API Key."))
-
-# --- Custom *Synchronous* Session Authentication ---
-class CustomSessionAuthentication(SessionAuthentication):
-    """
-    Standard Django Session Authentication provided by DRF.
-    Relies on Django's session middleware to populate request.user.
-    This class itself is synchronous, but the underlying session loading
-    needs to be handled correctly in async views (e.g., via middleware or wrappers).
-    """
-    # No override needed unless customizing session behavior.
-    pass
-
-
-# ==============================================================================
-# Permission Classes (Determine *if* access is allowed)
-# ==============================================================================
-
-class HasValidTokenOrSession(BasePermission):
-    """
-    Allows access if EITHER:
-    1. Static token authentication succeeded (request.auth is not None).
-    2. Session authentication succeeded (request.user is authenticated).
-    """
-    message = 'Authentication credentials were not provided or are invalid (Requires valid API Key or active session).'
-
-    def has_permission(self, request, view):
-        """
-        Checks if the request has valid authentication via token or session.
-        """
-        # Check if static token authentication was successful.
-        # StaticTokenAuthentication returns (AnonymousUser, token), so request.auth will be the token.
-        has_valid_token = getattr(request, 'auth', None) is not None
-        if has_valid_token:
-            logger.debug("[Perm][TokenOrSession] Access granted via static token (request.auth is set).")
-            return True
-
-        # Check if session authentication was successful.
-        # request.user should be populated by SessionAuthentication/AuthMiddleware.
-        user = getattr(request, 'user', None)
-        has_valid_session = user is not None and user.is_authenticated
-        if has_valid_session:
-            logger.debug(f"[Perm][TokenOrSession] Access granted via authenticated session user: {user}")
-            return True
-
-        # If neither condition is met, deny permission.
-        logger.debug("[Perm][TokenOrSession] Access denied: No valid token (request.auth=None) and no authenticated session user.")
-        return False
-
+        auth_header = request.headers.get("Authorization", "")
+        env_token = os.getenv("API_AUTH_TOKEN", None)
+        enable_auth = os.getenv("ENABLE_API_AUTH", "false").lower() in ("true", "1", "t")
+
+        # If API authentication is disabled, allow unrestricted access
+        if not enable_auth:
+            logger.info("Authentication is disabled (ENABLE_API_AUTH not set or False). Allowing all users.")
+            return (EnvAuthenticatedUser(), None)
+
+        # If API_AUTH_TOKEN is set, enforce token validation
+        if env_token:
+            if not auth_header:
+                raise AuthenticationFailed("Authentication credentials were not provided.")
+            if not auth_header.startswith("Bearer "):
+                raise AuthenticationFailed("Invalid token format.")
+
+            token = auth_header.split("Bearer ")[-1].strip()
+
+            if token == env_token:
+                logger.info("Authenticated using API_AUTH_TOKEN.")
+                return (EnvAuthenticatedUser(), None)  # Allow access
+            else:
+                raise AuthenticationFailed("Invalid token.")
+
+        # If API authentication is disabled, allow unrestricted access
+        if not enable_auth:
+            logger.info("Authentication is disabled (ENABLE_API_AUTH not set or False). Allowing all users.")
+            return (EnvAuthenticatedUser(), None)
+
+        # Fallback to Django's TokenAuthentication
+        return super().authenticate(request)
+
+    def authenticate_header(self, request):
+        return "Bearer"

swarm/consumers.py

@@ -62,25 +62,6 @@ class DjangoChatConsumer(AsyncWebsocketConsumer):
         await self.send(text_data=system_message_html)
 
         client = AsyncOpenAI(api_key=os.getenv("OPENAI_API_KEY"))
-        
-        # --- PATCH: Enforce LiteLLM-only endpoint and suppress OpenAI tracing/telemetry ---
-        import os, logging
-        if os.environ.get("LITELLM_BASE_URL") or os.environ.get("OPENAI_BASE_URL"):
-            logging.getLogger("openai.agents").setLevel(logging.CRITICAL)
-            try:
-                import openai.agents.tracing
-                openai.agents.tracing.TracingClient = lambda *a, **kw: None
-            except Exception:
-                pass
-        def _enforce_litellm_only(client):
-            base_url = getattr(client, 'base_url', None)
-            if base_url and 'openai.com' in base_url:
-                return
-            if base_url and 'openai.com' not in base_url:
-                import traceback
-                raise RuntimeError(f"Attempted fallback to OpenAI API when custom base_url is set! base_url={base_url}\n{traceback.format_stack()}")
-        _enforce_litellm_only(client)
-        
         stream = await client.chat.completions.create(
             model=os.getenv("OPENAI_MODEL"),
             messages=self.messages,

swarm/extensions/blueprint/__init__.py

@@ -1,49 +1,35 @@
 """
-Blueprint Extension Package for Open Swarm.
-
-Provides the base class, discovery mechanisms, and utilities for creating
-and running autonomous agent workflows (blueprints).
+Blueprint discovery and management utilities.
 """
 
-# Core components
-from swarm.core.blueprint_base import BlueprintBase
+from .blueprint_base import BlueprintBase
 from .blueprint_discovery import discover_blueprints
 from .blueprint_utils import filter_blueprints
 
-# Helper modules (primarily used internally by BlueprintBase or CLI)
-from . import config_loader
-from . import cli_handler
-# from . import interactive_mode # If interactive mode is refactored out
-# from . import output_utils     # If output utils are used externally
-
-# Re-export essential message utilities if they are part of the public API
-# of this extension package. If they are purely internal utilities,
-# they don't necessarily need to be re-exported here.
+# Re-export the necessary message utilities from their new locations
+# Note: The specific truncation functions like truncate_preserve_pairs might have been
+# consolidated into truncate_message_history. Adjust if needed.
 try:
     from swarm.utils.message_sequence import repair_message_payload, validate_message_sequence
     from swarm.utils.context_utils import truncate_message_history
+    # If specific old truncation functions are truly needed, they'd have to be
+    # re-implemented or their callers refactored to use truncate_message_history.
+    # Assuming truncate_message_history is the intended replacement for now.
+    # Define aliases if old names are required by downstream code:
+    # truncate_preserve_pairs = truncate_message_history # Example if needed
 except ImportError as e:
+    # Log an error or warning if imports fail, helpful for debugging setup issues
     import logging
-    logging.getLogger(__name__).warning(f"Could not import core message utilities: {e}")
-    # Define dummy functions or let importers handle the ImportError
-    def repair_message_payload(m, **kwargs): raise NotImplementedError from e
-    def validate_message_sequence(m): raise NotImplementedError from e
-    def truncate_message_history(m, *args, **kwargs): raise NotImplementedError from e
-
+    logging.getLogger(__name__).error(f"Failed to import core message utilities: {e}")
+    # Define dummy functions or raise error if critical
+    def repair_message_payload(m, **kwargs): return m
+    def validate_message_sequence(m): return m
+    def truncate_message_history(m, *args, **kwargs): return m
 
 __all__ = [
-    # Core
     "BlueprintBase",
     "discover_blueprints",
     "filter_blueprints",
-
-    # Helper Modules (Exporting for potential external use, though less common)
-    "config_loader",
-    "cli_handler",
-    # "interactive_mode",
-    # "output_utils",
-
-    # Utility Functions (If considered part of the public API)
     "repair_message_payload",
     "validate_message_sequence",
     "truncate_message_history",

swarm/{core → extensions/blueprint}/agent_utils.py

@@ -6,7 +6,7 @@ This module has been updated to remove dependency on swarm.types;
 instead, it now imports Agent from the openai-agents SDK.
 """
 
-from blueprint_agents.agent import Agent  # Updated import
+from agents.agent import Agent  # Updated import
 
 def get_agent_name(agent: Agent) -> str:
     """