django-cfg 1.4.107__py3-none-any.whl → 1.4.109__py3-none-any.whl

django_cfg/core/base/config_model.py

@@ -315,7 +315,7 @@ class DjangoConfig(BaseModel):
     # === Background Task Processing ===
     tasks: Optional[TaskConfig] = Field(
         default=None,
-        description="Background task processing configuration (Dramatiq)",
+        description="Background task processing configuration (ReArq)",
     )
 
     # === Centrifugo Configuration ===

django_cfg/core/builders/apps_builder.py

@@ -160,7 +160,7 @@ class InstalledAppsBuilder:
 
         # Auto-enable tasks if needed by other features
         if self.config.should_enable_tasks():
-            apps.append("django_dramatiq")  # Add django_dramatiq first
+            # No external app needed - ReArq is embedded
             apps.append("django_cfg.apps.tasks")
 
         # Add DRF Tailwind theme module (uses Tailwind via CDN)

django_cfg/core/generation/integration_generators/__init__.py

@@ -5,7 +5,7 @@ Contains generators for third-party integrations and frameworks:
 - Session configuration
 - External services (Telegram, Unfold, Constance)
 - API frameworks (JWT, DRF, Spectacular, OpenAPI Client)
-- Background tasks (Dramatiq)
+- Background tasks (ReArq)
 """
 
 from .api import APIFrameworksGenerator

django_cfg/core/generation/integration_generators/tasks.py

@@ -1,7 +1,7 @@
 """
 Background tasks generator.
 
-Handles Dramatiq task queue configuration.
+Handles ReArq task queue configuration.
 Size: ~100 lines (focused on task processing)
 """
 
@@ -19,7 +19,7 @@ class TasksSettingsGenerator:
     Generates background task processing settings.
 
     Responsibilities:
-    - Configure Dramatiq task queue
+    - Configure ReArq task queue
     - Auto-detect if tasks should be enabled
     - Set up task configuration
 
@@ -44,7 +44,7 @@ class TasksSettingsGenerator:
         Generate task processing settings.
 
         Returns:
-            Dictionary with Dramatiq configuration
+            Dictionary with ReArq configuration
 
         Example:
             >>> generator = TasksSettingsGenerator(config)
@@ -52,41 +52,37 @@ class TasksSettingsGenerator:
         """
         # Check if tasks should be enabled
         if not self.config.should_enable_tasks():
-            logger.debug("⏭️  Dramatiq disabled (no tasks/knowbase/agents)")
+            logger.debug("⏭️  Tasks disabled")
             return {}
 
         try:
-            return self._generate_dramatiq_settings()
+            return self._generate_rearq_settings()
         except ImportError as e:
-            logger.warning(f"Failed to import django_tasks module: {e}")
+            logger.warning(f"Failed to import ReArq: {e}")
             return {}
         except Exception as e:
-            logger.error(f"Failed to generate Dramatiq settings: {e}")
+            logger.error(f"Failed to generate ReArq settings: {e}")
             return {}
 
-    def _generate_dramatiq_settings(self) -> Dict[str, Any]:
+    def _generate_rearq_settings(self) -> Dict[str, Any]:
         """
-        Generate Dramatiq-specific settings.
+        Generate ReArq-specific settings.
 
         Returns:
-            Dictionary with Dramatiq configuration
+            Dictionary with ReArq configuration
         """
         from django_cfg.models.tasks import TaskConfig
-        from django_cfg.modules.django_tasks import generate_dramatiq_settings_from_config
 
         # Auto-initialize TaskConfig if needed
         task_config = TaskConfig.auto_initialize_if_needed()
         if task_config is None:
             return {}
 
-        # Generate Dramatiq settings
-        dramatiq_settings = generate_dramatiq_settings_from_config()
-        if not dramatiq_settings:
-            return {}
-
-        logger.info("✅ Dramatiq enabled (tasks/knowbase/agents required)")
+        # Generate settings via standard method
+        settings = task_config.to_django_settings()
 
-        return dramatiq_settings
+        logger.info("✅ ReArq tasks enabled")
+        return settings
 
 
 __all__ = ["TasksSettingsGenerator"]

django_cfg/core/generation/security_generators/crypto_fields.py

@@ -64,7 +64,8 @@ class CryptoFieldsSettingsGenerator:
         return crypto_config.to_django_settings(
             base_dir=self.config.base_dir,
             is_production=self.config.is_production,
-            debug=self.config.debug
+            debug=self.config.debug,
+            project_version=self.config.project_version
         )
 
 

django_cfg/core/integration/display/startup.py

@@ -429,7 +429,7 @@ class StartupDisplayManager(BaseDisplayManager):
                 task_table.add_row("Queue", "[yellow]default[/yellow]")
 
             # Add worker command
-            task_table.add_row("Start Workers", "[bright_blue]poetry run python manage.py rundramatiq[/bright_blue]")
+            task_table.add_row("Start Workers", "[bright_blue]poetry run python manage.py runrearq[/bright_blue]")
 
             task_panel = self.create_full_width_panel(
                 task_table,

django_cfg/mixins/__init__.py

@@ -0,0 +1,12 @@
+"""
+Django-CFG Common Mixins.
+
+Shared mixins for DRF views and viewsets.
+"""
+from .admin_api import AdminAPIMixin
+from .client_api import ClientAPIMixin
+
+__all__ = [
+    "AdminAPIMixin",
+    "ClientAPIMixin",
+]

django_cfg/mixins/admin_api.py

@@ -0,0 +1,37 @@
+"""
+Admin API Mixin.
+
+Common configuration for admin-only API endpoints.
+"""
+from rest_framework.authentication import BasicAuthentication, SessionAuthentication
+from rest_framework.permissions import IsAdminUser
+from rest_framework_simplejwt.authentication import JWTAuthentication
+
+
+class AdminAPIMixin:
+    """
+    Mixin for admin-only API endpoints.
+
+    Provides:
+    - JWT, Session, and Basic authentication
+    - IsAdminUser permission requirement
+
+    Usage:
+        class MyViewSet(AdminAPIMixin, viewsets.ModelViewSet):
+            queryset = MyModel.objects.all()
+            serializer_class = MySerializer
+
+    Authentication Methods:
+        1. JWT Token (Bearer): For frontend SPA authentication
+        2. Session: For Django admin integration
+        3. Basic Auth: For testing and scripts
+
+    All endpoints require admin user privileges.
+    """
+
+    authentication_classes = [
+        JWTAuthentication,      # JWT tokens (Bearer)
+        SessionAuthentication,  # Django session (for admin)
+        BasicAuthentication,    # HTTP Basic (for testing)
+    ]
+    permission_classes = [IsAdminUser]

django_cfg/mixins/client_api.py

@@ -0,0 +1,39 @@
+"""
+Client API Mixin.
+
+Common configuration for client API endpoints (authenticated users).
+"""
+from rest_framework.authentication import SessionAuthentication
+from rest_framework.permissions import IsAuthenticated
+from rest_framework_simplejwt.authentication import JWTAuthentication
+
+
+class ClientAPIMixin:
+    """
+    Mixin for client API endpoints (authenticated regular users).
+
+    Provides:
+    - JWT and Session authentication
+    - IsAuthenticated permission requirement
+
+    Usage:
+        class MyViewSet(ClientAPIMixin, viewsets.ModelViewSet):
+            queryset = MyModel.objects.all()
+            serializer_class = MySerializer
+
+            def get_queryset(self):
+                # Filter by current user
+                return super().get_queryset().filter(user=self.request.user)
+
+    Authentication Methods:
+        1. JWT Token (Bearer): For frontend SPA authentication
+        2. Session: For web browser sessions
+
+    All endpoints require authenticated user (not necessarily admin).
+    """
+
+    authentication_classes = [
+        JWTAuthentication,      # JWT tokens (Bearer)
+        SessionAuthentication,  # Django session
+    ]
+    permission_classes = [IsAuthenticated]

django_cfg/models/django/constance.py

@@ -164,14 +164,8 @@ class ConstanceConfig(BaseModel, BaseCfgAutoModule):
         app_fields = []
         config = self.get_config()
 
-        # Get fields from tasks app (only if knowbase or agents are enabled)
-        if config and config.should_enable_tasks():
-            try:
-                from django_cfg.modules.django_tasks import extend_constance_config_with_tasks
-                tasks_fields = extend_constance_config_with_tasks()
-                app_fields.extend(tasks_fields)
-            except (ImportError, Exception):
-                pass
+        # Note: Tasks constance fields removed - ReArq doesn't use dynamic config
+        # Task configuration is managed via TaskConfig model
 
         # Get fields from knowbase app (only if enabled)
         if config and config.enable_knowbase:

django_cfg/models/django/crypto_fields.py

@@ -68,7 +68,7 @@ class CryptoFieldsConfig(BaseModel):
         )
     )
 
-    def to_django_settings(self, base_dir: Path, is_production: bool, debug: bool) -> dict:
+    def to_django_settings(self, base_dir: Path, is_production: bool, debug: bool, project_version: str = "1.0.0") -> dict:
         """
         Convert to Django settings dictionary with environment-aware defaults.
 
@@ -76,6 +76,7 @@ class CryptoFieldsConfig(BaseModel):
             base_dir: Django project BASE_DIR
             is_production: Whether running in production mode
             debug: Whether debug mode is enabled
+            project_version: Project version to use for REVISION (default: "1.0.0")
 
         Returns:
             Dictionary of django-crypto-fields settings
@@ -111,53 +112,17 @@ class CryptoFieldsConfig(BaseModel):
             "AUTO_CREATE_KEYS": auto_create_keys,
         }
 
-        # Disable django-revision git integration (required by django-audit-fields)
-        # RevisionField will use package metadata, pyproject.toml, or VERSION file instead
-        if self.ignore_git_dir:
-            settings["DJANGO_REVISION_IGNORE_WORKING_DIR"] = True
-            # Allow django-revision to discover version from:
-            # 1. Package metadata (version())
-            # 2. pyproject.toml [project][version]
-            # 3. VERSION file (BASE_DIR/VERSION)
-            # Do NOT set REVISION here to avoid "not recommended" warning
-
-            # Create VERSION file if it doesn't exist (prevents fallback to settings.REVISION)
-            version_file = base_dir / "VERSION"
-            if not version_file.exists():
-                try:
-                    # Try to get version from pyproject.toml or package metadata
-                    version_to_write = "1.0.0"  # Default fallback
-
-                    # Try pyproject.toml first
-                    pyproject_file = base_dir / "pyproject.toml"
-                    if pyproject_file.exists():
-                        try:
-                            import tomllib
-                        except ImportError:
-                            # Python < 3.11
-                            try:
-                                import tomli as tomllib  # type: ignore
-                            except ImportError:
-                                tomllib = None  # type: ignore
-
-                        if tomllib:
-                            try:
-                                with open(pyproject_file, "rb") as f:
-                                    pyproject_data = tomllib.load(f)
-                                    version_to_write = pyproject_data.get("project", {}).get("version", version_to_write)
-                            except Exception:
-                                pass  # Use default version
-
-                    # Write VERSION file
-                    version_file.write_text(version_to_write + "\n")
-
-                    import logging
-                    logger = logging.getLogger(__name__)
-                    logger.info(f"Created VERSION file at {version_file} with version {version_to_write}")
-                except Exception as e:
-                    import logging
-                    logger = logging.getLogger(__name__)
-                    logger.warning(f"Could not create VERSION file: {e}")
+        # Fix django-revision (required by django-audit-fields dependency)
+        # Disable all automatic version detection and use project version directly
+        # This prevents "A distribution name is required" error when package metadata is not available
+        settings.update({
+            "REVISION": project_version,
+            "APP_NAME": "",  # Empty to prevent package metadata lookup
+            "DJANGO_REVISION_IGNORE_METADATA": True,  # Don't use importlib.metadata.version()
+            "DJANGO_REVISION_IGNORE_TOML_FILE": True,  # Don't read pyproject.toml
+            "DJANGO_REVISION_IGNORE_VERSION_FILE": True,  # Don't read VERSION file
+            "DJANGO_REVISION_IGNORE_WORKING_DIR": True,  # Don't use git
+        })
 
         return settings
 

django_cfg/models/tasks/__init__.py

@@ -2,25 +2,24 @@
 Task processing configuration models for Django-CFG.
 
 This module provides type-safe Pydantic models for configuring background task
-processing with Dramatiq, including worker management, queue configuration,
+processing with ReArq, including worker management, queue configuration,
 and monitoring settings.
 
 Architecture:
     config.py - Main TaskConfig and enums
-    backends.py - DramatiqConfig and WorkerConfig
+    backends.py - RearqConfig
     utils.py - Utility functions
 
 Example:
     ```python
-    from django_cfg.models.tasks import TaskConfig, DramatiqConfig
+    from django_cfg.models.tasks import TaskConfig, RearqConfig
 
     # Basic configuration
     tasks = TaskConfig(
         enabled=True,
-        dramatiq=DramatiqConfig(
-            processes=4,
-            threads=8,
-            queues=["default", "high", "low"],
+        rearq=RearqConfig(
+            redis_url="redis://localhost:6379/0",
+            max_jobs=10,
         )
     )
 
@@ -30,7 +29,7 @@ Example:
     ```
 """
 
-from .backends import DramatiqConfig, WorkerConfig
+from .backends import RearqConfig
 from .config import QueuePriority, TaskBackend, TaskConfig
 from .utils import get_default_task_config, get_smart_queues, validate_task_config
 
@@ -41,8 +40,7 @@ __all__ = [
     "QueuePriority",
 
     # Backend configurations
-    "DramatiqConfig",
-    "WorkerConfig",
+    "RearqConfig",
 
     # Utility functions
     "get_default_task_config",