django-cfg 1.2.2__py3-none-any.whl → 1.2.5__py3-none-any.whl

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/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/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/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/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/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

{django_cfg-1.2.2.dist-info → django_cfg-1.2.5.dist-info}/METADATA

@@ -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.dist-info → django_cfg-1.2.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 django_cfg/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_cfg/__init__.py,sha256=vaV1dOHjmG0bQG8EVAfNGOmb37ySIF-WZ33RKip8VHI,1630
+django_cfg/__init__.py,sha256=7xxzM_weNWt9rcTcCCF7ubv7Zep_cM7TAfgYUMq45hw,1630
 django_cfg/apps.py,sha256=k84brkeXJI7EgKZLEpTkM9YFZofKI4PzhFOn1cl9Msc,1656
 django_cfg/config.py,sha256=0cuRJVEnf03WzvEqhwzLvn9Zi1805C5KG1yk27ekABA,1190
 django_cfg/urls.py,sha256=bpRFjMonQuk4UCUMxx4ueBX3YDNB7HXKFwEghQ3KR3o,793
@@ -284,10 +284,10 @@ django_cfg/cli/commands/__init__.py,sha256=EKLXDAx-QttnGmdjsmVANAfhxWplxl2V_2I0S
 django_cfg/cli/commands/create_project.py,sha256=evR1AziJ_ofgW5biaT73dmQEUUkwDIwbCekTvX7iMro,21023
 django_cfg/cli/commands/info.py,sha256=ynOEvsAsAr4A2Xb1zhu2CCOB5-RBkDIA-iuWLo6DrxA,4922
 django_cfg/core/__init__.py,sha256=eVK57qFOok9kTeHoNEMQ1BplkUOaQ7NB9kP9eQK1vg0,358
-django_cfg/core/config.py,sha256=cjcDgVsnwd2ft8vB6PBSuWhmJcH5dR0NSUXY-2oJrwo,26106
+django_cfg/core/config.py,sha256=XZmW4tqHYi8zUOywpJ_8DqeFUzwwflMshZnwrpddjtw,26302
 django_cfg/core/environment.py,sha256=MAoEPqIPsLVhSANT2Bz4nnus2wmbMW0RCOQxhQfDrDc,9106
 django_cfg/core/exceptions.py,sha256=RTQEoU3PfR8lqqNNv5ayd_HY2yJLs3eioqUy8VM6AG4,10378
-django_cfg/core/generation.py,sha256=U5kXV4sBcSaPyDkZbYc-6v-hK0xGGGlXC0uwBnyc0_I,21187
+django_cfg/core/generation.py,sha256=OJjf54QmsbWAEEyrvO2AoPONP-8eK3zU4YDWe2w-H8E,22935
 django_cfg/core/integration.py,sha256=5kzkZSd45ij0rfrBdeNUYnDalObqvK__XpoP31xFYKo,5224
 django_cfg/core/validation.py,sha256=PhwDBTs24nuM3xqfIT3hXmN88VrhMT-Bk8Yb8FxjmPk,6590
 django_cfg/management/__init__.py,sha256=NrLAhiS59hqjy-bipOC1abNuRiNm5BpKXmjN05VzKbM,28
@@ -321,9 +321,11 @@ django_cfg/models/__init__.py,sha256=du24ZdqKdvc3VNXjgufEz_6B6gxdHtlqVHG4PJWaOQM
 django_cfg/models/api.py,sha256=bCsQR3CVsAUs78m1Q1aFpPTNbvGtr1cq-fuxdCK2-JI,4596
 django_cfg/models/base.py,sha256=Gy_B2dXSu-lYQjxlCaP6tkngFKhBFkCPeMNIpkkkKSU,10408
 django_cfg/models/cache.py,sha256=oAiBPM89pZfLlruIzDVFmqNmHdOPk3a2KAgB9jubUPg,12133
+django_cfg/models/cfg.py,sha256=P6YowmE-VOqp_L25Ijxj2hjjNhB9xtlm8G35DHWqTfk,2702
 django_cfg/models/constance.py,sha256=hzO3GuyGk5vFRD7pNWhiQZ7jz_JgFfJ_ry2vsf4108s,6818
+django_cfg/models/cors.py,sha256=lozVoQJVehhNL1qzOhvAkd4ZpgwAdOJ-OUX7wkJp5W4,3567
 django_cfg/models/database.py,sha256=LpcmEljjr-2pnR8UVSziUNSnucsojfh8PcgayhrWqK4,16875
-django_cfg/models/drf.py,sha256=zOCj8yiNFMxWVIYIBWnaipJ8DywAGSNsz-LlsTGHsGQ,9362
+django_cfg/models/drf.py,sha256=ZzxYv1KjA-iYLRGZj5HUcIyO9tg2B0Gudp1aZz9QNVg,9741
 django_cfg/models/email.py,sha256=y97W9I-Mm3TyWWLCLRh_2GO0u2PBVT2olMInqOyBiq8,4843
 django_cfg/models/environment.py,sha256=jM_KPXrxQHTFOhbaJTkkZL0Yml8bAM2Q7DJ69QsedX8,9438
 django_cfg/models/jwt.py,sha256=3R_dpLmVZIcH4zdtwA4qKnuCB8RZQACrgsbbgWY2q4c,9025
@@ -434,8 +436,8 @@ django_cfg/utils/path_resolution.py,sha256=C9As6p4Q9l3VeoVkFDRPQWGrzAWf8O8UxLVka
 django_cfg/utils/smart_defaults.py,sha256=b6A1z7VO1NJGq0oUQXN5P97c3k_Ssgw6qUi0mK-4TlM,19786
 django_cfg/utils/toolkit.py,sha256=Td8_iXNaftonF_xdZP4Y3uO65nuA_4_zditn5Q_Pfcw,23310
 django_cfg/utils/version_check.py,sha256=jI4v3YMdQriUEeb_TvRl511sDghy6I75iKRDUaNpucs,4800
-django_cfg-1.2.2.dist-info/METADATA,sha256=lqpgLyCzW9gfyYxukos7i7ohkUmutMF63ceutC9tqgE,45738
-django_cfg-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-django_cfg-1.2.2.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
-django_cfg-1.2.2.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
-django_cfg-1.2.2.dist-info/RECORD,,
+django_cfg-1.2.5.dist-info/METADATA,sha256=NMqpUdKjOVPigv8vWj7V1omQJ3eBFlSEN0lJqAOZqeE,45616
+django_cfg-1.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+django_cfg-1.2.5.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
+django_cfg-1.2.5.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
+django_cfg-1.2.5.dist-info/RECORD,,