django-cfg 1.1.82__py3-none-any.whl → 1.2.1__py3-none-any.whl

django_cfg/cli/commands/create_project.py

@@ -219,7 +219,7 @@ docker-compose -f docker-compose.yml -f docker-compose.nginx.yml up -d
 
 - **Admin Interface**: `http://localhost:8000/admin/`
 - **API Documentation**: `http://localhost:8000/api/schema/swagger-ui/`
-- **Django CFG Docs**: [django-cfg.unrealos.com](https://django-cfg.unrealos.com)
+- **Django CFG Docs**: [djangocfg.com](https://djangocfg.com)
 
 ## 🛠️ Development
 
@@ -579,7 +579,7 @@ def create_project(project_name: str, path: str, no_deps: bool, use_pip: bool, f
         click.echo("   ⚡ Background task processing")
         click.echo("   🐳 Docker deployment ready")
         
-        # click.echo(f"\n📚 Documentation: https://django-cfg.unrealos.com")
+        # click.echo(f"\n📚 Documentation: https://djangocfg.com")
         
         # Beautiful thank you message
         show_thank_you_message()

django_cfg/cli/commands/info.py

@@ -119,7 +119,7 @@ def info(verbose: bool):
     click.echo("   # Install optional dependencies")
     click.echo("   pip install twilio sendgrid django-unfold")
     click.echo()
-    click.echo("📚 Documentation: https://django-cfg.unrealos.com")
+    click.echo("📚 Documentation: https://djangocfg.com")
     click.echo("🐙 GitHub: https://github.com/unrealos/django-cfg")
     
     # Warnings for missing critical dependencies

django_cfg/config.py

@@ -0,0 +1,44 @@
+"""
+Django-CFG Library Configuration
+
+Configuration settings for the django-cfg library itself.
+"""
+
+from typing import List
+from .modules.django_unfold.icons import Icons
+from .modules.django_unfold.models.dropdown import SiteDropdownItem
+
+
+# Library configuration
+LIB_NAME = "Django CFG"
+LIB_SITE_URL = "https://djangocfg.com"
+LIB_DOCS_URL = "https://docs.djangocfg.com"
+LIB_GITHUB_URL = "https://github.com/django-cfg/django-cfg"
+LIB_SUPPORT_URL = "https://djangocfg.com/support"
+LIB_HEALTH_URL = "/cfg/health/"
+
+
+def get_default_dropdown_items() -> List[SiteDropdownItem]:
+    """Get default dropdown menu items for Unfold admin."""
+    return [
+        SiteDropdownItem(
+            title="Documentation",
+            icon=Icons.HELP_OUTLINE,
+            link=LIB_DOCS_URL,
+        ),
+        SiteDropdownItem(
+            title="GitHub",
+            icon=Icons.CODE,
+            link=LIB_GITHUB_URL,
+        ),
+        SiteDropdownItem(
+            title="Support",
+            icon=Icons.SUPPORT_AGENT,
+            link=LIB_SUPPORT_URL,
+        ),
+        SiteDropdownItem(
+            title="Django-CFG",
+            icon=Icons.HOME,
+            link=LIB_SITE_URL,
+        ),
+    ]

django_cfg/core/config.py

@@ -15,16 +15,11 @@ import os
 from pathlib import Path
 from urllib.parse import urlparse
 
-from django_cfg.exceptions import ConfigurationError, ValidationError, EnvironmentError
-from django_cfg.models.database import DatabaseConnection
-from django_cfg.models.cache import CacheBackend
-from django_cfg.models.services import EmailConfig, TelegramConfig
-from django_cfg.models.unfold import UnfoldConfig
-from django_cfg.models.drf import DRFConfig, SpectacularConfig
-from django_cfg.models.limits import LimitsConfig
-from django_cfg.models.ngrok import NgrokConfig
-from django_cfg.models.tasks import TaskConfig
-from django_cfg.modules.django_twilio.models import TwilioConfig
+from django_cfg import (
+    ConfigurationError, ValidationError, EnvironmentError,
+    DatabaseConfig, CacheConfig, EmailConfig, TelegramConfig,
+    UnfoldConfig, DRFConfig, SpectacularConfig, LimitsConfig
+)
 
 # Default apps
 DEFAULT_APPS = [
@@ -33,6 +28,7 @@ DEFAULT_APPS = [
     "unfold.contrib.filters",  # optional, if special filters are needed
     "unfold.contrib.forms",  # optional, if special form elements are needed
     "unfold.contrib.inlines",  # optional, if special inlines are needed
+    "import_export",  # django-import-export package
     "unfold.contrib.import_export",  # optional, if django-import-export package is used
     "unfold.contrib.guardian",  # optional, if django-guardian package is used
     "unfold.contrib.simple_history",  # optional, if django-simple-history package is used
@@ -54,7 +50,6 @@ DEFAULT_APPS = [
     "rest_framework_simplejwt.token_blacklist",
     "rest_framework_nested",
     "rangefilter",
-    "import_export",
     "django_filters",
     "drf_spectacular",
     "drf_spectacular_sidecar",
@@ -62,6 +57,7 @@ DEFAULT_APPS = [
     "django_extensions",
     "constance",
     "constance.backends.database",
+    "django_dramatiq",
     # Django CFG
     "django_cfg",
     "django_revolution",
@@ -87,8 +83,8 @@ class DjangoConfig(BaseModel):
         ```python
         class MyProjectConfig(DjangoConfig):
             project_name: str = "My Project"
-            databases: Dict[str, DatabaseConnection] = {
-                "default": DatabaseConnection(
+            databases: Dict[str, DatabaseConfig] = {
+                "default": DatabaseConfig(
                     engine="django.db.backends.postgresql",
                     name="${DATABASE_URL:mydb}",
                 )
@@ -100,7 +96,7 @@ class DjangoConfig(BaseModel):
 
     model_config = {
         "validate_assignment": True,
-        "extra": "forbid",  # Forbid additional fields for strict typing
+        "extra": "allow",  # Allow additional fields for extensibility
         "env_prefix": "DJANGO_",
         "populate_by_name": True,
         "validate_default": True,
@@ -149,6 +145,14 @@ class DjangoConfig(BaseModel):
         default=False,
         description="Enable django-cfg Leads application (lead collection, contact forms, CRM integration)",
     )
+    enable_knowbase: bool = Field(
+        default=False,
+        description="Enable django-cfg Knowledge Base application (documents, AI chat, embeddings, search)",
+    )
+    enable_agents: bool = Field(
+        default=False,
+        description="Enable django-cfg AI Agents application (agent definitions, executions, workflows, tools)",
+    )
 
     # === URLs ===
     site_url: str = Field(default="http://localhost:3000", description="Frontend site URL")
@@ -196,18 +200,18 @@ class DjangoConfig(BaseModel):
     )
 
     # === Database Configuration ===
-    databases: Dict[str, DatabaseConnection] = Field(
+    databases: Dict[str, DatabaseConfig] = Field(
         default_factory=dict,
         description="Database connections",
     )
 
     # === Cache Configuration ===
-    cache_default: Optional[CacheBackend] = Field(
+    cache_default: Optional[CacheConfig] = Field(
         default=None,
         description="Default cache backend",
     )
 
-    cache_sessions: Optional[CacheBackend] = Field(
+    cache_sessions: Optional[CacheConfig] = Field(
         default=None,
         description="Sessions cache backend",
     )
@@ -222,11 +226,6 @@ class DjangoConfig(BaseModel):
         default=None,
         description="Force SSL redirect on/off (None = auto based on domains and environment)",
     )
-    
-    cors_allow_headers: Optional[List[str]] = Field(
-        default=None,
-        description="Custom CORS allowed headers (None = use smart defaults including X-API-Key)",
-    )
 
     # === Services Configuration ===
     email: Optional[EmailConfig] = Field(
@@ -239,11 +238,6 @@ class DjangoConfig(BaseModel):
         description="Telegram service configuration",
     )
 
-    twilio: Optional[TwilioConfig] = Field(
-        default=None,
-        description="Twilio service configuration for OTP and messaging via WhatsApp, SMS, and Email",
-    )
-
     # === Admin Interface Configuration ===
     unfold: Optional[UnfoldConfig] = Field(
         default=None,
@@ -267,18 +261,6 @@ class DjangoConfig(BaseModel):
         description="Application limits configuration (file uploads, requests, etc.)",
     )
 
-    # === Ngrok Configuration ===
-    ngrok: Optional[NgrokConfig] = Field(
-        default=None,
-        description="Ngrok tunnel configuration for development",
-    )
-
-    # === Task Processing Configuration ===
-    tasks: Optional[TaskConfig] = Field(
-        default=None,
-        description="Background task processing configuration with Dramatiq",
-    )
-
     # === Middleware Configuration ===
     custom_middleware: List[str] = Field(
         default_factory=list,
@@ -551,11 +533,14 @@ class DjangoConfig(BaseModel):
             apps.append("django_cfg.apps.newsletter")
         if self.enable_leads:
             apps.append("django_cfg.apps.leads")
-
-        # Add task processing apps if enabled
-        if hasattr(self, 'tasks') and self.tasks and self.tasks.enabled:
-            if hasattr(self.tasks, 'dramatiq') and self.tasks.dramatiq:
-                apps.append("django_dramatiq")
+        if self.enable_knowbase:
+            apps.append("django_cfg.apps.knowbase")
+        if self.enable_agents:
+            apps.append("django_cfg.apps.agents")
+        
+        # Auto-enable tasks if knowbase or agents are enabled
+        if self.enable_knowbase or self.enable_agents:
+            apps.append("django_cfg.apps.tasks")
 
         # Auto-detect dashboard apps from Unfold callback
         dashboard_apps = self._get_dashboard_apps_from_callback()
@@ -633,7 +618,6 @@ class DjangoConfig(BaseModel):
             "django.contrib.sessions.middleware.SessionMiddleware",
             "django.middleware.common.CommonMiddleware",
             "django.middleware.csrf.CsrfViewMiddleware",
-            "django_cfg.middleware.PublicEndpointsMiddleware",  # Handle invalid JWT tokens on public endpoints
             "django.contrib.auth.middleware.AuthenticationMiddleware",
             "django.contrib.messages.middleware.MessageMiddleware",
             "django.middleware.clickjacking.XFrameOptionsMiddleware",
@@ -710,43 +694,6 @@ class DjangoConfig(BaseModel):
             return f"{self.site_url.rstrip('/')}/{path}"
         return self.site_url
 
-    def get_ngrok_url(self, path: str = "") -> Optional[str]:
-        """
-        Get the current ngrok tunnel URL with optional path.
-        
-        This method retrieves the active ngrok URL from either:
-        1. The active ngrok manager instance
-        2. Environment variables set by runserver_ngrok command
-        
-        Args:
-            path: Optional path to append to ngrok URL
-            
-        Returns:
-            Complete ngrok URL with path, or None if ngrok is not available
-            
-        Example:
-            config.get_ngrok_url("/api/webhooks/")  # Returns: https://abc123.ngrok.io/api/webhooks/
-        """
-        try:
-            # Import here to avoid circular imports
-            from django_cfg.modules.django_ngrok import get_effective_tunnel_url
-            
-            tunnel_url = get_effective_tunnel_url()
-            if not tunnel_url:
-                return None
-                
-            if path:
-                path = path.lstrip("/")
-                return f"{tunnel_url.rstrip('/')}/{path}"
-            return tunnel_url
-            
-        except ImportError:
-            # django_ngrok module not available
-            return None
-        except Exception:
-            # Any other error - fail silently
-            return None
-
     def invalidate_cache(self) -> None:
         """Invalidate cached Django settings to force regeneration."""
         self._django_settings = None

django_cfg/core/environment.py

@@ -12,7 +12,7 @@ import os
 from typing import Optional, Dict, Any, List
 from pathlib import Path
 
-from django_cfg.exceptions import EnvironmentError
+from django_cfg.core.exceptions import EnvironmentError
 
 
 class EnvironmentDetector:

django_cfg/core/generation.py

@@ -12,7 +12,7 @@ from typing import Dict, List, Any, TYPE_CHECKING
 from pathlib import Path
 import logging
 
-from django_cfg.exceptions import ConfigurationError
+from django_cfg.core.exceptions import ConfigurationError
 from django_cfg.utils.smart_defaults import SmartDefaults
 
 if TYPE_CHECKING:
@@ -76,20 +76,6 @@ class SettingsGenerator:
             # Generate third-party integration settings
             settings.update(cls._generate_integration_settings(config))
 
-            # Generate task processing settings
-            task_settings = cls._generate_task_settings(config)
-            settings.update(task_settings)
-            
-            # Merge task apps into INSTALLED_APPS if they exist
-            if "_TASK_APPS" in task_settings:
-                task_apps = task_settings["_TASK_APPS"]
-                if "INSTALLED_APPS" in settings and task_apps:
-                    for app in task_apps:
-                        if app not in settings["INSTALLED_APPS"]:
-                            settings["INSTALLED_APPS"].append(app)
-                # Remove the temporary key
-                settings.pop("_TASK_APPS", None)
-
             return settings
 
         except Exception as e:
@@ -195,7 +181,7 @@ class SettingsGenerator:
                         routing_rules[app] = alias
             
             if routing_rules:
-                settings["DATABASE_ROUTERS"] = ["django_cfg.routers.DatabaseRouter"]
+                settings["DATABASE_ROUTERS"] = ["django_cfg.routing.routers.DatabaseRouter"]
                 settings["DATABASE_ROUTING_RULES"] = routing_rules
 
             return settings
@@ -214,12 +200,11 @@ class SettingsGenerator:
             if config.cache_default:
                 caches["default"] = config.cache_default.to_django_config(config._environment, config.debug, "default")
             else:
-                # # Create default cache backend
-                # from django_cfg.models.cache import CacheBackend
+                # Create default cache backend
+                from django_cfg.models.cache import CacheConfig
 
-                # default_cache = CacheBackend()
-                # caches["default"] = default_cache.to_django_config(config._environment, config.debug, "default")
-                pass
+                default_cache = CacheConfig()
+                caches["default"] = default_cache.to_django_config(config._environment, config.debug, "default")
 
             # Sessions cache
             if config.cache_sessions:
@@ -257,8 +242,7 @@ class SettingsGenerator:
                     config.security_domains, 
                     config._environment, 
                     config.debug,
-                    config.ssl_redirect,
-                    config.cors_allow_headers
+                    config.ssl_redirect
                 )
                 settings.update(security_defaults)
 
@@ -420,15 +404,6 @@ class SettingsGenerator:
 
             # Check for Constance configuration
             if hasattr(config, "constance") and config.constance:
-                try:
-                    if hasattr(config, "tasks") and config.tasks and config.tasks.enabled:
-                        from django_cfg.modules.django_tasks import extend_constance_config_with_tasks
-                        task_fields = extend_constance_config_with_tasks()
-                        if task_fields:
-                            config.constance.fields.extend(task_fields)
-                except Exception as e:
-                    logger.warning(f"Failed to extend Constance with task fields: {e}")
-                
                 constance_settings = config.constance.to_django_settings()
                 settings.update(constance_settings)
                 integrations.append("constance")
@@ -439,6 +414,18 @@ class SettingsGenerator:
                 settings.update(jwt_settings)
                 integrations.append("jwt")
 
+            # Check for Tasks/Dramatiq configuration
+            try:
+                from django_cfg.modules.django_tasks import generate_dramatiq_settings_from_config
+                dramatiq_settings = generate_dramatiq_settings_from_config(config)
+                if dramatiq_settings:
+                    settings.update(dramatiq_settings)
+                    integrations.append("dramatiq")
+            except ImportError as e:
+                logger.warning(f"Failed to import django_tasks module: {e}")
+            except Exception as e:
+                logger.error(f"Failed to generate Dramatiq settings: {e}")
+
             # Check for Django Revolution configuration
             if hasattr(config, "revolution") and config.revolution:
                 revolution_settings = {
@@ -542,81 +529,6 @@ class SettingsGenerator:
 
         return errors
 
-    @classmethod
-    def _generate_task_settings(cls, config: "DjangoConfig") -> Dict[str, Any]:
-        """
-        Generate task processing settings for Dramatiq integration.
-
-        Args:
-            config: DjangoConfig instance
-
-        Returns:
-            Task processing settings dictionary
-        """
-        if not config.tasks or not config.tasks.enabled:
-            return {}
-
-        settings = {}
-
-        try:
-            # Check if Dramatiq dependencies are available
-            import dramatiq
-            import django_dramatiq
-            
-            # Generate task apps directly without using task service to avoid circular dependency
-            task_apps = ["django_dramatiq"]
-            
-            # Add custom tasks app if admin is enabled
-            if config.tasks.dramatiq and config.tasks.dramatiq.admin_enabled:
-                task_apps.append("django_cfg.apps.tasks")
-            
-            settings["_TASK_APPS"] = task_apps
-            
-            # Generate minimal Dramatiq broker settings
-            if (config.cache_default and 
-                config.cache_default.redis_url and 
-                config.tasks.dramatiq):
-                
-                redis_db = config.tasks.dramatiq.redis_db or 0
-                redis_url = config.cache_default.redis_url
-                
-                # Fix Redis URL to use correct database
-                from urllib.parse import urlparse, urlunparse
-                parsed = urlparse(redis_url)
-                # Replace the path (database) with the correct one
-                fixed_url = urlunparse((
-                    parsed.scheme,
-                    parsed.netloc,
-                    f"/{redis_db}",
-                    parsed.params,
-                    parsed.query,
-                    parsed.fragment
-                ))
-                
-                settings["DRAMATIQ_BROKER"] = {
-                    "BROKER": "dramatiq.brokers.redis.RedisBroker",
-                    "OPTIONS": {
-                        "url": fixed_url,
-                    },
-                    "MIDDLEWARE": [
-                        "dramatiq.middleware.AgeLimit",
-                        "dramatiq.middleware.TimeLimit", 
-                        "dramatiq.middleware.Callbacks",
-                        "dramatiq.middleware.Retries",
-                        "django_dramatiq.middleware.AdminMiddleware",
-                        "django_dramatiq.middleware.DbConnectionsMiddleware",
-                    ]
-                }
-                
-                logger.debug(f"Generated task settings with {len(task_apps)} apps")
-            
-        except ImportError:
-            logger.warning("Dramatiq dependencies not available, skipping task settings")
-        except Exception as e:
-            logger.error(f"Failed to generate task settings: {e}")
-        
-        return settings
-
 
 # Export the main class
 __all__ = [

django_cfg/{integration.py → core/integration.py}

@@ -89,25 +89,27 @@ def get_django_cfg_urls_info() -> dict:
     ]
     
     try:
-        from django_cfg.modules.base import BaseModule
-        base_module = BaseModule()
+        from django_cfg.modules.base import BaseCfgModule
+        base_module = BaseCfgModule()
         
-        # Support URLs - needed for admin interface
-        if base_module.is_support_enabled():
-            endpoints.append("cfg/support/")
-
-        if base_module.is_accounts_enabled():
-            endpoints.append("cfg/accounts/")
-
-        if base_module.is_newsletter_enabled():
-            endpoints.append("cfg/newsletter/")
-
-        if base_module.is_leads_enabled():
-            endpoints.append("cfg/leads/")
-            
+        # All business logic apps are handled by Django Revolution zones
+        # if base_module.is_support_enabled():
+        #     endpoints.append("cfg/support/")
+        # if base_module.is_accounts_enabled():
+        #     endpoints.append("cfg/accounts/")
+        # Newsletter and Leads are handled by Django Revolution zones
+        # if base_module.is_newsletter_enabled():
+        #     endpoints.append("cfg/newsletter/")
+        # if base_module.is_leads_enabled():
+        #     endpoints.append("cfg/leads/")
     except Exception:
         # Fallback: show all possible endpoints
-        pass
+        endpoints.extend([
+            "cfg/support/",
+            "cfg/accounts/",
+            "cfg/newsletter/",
+            "cfg/leads/",
+        ])
     
     info = {
         "django_cfg": {

django_cfg/core/validation.py

@@ -12,7 +12,7 @@ from typing import List, Dict, Any, Optional, Set, Tuple, TYPE_CHECKING
 import re
 from pathlib import Path
 
-from django_cfg.exceptions import ValidationError, ConfigurationError
+from django_cfg.core.exceptions import ValidationError, ConfigurationError
 
 if TYPE_CHECKING:
     from django_cfg.core.config import DjangoConfig

django_cfg/management/__init__.py

@@ -1 +1 @@
-# Django management commands for django-cfg
+# Django management package

django_cfg/management/commands/__init__.py

@@ -1 +1 @@
-# Django management commands for django-cfg
+# Django management commands