django-cfg 1.3.13__py3-none-any.whl → 1.4.3__py3-none-any.whl

django_cfg/models/api/__init__.py

@@ -0,0 +1,27 @@
+"""
+API configuration models for django_cfg.
+
+API, authentication, and documentation configuration.
+"""
+
+from .config import APIConfig
+from .keys import ApiKeys
+from .jwt import JWTConfig
+from .cors import CORSConfig
+from .limits import LimitsConfig
+from .drf.config import DRFConfig
+from .drf.spectacular import SpectacularConfig
+from .drf.swagger import SwaggerUISettings
+from .drf.redoc import RedocUISettings
+
+__all__ = [
+    "APIConfig",
+    "ApiKeys",
+    "JWTConfig",
+    "CORSConfig",
+    "LimitsConfig",
+    "DRFConfig",
+    "SpectacularConfig",
+    "SwaggerUISettings",
+    "RedocUISettings",
+]

django_cfg/models/{api.py → api/config.py}

@@ -6,7 +6,7 @@ Django REST Framework and API settings with Pydantic 2.
 
 from typing import Dict, Any, List
 from pydantic import Field, field_validator
-from .base import BaseConfig
+from ..base import BaseConfig
 
 
 class APIConfig(BaseConfig):

django_cfg/models/api/drf/__init__.py

@@ -0,0 +1,21 @@
+"""
+Django REST Framework configuration models.
+
+Provides type-safe configuration for DRF and API documentation:
+- DRFConfig: Main DRF configuration
+- SpectacularConfig: OpenAPI/Swagger documentation
+- SwaggerUISettings: Swagger UI settings
+- RedocUISettings: Redoc UI settings
+"""
+
+from .config import DRFConfig
+from .spectacular import SpectacularConfig
+from .swagger import SwaggerUISettings
+from .redoc import RedocUISettings
+
+__all__ = [
+    "DRFConfig",
+    "SpectacularConfig",
+    "SwaggerUISettings",
+    "RedocUISettings",
+]

django_cfg/models/api/drf/config.py

@@ -0,0 +1,101 @@
+"""
+Django REST Framework configuration.
+"""
+
+from typing import Dict, Any, List
+from pydantic import BaseModel, Field
+
+
+class DRFConfig(BaseModel):
+    """
+    🔧 Django REST Framework Configuration
+
+    Handles REST Framework settings with sensible defaults.
+    """
+
+    # Authentication
+    authentication_classes: List[str] = Field(
+        default_factory=lambda: [
+            'rest_framework.authentication.TokenAuthentication',
+            'rest_framework.authentication.SessionAuthentication',
+        ],
+        description="Default authentication classes"
+    )
+
+    # Permissions
+    permission_classes: List[str] = Field(
+        default_factory=lambda: [
+            'rest_framework.permissions.IsAuthenticated',
+        ],
+        description="Default permission classes"
+    )
+
+    # Pagination
+    pagination_class: str = Field(
+        default='django_cfg.middleware.pagination.DefaultPagination',
+        description="Default pagination class"
+    )
+    page_size: int = Field(default=100, description="Default page size")
+
+    # Schema
+    schema_class: str = Field(
+        default='drf_spectacular.openapi.AutoSchema',
+        description="Default schema class"
+    )
+
+    # Throttling
+    throttle_classes: List[str] = Field(
+        default_factory=lambda: [
+            'rest_framework.throttling.AnonRateThrottle',
+            'rest_framework.throttling.UserRateThrottle'
+        ],
+        description="Default throttle classes"
+    )
+    throttle_rates: Dict[str, str] = Field(
+        default_factory=lambda: {
+            'anon': '200/hour',
+            'user': '2000/hour'
+        },
+        description="Default throttle rates"
+    )
+
+    # Versioning
+    versioning_class: str = Field(
+        default='rest_framework.versioning.NamespaceVersioning',
+        description="Default versioning class"
+    )
+    default_version: str = Field(default='v1', description="Default API version")
+    allowed_versions: List[str] = Field(
+        default_factory=lambda: ['v1'],
+        description="Allowed API versions"
+    )
+
+    # Renderers
+    renderer_classes: List[str] = Field(
+        default_factory=lambda: [
+            'rest_framework.renderers.JSONRenderer',
+            'django_cfg.modules.django_drf_theme.renderers.TailwindBrowsableAPIRenderer',
+        ],
+        description="Default renderer classes (JSON + Tailwind Browsable API)"
+    )
+
+    def get_rest_framework_settings(self) -> Dict[str, Any]:
+        """Get complete REST Framework settings."""
+        return {
+            'DEFAULT_AUTHENTICATION_CLASSES': self.authentication_classes,
+            'DEFAULT_PERMISSION_CLASSES': self.permission_classes,
+            'DEFAULT_RENDERER_CLASSES': self.renderer_classes,
+            'DEFAULT_PAGINATION_CLASS': self.pagination_class,
+            'PAGE_SIZE': self.page_size,
+            'DEFAULT_SCHEMA_CLASS': self.schema_class,
+            'DEFAULT_THROTTLE_CLASSES': self.throttle_classes,
+            'DEFAULT_THROTTLE_RATES': self.throttle_rates,
+            'DEFAULT_VERSIONING_CLASS': self.versioning_class,
+            'DEFAULT_VERSION': self.default_version,
+            'ALLOWED_VERSIONS': self.allowed_versions,
+        }
+
+
+__all__ = [
+    "DRFConfig",
+]

django_cfg/models/api/drf/redoc.py

@@ -0,0 +1,31 @@
+"""
+Redoc UI settings for DRF Spectacular.
+"""
+
+from typing import Dict, Any
+from pydantic import BaseModel, Field
+
+
+class RedocUISettings(BaseModel):
+    """Redoc UI specific settings."""
+
+    native_scrollbars: bool = Field(default=True, description="Use native scrollbars")
+    theme_color: str = Field(default="#7c3aed", description="Primary theme color")
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary for Redoc UI."""
+        return {
+            "nativeScrollbars": self.native_scrollbars,
+            "theme": {
+                "colors": {
+                    "primary": {
+                        "main": self.theme_color
+                    }
+                }
+            }
+        }
+
+
+__all__ = [
+    "RedocUISettings",
+]

django_cfg/models/api/drf/spectacular.py

@@ -0,0 +1,129 @@
+"""
+DRF Spectacular configuration for OpenAPI/Swagger documentation.
+"""
+
+from typing import Dict, Any, Optional, List
+from pydantic import BaseModel, Field
+from .swagger import SwaggerUISettings
+from .redoc import RedocUISettings
+
+
+class SpectacularConfig(BaseModel):
+    """
+    📚 Spectacular Configuration
+
+    Handles DRF Spectacular settings for OpenAPI/Swagger documentation.
+    """
+
+    # API Information
+    title: str = Field(default="API Documentation", description="API title")
+    description: str = Field(default="RESTful API with modern architecture", description="API description")
+    version: str = Field(default="1.0.0", description="API version")
+    terms_of_service: Optional[str] = Field(
+        default=None, description="Terms of service URL"
+    )
+
+    # Contact Information
+    contact_name: Optional[str] = Field(default=None, description="Contact name")
+    contact_email: Optional[str] = Field(default=None, description="Contact email")
+    contact_url: Optional[str] = Field(default=None, description="Contact URL")
+
+    # License Information
+    license_name: Optional[str] = Field(default=None, description="License name")
+    license_url: Optional[str] = Field(default=None, description="License URL")
+
+    # Schema Settings
+    schema_path_prefix: str = Field(default="/api", description="Schema path prefix")
+    serve_include_schema: bool = Field(default=False, description="Include schema in UI")
+    component_split_request: bool = Field(default=True, description="Split request components")
+    sort_operations: bool = Field(default=False, description="Sort operations")
+
+    # UI Settings
+    swagger_ui_settings: SwaggerUISettings = Field(
+        default_factory=SwaggerUISettings, description="Swagger UI settings"
+    )
+    redoc_ui_settings: RedocUISettings = Field(
+        default_factory=RedocUISettings, description="Redoc UI settings"
+    )
+
+    # Post-processing
+    postprocessing_hooks: List[str] = Field(
+        default_factory=lambda: [
+            'drf_spectacular.contrib.djangorestframework_camel_case.camelize_serializer_fields'
+        ],
+        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: {
+            'ValidationErrorEnum': 'django.contrib.auth.models.ValidationError',
+        },
+        description="Enum name overrides"
+    )
+
+    def get_spectacular_settings(self, project_name: Optional[str] = None) -> Dict[str, Any]:
+        """
+        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.
+
+        Args:
+            project_name: Project name from DjangoConfig to use as API title
+        """
+        settings = {
+            # 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,
+        }
+
+        # Use project_name as API title if provided and title is default
+        if project_name and self.title == "API Documentation":
+            settings["TITLE"] = f"{project_name} API"
+        elif self.title != "API Documentation":
+            settings["TITLE"] = self.title
+
+        # Always set description and version
+        settings["DESCRIPTION"] = self.description
+        settings["VERSION"] = self.version
+
+        # Add optional fields if present
+        if self.terms_of_service:
+            settings["TERMS_OF_SERVICE"] = self.terms_of_service
+
+        # Contact information
+        if any([self.contact_name, self.contact_email, self.contact_url]):
+            settings["CONTACT"] = {}
+            if self.contact_name:
+                settings["CONTACT"]["name"] = self.contact_name
+            if self.contact_email:
+                settings["CONTACT"]["email"] = self.contact_email
+            if self.contact_url:
+                settings["CONTACT"]["url"] = self.contact_url
+
+        # License information
+        if self.license_name:
+            settings["LICENSE"] = {"name": self.license_name}
+            if self.license_url:
+                settings["LICENSE"]["url"] = self.license_url
+
+        return settings
+
+
+__all__ = [
+    "SpectacularConfig",
+]

django_cfg/models/api/drf/swagger.py

@@ -0,0 +1,59 @@
+"""
+Swagger UI settings for DRF Spectacular.
+"""
+
+from typing import Dict, Any
+from pydantic import BaseModel, Field
+
+
+class SwaggerUISettings(BaseModel):
+    """Swagger UI specific settings."""
+
+    try_it_out_enabled: bool = Field(
+        default=True, description="Enable Try It Out feature"
+    )
+    doc_expansion: str = Field(
+        default="list", description="Default expansion setting (list, full, none)"
+    )
+    deep_linking: bool = Field(default=True, description="Enable deep linking")
+    persist_authorization: bool = Field(
+        default=True, description="Persist authorization data"
+    )
+    display_operation_id: bool = Field(
+        default=True, description="Display operation IDs"
+    )
+    default_models_expand_depth: int = Field(
+        default=1, description="Default expansion depth for models"
+    )
+    default_model_expand_depth: int = Field(
+        default=1, description="Default expansion depth for model"
+    )
+    default_model_rendering: str = Field(
+        default="model", description="Default model rendering"
+    )
+    filter: bool = Field(default=True, description="Enable filtering")
+    show_extensions: bool = Field(default=False, description="Show extensions")
+    show_common_extensions: bool = Field(
+        default=True, description="Show common extensions"
+    )
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary for Swagger UI."""
+        return {
+            "tryItOutEnabled": self.try_it_out_enabled,
+            "docExpansion": self.doc_expansion,
+            "deepLinking": self.deep_linking,
+            "persistAuthorization": self.persist_authorization,
+            "displayOperationId": self.display_operation_id,
+            "defaultModelsExpandDepth": self.default_models_expand_depth,
+            "defaultModelExpandDepth": self.default_model_expand_depth,
+            "defaultModelRendering": self.default_model_rendering,
+            "filter": self.filter,
+            "showExtensions": self.show_extensions,
+            "showCommonExtensions": self.show_common_extensions,
+        }
+
+
+__all__ = [
+    "SwaggerUISettings",
+]

django_cfg/models/{api_keys.py → api/keys.py}

@@ -51,14 +51,19 @@ class ApiKeys(BaseModel):
         """Validate OpenAI API key format."""
         if v is None:
             return v
-        
+
         key_str = v.get_secret_value()
+
+        # Treat empty string as None
+        if not key_str or key_str.strip() == "":
+            return None
+
         if not key_str.startswith(("sk-", "sk-proj-")):
             raise ValueError("OpenAI API key must start with 'sk-' or 'sk-proj-'")
-        
+
         if len(key_str) < 20:
             raise ValueError("OpenAI API key appears to be too short")
-        
+
         return v
     
     @field_validator("openrouter")
@@ -67,14 +72,19 @@ class ApiKeys(BaseModel):
         """Validate OpenRouter API key format."""
         if v is None:
             return v
-        
+
         key_str = v.get_secret_value()
+
+        # Treat empty string as None
+        if not key_str or key_str.strip() == "":
+            return None
+
         if not key_str.startswith(("sk-or-", "sk-proj-")):
             raise ValueError("OpenRouter API key must start with 'sk-or-' or 'sk-proj-'")
-        
+
         if len(key_str) < 20:
             raise ValueError("OpenRouter API key appears to be too short")
-        
+
         return v
     
     def get_openai_key(self) -> Optional[str]:

django_cfg/models/{limits.py → api/limits.py}

@@ -10,7 +10,6 @@ Following CRITICAL_REQUIREMENTS.md:
 
 from typing import Optional, Dict, Any, List
 from pydantic import BaseModel, Field, field_validator, model_validator
-from django_cfg.core.exceptions import ConfigurationError
 
 
 class LimitsConfig(BaseModel):

django_cfg/models/base/__init__.py

@@ -0,0 +1,14 @@
+"""
+Base configuration models for django_cfg.
+
+Provides foundation classes for all configuration models.
+"""
+
+from .config import BaseConfig, BaseSettings
+from .module import BaseCfgAutoModule
+
+__all__ = [
+    "BaseConfig",
+    "BaseSettings",
+    "BaseCfgAutoModule",
+]

django_cfg/models/django/__init__.py

@@ -0,0 +1,16 @@
+"""
+Django-specific configuration models for django_cfg.
+
+Django integrations and extensions.
+"""
+
+from .environment import EnvironmentConfig
+from .constance import ConstanceConfig, ConstanceField
+from .revolution import RevolutionConfig
+
+__all__ = [
+    "EnvironmentConfig",
+    "ConstanceConfig",
+    "ConstanceField",
+    "RevolutionConfig",
+]

django_cfg/models/{constance.py → django/constance.py}

@@ -8,7 +8,7 @@ Unfold admin integration and smart field grouping.
 from typing import Dict, List, Optional, Any, Union, Literal
 from pydantic import BaseModel, Field, field_validator
 import traceback
-from django_cfg.models.cfg import BaseCfgAutoModule
+from django_cfg.models.base import BaseCfgAutoModule
 
 
 class ConstanceField(BaseModel):

django_cfg/models/{environment.py → django/environment.py}

@@ -8,7 +8,7 @@ import os
 from pathlib import Path
 from typing import List, Dict, Any
 from pydantic import Field, field_validator, computed_field
-from .base import BaseConfig
+from ..base import BaseConfig
 
 
 class EnvironmentConfig(BaseConfig):

django_cfg/models/infrastructure/__init__.py

@@ -0,0 +1,17 @@
+"""
+Infrastructure configuration models for django_cfg.
+
+Core infrastructure components: database, cache, logging, security.
+"""
+
+from .database import DatabaseConfig
+from .cache import CacheConfig
+from .logging import LoggingConfig
+from .security import SecurityConfig
+
+__all__ = [
+    "DatabaseConfig",
+    "CacheConfig",
+    "LoggingConfig",
+    "SecurityConfig",
+]

django_cfg/models/{cache.py → infrastructure/cache.py}

@@ -12,8 +12,6 @@ from typing import Dict, Optional, Any, Literal, Union
 from pydantic import BaseModel, Field, field_validator, model_validator
 from urllib.parse import urlparse
 
-from django_cfg.core.exceptions import CacheError, ValidationError
-
 
 class CacheConfig(BaseModel):
     """
@@ -237,6 +235,9 @@ class CacheConfig(BaseModel):
         Raises:
             CacheError: If configuration cannot be converted
         """
+        # Import here to avoid circular dependency
+        from django_cfg.core.exceptions import CacheError
+
         try:
             backend = self.get_backend_type(environment, debug)
             

django_cfg/models/infrastructure/database/__init__.py

@@ -0,0 +1,22 @@
+"""
+Database configuration for django_cfg.
+
+Provides type-safe database configuration with:
+- Connection string parsing
+- Field validation
+- Django settings conversion
+- Database routing
+
+Organized into focused modules:
+- config.py - Main DatabaseConfig class
+- validators.py - Field validators
+- parsers.py - Connection string parsers
+- converters.py - Django settings converters
+- routing.py - Database routing utilities
+"""
+
+from .config import DatabaseConfig
+
+__all__ = [
+    "DatabaseConfig",
+]