django-cfg 1.1.59__tar.gz → 1.1.61__tar.gz

{django_cfg-1.1.59 → django_cfg-1.1.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.1.59
+Version: 1.1.61
 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

{django_cfg-1.1.59 → django_cfg-1.1.61}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.1.59"
+version = "1.1.61"
 description = "🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience"
 readme = "README.md"
 license = {text = "MIT"}

{django_cfg-1.1.59 → django_cfg-1.1.61}/src/django_cfg/__init__.py

@@ -38,7 +38,7 @@ default_app_config = "django_cfg.apps.DjangoCfgConfig"
 from typing import TYPE_CHECKING
 
 # Version information
-__version__ = "1.1.59"
+__version__ = "1.1.60"
 __author__ = "Unrealos Team"
 __email__ = "info@unrealos.com"
 __license__ = "MIT"

{django_cfg-1.1.59 → django_cfg-1.1.61}/src/django_cfg/management/commands/rundramatiq.py

@@ -183,7 +183,7 @@ class Command(BaseCommand):
         self.stdout.write(f"  {' '.join(worker_args)}")
     
     def _start_workers(self, worker_args, options):
-        """Start Dramatiq workers using Python API instead of CLI."""
+        """Start Dramatiq workers using subprocess like django_dramatiq does."""
         self.stdout.write(
             self.style.SUCCESS("Starting Dramatiq workers...")
         )
@@ -209,36 +209,61 @@ class Command(BaseCommand):
             self.stdout.write(f"PID written to: {options['pid_file']}")
         
         try:
-            # Import dramatiq and get broker FIRST
-            import dramatiq
-            from dramatiq.worker import Worker
-            from django_cfg.modules.django_tasks import get_dramatiq_broker
+            # Build process arguments like django_dramatiq does
+            executable_name = "dramatiq"
+            executable_path = self._resolve_executable(executable_name)
             
-            # Get the configured broker
-            broker = get_dramatiq_broker()
+            # Discover task modules (including django_dramatiq.setup)
+            discovered_modules = self._discover_task_modules()
             
-            # CRITICAL: Set the broker as the global default BEFORE importing tasks
-            dramatiq.set_broker(broker)
+            process_args = [
+                executable_name,
+                "--processes", str(processes),
+                "--threads", str(threads),
+            ]
             
-            # Now discover and import task modules with the correct broker set
-            discovered_modules = get_task_service().discover_tasks()
-            for module_name in discovered_modules:
-                try:
-                    __import__(module_name)
-                    self.stdout.write(f"Loaded tasks from: {module_name}")
-                except ImportError as e:
-                    self.stdout.write(f"Warning: Could not import {module_name}: {e}")
+            # Add queues
+            if queues:
+                process_args.extend(["--queues"] + queues)
             
-            # Verify broker is set correctly
-            current_broker = dramatiq.get_broker()
-            self.stdout.write(f"Using broker: {current_broker}")
+            # Add task modules (including django_dramatiq.setup)
+            process_args.extend(discovered_modules)
             
-            # Create and start worker
-            worker = Worker(broker, worker_timeout=600000)
-            worker.start()
+            self.stdout.write(f"Running dramatiq: {' '.join(process_args)}")
+            
+            # Use subprocess like django_dramatiq does
+            import subprocess
+            if sys.platform == "win32":
+                command = [executable_path] + process_args[1:]
+                sys.exit(subprocess.run(command))
+            else:
+                # Use os.execvp like django_dramatiq
+                os.execvp(executable_path, process_args)
                 
         except KeyboardInterrupt:
             self.stdout.write("\nShutting down workers...")
         except Exception as e:
             logger.exception("Worker execution failed")
             raise CommandError(f"Worker execution failed: {e}")
+    
+    def _discover_task_modules(self):
+        """Discover task modules like django_dramatiq does."""
+        task_modules = ["django_dramatiq.setup"]  # Always include setup module
+        
+        # Add discovered modules from django-cfg
+        discovered_modules = get_task_service().discover_tasks()
+        for module_name in discovered_modules:
+            self.stdout.write(f"Discovered tasks module: {module_name}")
+            task_modules.append(module_name)
+        
+        return task_modules
+    
+    def _resolve_executable(self, exec_name):
+        """Resolve executable path like django_dramatiq does."""
+        bin_dir = os.path.dirname(sys.executable)
+        if bin_dir:
+            for d in [bin_dir, os.path.join(bin_dir, "Scripts")]:
+                exec_path = os.path.join(d, exec_name)
+                if os.path.isfile(exec_path):
+                    return exec_path
+        return exec_name

{django_cfg-1.1.59 → django_cfg-1.1.61}/src/django_cfg/modules/django_tasks.py

@@ -682,14 +682,19 @@ def initialize_task_system():
         if config and config.enabled:
             logger.info("🔧 Initializing Django-CFG task system...")
             
-            # CRITICAL: Set up global broker for task sending
+            # Set up Dramatiq broker from Django settings
             try:
                 import dramatiq
-                broker = get_dramatiq_broker()
-                dramatiq.set_broker(broker)
-                logger.debug(f"Set global Dramatiq broker: {broker}")
+                from django.conf import settings
+                
+                # Django-dramatiq automatically configures the broker from DRAMATIQ_BROKER setting
+                if hasattr(settings, 'DRAMATIQ_BROKER'):
+                    logger.debug("✅ Dramatiq broker configured from Django settings")
+                else:
+                    logger.warning("DRAMATIQ_BROKER not found in Django settings")
+                    
             except Exception as e:
-                logger.warning(f"Failed to set global broker: {e}")
+                logger.warning(f"Failed to configure Dramatiq: {e}")
             
             logger.info("✅ Task system initialized successfully")
             logger.info("💡 To start workers, run: python manage.py rundramatiq")
@@ -722,70 +727,8 @@ def extend_constance_config_with_tasks():
         return []
 
 
-# === Broker Creation ===
-
-def create_dramatiq_broker():
-    """
-    Create and configure Dramatiq broker from Django settings.
-    
-    This function creates a broker instance that can be used directly
-    by the Dramatiq CLI without requiring a separate broker.py file.
-    
-    Returns:
-        dramatiq.Broker: Configured Dramatiq broker instance
-    """
-    try:
-        from django.conf import settings
-        
-        if not hasattr(settings, 'DRAMATIQ_BROKER'):
-            raise RuntimeError("DRAMATIQ_BROKER not configured in Django settings")
-        
-        broker_config = settings.DRAMATIQ_BROKER
-        
-        # Create broker from Django settings
-        broker = RedisBroker(**broker_config['OPTIONS'])
-        
-        # Add middleware (only if not already present)
-        existing_middleware_types = {type(mw).__name__ for mw in broker.middleware}
-        
-        for middleware_path in broker_config['MIDDLEWARE']:
-            try:
-                module_path, class_name = middleware_path.rsplit('.', 1)
-                
-                # Skip if middleware of this type already exists
-                if class_name in existing_middleware_types:
-                    continue
-                    
-                module = __import__(module_path, fromlist=[class_name])
-                middleware_class = getattr(module, class_name)
-                broker.add_middleware(middleware_class())
-            except Exception as e:
-                logger.warning(f"Failed to add middleware {middleware_path}: {e}")
-        
-        return broker
-        
-    except Exception as e:
-        logger.error(f"Failed to create Dramatiq broker: {e}")
-        raise
-
-
-# Global broker instance (lazy-loaded)
-_broker_instance = None
-
-
-def get_dramatiq_broker():
-    """
-    Get the global Dramatiq broker instance.
-    
-    Returns:
-        dramatiq.Broker: The singleton broker instance
-    """
-    global _broker_instance
-    
-    if _broker_instance is None:
-        _broker_instance = create_dramatiq_broker()
-    
-    return _broker_instance
+# === Broker Creation (Simplified) ===
+# Note: We now use django-dramatiq.setup() instead of custom broker creation
 
 
 # === Exports ===
@@ -801,6 +744,4 @@ __all__ = [
     "extend_constance_config_with_tasks",
     "initialize_task_system",
     "clear_dramatiq_queues",
-    "create_dramatiq_broker",
-    "get_dramatiq_broker",
 ]