cardo-python-utils 0.5.6__tar.gz → 0.5.8__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {cardo_python_utils-0.5.6/cardo_python_utils.egg-info → cardo_python_utils-0.5.8}/PKG-INFO +1 -1
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8/cardo_python_utils.egg-info}/PKG-INFO +1 -1
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/pyproject.toml +1 -1
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/oidc_settings.py +12 -4
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/storage/tenant_aware_storage.py +19 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/LICENSE +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/MANIFEST.in +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/README.rst +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/SOURCES.txt +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/dependency_links.txt +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/requires.txt +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/top_level.txt +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/choices.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/data_structures.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/db.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/README.md +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/auth.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/templates/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/templates/user_groups_changelist.html +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/user_group.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/views.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/api/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/api/drf.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/api/ninja.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/api/utils.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/apps.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/auth/service.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/celery/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/celery/tenant_aware_database_scheduler.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/celery/tenant_aware_task.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/db/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/db/alias.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/db/routers.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/db/transaction.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/db/utils.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/commands/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/commands/migrateall.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/commands/shell.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/commands/showmigrations.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/commands/tenant_aware_command.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/middleware/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/middleware/tenant_aware_http_middleware.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/middleware/tenant_aware_websocket_middleware.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0001_initial.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0001_initial_squashed_0005_alter_userrole_id.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0002_auto_20220120_1617.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0003_auto_20220513_1025.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0004_auto_20220817_1526.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0005_alter_userrole_id.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0006_userrole_organization_and_more.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0007_user_demo.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0008_delete_userrole.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/models/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/models/user.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/models/user_group.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/redis/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/redis/key_function.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/settings.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/storage/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/tenant_context.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/tests/__init__.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/tests/conftest.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django_utils.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/esma_choices.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/exceptions.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/imports.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/math.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/text.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/time.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/types_hinting.py +0 -0
- {cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/setup.cfg +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "cardo-python-utils"
|
|
7
|
-
version = "0.5.
|
|
7
|
+
version = "0.5.8"
|
|
8
8
|
description = "Python library enhanced with a wide range of functions for different scenarios."
|
|
9
9
|
readme = "README.rst"
|
|
10
10
|
requires-python = ">=3.8"
|
|
@@ -6,6 +6,7 @@ dynamically based on the tenant.
|
|
|
6
6
|
|
|
7
7
|
import json
|
|
8
8
|
import os
|
|
9
|
+
import time
|
|
9
10
|
import requests
|
|
10
11
|
|
|
11
12
|
from django.conf import settings
|
|
@@ -125,10 +126,17 @@ def get_oidc_confidential_client_token(**kwargs) -> dict:
|
|
|
125
126
|
data["client_assertion_type"] = KEYCLOAK_CLIENT_ASSERTION_TYPE
|
|
126
127
|
data["client_assertion"] = get_confidential_client_service_account_token()
|
|
127
128
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
129
|
+
max_retries = 3
|
|
130
|
+
for attempt in range(max_retries + 1):
|
|
131
|
+
response = requests.post(
|
|
132
|
+
get_oidc_op_token_endpoint(),
|
|
133
|
+
data=data,
|
|
134
|
+
)
|
|
135
|
+
# Retry on server errors (5xx), it might be a temporary issue with Keycloak.
|
|
136
|
+
if response.status_code < 500 or attempt == max_retries:
|
|
137
|
+
break
|
|
138
|
+
time.sleep(2**attempt) # 1, 2, 4 seconds
|
|
139
|
+
|
|
132
140
|
response.raise_for_status()
|
|
133
141
|
|
|
134
142
|
return response.json()
|
|
@@ -60,6 +60,14 @@ class TenantAwareS3Storage(S3Boto3Storage):
|
|
|
60
60
|
def __init__(self, *args, **kwargs):
|
|
61
61
|
# Don't set bucket_name here; it will be resolved dynamically
|
|
62
62
|
super().__init__(*args, **kwargs)
|
|
63
|
+
self._buckets = {}
|
|
64
|
+
|
|
65
|
+
@property
|
|
66
|
+
def bucket(self):
|
|
67
|
+
bucket_name = self.bucket_name # resolves current tenant
|
|
68
|
+
if bucket_name not in self._buckets:
|
|
69
|
+
self._buckets[bucket_name] = self.connection.Bucket(bucket_name)
|
|
70
|
+
return self._buckets[bucket_name]
|
|
63
71
|
|
|
64
72
|
@property
|
|
65
73
|
def bucket_name(self):
|
|
@@ -75,6 +83,17 @@ class TenantAwareS3Storage(S3Boto3Storage):
|
|
|
75
83
|
# Allow setting bucket_name but it will be overridden by the property getter
|
|
76
84
|
self._bucket_name_override = value
|
|
77
85
|
|
|
86
|
+
def __getstate__(self):
|
|
87
|
+
"""Override __getstate__ to exclude the _buckets cache from being pickled."""
|
|
88
|
+
state = super().__getstate__()
|
|
89
|
+
state.pop("_buckets", None)
|
|
90
|
+
return state
|
|
91
|
+
|
|
92
|
+
def __setstate__(self, state):
|
|
93
|
+
"""Override __setstate__ to reinitialize the _buckets cache after unpickling."""
|
|
94
|
+
super().__setstate__(state)
|
|
95
|
+
self._buckets = {}
|
|
96
|
+
|
|
78
97
|
|
|
79
98
|
class TenantAwarePrivateS3Storage(TenantAwareS3Storage):
|
|
80
99
|
"""
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/requires.txt
RENAMED
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/cardo_python_utils.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/admin/user_group.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/celery/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/management/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/middleware/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/0001_initial.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/migrations/__init__.py
RENAMED
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/models/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/models/user_group.py
RENAMED
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/redis/key_function.py
RENAMED
|
File without changes
|
|
File without changes
|
{cardo_python_utils-0.5.6 → cardo_python_utils-0.5.8}/python_utils/django/storage/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|