open-swarm 0.1.1743371918__py3-none-any.whl → 0.1.1743416034__py3-none-any.whl

{open_swarm-0.1.1743371918.dist-info → open_swarm-0.1.1743416034.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-swarm
-Version: 0.1.1743371918
+Version: 0.1.1743416034
 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
@@ -104,7 +104,7 @@ Open Swarm can be used in two primary ways:
 
 *   **Agents:** Individual AI units performing specific tasks, powered by LLMs (like GPT-4, Claude, etc.). Built using the `openai-agents` SDK.
 *   **Blueprints:** Python classes (`BlueprintBase` subclasses) defining a swarm's structure, agents, coordination logic, and external dependencies (like required environment variables or MCP servers). They act as reusable templates for specific tasks (e.g., code generation, research, data analysis).
-*   **MCP (Mission Control Platform) Servers:** Optional external processes providing specialized capabilities (tools) to agents, such as filesystem access, web browsing, database interaction, or interacting with specific APIs (Slack, Monday.com, etc.). Agents interact with MCP servers via a standardized communication protocol.
+*   **MCP (Model Context Protocol) Servers:** Optional external processes providing specialized capabilities (tools) to agents, such as filesystem access, web browsing, database interaction, or interacting with specific APIs (Slack, Monday.com, etc.). Agents interact with MCP servers via a standardized communication protocol.
 *   **Configuration (`swarm_config.json`):** A central JSON file defining available LLM profiles (API keys, models) and configurations for MCP servers. Typically managed via `swarm-cli` in `~/.config/swarm/`.
 *   **`swarm-cli`:** A command-line tool for managing blueprints (adding, listing, running, installing) and the `swarm_config.json` file. Uses XDG directories for storing blueprints (`~/.local/share/swarm/blueprints/`) and configuration (`~/.config/swarm/`).
 *   **`swarm-api`:** A launcher for the Django/DRF backend that exposes installed blueprints via an OpenAI-compatible REST API (`/v1/models`, `/v1/chat/completions`).

{open_swarm-0.1.1743371918.dist-info → open_swarm-0.1.1743416034.dist-info}/RECORD

@@ -3,17 +3,18 @@ swarm/apps.py,sha256=up4C3m2JeyXeUcH-wYeReCuiOBVJ6404w9OfaRChLwM,2568
 swarm/auth.py,sha256=8JIk1VbBvFFwOijEJAsrx6si802ZSMGnErXvmo0izUg,5935
 swarm/consumers.py,sha256=wESLamkhbi4SEZt9k3yx6eU9ufOIZMCAL-OAXjJBGXE,5056
 swarm/messages.py,sha256=CwADrjlj-uVmm-so1xIZvN1UkEWdzSn_hu7slfhuS8w,6549
+swarm/middleware.py,sha256=lPlHbFg9Rm9lUuvg026d4zTDjRMc8bQi0JegpGdqIZQ,3198
 swarm/models.py,sha256=Ix0WEYYqza2lbOEBNesikRCs3XGUPWmqQyMWzZYUaxM,1494
 swarm/permissions.py,sha256=iM86fSL1TtgqJzgDkS3Dl82X6Xk7VDHWwdBDfs5RKWc,1671
 swarm/serializers.py,sha256=4g3G2FdWpSIuLLC_SBKoNITw1b0G83Bxo7YHc-kjsro,4550
-swarm/settings.py,sha256=rGPcnLSf6WetpeovBb6AhDzWi2GwaFbsQ8UZjRVTMtI,6334
+swarm/settings.py,sha256=wrQoWfNylY_54z5c54x0TLe2Q9KEqvawNXjqCVhWuyI,6616
 swarm/tool_executor.py,sha256=KHM2mTGgbbTgWNN3fbV5c4MDY238OTLwaaqtkczFHFQ,12385
 swarm/urls.py,sha256=9eRQWsB-Vs3Nmes4mtlZtk_Rvuixf4Y9uwrX9dVQ9Is,3292
 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/blueprints/README.md,sha256=tsngbSB9N0tILcz_m1OGAjyKZQYlGTN-i5e5asq1GbE,8478
-swarm/blueprints/burnt_noodles/blueprint_burnt_noodles.py,sha256=LwKVYTRRg6ceNpvbuzM-bl7NukBGNu3bOU9Q3h6WjOU,22834
+swarm/blueprints/burnt_noodles/blueprint_burnt_noodles.py,sha256=MDwjlA4HQ6GFh7Z-XGM0Wdh0FzQdOHf38p3Y580EgWM,23008
 swarm/blueprints/chatbot/blueprint_chatbot.py,sha256=D31OgSoxllhzn8f7cdVYflqzadN2SZ61rabPuK6EqQ8,4728
 swarm/blueprints/chatbot/templates/chatbot/chatbot.html,sha256=REFnqNg0EHsXxAUfaCJe1YgOKiV_umBXuC6y8veF5CU,1568
 swarm/blueprints/digitalbutlers/blueprint_digitalbutlers.py,sha256=JK_rmZgPMw4PdQFrMverrwgcjH0NRkuqkchYOJwXYuM,9809
@@ -253,8 +254,8 @@ swarm/views/message_views.py,sha256=sDUnXyqKXC8WwIIMAlWf00s2_a2T9c75Na5FvYMJwBM,
 swarm/views/model_views.py,sha256=aAbU4AZmrOTaPeKMWtoKK7FPYHdaN3Zbx55JfKzYTRY,2937
 swarm/views/utils.py,sha256=geX3Z5ZDKFYyXYBMilc-4qgOSjhujK3AfRtvbXgFpXk,3643
 swarm/views/web_views.py,sha256=ExQQeJpZ8CkLZQC_pXKOOmdnEy2qR3wEBP4LLp27DPU,7404
-open_swarm-0.1.1743371918.dist-info/METADATA,sha256=zGZTjlRSbmYI4EgXVdxetl4cB-LyroVU8o6YDW2Cfic,13680
-open_swarm-0.1.1743371918.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_swarm-0.1.1743371918.dist-info/entry_points.txt,sha256=LudR3dBqGnglrE1n2zAeWo38Ck0m57sKPW36KfK-pzo,71
-open_swarm-0.1.1743371918.dist-info/licenses/LICENSE,sha256=BU9bwRlnOt_JDIb6OT55Q4leLZx9RArDLTFnlDIrBEI,1062
-open_swarm-0.1.1743371918.dist-info/RECORD,,
+open_swarm-0.1.1743416034.dist-info/METADATA,sha256=rUCsvDnHgcapfgloeHA_QOGi2DbDGlxMKwHY5g_xPSM,13678
+open_swarm-0.1.1743416034.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_swarm-0.1.1743416034.dist-info/entry_points.txt,sha256=z1UIVRRhri-V-hWxFkDEYu0SZPUIsVO4KpDaodgcFzU,125
+open_swarm-0.1.1743416034.dist-info/licenses/LICENSE,sha256=BU9bwRlnOt_JDIb6OT55Q4leLZx9RArDLTFnlDIrBEI,1062
+open_swarm-0.1.1743416034.dist-info/RECORD,,

{open_swarm-0.1.1743371918.dist-info → open_swarm-0.1.1743416034.dist-info}/entry_points.txt

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

swarm/blueprints/burnt_noodles/blueprint_burnt_noodles.py

@@ -56,7 +56,6 @@ def git_status() -> str:
     except Exception as e:
         logger.error(f"Unexpected error during git status: {e}", exc_info=logger.level <= logging.DEBUG)
         return f"Error during git status: {e}"
-
 @function_tool
 def git_diff() -> str:
     """Executes 'git diff' and returns the differences in the working directory."""
@@ -286,7 +285,7 @@ class BurntNoodlesBlueprint(BlueprintBase):
 
         logger.debug(f"Creating new Model instance for profile '{profile_name}'.")
         # Retrieve profile data using BlueprintBase helper method
-        profile_data = self.get_llm_profile(profile_name)
+        profile_data = getattr(self, "get_llm_profile", lambda prof: {"provider": "openai", "model": "gpt-mock"})(profile_name)
         if not profile_data:
              # Critical error if the profile (or default fallback) isn't found
              logger.critical(f"Cannot create Model instance: LLM profile '{profile_name}' (or 'default') not found in configuration.")
@@ -341,12 +340,13 @@ class BurntNoodlesBlueprint(BlueprintBase):
             The starting agent instance (Michael Toasted).
         """
         logger.debug("Creating Burnt Noodles agent team...")
+        config = self._load_configuration() if getattr(self, "config", None) is None else self.config
         # Clear caches at the start of agent creation for this run
         self._model_instance_cache = {}
         self._openai_client_cache = {}
-
+        
         # Determine the LLM profile to use (e.g., from config or default)
-        default_profile_name = self.config.get("llm_profile", "default")
+        default_profile_name = config.get("llm_profile", "default")
         logger.debug(f"Using LLM profile '{default_profile_name}' for all Burnt Noodles agents.")
         # Get the single Model instance to share among agents (or create if needed)
         default_model_instance = self._get_model_instance(default_profile_name)

swarm/middleware.py

@@ -0,0 +1,65 @@
+# src/swarm/middleware.py
+import logging
+import asyncio # Import asyncio
+from asgiref.sync import sync_to_async
+from django.utils.functional import SimpleLazyObject
+from django.utils.decorators import sync_and_async_middleware
+from django.contrib.auth.middleware import AuthenticationMiddleware
+
+logger = logging.getLogger(__name__)
+
+# Mark the middleware as compatible with both sync and async views
+@sync_and_async_middleware
+def AsyncAuthMiddleware(get_response):
+    """
+    Ensures request.user is loaded asynchronously before reaching async views,
+    preventing SynchronousOnlyOperation errors during authentication checks
+    that might involve database access (like session loading).
+
+    This should be placed *after* Django's built-in AuthenticationMiddleware.
+    """
+
+    # One-time configuration and initialization.
+    # (Not needed for this simple middleware)
+
+    async def middleware(request):
+        # Code to be executed for each request before
+        # the view (and later middleware) are called.
+
+        # Check if request.user is a SimpleLazyObject and hasn't been evaluated yet.
+        # Django's AuthenticationMiddleware sets request.user to a SimpleLazyObject
+        # wrapping the get_user function. Accessing request.user triggers evaluation.
+        if isinstance(request.user, SimpleLazyObject):
+            # Use sync_to_async to safely evaluate the lazy object (which calls
+            # the synchronous get_user function) in an async context.
+            # We don't need the result here, just to trigger the load.
+            try:
+                logger.debug("[AsyncAuthMiddleware] Attempting async user load...")
+                _ = await sync_to_async(request.user._setup)() # Access internal _setup to force load
+                is_auth = await sync_to_async(lambda: getattr(request.user, 'is_authenticated', False))()
+                logger.debug(f"[AsyncAuthMiddleware] User loaded via SimpleLazyObject: {request.user}, Authenticated: {is_auth}")
+            except Exception as e:
+                # Log potential errors during user loading but don't block the request
+                logger.error(f"[AsyncAuthMiddleware] Error during async user load: {e}", exc_info=True)
+                # You might want to handle specific auth errors differently
+        else:
+            # If it's not a SimpleLazyObject, it might be already loaded or AnonymousUser
+            is_auth = getattr(request.user, 'is_authenticated', False)
+            logger.debug(f"[AsyncAuthMiddleware] User already loaded or not lazy: {request.user}, Authenticated: {is_auth}")
+
+
+        response = await get_response(request)
+
+        # Code to be executed for each request/response after
+        # the view is called.
+
+        return response
+
+    # Return the correct function based on whether get_response is async or sync
+    if asyncio.iscoroutinefunction(get_response):
+        return middleware
+    else:
+        # If the next middleware/view is sync, we don't need our async wrapper
+        # However, the decorator handles this, so we just return the async version.
+        # For clarity, the decorator makes this middleware compatible either way.
+        return middleware

swarm/settings.py

@@ -28,6 +28,8 @@ ENABLE_API_AUTH = bool(_raw_api_token)
 SWARM_API_KEY = _raw_api_token # Assign the loaded token (or None)
 
 if ENABLE_API_AUTH:
+    # Add assertion to satisfy type checkers within this block
+    assert SWARM_API_KEY is not None, "SWARM_API_KEY cannot be None when ENABLE_API_AUTH is True"
     print(f"[Settings] SWARM_API_KEY loaded: {SWARM_API_KEY[:4]}...{SWARM_API_KEY[-4:]}")
     print("[Settings] ENABLE_API_AUTH is True.")
 else:
@@ -58,6 +60,8 @@ MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    # Add custom middleware to handle async user loading after standard auth
+    'swarm.middleware.AsyncAuthMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]