cardo-python-utils 0.5.dev40__tar.gz → 0.5.dev42__tar.gz

{cardo_python_utils-0.5.dev40/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev40
+Version: 0.5.dev42
 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.dev40 → cardo_python_utils-0.5.dev42/cardo_python_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev40
+Version: 0.5.dev42
 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.dev40 → cardo_python_utils-0.5.dev42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cardo-python-utils"
-version = "0.5.dev40"
+version = "0.5.dev42"
 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.dev40 → cardo_python_utils-0.5.dev42}/python_utils/django/api/utils.py

@@ -20,9 +20,6 @@ def get_jwks_client():
     return JWKS_CLIENTS[tenant]
 
 
-User = get_user_model()
-
-
 class TokenPayload(TypedDict, total=False):
     exp: int
     iat: int
@@ -75,7 +72,7 @@ def get_user_data_from_payload(payload: TokenPayload) -> dict:
         "is_staff": payload.get("is_staff", False),
     }
 
-    if hasattr(User, "is_demo"):
+    if hasattr(get_user_model(), "is_demo"):
         user_data["is_demo"] = payload.get("is_demo", False)
 
     return user_data
@@ -96,6 +93,7 @@ def create_or_update_user(username: str, payload: TokenPayload):
     """
     Create or update a user based on the JWT payload.
     """
+    User = get_user_model()
     user_data = get_user_data_from_payload(payload)
 
     user = User.objects.filter(username=username).first()
@@ -114,6 +112,7 @@ def create_or_update_user(username: str, payload: TokenPayload):
 
 
 async def acreate_or_update_user(username: str, payload: TokenPayload):
+    User = get_user_model()
     user_data = get_user_data_from_payload(payload)
 
     user = await User.objects.filter(username=username).afirst()

{cardo_python_utils-0.5.dev40 → cardo_python_utils-0.5.dev42}/python_utils/django/settings.py

@@ -1,7 +1,6 @@
 from django.conf import settings
 
 TENANT_KEY = "tenant"
-DATABASES = settings.DATABASES
 TENANT_DATABASES = set(settings.DATABASES.keys()) - {"default"}
 
 TENANT_AWARE_EXCLUDED_PATHS = getattr(settings, "TENANT_AWARE_EXCLUDED_PATHS", ())
@@ -20,4 +19,4 @@ if DEVELOPMENT_TENANT is None:
     if TENANT_DATABASES:
         DEVELOPMENT_TENANT = list(TENANT_DATABASES)[0]
     else:
-        DEVELOPMENT_TENANT = list(DATABASES.keys())[0]
+        DEVELOPMENT_TENANT = list(settings.DATABASES.keys())[0]

{cardo_python_utils-0.5.dev40 → cardo_python_utils-0.5.dev42}/python_utils/django/tenant_context.py

@@ -3,7 +3,7 @@ from contextlib import ContextDecorator
 from contextvars import ContextVar
 from typing import Optional
 
-from .settings import DATABASES
+from django.conf import settings
 
 logger = logging.getLogger(__name__)
 
@@ -84,7 +84,7 @@ class TenantContext(ContextDecorator):
                 # If the tenant is already set to the same value, we do nothing and return None.
                 return None
 
-        if tenant not in DATABASES:
+        if tenant not in settings.DATABASES:
             raise ValueError(f"Tenant '{tenant}' not found in DATABASES settings.")
 
         token = _tenant_var.set(tenant)