django-cfg 1.2.2__tar.gz → 1.2.5__tar.gz

{django_cfg-1.2.2 → django_cfg-1.2.5}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.2.2
-Summary: 🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience
-Project-URL: Homepage, https://github.com/markolofsen/django-cfg
-Project-URL: Documentation, https://django-cfg.readthedocs.io
-Project-URL: Repository, https://github.com/markolofsen/django-cfg.git
-Project-URL: Issues, https://github.com/markolofsen/django-cfg/issues
-Project-URL: Changelog, https://github.com/markolofsen/django-cfg/blob/main/CHANGELOG.md
+Version: 1.2.5
+Summary: 🚀 Next-gen Django configuration: type-safety, AI features, blazing-fast setup, and automated best practices — all in one.
+Project-URL: Homepage, https://django-cfg.com
+Project-URL: Documentation, https://django-cfg.com
+Project-URL: Repository, https://django-cfg.com
+Project-URL: Issues, https://django-cfg.com
+Project-URL: Changelog, https://django-cfg.com
 Author-email: ReformsAI Team <dev@reforms.ai>
 Maintainer-email: ReformsAI Team <dev@reforms.ai>
 License: MIT
@@ -47,7 +47,7 @@ Requires-Dist: django-import-export<5.0,>=4.3.0
 Requires-Dist: django-json-widget<3.0,>=2.0.0
 Requires-Dist: django-ratelimit<5.0.0,>=4.1.0
 Requires-Dist: django-redis<7.0,>=6.0.0
-Requires-Dist: django-revolution<2.0,>=1.0.35
+Requires-Dist: django-revolution<2.0,>=1.0.43
 Requires-Dist: django-unfold<1.0,>=0.64.0
 Requires-Dist: djangorestframework-simplejwt<6.0,>=5.5.0
 Requires-Dist: djangorestframework-simplejwt[token-blacklist]<6.0,>=5.5.0

{django_cfg-1.2.2 → django_cfg-1.2.5}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.2.2"
-description = "🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience"
+version = "1.2.5"
+description = "🚀 Next-gen Django configuration: type-safety, AI features, blazing-fast setup, and automated best practices — all in one."
 readme = "README.md"
 license = {text = "MIT"}
 authors = [
@@ -90,7 +90,6 @@ dependencies = [
     "django-import-export>=4.3.0,<5.0",
     "django-extensions>=4.1.0,<5.0",
     "django-constance>=4.3.0,<5.0",
-    "django-revolution>=1.0.35,<2.0",
     "django-unfold>=0.64.0,<1.0",
     "django-redis>=6.0.0,<7.0",
     "redis>=6.4.0,<7.0",
@@ -117,8 +116,13 @@ dependencies = [
     "lxml>=6.0.0,<7.0",
     "pgvector>=0.4.0,<1.0",
     "pydantic-ai>=1.0.10,<2.0",
+
+    "django-revolution>=1.0.43,<2.0",
 ]
 
+# Local development dependencies
+# django-revolution = {path = "../django-revolution", develop = true}
+
 [project.optional-dependencies]
 
 # Django compatibility - users should install one of these (minimum 5.2)
@@ -187,11 +191,11 @@ full = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/markolofsen/django-cfg"
-Documentation = "https://django-cfg.readthedocs.io"
-Repository = "https://github.com/markolofsen/django-cfg.git"
-Issues = "https://github.com/markolofsen/django-cfg/issues"
-Changelog = "https://github.com/markolofsen/django-cfg/blob/main/CHANGELOG.md"
+Homepage = "https://django-cfg.com"
+Documentation = "https://django-cfg.com"
+Repository = "https://django-cfg.com"
+Issues = "https://django-cfg.com"
+Changelog = "https://django-cfg.com"
 
 [project.scripts]
 django-cfg = "django_cfg.cli.main:main"

{django_cfg-1.2.2 → django_cfg-1.2.5}/requirements-dev.txt

@@ -22,7 +22,7 @@ django-import-export>=4.3.0,<5.0
 django-json-widget>=2.0.0,<3.0
 django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0,<7.0
-django-revolution>=1.0.35,<2.0
+django-revolution>=1.0.43,<2.0
 django-unfold>=0.64.0,<1.0
 django>=5.2,<6.0
 djangorestframework-simplejwt>=5.5.0,<6.0

{django_cfg-1.2.2 → django_cfg-1.2.5}/requirements-test.txt

@@ -20,7 +20,7 @@ django-import-export>=4.3.0,<5.0
 django-json-widget>=2.0.0,<3.0
 django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0,<7.0
-django-revolution>=1.0.35,<2.0
+django-revolution>=1.0.43,<2.0
 django-unfold>=0.64.0,<1.0
 django>=5.2,<6.0
 djangorestframework-simplejwt>=5.5.0,<6.0

{django_cfg-1.2.2 → django_cfg-1.2.5}/requirements.txt

@@ -20,7 +20,7 @@ django-import-export>=4.3.0,<5.0
 django-json-widget>=2.0.0,<3.0
 django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0,<7.0
-django-revolution>=1.0.35,<2.0
+django-revolution>=1.0.43,<2.0
 django-unfold>=0.64.0,<1.0
 djangorestframework-simplejwt>=5.5.0,<6.0
 djangorestframework-simplejwt[token-blacklist]>=5.5.0,<6.0

{django_cfg-1.2.2 → django_cfg-1.2.5}/src/django_cfg/__init__.py

@@ -32,7 +32,7 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.2.2"
+__version__ = "1.2.5"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

{django_cfg-1.2.2 → django_cfg-1.2.5}/src/django_cfg/core/config.py

@@ -245,14 +245,16 @@ class DjangoConfig(BaseModel):
     )
 
     # === API Configuration ===
+    # Note: DRF base configuration is handled by django-revolution
+    # These fields provide additional/extended settings on top of Revolution
     drf: Optional[DRFConfig] = Field(
         default=None,
-        description="Django REST Framework configuration",
+        description="Extended Django REST Framework configuration (supplements Revolution)",
     )
 
     spectacular: Optional[SpectacularConfig] = Field(
         default=None,
-        description="DRF Spectacular OpenAPI/Swagger configuration",
+        description="Extended DRF Spectacular configuration (supplements Revolution)",
     )
 
     # === Limits Configuration ===

{django_cfg-1.2.2 → django_cfg-1.2.5}/src/django_cfg/core/generation.py

@@ -440,30 +440,52 @@ class SettingsGenerator:
                 settings.update(revolution_settings)
                 integrations.append("django_revolution")
 
-                # Automatically generate DRF configuration if RevolutionConfig has DRF parameters
-                if hasattr(config.revolution, "get_drf_config_kwargs"):
-                    try:
-                        from django_revolution.drf_config import create_drf_config
-
-                        # Get DRF config parameters from RevolutionConfig
-                        drf_kwargs = config.revolution.get_drf_config_kwargs()
-
-                        # Create DRF config with Django Revolution integration
-                        drf_config = create_drf_config(**drf_kwargs)
-
-                        # Get Django settings from DRF config
-                        drf_settings = drf_config.get_django_settings()
-                        settings.update(drf_settings)
-                        integrations.append("drf_spectacular")
-
-                    except ImportError as e:
-                        logger.warning(f"Could not import django_revolution.drf_config: {e}")
-                    except Exception as e:
-                        logger.warning(f"Could not generate DRF config from Revolution: {e}")
-
-            # Note: DRF and Spectacular configuration is now handled through Revolution
-            # The old config.drf and config.spectacular fields are deprecated
-            # in favor of Revolution's integrated DRF configuration
+                # Automatically generate DRF configuration using Revolution's core_config
+                try:
+                    from django_revolution import create_drf_spectacular_config
+
+                    # Extract DRF parameters from RevolutionConfig
+                    drf_kwargs = {
+                        "title": getattr(config.revolution, "drf_title", "API"),
+                        "description": getattr(config.revolution, "drf_description", "RESTful API"),
+                        "version": getattr(config.revolution, "drf_version", "1.0.0"),
+                        "schema_path_prefix": f"/{config.revolution.api_prefix}/",
+                        "enable_browsable_api": getattr(config.revolution, "drf_enable_browsable_api", False),
+                        "enable_throttling": getattr(config.revolution, "drf_enable_throttling", False),
+                    }
+
+                    # Create DRF + Spectacular config with Revolution's comprehensive settings (includes proper enum config)
+                    drf_settings = create_drf_spectacular_config(**drf_kwargs)
+                    settings.update(drf_settings)
+                    logger.info("🚀 Generated DRF + Spectacular settings using Revolution's create_drf_spectacular_config")
+                    integrations.append("drf_spectacular")
+
+                except ImportError as e:
+                    logger.warning(f"Could not import django_revolution.create_drf_spectacular_config: {e}")
+                except Exception as e:
+                    logger.warning(f"Could not generate DRF config from Revolution: {e}")
+
+            # Apply django-cfg DRF/Spectacular extensions (only if explicitly configured by user)
+            try:
+                if config.drf or config.spectacular:
+                    # Extend REST_FRAMEWORK settings if config.drf is provided
+                    if config.drf and "REST_FRAMEWORK" in settings:
+                        drf_extensions = config.drf.get_rest_framework_settings()
+                        # Merge with existing settings (django-cfg extensions take priority)
+                        settings["REST_FRAMEWORK"].update(drf_extensions)
+                        logger.info("🔧 Extended REST_FRAMEWORK settings with django-cfg DRF config")
+                    
+                    # Extend SPECTACULAR_SETTINGS if config.spectacular is provided
+                    if config.spectacular and "SPECTACULAR_SETTINGS" in settings:
+                        spectacular_extensions = config.spectacular.get_spectacular_settings()
+                        # Merge with existing settings (django-cfg extensions take priority)
+                        settings["SPECTACULAR_SETTINGS"].update(spectacular_extensions)
+                        logger.info("🔧 Extended SPECTACULAR_SETTINGS with django-cfg Spectacular config")
+                        
+                    integrations.append("drf_spectacular_extended")
+                    
+            except Exception as e:
+                logger.warning(f"Could not apply DRF/Spectacular extensions from django-cfg: {e}")
 
             # Add integration info for debugging
             if integrations:

django_cfg-1.2.5/src/django_cfg/models/cfg.py

@@ -0,0 +1,99 @@
+"""
+Base Configuration Module for Django CFG
+
+Provides a unified base class for all auto-configuration modules.
+"""
+
+from typing import Optional, TYPE_CHECKING
+from abc import ABC, abstractmethod
+
+if TYPE_CHECKING:
+    from django_cfg.core.config import DjangoConfig
+
+
+class BaseCfgAutoModule(ABC):
+    """
+    Base class for all django-cfg auto-configuration modules.
+    
+    Provides unified configuration access and smart defaults.
+    Designed to be used in generation.py without circular imports.
+    """
+    
+    def __init__(self, config: Optional["DjangoConfig"] = None):
+        """
+        Initialize the auto-configuration module.
+        
+        Args:
+            config: DjangoConfig instance (passed from generation.py)
+        """
+        self._config = config
+    
+    def set_config(self, config: "DjangoConfig") -> None:
+        """
+        Set the configuration instance.
+        
+        Args:
+            config: The DjangoConfig instance
+        """
+        self._config = config
+    
+    def get_config(self) -> Optional["DjangoConfig"]:
+        """Get the current configuration instance."""
+        return self._config
+    
+    def has_config_field(self, field_name: str) -> bool:
+        """
+        Check if config has a specific field with a non-None value.
+        
+        Args:
+            field_name: Name of the field to check
+            
+        Returns:
+            True if field exists and is not None
+        """
+        if not self._config:
+            return False
+        return hasattr(self._config, field_name) and getattr(self._config, field_name) is not None
+    
+    def get_config_field(self, field_name: str, default=None):
+        """
+        Get a field value from config with fallback.
+        
+        Args:
+            field_name: Name of the field to get
+            default: Default value if field doesn't exist or is None
+            
+        Returns:
+            Field value or default
+        """
+        if not self._config:
+            return default
+        return getattr(self._config, field_name, default)
+    
+    @abstractmethod
+    def get_smart_defaults(self):
+        """
+        Get smart default configuration for this module.
+        
+        Returns:
+            Configuration object with intelligent defaults
+        """
+        pass
+    
+    @abstractmethod
+    def get_module_config(self):
+        """
+        Get the final configuration for this module.
+        
+        Uses project config if available, otherwise returns smart defaults.
+        
+        Returns:
+            Configuration object ready for Django settings generation
+        """
+        pass
+
+
+# Export the base class
+__all__ = [
+    "BaseCfgAutoModule",
+]

django_cfg-1.2.5/src/django_cfg/models/cors.py

@@ -0,0 +1,118 @@
+"""
+CORS Configuration Models
+
+Handles CORS settings with smart defaults and custom header support.
+"""
+
+from typing import List, Optional
+from pydantic import BaseModel, Field
+
+
+class CORSConfig(BaseModel):
+    """CORS configuration with smart defaults"""
+    
+    # Custom headers (user-defined)
+    custom_headers: List[str] = Field(
+        default_factory=list,
+        description="Custom headers to allow (e.g., ['x-api-key'])"
+    )
+    
+    # Origins
+    allowed_origins: Optional[List[str]] = Field(
+        default=None,
+        description="Allowed origins (None = all origins allowed)"
+    )
+    
+    # Credentials
+    allow_credentials: bool = Field(
+        default=True,
+        description="Allow credentials in CORS requests"
+    )
+    
+    # Methods
+    allowed_methods: List[str] = Field(
+        default_factory=lambda: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+        description="Allowed HTTP methods"
+    )
+    
+    # Max age
+    max_age: int = Field(
+        default=86400,  # 24 hours
+        description="Max age for preflight requests in seconds"
+    )
+    
+    def get_all_headers(self) -> List[str]:
+        """Get all headers (standard + custom)"""
+        # Standard headers that are always needed
+        standard_headers = [
+            "accept",
+            "accept-encoding", 
+            "authorization",
+            "content-type",
+            "dnt",
+            "origin",
+            "user-agent",
+            "x-csrftoken",
+            "x-requested-with",
+        ]
+        
+        # Combine with custom headers
+        all_headers = standard_headers + self.custom_headers
+        
+        # Remove duplicates while preserving order
+        seen = set()
+        unique_headers = []
+        for header in all_headers:
+            if header.lower() not in seen:
+                seen.add(header.lower())
+                unique_headers.append(header)
+        
+        return unique_headers
+
+
+# ===== AUTO-CONFIGURATION MODULE =====
+
+try:
+    from .cfg import BaseCfgAutoModule
+    
+    class DjangoCORSModule(BaseCfgAutoModule):
+        """Django CORS auto-configuration module"""
+        
+        def get_smart_defaults(self) -> CORSConfig:
+            """Get smart default CORS configuration"""
+            return CORSConfig(
+                custom_headers=["x-api-key"],
+                allowed_origins=None,  # Allow all origins by default
+                allow_credentials=True,
+                allowed_methods=["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
+                max_age=86400,  # 24 hours
+            )
+        
+        def get_module_config(self) -> CORSConfig:
+            """Get CORS configuration with project overrides"""
+            if self.has_config_field('cors'):
+                return self.get_config_field('cors')
+            return self.get_smart_defaults()
+        
+        def get_cors_config(self, custom_headers: Optional[List[str]] = None) -> CORSConfig:
+            """Get CORS configuration with custom headers support"""
+            # Get base config (project or defaults)
+            cors_config = self.get_module_config()
+            
+            # Override custom headers if provided
+            if custom_headers:
+                cors_config = cors_config.model_copy()
+                cors_config.custom_headers = custom_headers
+            
+            return cors_config
+
+except ImportError:
+    # BaseCfgAutoModule not available - auto-configuration disabled
+    DjangoCORSModule = None
+
+
+# Export all models
+__all__ = [
+    "CORSConfig",
+    "DjangoCORSModule",
+]

{django_cfg-1.2.2 → django_cfg-1.2.5}/src/django_cfg/models/drf.py

@@ -122,6 +122,9 @@ class SpectacularConfig(BaseModel):
         description="Post-processing hooks"
     )
     
+    # NOTE: Enum generation settings are handled by django-revolution
+    # Only override if you need different values than Revolution defaults
+    
     # Enum overrides
     enum_name_overrides: Dict[str, str] = Field(
         default_factory=lambda: {
@@ -131,22 +134,26 @@ class SpectacularConfig(BaseModel):
     )
 
     def get_spectacular_settings(self) -> Dict[str, Any]:
-        """Get complete Spectacular settings."""
+        """
+        Get django-cfg Spectacular extensions.
+        
+        NOTE: This extends Revolution's base settings, not replaces them.
+        Only include settings that are unique to django-cfg or critical fixes.
+        """
         settings = {
-            # Basic information
-            "TITLE": self.title,
-            "DESCRIPTION": self.description,
-            "VERSION": self.version,
-            "SERVE_INCLUDE_SCHEMA": self.serve_include_schema,
-            "SCHEMA_PATH_PREFIX": self.schema_path_prefix,
-            "COMPONENT_SPLIT_REQUEST": self.component_split_request,
-            "SORT_OPERATIONS": self.sort_operations,
-            # UI Settings
-            "SWAGGER_UI_SETTINGS": self.swagger_ui_settings.to_dict(),
-            "REDOC_UI_SETTINGS": self.redoc_ui_settings.to_dict(),
-            # Processing
-            "POSTPROCESSING_HOOKS": self.postprocessing_hooks,
-            "ENUM_NAME_OVERRIDES": self.enum_name_overrides,
+            # django-cfg specific UI enhancements
+            "REDOC_UI_SETTINGS": self.redoc_ui_settings.to_dict(),  # Revolution doesn't have custom Redoc settings
+            
+            # django-cfg specific processing extensions
+            "ENUM_NAME_OVERRIDES": self.enum_name_overrides,  # Custom enum overrides
+            
+            # CRITICAL: Ensure enum generation is always enabled (fix Revolution gaps)
+            # These settings ensure proper enum generation even if Revolution config changes
+            "GENERATE_ENUM_FROM_CHOICES": True,
+            "ENUM_GENERATE_CHOICE_FROM_PATH": True, 
+            "ENUM_NAME_SUFFIX": "Enum",
+            "CAMELIZE_NAMES": False,
+            "ENUM_ADD_EXPLICIT_BLANK_NULL_CHOICE": False,
         }
         
         # Add optional fields if present