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

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

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

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

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

@@ -10,8 +10,6 @@ This package provides utilities for facilitating IDP communication and multi-ten
 - DATABASE_CONFIG
   - A JSON dictionary where each key is the tenant name and the value is a dict with the datase config.
   - If multiple 'DATABASE_CONFIG'-prefixed variables are set, they will be merged into a single dictionary.
-- KEYCLOAK_SERVER_URL
-  - The URL of the Keycloak deployment
 - KEYCLOAK_CONFIDENTIAL_CLIENT_ID
   - The id of the confidential client of the backend service
 - KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS

{cardo_python_utils-0.5.dev53 → cardo_python_utils-0.5.dev55}/python_utils/django/auth/service.py

@@ -6,8 +6,8 @@ from keycloak import KeycloakOpenIDConnection
 from keycloak.exceptions import KeycloakGetError
 
 from ..oidc_settings import (
-    KEYCLOAK_SERVER_URL,
     KEYCLOAK_CONFIDENTIAL_CLIENT_ID,
+    get_keycloak_server_url,
     get_oidc_confidential_client_token,
 )
 from ..tenant_context import TenantContext
@@ -70,7 +70,7 @@ class KeycloakService:
         tenant = TenantContext.get()
 
         keycloak_connection = KeycloakOpenIDConnection(
-            server_url=KEYCLOAK_SERVER_URL,
+            server_url=get_keycloak_server_url(),
             realm_name=tenant,
             user_realm_name=tenant,
             client_id=KEYCLOAK_CONFIDENTIAL_CLIENT_ID,

{cardo_python_utils-0.5.dev53 → cardo_python_utils-0.5.dev55}/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.dev53 → cardo_python_utils-0.5.dev55}/python_utils/django/oidc_settings.py

@@ -12,7 +12,7 @@ from django.conf import settings
 from .tenant_context import TenantContext
 
 
-KEYCLOAK_SERVER_URL = os.getenv("KEYCLOAK_SERVER_URL", None)
+KEYCLOAK_SERVER_URL_TEMPLATE = os.getenv("KEYCLOAK_SERVER_URL_TEMPLATE", "https://keycloak.{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")
@@ -45,11 +45,17 @@ def get_realm_for_tenant(tenant: str) -> str:
     return TENANT_REALM_MAPPING.get(tenant, tenant)
 
 
+def get_keycloak_server_url() -> str:
+    """Get the Keycloak server URL for the current tenant."""
+
+    return KEYCLOAK_SERVER_URL_TEMPLATE.format(realm=get_realm_for_tenant(TenantContext.get()))
+
+
 def get_oidc_op_base_url() -> str:
     """Get the base URL for the OIDC provider (Keycloak realm URL)."""
 
     realm = get_realm_for_tenant(TenantContext.get())
-    return f"{KEYCLOAK_SERVER_URL}/realms/{realm}"
+    return f"{get_keycloak_server_url()}/realms/{realm}"
 
 
 def get_oidc_op_authorization_endpoint() -> str:

{cardo_python_utils-0.5.dev53 → cardo_python_utils-0.5.dev55}/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):