fix: small fixes

Author: klajdicaushi

pyproject.toml

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

python_utils/django/admin/user_group.py

@@ -71,7 +71,7 @@ def get_queryset(self, request):
         queryset = super().get_queryset(request)
 
         queryset = queryset.annotate(**{
-            f"allowed_{entity}_count": Count(f"allowed_{entity}") for entity in self.app_entities
+            f"allowed_{entity}_count": Count(f"allowed_{entity}", distinct=True) for entity in self.app_entities
         })
 
         return queryset

python_utils/django/celery/tenant_aware_task.py

@@ -15,6 +15,8 @@
     TaskClass = Task
     USE_QUEUE_ONCE = False
 
+CELERY_BACKEND_CLEANUP_TASK = "celery.backend_cleanup"
+
 
 class TenantAwareTask(TaskClass):
     #: Enable argument checking.
@@ -46,7 +48,7 @@ def apply(
         if kwargs is None:
             kwargs = {}
 
-        if TENANT_KEY not in kwargs:
+        if TENANT_KEY not in kwargs and self.name != CELERY_BACKEND_CLEANUP_TASK:
             kwargs[TENANT_KEY] = TenantContext.get()
 
         return super().apply(
@@ -61,19 +63,19 @@ def apply_async(
         if kwargs is None:
             kwargs = {}
 
-        if TENANT_KEY not in kwargs:
+        if TENANT_KEY not in kwargs and self.name != CELERY_BACKEND_CLEANUP_TASK:
             kwargs[TENANT_KEY] = TenantContext.get()
 
         return super().apply_async(args, kwargs, task_id, producer, link, link_error, shadow, **options)
 
     def s(self, *args, **kwargs):
-        if TENANT_KEY not in kwargs:
+        if TENANT_KEY not in kwargs and self.name != CELERY_BACKEND_CLEANUP_TASK:
             kwargs[TENANT_KEY] = TenantContext.get()
 
         return self.signature(args, kwargs)
 
     def si(self, *args, **kwargs):
-        if TENANT_KEY not in kwargs:
+        if TENANT_KEY not in kwargs and self.name != CELERY_BACKEND_CLEANUP_TASK:
             kwargs[TENANT_KEY] = TenantContext.get()
 
         return self.signature(args, kwargs, immutable=True)
@@ -87,8 +89,14 @@ def __call__(self, *args, **kwargs):
             key = self.get_key(args, kwargs)
             self.once_backend.clear_lock(key)
 
-        if self.name != "celery.backend_cleanup":
-            tenant = kwargs.pop(TENANT_KEY)
+        if self.name != CELERY_BACKEND_CLEANUP_TASK:
+            try:
+                tenant = kwargs.pop(TENANT_KEY)
+            except KeyError:
+                raise RuntimeError(
+                    f"TenantAwareTask {self.name} called without tenant in kwargs. "
+                    f"Make sure to call the task with the tenant in the kwargs or use the apply/apply_async/s/si methods."
+                )
             TenantContext.set(tenant)
 
         return self.run(*args, **kwargs)

python_utils/django/oidc_settings.py

@@ -12,7 +12,7 @@
 from .tenant_context import TenantContext
 
 
-KEYCLOAK_SERVER_URL_TEMPLATE = os.getenv("KEYCLOAK_SERVER_URL_TEMPLATE", "https://keycloak.{realm}.company.com")
+KEYCLOAK_SERVER_URL_TEMPLATE = os.getenv("KEYCLOAK_SERVER_URL_TEMPLATE", "https://id.{realm}.company.com")
 KEYCLOAK_CONFIDENTIAL_CLIENT_ID = os.getenv("KEYCLOAK_CONFIDENTIAL_CLIENT_ID", None)
 
 OIDC_CLIENT_AUTH_METHOD = getattr(settings, "OIDC_CLIENT_AUTH_METHOD", "client_assertion")