django-cfg 1.1.55__tar.gz → 1.1.58__tar.gz

{django_cfg-1.1.55 → django_cfg-1.1.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.1.55
+Version: 1.1.58
 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.55 → django_cfg-1.1.58}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.1.55"
+version = "1.1.58"
 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.55 → django_cfg-1.1.58}/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.55"
+__version__ = "1.1.58"
 __author__ = "Unrealos Team"
 __email__ = "info@unrealos.com"
 __license__ = "MIT"

{django_cfg-1.1.55 → django_cfg-1.1.58}/src/django_cfg/core/generation.py

@@ -192,9 +192,7 @@ class SettingsGenerator:
             for alias, db_config in config.databases.items():
                 if db_config.has_routing_rules():
                     for app in db_config.apps:
-                        # Extract app_label from full path (e.g., "apps.knowbase" -> "knowbase")
-                        app_label = app.split('.')[-1] if '.' in app else app
-                        routing_rules[app_label] = alias
+                        routing_rules[app] = alias
             
             if routing_rules:
                 settings["DATABASE_ROUTERS"] = ["django_cfg.routers.DatabaseRouter"]

{django_cfg-1.1.55 → django_cfg-1.1.58}/src/django_cfg/management/commands/rundramatiq.py

@@ -143,8 +143,7 @@ class Command(BaseCommand):
         if options.get("pid_file"):
             args.extend(["--pid-file", options["pid_file"]])
         
-        # Add broker (required positional argument)
-        args.append("django_dramatiq.setup")
+        # Note: Using Python API instead of CLI, so no broker argument needed
         
         # Add discovered task modules
         discovered_modules = get_task_service().discover_tasks()
@@ -184,7 +183,7 @@ class Command(BaseCommand):
         self.stdout.write(f"  {' '.join(worker_args)}")
     
     def _start_workers(self, worker_args, options):
-        """Start Dramatiq workers."""
+        """Start Dramatiq workers using Python API instead of CLI."""
         self.stdout.write(
             self.style.SUCCESS("Starting Dramatiq workers...")
         )
@@ -193,9 +192,15 @@ class Command(BaseCommand):
         task_service = get_task_service()
         config = task_service.config
         
-        self.stdout.write(f"Processes: {config.get_effective_processes()}")
-        self.stdout.write(f"Threads: {config.dramatiq.threads}")
-        self.stdout.write(f"Queues: {', '.join(config.get_effective_queues())}")
+        processes = options.get("processes") or config.get_effective_processes()
+        threads = options.get("threads") or config.dramatiq.threads
+        queues = config.get_effective_queues()
+        if options.get("queues"):
+            queues = [q.strip() for q in options["queues"].split(",")]
+        
+        self.stdout.write(f"Processes: {processes}")
+        self.stdout.write(f"Threads: {threads}")
+        self.stdout.write(f"Queues: {', '.join(queues)}")
         
         # Write PID file if requested
         if options.get("pid_file"):
@@ -204,20 +209,26 @@ class Command(BaseCommand):
             self.stdout.write(f"PID written to: {options['pid_file']}")
         
         try:
-            # Import and run dramatiq
+            # Import dramatiq and get broker
             import dramatiq
-            from dramatiq.cli import main as dramatiq_main
+            from dramatiq.worker import Worker
+            from django_cfg.modules.django_tasks import get_dramatiq_broker
+            
+            # Get the configured broker
+            broker = get_dramatiq_broker()
             
-            # Replace sys.argv with our arguments
-            original_argv = sys.argv[:]
-            sys.argv = worker_args
+            # Discover and import task modules
+            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}")
             
-            try:
-                # Run dramatiq CLI
-                dramatiq_main()
-            finally:
-                # Restore original argv
-                sys.argv = original_argv
+            # Create and start worker
+            worker = Worker(broker, worker_timeout=600000)
+            worker.start()
                 
         except KeyboardInterrupt:
             self.stdout.write("\nShutting down workers...")

{django_cfg-1.1.55 → django_cfg-1.1.58}/src/django_cfg/modules/django_tasks.py

@@ -712,6 +712,72 @@ 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
+
+
 # === Exports ===
 
 __all__ = [
@@ -725,4 +791,6 @@ __all__ = [
     "extend_constance_config_with_tasks",
     "initialize_task_system",
     "clear_dramatiq_queues",
+    "create_dramatiq_broker",
+    "get_dramatiq_broker",
 ]