cardo-python-utils 0.5.dev32__tar.gz → 0.5.dev33__tar.gz

{cardo_python_utils-0.5.dev32/cardo_python_utils.egg-info → cardo_python_utils-0.5.dev33}/PKG-INFO

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

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

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

@@ -2,18 +2,20 @@ This package provides utilities for facilitating IDP communication and multi-ten
 
 # Usage
 
-
 ## Environment variables to set
 
 - AWS_STORAGE_TENANT_BUCKET_NAMES
-    - A JSON dictionary where each key is the tenant name and the value is the bucket name.
+  - _This variable should be set if separate tenant buckets are needed._
+  - A JSON dictionary where each key is the tenant name and the value is the bucket name.
 - DATABASE_CONFIG
-    - A 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. 
+  - 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
+  - The URL of the Keycloak deployment
 - KEYCLOAK_CONFIDENTIAL_CLIENT_ID
-    - The id of the confidential client of the backend service
+  - The id of the confidential client of the backend service
+- KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS
+  - A JSON dictionary where each key is the tenant name and the value is the file path of the service account token for the confidential client of that tenant
 
 ## settings.py file
 
@@ -61,7 +63,8 @@ CACHES = {
     }
 }
 
-# If using Django Storages with S3, configure the storage backends as follows:
+# If using Django Storages with S3, and separate tenant buckets are needed, 
+# configure the storage backends as follows:
 STORAGES = {
     "default": {
         "BACKEND": "python_utils.django.storage.TenantAwarePrivateS3Storage",
@@ -119,4 +122,4 @@ SESSION_SAVE_EVERY_REQUEST = True  # Extend session on each request
 
 ## With django-ninja
 
-If using `django-ninja`, apart from the settings configured above, auth utils are provided in the django/api/ninja.py module.
+If using `django-ninja`, apart from the settings configured above, auth utils are provided in the django/api/ninja.py module.

{cardo_python_utils-0.5.dev32 → cardo_python_utils-0.5.dev33}/python_utils/django/api/utils.py

@@ -4,8 +4,7 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from jwt import decode, PyJWKClient
 
-from django.oidc_settings import get_oidc_op_jwks_endpoint
-
+from ..oidc_settings import get_oidc_op_jwks_endpoint
 from ..tenant_context import TenantContext
 
 JWKS_CLIENTS = {}  # Cache for PyJWKClient instances

{cardo_python_utils-0.5.dev32 → cardo_python_utils-0.5.dev33}/python_utils/django/middleware/tenant_aware_http_middleware.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.core.handlers.wsgi import WSGIRequest
 from django.http import HttpResponse
 
-from ..settings import DEVELOPMENT_TENANT, TENANT_AWARE_EXCLUDED_PATHS, TENANT_DATABASES
+from ..settings import DEVELOPMENT_TENANT, TENANT_AWARE_EXCLUDED_PATHS
 from ..tenant_context import TenantContext
 
 logger = logging.getLogger(__name__)
@@ -51,9 +51,6 @@ class TenantAwareHttpMiddleware:
         if self._is_excluded_path(request.path):
             return self.get_response(request)
 
-        if TenantContext.is_set():
-            raise Exception("Tenant context already set")
-
         # In DEBUG mode, use DEVELOPMENT_TENANT directly
         # In production, extract tenant from subdomain
         if settings.DEBUG:
@@ -64,10 +61,6 @@ class TenantAwareHttpMiddleware:
             if tenant is None:
                 raise Exception(f"Could not determine tenant from subdomain. Host: {request.get_host()}")
 
-        # Validate tenant exists in configured databases
-        if not self._is_valid_tenant(tenant):
-            raise Exception(f"Unknown tenant: {tenant}")
-
         # Call the next middleware in the chain until the response is returned.
         # After that, the database alias is removed from the thread local variable.
         with TenantContext(tenant):
@@ -94,6 +87,11 @@ class TenantAwareHttpMiddleware:
         - <app>.tenant-internal.domain.com -> tenant (strips -internal suffix)
         """
         host = request.get_host().split(":")[0]  # Remove port if present
+
+        if host == "testserver":
+            logger.debug("Using 'default' tenant for testserver host.")
+            return "default"
+
         parts = host.split(".")
 
         # Need at least 3 parts: <app>.<tenant>.<domain>
@@ -103,11 +101,3 @@ class TenantAwareHttpMiddleware:
             return tenant
 
         return None
-
-    @staticmethod
-    def _is_valid_tenant(tenant: str) -> bool:
-        """
-        Validate that the tenant exists in configured databases.
-        Skip 'default' as it's typically a placeholder.
-        """
-        return tenant in TENANT_DATABASES

{cardo_python_utils-0.5.dev32 → cardo_python_utils-0.5.dev33}/python_utils/django/oidc_settings.py

@@ -12,15 +12,9 @@ from .tenant_context import TenantContext
 
 
 KEYCLOAK_SERVER_URL = os.getenv("KEYCLOAK_SERVER_URL", None)
-if not KEYCLOAK_SERVER_URL:
-    raise ValueError("KEYCLOAK_SERVER_URL env variable is not set.")
-
 KEYCLOAK_CONFIDENTIAL_CLIENT_ID = os.getenv("KEYCLOAK_CONFIDENTIAL_CLIENT_ID", None)
-if not KEYCLOAK_CONFIDENTIAL_CLIENT_ID:
-    raise ValueError("KEYCLOAK_CONFIDENTIAL_CLIENT_ID env variable is not set.")
-
 KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS: dict[str, str] = json.loads(
-    os.getenv("KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS")
+    os.getenv("KEYCLOAK_CONFIDENTIAL_CLIENT_SERVICE_ACCOUNT_TOKEN_FILE_PATHS", "{}")
 )
 KEYCLOAK_CLIENT_CREDENTIALS_GRANT_TYPE = "client_credentials"
 KEYCLOAK_CLIENT_ASSERTION_TYPE = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"

{cardo_python_utils-0.5.dev32 → cardo_python_utils-0.5.dev33}/python_utils/django/settings.py

@@ -1,6 +1,7 @@
 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", ())
@@ -14,4 +15,9 @@ TENANT_AWARE_EXCLUDED_PATHS = (
     "/mediafiles",
 )
 
-DEVELOPMENT_TENANT = getattr(settings, "DEVELOPMENT_TENANT", list(TENANT_DATABASES)[0])
+DEVELOPMENT_TENANT = getattr(settings, "DEVELOPMENT_TENANT")
+if DEVELOPMENT_TENANT is None:
+    if TENANT_DATABASES:
+        DEVELOPMENT_TENANT = list(TENANT_DATABASES)[0]
+    else:
+        DEVELOPMENT_TENANT = list(DATABASES.keys())[0]

{cardo_python_utils-0.5.dev32 → cardo_python_utils-0.5.dev33}/python_utils/django/tenant_context.py

@@ -4,7 +4,7 @@ from contextlib import ContextDecorator
 from threading import local
 from typing import Optional
 
-from .settings import TENANT_DATABASES
+from .settings import DATABASES
 
 logger = logging.getLogger(__name__)
 thread_namespace = local()
@@ -75,7 +75,7 @@ class TenantContext(ContextDecorator):
                 logger.info("Tenant context already set to %s", tenant)
                 return
         
-        if tenant not in TENANT_DATABASES:
+        if tenant not in DATABASES:
             logger.error(f"Tenant '{tenant}' not found in DATABASES settings.")
             return sys.exit(1)