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

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

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

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

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

@@ -192,7 +192,9 @@ class SettingsGenerator:
             for alias, db_config in config.databases.items():
                 if db_config.has_routing_rules():
                     for app in db_config.apps:
-                        routing_rules[app] = alias
+                        # 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
             
             if routing_rules:
                 settings["DATABASE_ROUTERS"] = ["django_cfg.routers.DatabaseRouter"]

django_cfg-1.1.55/src/django_cfg/routers.py

@@ -0,0 +1,83 @@
+"""
+Database Router for Django Config Toolkit
+
+Simple and reliable database routing.
+"""
+
+from django.conf import settings
+from django.apps import apps
+
+
+class DatabaseRouter:
+    """
+    Simple database router that routes based on app labels.
+    
+    Uses DATABASE_ROUTING_RULES setting to determine which apps
+    should use which databases.
+    """
+    
+    def _get_database_for_app(self, app_label):
+        """
+        Get database for app_label, trying multiple approaches.
+        
+        1. Direct app_label lookup
+        2. Find full app path and lookup
+        """
+        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
+        
+        # Try direct app_label first
+        if app_label in rules:
+            return rules[app_label]
+        
+        # Try to find full app path using Django's app registry
+        try:
+            app_config = apps.get_app_config(app_label)
+            app_module = app_config.module.__name__
+            
+            # Check if full module path is in rules
+            if app_module in rules:
+                return rules[app_module]
+                
+        except LookupError:
+            pass
+        
+        return None
+
+    def db_for_read(self, model, **hints):
+        """Route reads to correct database."""
+        return self._get_database_for_app(model._meta.app_label)
+
+    def db_for_write(self, model, **hints):
+        """Route writes to correct database.""" 
+        return self._get_database_for_app(model._meta.app_label)
+
+    def allow_relation(self, obj1, obj2, **hints):
+        """Allow relations between databases."""
+        app_label1 = obj1._meta.app_label
+        app_label2 = obj2._meta.app_label
+        
+        db1 = self._get_database_for_app(app_label1)
+        db2 = self._get_database_for_app(app_label2)
+        
+        # Allow relations if both are in same database
+        if db1 and db2:
+            return db1 == db2
+        
+        # Allow relations between routed apps and default database
+        # (e.g., User from default can relate to Document from knowbase)
+        if (db1 and not db2) or (db2 and not db1):
+            return True
+            
+        # Allow all other relations (both in default)
+        return True
+
+    def allow_migrate(self, db, app_label, **hints):
+        """Allow migrations to correct database."""
+        target_db = self._get_database_for_app(app_label)
+
+        if target_db:
+            # This app IS configured in the rules
+            return db == target_db
+        else:
+            # This app is NOT configured, allow migration to default only
+            return db == 'default'

django_cfg-1.1.54/src/django_cfg/routers.py

@@ -1,48 +0,0 @@
-"""
-Database Router for Django Config Toolkit
-
-Simple and reliable database routing.
-"""
-
-from django.conf import settings
-
-
-class DatabaseRouter:
-    """
-    Simple database router that routes based on app labels.
-    
-    Uses DATABASE_ROUTING_RULES setting to determine which apps
-    should use which databases.
-    """
-
-    def db_for_read(self, model, **hints):
-        """Route reads to correct database."""
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        return rules.get(model._meta.app_label)
-
-    def db_for_write(self, model, **hints):
-        """Route writes to correct database.""" 
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        return rules.get(model._meta.app_label)
-
-    def allow_relation(self, obj1, obj2, **hints):
-        """Allow relations between same database."""
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        db1 = rules.get(obj1._meta.app_label)
-        db2 = rules.get(obj2._meta.app_label)
-        return db1 == db2 if db1 and db2 else None
-
-    def allow_migrate(self, db, app_label, **hints):
-        """Allow migrations to correct database."""
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        target_db = rules.get(app_label)
-
-        if target_db:
-            # This app IS configured in the rules
-            return db == target_db
-        elif db in rules.values():
-            # This app is NOT configured, but the target DB is used by other apps
-            return db == 'default'
-        
-        # Allow migration to default
-        return None