cardo-python-utils 0.5.dev50__tar.gz → 0.5.dev53__tar.gz

{cardo_python_utils-0.5.dev50/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev53}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cardo-python-utils
-Version: 0.5.dev50
+Version: 0.5.dev53
 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.dev50 → cardo_python_utils-0.5.dev53}/cardo_python_utils.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ python_utils/django/management/__init__.py
 python_utils/django/management/commands/__init__.py
 python_utils/django/management/commands/migrateall.py
 python_utils/django/management/commands/shell.py
+python_utils/django/management/commands/showmigrations.py
 python_utils/django/management/commands/tenant_aware_command.py
 python_utils/django/middleware/__init__.py
 python_utils/django/middleware/tenant_aware_http_middleware.py

{cardo_python_utils-0.5.dev50 → cardo_python_utils-0.5.dev53}/pyproject.toml

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

@@ -157,14 +157,28 @@ If using `django-ninja`, apart from the settings configured above, auth utils ar
 
 ## Atomic Transactions
 
-Django's `transaction.atomic` uses the default database. To make it tenant-aware, use `tenant_atomic`
+Django's `transaction.atomic` uses the default database. To make it tenant-aware, use `tenant_atomic`.
+If `transaction.on_commit` is used, make sure to pass the tenant as DB alias as well:
 
 ```python3
 from python_utils.django.db.transaction import tenant_atomic
 
 @tenant_atomic
 def my_function():
-    ...
+    # Some logic
+
+    transaction.on_commit(do_smth, using=TenantContext.get())
+```
+
+## Explicit database connection
+
+If using django.db.connection anywhere in the code, you need to change that to get a tenant-aware connection:
+
+```python3
+from python_utils.django.db.utils import get_connection
+from python_utils.django.tenant_context import TenantContext
+
+connection = get_connection(TenantContext.get())
 ```
 
 ## Django Shell

{cardo_python_utils-0.5.dev50 → cardo_python_utils-0.5.dev53}/python_utils/django/api/drf.py

@@ -1,8 +1,8 @@
 from django.conf import settings
-from jwt.exceptions import InvalidTokenError, PyJWKClientError
+from jwt.exceptions import ExpiredSignatureError, InvalidTokenError, PyJWKClientError
 
 from rest_framework import authentication
-from rest_framework.exceptions import AuthenticationFailed
+from rest_framework.exceptions import AuthenticationFailed, PermissionDenied
 from rest_framework.permissions import BasePermission
 
 from .utils import create_or_update_user, decode_jwt
@@ -14,13 +14,15 @@ class AuthenticationBackend(authentication.TokenAuthentication):
     def authenticate_credentials(self, token: str):
         try:
             payload = decode_jwt(token, audience=self._get_audience())
+        except ExpiredSignatureError as e:
+            raise AuthenticationFailed("Token has expired.") from e
         except (InvalidTokenError, PyJWKClientError) as e:
-            raise AuthenticationFailed(f"Invalid token: {str(e)}") from e
+            raise PermissionDenied(f"Invalid token: {str(e)}") from e
 
         try:
             username = payload["preferred_username"]
         except KeyError as e:
-            raise AuthenticationFailed(
+            raise PermissionDenied(
                 "Invalid token: preferred_username not present."
             ) from e
 

{cardo_python_utils-0.5.dev50 → cardo_python_utils-0.5.dev53}/python_utils/django/api/ninja.py

@@ -1,12 +1,12 @@
 import logging
 from typing import Literal, Optional, Union
 
-from jwt.exceptions import InvalidTokenError, PyJWKClientError
+from jwt.exceptions import ExpiredSignatureError, InvalidTokenError, PyJWKClientError
 
 from django.conf import settings
 from django.http import HttpRequest
 from ninja.security import HttpBearer
-from ninja.errors import AuthenticationError, HttpError
+from ninja.errors import AuthenticationError, AuthorizationError, HttpError
 
 from .utils import (
     acreate_or_update_user,
@@ -42,7 +42,7 @@ class AuthBearer(HttpBearer):
 
     def _get_token(self, request: HttpRequest) -> Optional[str]:
         """
-        This part of the token validation is similar to what 
+        This part of the token validation is similar to what
         django-ninja is doing in HttpBearer.__call__
         """
         headers = request.headers
@@ -61,16 +61,16 @@ class AuthBearer(HttpBearer):
     def _decode_token(self, token: str) -> TokenPayload:
         try:
             return decode_jwt(token)
+        except ExpiredSignatureError as e:
+            raise AuthenticationError("Token has expired.") from e
         except (InvalidTokenError, PyJWKClientError) as e:
-            raise AuthenticationError(f"Invalid token: {str(e)}") from e
+            raise AuthorizationError(f"Invalid token: {str(e)}") from e
 
     def _get_username(self, payload: TokenPayload) -> str:
         try:
             return payload["preferred_username"]
         except KeyError as e:
-            raise AuthenticationError(
-                "Invalid token: 'preferred_username' claim not present."
-            ) from e
+            raise AuthorizationError("Invalid token: 'preferred_username' claim not present.") from e
 
     def _verify_scopes(self, request, token_payload):
         allowed_scopes = self._get_view_allowed_scopes(request)
@@ -106,9 +106,7 @@ class AuthBearer(HttpBearer):
             if operation.methods and method in operation.methods:
                 return operation.view_func
 
-        raise Exception(
-            f"Could not determine the view function for {request.method} {request.path}."
-        )
+        raise Exception(f"Could not determine the view function for {request.method} {request.path}.")
 
 
 class AuthBearerAsync(AuthBearer):

{cardo_python_utils-0.5.dev50 → cardo_python_utils-0.5.dev53}/python_utils/django/celery/tenant_aware_task.py

@@ -27,8 +27,49 @@ class TenantAwareTask(TaskClass):
 
     once = {"graceful": True, "unlock_before_run": False}
 
+    def apply(
+        self,
+        args=None,
+        kwargs=None,
+        link=None,
+        link_error=None,
+        task_id=None,
+        retries=None,
+        throw=None,
+        logfile=None,
+        loglevel=None,
+        headers=None,
+        **options,
+    ):
+        """Pass the tenant name from the context in the kwargs."""
+
+        if kwargs is None:
+            kwargs = {}
+
+        if TENANT_KEY not in kwargs:
+            tenant = TenantContext.get()
+            kwargs[TENANT_KEY] = tenant
+
+        return super().apply(
+            args, kwargs, link, link_error, task_id, retries, throw, logfile, loglevel, headers, **options
+        )
+
+    def apply_async(
+        self, args=None, kwargs=None, task_id=None, producer=None, link=None, link_error=None, shadow=None, **options
+    ):
+        """Pass the tenant name from the context in the kwargs."""
+
+        if kwargs is None:
+            kwargs = {}
+
+        if TENANT_KEY not in kwargs:
+            tenant = TenantContext.get()
+            kwargs[TENANT_KEY] = tenant
+
+        return super().apply_async(args, kwargs, task_id, producer, link, link_error, shadow, **options)
+
     def __call__(self, *args, **kwargs):
-        """Override the __call__ method to set the tenant name in the thread namespace."""
+        """Use the tenant name from the kwargs to update the context."""
 
         # Only clear the lock before the task's execution if the
         # "unlock_before_run" option is True
@@ -43,7 +84,8 @@ class TenantAwareTask(TaskClass):
         return self.run(*args, **kwargs)
 
     def after_return(self, status, retval, task_id, args, kwargs, einfo):
-        """Clear the tenant from the thread namespace after the task has returned."""
+        """Clear the tenant from the context after the task has returned."""
+
         TenantContext.clear()
         super().after_return(status, retval, task_id, args, kwargs, einfo)
 
@@ -67,7 +109,7 @@ class TenantAwareTask(TaskClass):
         tenant_kwarg = {TENANT_KEY: tenant}
         task_call_args = super()._get_call_args(args, _kwargs)
 
-        # Add the tenant kwarg back to the return value 
+        # Add the tenant kwarg back to the return value
         # since this value is being used to create the key for the lock.
         # We want to lock the task for the tenant that is running it.
         return task_call_args | tenant_kwarg

{cardo_python_utils-0.5.dev50 → cardo_python_utils-0.5.dev53}/python_utils/django/db/utils.py

@@ -1,7 +1,7 @@
 from functools import reduce
 import json
 import os
-from typing import NotRequired, TypedDict
+from typing import TypedDict
 from django.db import connections
 
 
@@ -10,7 +10,7 @@ class DatabaseConfigData(TypedDict):
     name: str
     user: str
     password: str
-    port: NotRequired[int]
+    port: int | None
 
 
 def get_connection(tenant: str = None):

cardo_python_utils-0.5.dev53/python_utils/django/management/commands/showmigrations.py

@@ -0,0 +1,37 @@
+from django.core.management.commands.showmigrations import Command as ShowMigrationsCommand
+
+from ...settings import TENANT_DATABASES
+from ...tenant_context import TenantContext
+
+
+class Command(ShowMigrationsCommand):
+    help = "Shows all available migrations for a specific tenant."
+
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+
+        parser.add_argument(
+            "--tenant",
+            action="store",
+            dest="tenant",
+            help="Specify the tenant to show migrations for, either a single tenant name or 'all'.",
+            required=True,
+            type=str,
+        )
+
+    def handle(self, *args, **options):
+        tenant = options["tenant"]
+
+        if tenant.lower() == "all":
+            tenants_to_use = list(TENANT_DATABASES)
+        else:
+            if tenant not in TENANT_DATABASES:
+                self.stdout.write(self.style.ERROR(f"Tenant '{tenant}' not found in DATABASES settings."))
+                return
+            tenants_to_use = [tenant]
+
+        for t in tenants_to_use:
+            self.stdout.write(self.style.MIGRATE_LABEL(f"\n=== Tenant: {t} ==="))
+            options["database"] = t
+            with TenantContext(t):
+                super().handle(*args, **options)