django-cfg 1.1.55__py3-none-any.whl → 1.1.58__py3-none-any.whl

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/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/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/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",
 ]

{django_cfg-1.1.55.dist-info → django_cfg-1.1.58.dist-info}/METADATA

@@ -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.dist-info → django_cfg-1.1.58.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_cfg/__init__.py,sha256=ZTcmv4CICkfINCwJpvyAB07eMvcwno-wz_5ySOgJ6QM,14288
+django_cfg/__init__.py,sha256=PGJQnkUVjXVdcLHsEFKEd5OA6phVKID_9p6ju6HFK0Y,14288
 django_cfg/apps.py,sha256=k84brkeXJI7EgKZLEpTkM9YFZofKI4PzhFOn1cl9Msc,1656
 django_cfg/exceptions.py,sha256=RTQEoU3PfR8lqqNNv5ayd_HY2yJLs3eioqUy8VM6AG4,10378
 django_cfg/integration.py,sha256=-7hvd-4ohLdzH4eufCZTOe3yTzPoQyB_HCfvsSm9AAw,5218
@@ -146,7 +146,7 @@ django_cfg/cli/commands/info.py,sha256=tLZmiZX2nEpwrcN9cUwrGKb95X7dasuoeePrqTmK2
 django_cfg/core/__init__.py,sha256=eVK57qFOok9kTeHoNEMQ1BplkUOaQ7NB9kP9eQK1vg0,358
 django_cfg/core/config.py,sha256=EO6l39BncNRnvxkWHqyGNAiP-rhoAfwtBtr_UmWLYL8,27799
 django_cfg/core/environment.py,sha256=AXNKVxcV_3_3gtlafDx3wFTnTPPMGQ9gl40vYm2w-Hg,9101
-django_cfg/core/generation.py,sha256=zClvEA0Qq_uMaIJ-2TjacdgldHH9KwNoKRMKSjJV2o0,24849
+django_cfg/core/generation.py,sha256=z4yDoYM-_q6RGIn4ZesLXS8frcHoiHz5oBIREcJON4U,24668
 django_cfg/core/validation.py,sha256=j0q57oJEJjI6ylb3AzvsgupmvBKsUcrxpmkfKF3ZRF4,6585
 django_cfg/management/__init__.py,sha256=z8p1jlyajNUleDxRUXL3iXUI99xXWFYNtFAe5nKy1kA,43
 django_cfg/management/commands/__init__.py,sha256=z8p1jlyajNUleDxRUXL3iXUI99xXWFYNtFAe5nKy1kA,43
@@ -156,7 +156,7 @@ django_cfg/management/commands/create_token.py,sha256=beHtUTuyFZhG97F9vSkaX-u7ti
 django_cfg/management/commands/generate.py,sha256=w0BF7IMftxNjxTxFuY8cw5pNKGW-LmTScJ8kZpxHu_8,4248
 django_cfg/management/commands/list_urls.py,sha256=D8ikInA3uE1LbQGLWmfdLnEqPg7wqrI3caQA6iTe_-0,11009
 django_cfg/management/commands/migrator.py,sha256=mhMM63uv_Jp9zHVVM7TMwCB90uv3iFZn1vOG-rXyi3s,16191
-django_cfg/management/commands/rundramatiq.py,sha256=7NkMEBHcSd4K4UT-j135GNNc8r8m7QojMgqgmjyEej4,8092
+django_cfg/management/commands/rundramatiq.py,sha256=6FnSNonO0SAuvANNXm7VOgVqtZvyRMfW8epTd9Jj9Js,8768
 django_cfg/management/commands/runserver_ngrok.py,sha256=mcTioDIzHgha6sGo5eazlJhdKr8y5-uEQIc3qG3AvCI,5237
 django_cfg/management/commands/script.py,sha256=I6zOEQEGaED0HoLxl2EqKz39HwbKg9HhdxnGKybfH5s,16974
 django_cfg/management/commands/show_config.py,sha256=0YJ99P1XvymT3fWritaNmn_HJ-PVb0I-yBy757M_bn8,8337
@@ -189,7 +189,7 @@ django_cfg/modules/base.py,sha256=X90X-0iBfnaUSaC7S8_ULa_rdT41tqTVJnT05_RuyK4,47
 django_cfg/modules/django_email.py,sha256=uBvvqRVe1DG73Qq2d2IBYTjhFRdvHgsIbkVw3ge9OW8,16586
 django_cfg/modules/django_logger.py,sha256=VfcPCurTdU3iI593EJNs3wUoWQowu7-ykJGuHNkE79M,6325
 django_cfg/modules/django_ngrok.py,sha256=OAvir2pBFHfko-XaVgZTjeJwyZw-NSEILaKNlqQziqA,10476
-django_cfg/modules/django_tasks.py,sha256=Zn69ewpj_3xZZxeI6sVrQMrAKf4fxtI4ME6bQo5KEmY,26531
+django_cfg/modules/django_tasks.py,sha256=sOSQx7Wr61_I04QzAKF0Hz_kc7fgps6hSxBCvLt3R0I,28647
 django_cfg/modules/django_telegram.py,sha256=Mun2tAm0P2cUyQlAs8FaPe-FVgcrv7L_-FPTXQQEUT0,16356
 django_cfg/modules/logger.py,sha256=4_zeasNehr8LGz8r_ckv15-fQS63zCodiqD4CYIEyFI,10546
 django_cfg/modules/django_currency/README.md,sha256=Ox3jgRtsbOIaMuYDkIhrs9ijLGLbn-2R7mD9n2tjAVE,8512
@@ -251,8 +251,8 @@ django_cfg/templates/emails/base_email.html,sha256=TWcvYa2IHShlF_E8jf1bWZStRO0v8
 django_cfg/utils/__init__.py,sha256=64wwXJuXytvwt8Ze_erSR2HmV07nGWJ6DV5wloRBvYE,435
 django_cfg/utils/path_resolution.py,sha256=eML-6-RIGTs5TePktIQN8nxfDUEFJ3JA0AzWBcihAbs,13894
 django_cfg/utils/smart_defaults.py,sha256=iL6_n3jGDW5812whylWAwXik0xBSYihdLp4IJ26T5eA,20547
-django_cfg-1.1.55.dist-info/METADATA,sha256=yjqg7Vz6T_N9tMe_gdeqTzxEV7jo-vZH8nKbH4eHies,38953
-django_cfg-1.1.55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-django_cfg-1.1.55.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
-django_cfg-1.1.55.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
-django_cfg-1.1.55.dist-info/RECORD,,
+django_cfg-1.1.58.dist-info/METADATA,sha256=pVR_L4eFV_gfOVrsanwBT6YbUS7A82DJFV0FuhRIvIk,38953
+django_cfg-1.1.58.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+django_cfg-1.1.58.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
+django_cfg-1.1.58.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
+django_cfg-1.1.58.dist-info/RECORD,,