cardo-python-utils 0.5.dev51__tar.gz → 0.5.dev54__tar.gz

{cardo_python_utils-0.5.dev51/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev54}/PKG-INFO

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

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

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

@@ -170,6 +170,17 @@ def my_function():
     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
 
 This library overrides the shell command of Django, so that it requires the `tenant` arg. 

{cardo_python_utils-0.5.dev51 → cardo_python_utils-0.5.dev54}/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.dev51 → cardo_python_utils-0.5.dev54}/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.dev51 → cardo_python_utils-0.5.dev54}/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.dev54/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)

{cardo_python_utils-0.5.dev51 → cardo_python_utils-0.5.dev54}/python_utils/django/middleware/tenant_aware_http_middleware.py

@@ -10,6 +10,8 @@ from ..tenant_context import TenantContext
 
 logger = logging.getLogger(__name__)
 
+DEFAULT_EXCLUDED_PATHS = ["/", "/healthz", "/healthz/"]
+
 
 class TenantAwareHttpMiddleware:
     """
@@ -72,6 +74,9 @@ class TenantAwareHttpMiddleware:
         """
         Check if the path should be excluded from tenant handling.
         """
+        if path in DEFAULT_EXCLUDED_PATHS:
+            return True
+
         for excluded_path in TENANT_AWARE_EXCLUDED_PATHS:
             if path.startswith(excluded_path):
                 return True

{cardo_python_utils-0.5.dev51 → cardo_python_utils-0.5.dev54}/python_utils/esma_choices.py

@@ -42,6 +42,9 @@ class FinancialCreditAssetFinancingPurposeChoices(ChoiceEnum):
     OTHV = 16, "Other Vehicle"
     EQUP = 17, "Equipment"
     PROP = 18, "Property"
+    PURC = 20, "Purchase"
+    RFTM = 21, "Rate/Term Refinance"
+    COUT = 22, "Cash-Out Refinance"
     OTHR = 100, "Other"
 
 
@@ -60,6 +63,9 @@ class InterestRateTypeChoices(ChoiceEnum):
     MODE = 12, "Modular"
     OTHR = 13, "Other"
     FXRT = 14, "Fixed Rate"
+    VARI = 15, "Variable (ARM)"
+    HYBR = 16, "Hybrid ARM (Fixed-to-Variable)"
+    STEP = 17, "Step Rate"
 
 
 class SeniorityChoices(ChoiceEnum):
@@ -86,7 +92,13 @@ class EmploymentStatusChoices(ChoiceEnum):
     STNT = 6, "Student"
     PNNR = 7, "Pensioner"
     NOEM = 8, "No Employment, Obligor is Legal Entity"
+    RETI = 9, "Retired"
     OTHR = 10, "Other"
+    UNUM = 11, "Unemployed"
+    PATE = 12, "Part-Time Employed"
+    CNTR = 13, "Contract / Freelance"
+    BOWN = 14, "Business Owner"
+    SEAS = 15, "Seasonally Employed"
 
 
 class PrimaryIncomeTypeChoices(ChoiceEnum):
@@ -100,6 +112,15 @@ class PrimaryIncomeTypeChoices(ChoiceEnum):
     DSPL = 8, "Disposable Income"
     CORP = 9, "Borrower is legal entity"
     OTHR = 10, "Other"
+    SALR = 11, "Salary"
+    SEMP = 12, "Self-Employment Income"
+    BUSI = 13, "Business Income"
+    RENT = 14, "Rental Income"
+    INVT = 15, "Investment Income"
+    CNTR = 16, "1099 / Contract Income"
+    PENS = 17, "Pension / Retirement"
+    SOCS = 18, "Social Security / Disability"
+    ROYA = 19, "Royalties"
 
 
 class PrimaryIncomeVerificationChoices(ChoiceEnum):