cardo-python-utils 0.5.2__tar.gz → 0.5.3__tar.gz

{cardo_python_utils-0.5.2/cardo_python_utils.egg-info → cardo_python_utils-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.2
+Version: 0.5.3
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.2 → cardo_python_utils-0.5.3/cardo_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.2
+Version: 0.5.3
 Summary: Python library enhanced with a wide range of functions for different scenarios.
 Author-email: CardoAI <hello@cardoai.com>
 License: MIT

{cardo_python_utils-0.5.2 → cardo_python_utils-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.2"
+version = "0.5.3"
 description = "Python library enhanced with a wide range of functions for different scenarios."
 readme = "README.rst"
 requires-python = ">=3.8"

{cardo_python_utils-0.5.2 → cardo_python_utils-0.5.3}/python_utils/django/admin/user_group.py

@@ -70,9 +70,9 @@ class UserGroupAdminBase(admin.ModelAdmin, metaclass=UserGroupAdminMetaclass):
     def get_queryset(self, request):
         queryset = super().get_queryset(request)
 
-        for entity in self.app_entities:
-            count_attr = f"allowed_{entity}_count"
-            queryset = queryset.annotate(**{count_attr: Count(f"allowed_{entity}")})
+        queryset = queryset.annotate(**{
+            f"allowed_{entity}_count": Count(f"allowed_{entity}") for entity in self.app_entities
+        })
 
         return queryset
 

{cardo_python_utils-0.5.2 → cardo_python_utils-0.5.3}/python_utils/django/models/user_group.py

@@ -20,3 +20,4 @@ class UserGroupBase(models.Model):
 
     class Meta:
         abstract = True
+        ordering = ["path"]

{cardo_python_utils-0.5.2 → cardo_python_utils-0.5.3}/python_utils/django/tenant_context.py

@@ -11,6 +11,9 @@ logger = logging.getLogger(__name__)
 _tenant_var: ContextVar[Optional[str]] = ContextVar("tenant", default=None)
 
 
+ALLOW_TENANT_CONTEXT_CHANGE = getattr(settings, "ALLOW_TENANT_CONTEXT_CHANGE", False)
+
+
 class TenantContext(ContextDecorator):
     """
     Context manager that sets the current tenant.
@@ -68,14 +71,14 @@ class TenantContext(ContextDecorator):
     def set(tenant):
         if TenantContext.is_set():
             # If the tenant is already set, we do not allow to set it
-            # again unless it is the same value.
+            # again unless it is the same value or ALLOW_TENANT_CONTEXT_CHANGE is True.
             # This is to prevent the tenant to be set to a different
             # value in the same thread.
             # A request-response cycle is required to set the tenant
             # only once and operate on the same tenant in its lifecycle.
             # The same applies to a single task, it is not allowed to set the
             # tenant in the same task to a different value.
-            if TenantContext.get() != tenant:
+            if TenantContext.get() != tenant and not ALLOW_TENANT_CONTEXT_CHANGE:
                 raise RuntimeError(
                     f"Tenant context already set to '{TenantContext.get()}', "
                     f"cannot change to '{tenant}' within the same request/task lifecycle."