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

swarm/serializers.py

@@ -1,103 +1,12 @@
 from rest_framework import serializers
-from swarm.models import ChatMessage
-import logging
-
-logger = logging.getLogger(__name__)
-print_logger = logging.getLogger('print_debug')
-
-class MessageSerializer(serializers.Serializer):
-    role = serializers.ChoiceField(choices=["system", "user", "assistant", "tool"])
-    # Content is CharField, allows null/blank by default
-    content = serializers.CharField(allow_null=True, required=False, allow_blank=True)
-    name = serializers.CharField(required=False, allow_blank=True)
-
-    # Removed validate_content
-
-    def validate(self, data):
-        """Validate message structure based on role."""
-        print_logger.debug(f"MessageSerializer.validate received data: {data}")
-        role = data.get('role')
-        content = data.get('content', None)
-        name = data.get('name')
-
-        # Role validation
-        if 'role' not in data:
-             raise serializers.ValidationError({"role": ["This field is required."]})
-
-        # Content requiredness validation (based on role)
-        content_required = role in ['system', 'user', 'assistant', 'tool']
-        content_present = 'content' in data
-
-        if content_required:
-            if not content_present:
-                 raise serializers.ValidationError({"content": ["This field is required."]})
-            # Null/Blank checks are handled by field definition (allow_null/allow_blank)
-            # Type check will happen in ChatCompletionRequestSerializer.validate_messages
-
-        # Name validation for tool role
-        if role == 'tool' and not name:
-             raise serializers.ValidationError({"name": ["This field is required for role 'tool'."]})
-
-        print_logger.debug(f"MessageSerializer.validate PASSED for data: {data}")
-        return data
-
-class ChatCompletionRequestSerializer(serializers.Serializer):
-    model = serializers.CharField(max_length=255)
-    messages = MessageSerializer(many=True, min_length=1)
-    stream = serializers.BooleanField(default=False)
-    params = serializers.JSONField(required=False, allow_null=True)
-
-    def validate(self, data):
-        """Perform object-level validation."""
-        model_value = self.initial_data.get('model')
-        logger.debug(f"Top-level validate checking model type. Got: {type(model_value)}, value: {model_value}")
-        if model_value is not None and not isinstance(model_value, str):
-             raise serializers.ValidationError({"model": ["Field 'model' must be a string."]})
-        # Messages validation (including content type) happens in validate_messages
-        return data
-
-    def validate_messages(self, value):
-        """
-        Validate the messages list itself and perform raw type checks.
-        'value' here is the list *after* MessageSerializer has run on each item.
-        We need to inspect `self.initial_data` for the raw types.
-        """
-        if not value:
-            raise serializers.ValidationError("Messages list cannot be empty.")
-
-        # Access raw message data from initial_data for type checking
-        raw_messages = self.initial_data.get('messages', [])
-        if not isinstance(raw_messages, list):
-             # This case is handled by ListField implicitly, but good to be explicit
-             raise serializers.ValidationError("Expected a list of message items.")
-
-        errors = []
-        for i, raw_msg in enumerate(raw_messages):
-             msg_errors = {}
-             if not isinstance(raw_msg, dict):
-                 # If the item itself isn't a dict, add error and skip further checks for it
-                 errors.append({f"item_{i}": "Each message must be a dictionary."})
-                 continue
-
-             # *** Check raw content type here ***
-             content = raw_msg.get('content', None)
-             if 'content' in raw_msg and content is not None and not isinstance(content, str):
-                  msg_errors['content'] = ["Content must be a string or null."] # Match test assertion
-
-             # Add other raw checks if needed (e.g., role type)
-
-             if msg_errors:
-                  errors.append(msg_errors) # Append errors for this specific message index
-
-        if errors:
-             # Raise a single validation error containing all message-specific errors
-             raise serializers.ValidationError(errors)
-
-        # Return the processed 'value' which passed MessageSerializer validation
-        return value
+from swarm.models import ChatMessage, ChatConversation
 
 class ChatMessageSerializer(serializers.ModelSerializer):
     class Meta:
         model = ChatMessage
         fields = '__all__'
 
+class ChatConversationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ChatConversation
+        fields = '__all__'

swarm/settings.py

@@ -1,46 +1,48 @@
 """
 Django settings for swarm project.
+Includes Pydantic base settings for Swarm Core.
 """
 
+import logging
 import os
+import sys
+from enum import Enum
 from pathlib import Path
-from dotenv import load_dotenv
-import logging
+from pydantic import Field # Import Field from Pydantic v2+
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+# --- Pydantic Settings for Swarm Core ---
+class LogFormat(str, Enum):
+    standard = "[%(levelname)s] %(asctime)s - %(name)s:%(lineno)d - %(message)s"
+    simple = "[%(levelname)s] %(name)s - %(message)s"
 
-BASE_DIR = Path(__file__).resolve().parent.parent # Points to src/
+class Settings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix='SWARM_', case_sensitive=False)
 
-# --- Load .env file ---
-dotenv_path = BASE_DIR.parent / '.env'
-load_dotenv(dotenv_path=dotenv_path)
-# print(f"[Settings] Attempted to load .env from: {dotenv_path}")
-# ---
+    log_level: str = Field(default='INFO', description="Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)")
+    log_format: LogFormat = Field(default=LogFormat.standard, description="Logging format")
+    debug: bool = Field(default=False, description="Global debug flag")
 
-SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'django-insecure-fallback-key-for-dev')
-DEBUG = os.getenv('DJANGO_DEBUG', 'True').lower() in ('true', '1', 't')
-ALLOWED_HOSTS = os.getenv('DJANGO_ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',')
+# --- Standard Django Settings ---
 
-# --- Custom Swarm Settings ---
-# Load the token from environment
-_raw_api_token = os.getenv('API_AUTH_TOKEN')
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+PROJECT_ROOT = BASE_DIR.parent
+if str(PROJECT_ROOT) not in sys.path:
+    sys.path.insert(0, str(PROJECT_ROOT))
 
-# *** Only enable API auth if the token is actually set ***
-ENABLE_API_AUTH = bool(_raw_api_token)
-SWARM_API_KEY = _raw_api_token # Assign the loaded token (or None)
+BLUEPRINTS_DIR = PROJECT_ROOT / 'blueprints'
 
-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:
-    # print("[Settings] API_AUTH_TOKEN env var not set. SWARM_API_KEY is None.")
-    # print("[Settings] ENABLE_API_AUTH is False.")
-    pass
+# --- Determine if running under pytest ---
+TESTING = 'pytest' in sys.modules
 
-SWARM_CONFIG_PATH = os.getenv('SWARM_CONFIG_PATH', str(BASE_DIR.parent / 'swarm_config.json'))
-BLUEPRINT_DIRECTORY = os.getenv('BLUEPRINT_DIRECTORY', str(BASE_DIR / 'swarm' / 'blueprints'))
-# --- End Custom Swarm Settings ---
+# Quick-start development settings - unsuitable for production
+SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'django-insecure-YOUR_FALLBACK_KEY_HERE_CHANGE_ME')
+# Use the Pydantic setting value for Django's DEBUG
+DEBUG = Settings().debug # Read from instantiated Pydantic settings
+ALLOWED_HOSTS = os.getenv('DJANGO_ALLOWED_HOSTS', '*').split(',')
 
+# --- Application definition ---
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -48,20 +50,61 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    # Third-party apps
     'rest_framework',
     'rest_framework.authtoken',
     'drf_spectacular',
-    'swarm',
+    # Local apps
+    'swarm.apps.SwarmConfig',
 ]
 
+# # --- Conditionally add blueprint apps for TESTING ---
+# if TESTING:
+#     _test_apps_to_add = ['blueprints.university']
+#     for app in _test_apps_to_add:
+#         if app not in INSTALLED_APPS:
+#             INSTALLED_APPS.insert(0, app)
+#             logging.info(f"Settings [TESTING]: Added '{app}' to INSTALLED_APPS.")
+#     if 'SWARM_BLUEPRINTS' not in os.environ:
+#          os.environ['SWARM_BLUEPRINTS'] = 'university'
+#          logging.info(f"Settings [TESTING]: Set SWARM_BLUEPRINTS='university'")
+# else:
+#     # --- Dynamic App Loading for Production/Development ---
+#     _INITIAL_BLUEPRINT_APPS = []
+#     _swarm_blueprints_env = os.getenv('SWARM_BLUEPRINTS')
+#     _log_source = "Not Set"
+#     if _swarm_blueprints_env:
+#         _blueprint_names = [name.strip() for name in _swarm_blueprints_env.split(',') if name.strip()]
+#         _INITIAL_BLUEPRINT_APPS = [f'blueprints.{name}' for name in _blueprint_names if name.replace('_', '').isidentifier()]
+#         _log_source = "SWARM_BLUEPRINTS env var"
+#         logging.info(f"Settings: Found blueprints from env var: {_INITIAL_BLUEPRINT_APPS}")
+#     else:
+#         _log_source = "directory scan"
+#         try:
+#             if BLUEPRINTS_DIR.is_dir():
+#                  for item in BLUEPRINTS_DIR.iterdir():
+#                      if item.is_dir() and (item / '__init__.py').exists():
+#                          if item.name.replace('_', '').isidentifier():
+#                              _INITIAL_BLUEPRINT_APPS.append(f'blueprints.{item.name}')
+#             logging.info(f"Settings: Found blueprints from directory scan: {_INITIAL_BLUEPRINT_APPS}")
+#         except Exception as e:
+#             logging.error(f"Settings: Error discovering blueprint apps during initial load: {e}")
+
+#     for app in _INITIAL_BLUEPRINT_APPS:
+#          if app not in INSTALLED_APPS:
+#               INSTALLED_APPS.append(app)
+#               logging.info(f"Settings [{_log_source}]: Added '{app}' to INSTALLED_APPS.")
+# # --- End App Loading Logic ---
+
+if isinstance(INSTALLED_APPS, tuple): INSTALLED_APPS = list(INSTALLED_APPS)
+logging.info(f"Settings: Final INSTALLED_APPS = {INSTALLED_APPS}")
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     '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',
 ]
@@ -71,7 +114,7 @@ ROOT_URLCONF = 'swarm.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR.parent / 'templates'],
+        'DIRS': [BASE_DIR / 'templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -85,93 +128,62 @@ TEMPLATES = [
 ]
 
 WSGI_APPLICATION = 'swarm.wsgi.application'
-ASGI_APPLICATION = 'swarm.asgi.application'
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.environ.get('DJANGO_DB_NAME', '/tmp/db.sqlite3'),
-        'TEST': {
-            'NAME': os.environ.get('DJANGO_TEST_DB_NAME', '/tmp/test_db.sqlite3'),
-            'OPTIONS': {
-                'timeout': 20,
-                'init_command': "PRAGMA journal_mode=WAL;",
-            },
-        },
-    }
-}
+
+SQLITE_DB_PATH = os.getenv('SQLITE_DB_PATH', BASE_DIR / 'db.sqlite3')
+DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': SQLITE_DB_PATH } }
+DJANGO_DATABASE = DATABASES['default']
 
 AUTH_PASSWORD_VALIDATORS = [
-    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',},
-    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',},
-    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',},
-    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',},
+    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
+    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator'},
+    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
+    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
-LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'UTC'
-USE_I18N = True
-USE_TZ = True
+LANGUAGE_CODE = 'en-us'; TIME_ZONE = 'UTC'; USE_I18N = True; USE_TZ = True
 
-STATIC_URL = 'static/'
-STATIC_ROOT = BASE_DIR.parent / 'staticfiles'
-STATICFILES_DIRS = [ BASE_DIR / "swarm" / "static", ]
+STATIC_URL = '/static/'; STATIC_ROOT = BASE_DIR / 'staticfiles'
+STATICFILES_DIRS = [ BASE_DIR / 'static', BASE_DIR / 'assets' ]
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': [
-        'swarm.auth.StaticTokenAuthentication',
-        'swarm.auth.CustomSessionAuthentication',
-    ],
-    # *** IMPORTANT: Add DEFAULT_PERMISSION_CLASSES ***
-    # If ENABLE_API_AUTH is False, we might want to allow any access for testing.
-    # If ENABLE_API_AUTH is True, we require HasValidTokenOrSession.
-    # We need to set this dynamically based on ENABLE_API_AUTH.
-    # A simple way is to set it here, but a cleaner way might involve middleware
-    # or overriding get_permissions in views. For now, let's adjust this:
-    'DEFAULT_PERMISSION_CLASSES': [
-         # If auth is enabled, require our custom permission
-         'swarm.permissions.HasValidTokenOrSession' if ENABLE_API_AUTH else
-         # Otherwise, allow anyone (useful for dev when token isn't set)
-         'rest_framework.permissions.AllowAny'
-    ],
     'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'swarm.auth.EnvOrTokenAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+    ),
+    'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAuthenticated',)
 }
 
 SPECTACULAR_SETTINGS = {
     'TITLE': 'Open Swarm API',
-    'DESCRIPTION': 'API for managing autonomous agent swarms',
-    'VERSION': '0.2.0',
+    'DESCRIPTION': 'API for the Open Swarm multi-agent collaboration framework.',
+    'VERSION': '1.0.0',
     'SERVE_INCLUDE_SCHEMA': False,
+    'SERVE_PERMISSIONS': ['rest_framework.permissions.AllowAny'],
 }
 
 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': { 'format': '[{levelname}] {asctime} - {name}:{lineno} - {message}', 'style': '{', },
-        'simple': { 'format': '[{levelname}] {message}', 'style': '{', },
-    },
-    'handlers': {
-        'console': { 'class': 'logging.StreamHandler', 'formatter': 'verbose', },
-    },
+    'version': 1, 'disable_existing_loggers': False,
+    'formatters': { 'standard': { 'format': '[%(levelname)s] %(asctime)s - %(name)s:%(lineno)d - %(message)s' }, },
+    'handlers': { 'console': { 'level': 'DEBUG' if DEBUG else 'INFO', 'class': 'logging.StreamHandler', 'formatter': 'standard', }, },
     'loggers': {
-        'django': { 'handlers': ['console'], 'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'), 'propagate': False, },
-        'swarm': { 'handlers': ['console'], 'level': os.getenv('SWARM_LOG_LEVEL', 'DEBUG'), 'propagate': False, },
-        'swarm.auth': { 'handlers': ['console'], 'level': 'DEBUG', 'propagate': False, },
-        'swarm.views': { 'handlers': ['console'], 'level': 'DEBUG', 'propagate': False, },
-        'swarm.extensions': { 'handlers': ['console'], 'level': 'DEBUG', 'propagate': False, },
-        'blueprint_django_chat': { 'handlers': ['console'], 'level': 'DEBUG', 'propagate': False, },
-        'print_debug': { 'handlers': ['console'], 'level': 'DEBUG', 'propagate': False, },
+        'django': { 'handlers': ['console'], 'level': 'INFO', 'propagate': False, },
+        'django.request': { 'handlers': ['console'], 'level': 'WARNING', 'propagate': False, },
+        'swarm': { 'handlers': ['console'], 'level': 'DEBUG' if DEBUG else 'INFO', 'propagate': False, },
+        'swarm.extensions': { 'handlers': ['console'], 'level': 'DEBUG' if DEBUG else 'INFO', 'propagate': False, },
+        'blueprints': { 'handlers': ['console'], 'level': 'DEBUG' if DEBUG else 'INFO', 'propagate': False, },
     },
-    'root': { 'handlers': ['console'], 'level': 'WARNING', },
 }
 
+AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']
+LOGIN_URL = '/accounts/login/'; LOGIN_REDIRECT_URL = '/chatbot/'
+
 REDIS_HOST = os.getenv('REDIS_HOST', 'localhost')
-REDIS_PORT = int(os.getenv('REDIS_PORT', '6379'))
+REDIS_PORT = int(os.getenv('REDIS_PORT', 6379))
 
-LOGIN_URL = '/login/'
-LOGIN_REDIRECT_URL = '/'
-LOGOUT_REDIRECT_URL = '/'
-CSRF_TRUSTED_ORIGINS = os.getenv('DJANGO_CSRF_TRUSTED_ORIGINS', 'http://localhost:8000,http://127.0.0.1:8000').split(',')
+if TESTING:
+     print("Pytest detected: Adjusting settings for testing.")
+     DATABASES['default']['NAME'] = ':memory:'

swarm/urls.py

@@ -1,72 +1,89 @@
-"""
-Swarm URL Configuration
-"""
-import logging
 from django.contrib import admin
-from django.urls import path, include, reverse_lazy
+from django.urls import path, re_path, include
+from django.http import HttpResponse
 from django.conf import settings
-from django.views.generic import RedirectView
-from django.contrib.auth import views as auth_views
-
-from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, SpectacularSwaggerView
+from django.conf.urls.static import static
+import os
+import logging
 
-from swarm.views.chat_views import ChatCompletionsView, HealthCheckView
-# *** Uncomment and correct the import path ***
-from swarm.views.api_views import ModelsListView
-# from swarm.views.webui_views import index as webui_index # Rename to avoid conflict
+# Import specific views from their modules
+from swarm.views.core_views import index as core_index_view, serve_swarm_config, custom_login
+from swarm.views.chat_views import chat_completions
+from swarm.views.model_views import list_models
+from swarm.views.message_views import ChatMessageViewSet
+from drf_spectacular.views import SpectacularSwaggerView, SpectacularAPIView as HiddenSpectacularAPIView
+from rest_framework.routers import DefaultRouter
 
 logger = logging.getLogger(__name__)
 
-# ==============================================================================
-# API URL Patterns (v1)
-# ==============================================================================
-api_urlpatterns = [
-    path('chat/completions', ChatCompletionsView.as_view(), name='chat_completions'),
-    # *** Uncomment this URL pattern ***
-    path('models', ModelsListView.as_view(), name='list_models'),
-    path('health', HealthCheckView.as_view(), name='health_check'),
-    # Add other v1 API endpoints here
-]
-
-# ==============================================================================
-# Schema URL Patterns
-# ==============================================================================
-schema_urlpatterns = [
-    path('schema/', SpectacularAPIView.as_view(), name='schema'),
-    path('schema/swagger-ui/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
-    path('schema/redoc/', SpectacularRedocView.as_view(url_name='schema'), name='redoc'),
-]
+def favicon(request):
+    favicon_path = settings.BASE_DIR / 'assets' / 'images' / 'favicon.ico'
+    try:
+        with open(favicon_path, 'rb') as f:
+            favicon_data = f.read()
+        return HttpResponse(favicon_data, content_type="image/x-icon")
+    except FileNotFoundError:
+        logger.warning("Favicon not found.")
+        return HttpResponse(status=404)
 
-# ==============================================================================
-# Main URL Patterns
-# ==============================================================================
-urlpatterns = [
-    # Redirect root based on DEBUG setting
-    path('', RedirectView.as_view(pattern_name='swagger-ui', permanent=False) if settings.DEBUG else RedirectView.as_view(pattern_name='login', permanent=False)),
+ENABLE_ADMIN = os.getenv("ENABLE_ADMIN", "false").lower() in ("true", "1", "t")
+ENABLE_WEBUI = os.getenv("ENABLE_WEBUI", "true").lower() in ("true", "1", "t")
 
-    # API v1 endpoints
-    path('v1/', include(api_urlpatterns)),
+logger.debug(f"ENABLE_WEBUI={'true' if ENABLE_WEBUI else 'false'}")
+logger.debug(f"ENABLE_ADMIN={'true' if ENABLE_ADMIN else 'false'}")
 
-    # Schema endpoints
-    path('api/', include(schema_urlpatterns)),
+router = DefaultRouter()
+# Ensure ChatMessageViewSet is available before registering
+if ChatMessageViewSet:
+    router.register(r'v1/chat/messages', ChatMessageViewSet, basename='chatmessage')
+else:
+     logger.warning("ChatMessageViewSet not imported correctly, skipping API registration.")
 
-    # Django Admin (Optional)
-    path('admin/', admin.site.urls) if getattr(settings, 'ENABLE_ADMIN', False) else path('admin/', RedirectView.as_view(url=reverse_lazy('login'))),
+# Base URL patterns required by Swarm core
+# Use the imported view functions directly
+base_urlpatterns = [
+    re_path(r'^health/?$', lambda request: HttpResponse("OK"), name='health_check'),
+    re_path(r'^v1/chat/completions/?$', chat_completions, name='chat_completions'),
+    re_path(r'^v1/models/?$', list_models, name='list_models'),
+    re_path(r'^schema/?$', HiddenSpectacularAPIView.as_view(), name='schema'),
+    re_path(r'^swagger-ui/?$', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
+]
 
-    # Authentication Views (Django Built-in)
-    path('login/', auth_views.LoginView.as_view(template_name='swarm/login.html'), name='login'),
-    path('logout/', auth_views.LogoutView.as_view(next_page=reverse_lazy('login')), name='logout'),
+# Optional Admin URLs
+admin_urlpatterns = [path('admin/', admin.site.urls)] if ENABLE_ADMIN else []
 
-    # Web UI (Optional) - Conditionally include based on settings
-    # *** Ensure this line remains commented out or removed if webui_index is not defined ***
-    # path('webui/', webui_index, name='webui_index') if getattr(settings, 'ENABLE_WEBUI', False) else path('webui/', RedirectView.as_view(url=reverse_lazy('login'))),
-]
+# Optional Web UI URLs
+webui_urlpatterns = []
+if ENABLE_WEBUI:
+    webui_urlpatterns = [
+        path('', core_index_view, name='index'),
+        path('favicon.ico', favicon, name='favicon'),
+        path('config/swarm_config.json', serve_swarm_config, name='serve_swarm_config'),
+        path('accounts/login/', custom_login, name='custom_login'),
+    ]
+    if settings.DEBUG:
+         if settings.STATIC_URL and settings.STATIC_ROOT:
+              webui_urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+         else:
+              logger.warning("STATIC_URL or STATIC_ROOT not configured, static files may not serve correctly in DEBUG mode.")
 
-# Debug logging (optional)
-logger.debug(f"ENABLE_ADMIN={getattr(settings, 'ENABLE_ADMIN', False)}")
-logger.debug(f"ENABLE_WEBUI={getattr(settings, 'ENABLE_WEBUI', False)}")
+# --- Blueprint URLs are now added dynamically via blueprint_base.py -> django_utils.py ---
+blueprint_urlpatterns = [] # Start with empty list, populated by utils
 
-# Example of how to conditionally add URLs based on settings
-# if getattr(settings, 'ENABLE_SOMETHING', False):
-#     urlpatterns.append(path('something/', include('something.urls')))
+# Combine all URL patterns
+urlpatterns = webui_urlpatterns + admin_urlpatterns + base_urlpatterns + blueprint_urlpatterns + router.urls
 
+# Log final URL patterns (consider moving this to where patterns are finalized if issues persist)
+if settings.DEBUG:
+    try:
+        from django.urls import get_resolver
+        # Note: get_resolver(None) might not reflect dynamically added URLs perfectly here.
+        # Logging within django_utils might be more accurate for dynamic additions.
+        final_patterns = get_resolver(None).url_patterns
+        logger.debug(f"Initial resolved URL patterns ({len(final_patterns)} total):")
+        # for pattern in final_patterns:
+        #      try: pattern_repr = str(pattern)
+        #      except: pattern_repr = f"[Pattern for {getattr(pattern, 'name', 'unnamed')}]"
+        #      logger.debug(f"  {pattern_repr}")
+    except Exception as e:
+        logger.error(f"Could not log initial URL patterns: {e}")

swarm/utils/context_utils.py

@@ -23,16 +23,10 @@ def _is_valid_message(msg: Any) -> bool:
     role = msg.get("role")
     if not role or not isinstance(role, str): logger.warning(f"Skipping msg missing role: {str(msg)[:150]}"); return False
     content = msg.get("content"); tool_calls = msg.get("tool_calls"); tool_call_id = msg.get("tool_call_id")
-    # Validate based on role: content must be a string for system/user/tool; assistant may have tool calls
-    if role == "system":
-        is_valid = isinstance(content, str)
-    elif role == "user":
-        is_valid = isinstance(content, str)
-    elif role == "assistant":
-        # Assistant valid if it has string content or at least one tool call
-        is_valid = isinstance(content, str) or (isinstance(tool_calls, list) and len(tool_calls) > 0)
-    elif role == "tool":
-        is_valid = isinstance(content, str) and tool_call_id is not None
+    if role == "system": is_valid = content is not None
+    elif role == "user": is_valid = content is not None
+    elif role == "assistant": is_valid = content is not None or (isinstance(tool_calls, list) and len(tool_calls) > 0)
+    elif role == "tool": is_valid = content is not None and tool_call_id is not None
     else: is_valid = False
     if not is_valid: logger.warning(f"Skipping msg failing validity check for role '{role}': {str(msg)[:150]}")
     return is_valid

swarm/utils/general_utils.py

@@ -118,27 +118,6 @@ def _search_and_process_jmespath(expression: str, payload: dict) -> str:
 
     return str(chat_id) if chat_id is not None else ""
 
-# ---------------------------------------------------------------------------
-# Debug utilities
-# ---------------------------------------------------------------------------
-
-_DEBUG_ENV_VARS = ("SWARM_DEBUG", "DEBUG", "OPEN_SWARM_DEBUG")
-
-
-def is_debug_enabled() -> bool:
-    """Return True if any recognised debug environment variable is truthy.
-
-    A value is considered *truthy* when it is set and **not** one of
-    "0", "false", "off" (case‑insensitive).
-    """
-    import os
-
-    for var in _DEBUG_ENV_VARS:
-        val = os.getenv(var)
-        if val and val.lower() not in ("0", "false", "off"):
-            return True
-    return False
-
 
 def extract_chat_id(payload: dict) -> str:
     """