django-cfg 1.1.54__py3-none-any.whl → 1.1.55__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.54"
+__version__ = "1.1.55"
 __author__ = "Unrealos Team"
 __email__ = "info@unrealos.com"
 __license__ = "MIT"

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/routers.py

@@ -5,6 +5,7 @@ Simple and reliable database routing.
 """
 
 from django.conf import settings
+from django.apps import apps
 
 
 class DatabaseRouter:
@@ -14,35 +15,69 @@ class DatabaseRouter:
     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."""
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        return rules.get(model._meta.app_label)
+        return self._get_database_for_app(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)
+        return self._get_database_for_app(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
+        """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."""
-        rules = getattr(settings, 'DATABASE_ROUTING_RULES', {})
-        target_db = rules.get(app_label)
+        target_db = self._get_database_for_app(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
+        else:
+            # This app is NOT configured, allow migration to default only
             return db == 'default'
-        
-        # Allow migration to default
-        return None

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

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

@@ -1,8 +1,8 @@
-django_cfg/__init__.py,sha256=YZogs5kyytXzUOnW3xvppcMf0B__-iElityi3otj7qE,14288
+django_cfg/__init__.py,sha256=ZTcmv4CICkfINCwJpvyAB07eMvcwno-wz_5ySOgJ6QM,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
-django_cfg/routers.py,sha256=J89kcIArV2lSl3rzh61Rya0h-I5Zq7-QAat6PvmKVFs,1582
+django_cfg/routers.py,sha256=O954Hm1BKMyN9-tIK2SByxTHafy_SGzbHLjCbBaf4lg,2622
 django_cfg/version_check.py,sha256=jI4v3YMdQriUEeb_TvRl511sDghy6I75iKRDUaNpucs,4800
 django_cfg/apps/__init__.py,sha256=JtDmEYt1OcleWM2ZaeX0LKDnRQzPOavfaXBWG4ECB5Q,26
 django_cfg/apps/urls.py,sha256=aQemCAjtBYZJwGqb5Az_kiZ_43bJTLH74EZjn_A40Vw,2125
@@ -135,7 +135,7 @@ django_cfg/apps/tasks/templates/tasks/components/tab_navigation.html,sha256=Sxb7
 django_cfg/apps/tasks/templates/tasks/components/task_details_modal.html,sha256=DeJjj3dxYcBEAj8Hv4Ii4koEMaNRVHta9_R25qZyK4w,6317
 django_cfg/apps/tasks/templates/tasks/components/tasks_tab.html,sha256=Yd6SPgdQX1p_6miitu3nZHjdZOtbsXMhUP4DnXSntPs,1826
 django_cfg/apps/tasks/templates/tasks/components/workers_tab.html,sha256=4Ud4QpG6bnxBsrBDKGXdy4GcIne43wC13Ch1szZzrbo,1580
-django_cfg/archive/django_sample.zip,sha256=9ZkmIjiQEWf9dYHet1BHVKuQWO1dHwp8rfJbOEa8fhc,624553
+django_cfg/archive/django_sample.zip,sha256=BWQUWaM6yP4q-oL2JsAi2dQhY1fdZvFqtRt9tJ5_uCI,624553
 django_cfg/cli/README.md,sha256=m0pkw3h-g_dJ4wU1N5eMxQP_ecGUDTM_3l0tDNDxByQ,11669
 django_cfg/cli/__init__.py,sha256=i3ksFngCqZCBvaimQcBD1P2_gr5PiM--4efLScCjvvU,152
 django_cfg/cli/main.py,sha256=6PfG3ec2AmPHLmUGYc472CId1gs8cRKYrHcvd3ECPxU,998
@@ -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=z4yDoYM-_q6RGIn4ZesLXS8frcHoiHz5oBIREcJON4U,24668
+django_cfg/core/generation.py,sha256=zClvEA0Qq_uMaIJ-2TjacdgldHH9KwNoKRMKSjJV2o0,24849
 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
@@ -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.54.dist-info/METADATA,sha256=OlemLNWZct6A8IOV06tZcAVaGSqDIvP96Qf2yjkz5r0,38953
-django_cfg-1.1.54.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-django_cfg-1.1.54.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
-django_cfg-1.1.54.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
-django_cfg-1.1.54.dist-info/RECORD,,
+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,,