django-cfg 1.2.12__py3-none-any.whl → 1.2.14__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.12"
+__version__ = "1.2.14"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

django_cfg/apps/urls.py

@@ -45,8 +45,8 @@ def get_django_cfg_urlpatterns() -> List[URLPattern]:
         #     patterns.append(path('leads/', include('django_cfg.apps.leads.urls')))
         
         # Tasks app - enabled when knowbase or agents are enabled
-        # if base_module.is_tasks_enabled():
-        #     patterns.append(path('tasks/', include('django_cfg.apps.tasks.urls')))
+        if base_module.is_tasks_enabled():
+            patterns.append(path('tasks/', include('django_cfg.apps.tasks.urls')))
             
     except Exception:
         # Fallback: include all URLs if config is not available

django_cfg/core/generation.py

@@ -467,24 +467,52 @@ class SettingsGenerator:
                 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)
+            # Apply django-cfg DRF/Spectacular extensions
             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)
+                # Always apply project name to Spectacular settings if they exist
+                if "SPECTACULAR_SETTINGS" in settings:
+                    if config.spectacular:
+                        # User provided explicit spectacular config
+                        spectacular_extensions = config.spectacular.get_spectacular_settings(project_name=config.project_name)
                         settings["SPECTACULAR_SETTINGS"].update(spectacular_extensions)
                         logger.info("🔧 Extended SPECTACULAR_SETTINGS with django-cfg Spectacular config")
-                        
+                    else:
+                        # Auto-create minimal spectacular config to set project name
+                        from django_cfg.models.drf import SpectacularConfig
+                        auto_spectacular = SpectacularConfig()
+                        spectacular_extensions = auto_spectacular.get_spectacular_settings(project_name=config.project_name)
+                        settings["SPECTACULAR_SETTINGS"].update(spectacular_extensions)
+                        logger.info(f"🚀 Auto-configured API title as '{config.project_name} API'")
+                    
                     integrations.append("drf_spectacular_extended")
+                
+                # Always apply django-cfg DRF settings (create REST_FRAMEWORK if needed)
+                if config.drf:
+                    # User provided explicit DRF config
+                    drf_extensions = config.drf.get_rest_framework_settings()
+                    if "REST_FRAMEWORK" in settings:
+                        settings["REST_FRAMEWORK"].update(drf_extensions)
+                    else:
+                        settings["REST_FRAMEWORK"] = drf_extensions
+                    logger.info("🔧 Extended REST_FRAMEWORK settings with django-cfg DRF config")
+                else:
+                    # Auto-create minimal DRF config to set default pagination
+                    from django_cfg.models.drf import DRFConfig
+                    auto_drf = DRFConfig()
+                    drf_extensions = auto_drf.get_rest_framework_settings()
+                    
+                    if "REST_FRAMEWORK" in settings:
+                        # Only apply pagination and page_size, don't override other settings
+                        pagination_settings = {
+                            'DEFAULT_PAGINATION_CLASS': drf_extensions['DEFAULT_PAGINATION_CLASS'],
+                            'PAGE_SIZE': drf_extensions['PAGE_SIZE'],
+                        }
+                        settings["REST_FRAMEWORK"].update(pagination_settings)
+                    else:
+                        # Create new REST_FRAMEWORK settings with our defaults
+                        settings["REST_FRAMEWORK"] = drf_extensions
+                    
+                    logger.info(f"🚀 Auto-configured default pagination: {drf_extensions['DEFAULT_PAGINATION_CLASS']}")
                     
             except Exception as e:
                 logger.warning(f"Could not apply DRF/Spectacular extensions from django-cfg: {e}")

django_cfg/middleware/pagination.py

@@ -0,0 +1,258 @@
+"""
+Django CFG Default Pagination Classes
+
+Provides enhanced pagination classes with better response format and schema support.
+"""
+
+from rest_framework.pagination import PageNumberPagination
+from rest_framework.response import Response
+from typing import Dict, Any, Optional
+from django.core.paginator import InvalidPage
+from rest_framework.exceptions import NotFound
+
+
+class DefaultPagination(PageNumberPagination):
+    """
+    Enhanced default pagination class for django-cfg projects.
+    
+    Features:
+    - Configurable page size via query parameter
+    - Enhanced response format with detailed pagination info
+    - Better OpenAPI schema support
+    - Consistent error handling
+    """
+    
+    # Page size configuration
+    page_size = 100
+    page_size_query_param = 'page_size'
+    max_page_size = 1000
+    
+    # Page number configuration
+    page_query_param = 'page'
+    
+    # Template for invalid page messages
+    invalid_page_message = 'Invalid page "{page_number}": {message}.'
+
+    def paginate_queryset(self, queryset, request, view=None):
+        """
+        Paginate a queryset if required, either returning a page object,
+        or `None` if pagination is not configured for this view.
+        """
+        try:
+            return super().paginate_queryset(queryset, request, view)
+        except InvalidPage as exc:
+            msg = self.invalid_page_message.format(
+                page_number=request.query_params.get(self.page_query_param, 1),
+                message=str(exc)
+            )
+            raise NotFound(msg)
+
+    def get_paginated_response(self, data):
+        """
+        Return a paginated style `Response` object with enhanced format.
+        
+        Response format:
+        {
+            "count": 150,           # Total number of items
+            "page": 2,              # Current page number
+            "pages": 15,            # Total number of pages
+            "page_size": 10,        # Items per page
+            "has_next": true,       # Whether there is a next page
+            "has_previous": true,   # Whether there is a previous page
+            "next_page": 3,         # Next page number (null if no next)
+            "previous_page": 1,     # Previous page number (null if no previous)
+            "results": [...]        # Actual data
+        }
+        """
+        return Response({
+            'count': self.page.paginator.count,
+            'page': self.page.number,
+            'pages': self.page.paginator.num_pages,
+            'page_size': self.page.paginator.per_page,
+            'has_next': self.page.has_next(),
+            'has_previous': self.page.has_previous(),
+            'next_page': self.page.next_page_number() if self.page.has_next() else None,
+            'previous_page': self.page.previous_page_number() if self.page.has_previous() else None,
+            'results': data,
+        })
+
+    def get_paginated_response_schema(self, schema):
+        """
+        Return the OpenAPI schema for paginated responses.
+        
+        This ensures proper API documentation generation.
+        """
+        return {
+            'type': 'object',
+            'required': ['count', 'page', 'pages', 'page_size', 'has_next', 'has_previous', 'results'],
+            'properties': {
+                'count': {
+                    'type': 'integer',
+                    'description': 'Total number of items across all pages',
+                    'example': 150
+                },
+                'page': {
+                    'type': 'integer',
+                    'description': 'Current page number (1-based)',
+                    'example': 2
+                },
+                'pages': {
+                    'type': 'integer', 
+                    'description': 'Total number of pages',
+                    'example': 15
+                },
+                'page_size': {
+                    'type': 'integer',
+                    'description': 'Number of items per page',
+                    'example': 10
+                },
+                'has_next': {
+                    'type': 'boolean',
+                    'description': 'Whether there is a next page',
+                    'example': True
+                },
+                'has_previous': {
+                    'type': 'boolean',
+                    'description': 'Whether there is a previous page',
+                    'example': True
+                },
+                'next_page': {
+                    'type': 'integer',
+                    'nullable': True,
+                    'description': 'Next page number (null if no next page)',
+                    'example': 3
+                },
+                'previous_page': {
+                    'type': 'integer',
+                    'nullable': True,
+                    'description': 'Previous page number (null if no previous page)',
+                    'example': 1
+                },
+                'results': {
+                    **schema,
+                    'description': 'Array of items for current page'
+                },
+            },
+        }
+
+    def get_html_context(self):
+        """
+        Return context for HTML template rendering (browsable API).
+        """
+        base_context = super().get_html_context()
+        base_context.update({
+            'page_size': self.page.paginator.per_page,
+            'total_pages': self.page.paginator.num_pages,
+        })
+        return base_context
+
+
+class LargePagination(DefaultPagination):
+    """
+    Pagination class for large datasets.
+    
+    Uses larger page sizes for better performance with big collections.
+    """
+    page_size = 500
+    max_page_size = 2000
+
+
+class SmallPagination(DefaultPagination):
+    """
+    Pagination class for small datasets or detailed views.
+    
+    Uses smaller page sizes for better user experience.
+    """
+    page_size = 20
+    max_page_size = 100
+
+
+class NoPagination(PageNumberPagination):
+    """
+    Pagination class that effectively disables pagination.
+    
+    Returns all results in a single page. Use with caution on large datasets.
+    """
+    page_size = None
+    page_size_query_param = None
+    max_page_size = None
+
+    def paginate_queryset(self, queryset, request, view=None):
+        """
+        Don't paginate the queryset, return None to indicate no pagination.
+        """
+        return None
+
+    def get_paginated_response(self, data):
+        """
+        Return a non-paginated response.
+        """
+        return Response(data)
+
+
+class CursorPaginationEnhanced(PageNumberPagination):
+    """
+    Enhanced cursor-based pagination for large datasets.
+    
+    Better performance for large datasets but doesn't support jumping to arbitrary pages.
+    """
+    page_size = 100
+    page_size_query_param = 'page_size'
+    max_page_size = 1000
+    cursor_query_param = 'cursor'
+    ordering = '-created_at'  # Default ordering, should be overridden
+
+    def get_paginated_response(self, data):
+        """
+        Return cursor-paginated response with enhanced format.
+        """
+        return Response({
+            'next': self.get_next_link(),
+            'previous': self.get_previous_link(),
+            'page_size': self.page_size,
+            'results': data,
+        })
+
+    def get_paginated_response_schema(self, schema):
+        """
+        Return the OpenAPI schema for cursor-paginated responses.
+        """
+        return {
+            'type': 'object',
+            'required': ['results'],
+            'properties': {
+                'next': {
+                    'type': 'string',
+                    'nullable': True,
+                    'format': 'uri',
+                    'description': 'URL to next page of results',
+                    'example': 'http://api.example.org/accounts/?cursor=cD0yMDIzLTEyLTE1KzAyJTNBMDA%3D'
+                },
+                'previous': {
+                    'type': 'string',
+                    'nullable': True,
+                    'format': 'uri',
+                    'description': 'URL to previous page of results',
+                    'example': 'http://api.example.org/accounts/?cursor=bD0yMDIzLTEyLTEzKzAyJTNBMDA%3D'
+                },
+                'page_size': {
+                    'type': 'integer',
+                    'description': 'Number of items per page',
+                    'example': 100
+                },
+                'results': {
+                    **schema,
+                    'description': 'Array of items for current page'
+                },
+            },
+        }
+
+
+# Export all pagination classes
+__all__ = [
+    'DefaultPagination',
+    'LargePagination', 
+    'SmallPagination',
+    'NoPagination',
+    'CursorPaginationEnhanced',
+]

django_cfg/models/drf.py

@@ -133,12 +133,15 @@ class SpectacularConfig(BaseModel):
         description="Enum name overrides"
     )
 
-    def get_spectacular_settings(self) -> Dict[str, Any]:
+    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
@@ -156,6 +159,16 @@ class SpectacularConfig(BaseModel):
             "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
@@ -205,10 +218,10 @@ class DRFConfig(BaseModel):
     
     # Pagination
     pagination_class: str = Field(
-        default='rest_framework.pagination.PageNumberPagination',
+        default='django_cfg.middleware.pagination.DefaultPagination',
         description="Default pagination class"
     )
-    page_size: int = Field(default=25, description="Default page size")
+    page_size: int = Field(default=100, description="Default page size")
     
     # Schema
     schema_class: str = Field(

django_cfg/registry/core.py

@@ -41,6 +41,13 @@ CORE_REGISTRY = {
     "TaskConfig": ("django_cfg.models.tasks", "TaskConfig"),
     "DramatiqConfig": ("django_cfg.models.tasks", "DramatiqConfig"),
     
+    # Pagination classes
+    "DefaultPagination": ("django_cfg.middleware.pagination", "DefaultPagination"),
+    "LargePagination": ("django_cfg.middleware.pagination", "LargePagination"),
+    "SmallPagination": ("django_cfg.middleware.pagination", "SmallPagination"),
+    "NoPagination": ("django_cfg.middleware.pagination", "NoPagination"),
+    "CursorPaginationEnhanced": ("django_cfg.middleware.pagination", "CursorPaginationEnhanced"),
+    
     # Utils
     "version_check": ("django_cfg.utils.version_check", "version_check"),
     "toolkit": ("django_cfg.utils.toolkit", "toolkit"),

django_cfg/templates/rest_framework/api.html

@@ -0,0 +1,12 @@
+{% extends "rest_framework/base.html" %}
+{% load django_cfg %}
+
+{% block title %}
+    {% if view.get_view_name %}{{ view.get_view_name }}{% else %}API{% endif %} - {% project_name %}
+{% endblock %}
+
+{% block branding %}
+    <a class='navbar-brand' rel="nofollow" href='{% url "api-root" %}'>
+        {% project_name %}
+    </a>
+{% endblock %}

django_cfg/templatetags/django_cfg.py

@@ -32,3 +32,19 @@ def lib_health_url():
     # Lazy import to avoid AppRegistryNotReady error
     from django_cfg.config import LIB_HEALTH_URL
     return LIB_HEALTH_URL
+
+
+@register.simple_tag
+def project_name():
+    """Get the project name from current config."""
+    # Lazy import to avoid AppRegistryNotReady error
+    from django_cfg.core.config import get_current_config
+    from django_cfg.config import LIB_NAME
+    
+    # Try to get project name from current config
+    config = get_current_config()
+    if config and hasattr(config, 'project_name'):
+        return config.project_name
+    
+    # Fallback to library name
+    return LIB_NAME