oxutils 0.1.10__tar.gz → 0.1.12__tar.gz

{oxutils-0.1.10 → oxutils-0.1.12}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.1.10
+Version: 0.1.12
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
-Keywords: django,utilities,jwt,s3,audit,logging,celery,structlog
+Keywords: django,utilities,jwt,audit,logging,celery,structlog
 Author: Edimedia Mutoke
 Author-email: Edimedia Mutoke <eddycondor07@gmail.com>
 License-Expression: Apache-2.0
@@ -24,7 +24,6 @@ Requires-Dist: django-celery-results>=2.6.0
 Requires-Dist: django-extensions>=4.1
 Requires-Dist: django-ninja>=1.5.0
 Requires-Dist: django-ninja-extra>=0.30.6
-Requires-Dist: django-storages[s3]>=1.14.6
 Requires-Dist: django-structlog[celery]>=10.0.0
 Requires-Dist: jwcrypto>=1.5.6
 Requires-Dist: pydantic-settings>=2.12.0
@@ -71,7 +70,6 @@ Description-Content-Type: text/markdown
 ## Features
 
 - 🔐 **JWT Authentication** - RS256 with JWKS caching
-- 📦 **S3 Storage** - Static, media, private, and log backends
 - 📝 **Structured Logging** - JSON logs with automatic request tracking
 - 🔍 **Audit System** - Change tracking with S3 export
 - ⚙️ **Celery Integration** - Pre-configured task processing
@@ -118,8 +116,6 @@ MIDDLEWARE = [
 ```bash
 OXI_SERVICE_NAME=my-service
 OXI_JWT_JWKS_URL=https://auth.example.com/.well-known/jwks.json
-OXI_USE_STATIC_S3=True
-OXI_STATIC_STORAGE_BUCKET_NAME=my-bucket
 ```
 
 ### 3. Usage Examples
@@ -134,10 +130,6 @@ import structlog
 logger = structlog.get_logger(__name__)
 logger.info("user_action", user_id=user_id)
 
-# S3 Storage
-from oxutils.s3.storages import PrivateMediaStorage
-class Document(models.Model):
-    file = models.FileField(storage=PrivateMediaStorage())
 
 # Model Mixins
 from oxutils.models.base import BaseModelMixin
@@ -165,7 +157,6 @@ TEMPLATES = [{
 ### Core Modules
 - **[Settings](docs/settings.md)** - Configuration reference
 - **[JWT](docs/jwt.md)** - Authentication
-- **[S3](docs/s3.md)** - Storage backends
 - **[Audit](docs/audit.md)** - Change tracking
 - **[Logging](docs/logger.md)** - Structured logs
 - **[Mixins](docs/mixins.md)** - Model/service mixins

{oxutils-0.1.10 → oxutils-0.1.12}/README.md

@@ -12,7 +12,6 @@
 ## Features
 
 - 🔐 **JWT Authentication** - RS256 with JWKS caching
-- 📦 **S3 Storage** - Static, media, private, and log backends
 - 📝 **Structured Logging** - JSON logs with automatic request tracking
 - 🔍 **Audit System** - Change tracking with S3 export
 - ⚙️ **Celery Integration** - Pre-configured task processing
@@ -59,8 +58,6 @@ MIDDLEWARE = [
 ```bash
 OXI_SERVICE_NAME=my-service
 OXI_JWT_JWKS_URL=https://auth.example.com/.well-known/jwks.json
-OXI_USE_STATIC_S3=True
-OXI_STATIC_STORAGE_BUCKET_NAME=my-bucket
 ```
 
 ### 3. Usage Examples
@@ -75,10 +72,6 @@ import structlog
 logger = structlog.get_logger(__name__)
 logger.info("user_action", user_id=user_id)
 
-# S3 Storage
-from oxutils.s3.storages import PrivateMediaStorage
-class Document(models.Model):
-    file = models.FileField(storage=PrivateMediaStorage())
 
 # Model Mixins
 from oxutils.models.base import BaseModelMixin
@@ -106,7 +99,6 @@ TEMPLATES = [{
 ### Core Modules
 - **[Settings](docs/settings.md)** - Configuration reference
 - **[JWT](docs/jwt.md)** - Authentication
-- **[S3](docs/s3.md)** - Storage backends
 - **[Audit](docs/audit.md)** - Change tracking
 - **[Logging](docs/logger.md)** - Structured logs
 - **[Mixins](docs/mixins.md)** - Model/service mixins

{oxutils-0.1.10 → oxutils-0.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxutils"
-version = "0.1.10"
+version = "0.1.12"
 description = "Production-ready utilities for Django applications in the Oxiliere ecosystem"
 readme = "README.md"
 license = "Apache-2.0"
@@ -8,7 +8,7 @@ authors = [
     { name = "Edimedia Mutoke", email = "eddycondor07@gmail.com" }
 ]
 requires-python = ">=3.12"
-keywords = ["django", "utilities", "jwt", "s3", "audit", "logging", "celery", "structlog"]
+keywords = ["django", "utilities", "jwt", "audit", "logging", "celery", "structlog"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Framework :: Django",
@@ -30,7 +30,6 @@ dependencies = [
     "django-extensions>=4.1",
     "django-ninja>=1.5.0",
     "django-ninja-extra>=0.30.6",
-    "django-storages[s3]>=1.14.6",
     "django-structlog[celery]>=10.0.0",
     "jwcrypto>=1.5.6",
     "pydantic-settings>=2.12.0",

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/__init__.py

@@ -2,7 +2,6 @@
 
 This package provides:
 - JWT authentication with JWKS support
-- S3 storage backends (static, media, private, logs)
 - Structured logging with correlation IDs
 - Audit system with S3 export
 - Celery integration
@@ -11,7 +10,7 @@ This package provides:
 - Permission management
 """
 
-__version__ = "0.1.10"
+__version__ = "0.1.12"
 
 from oxutils.settings import oxi_settings
 from oxutils.conf import UTILS_APPS, AUDIT_MIDDLEWARE

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/audit/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 
 import django.db.models.deletion
 import oxutils.enums.audit
-import oxutils.s3.storages
+from oxutils.logger import get_log_storage
 from django.db import migrations, models
 
 
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 ('updated_at', models.DateTimeField(auto_now=True, help_text='Date and time when this record was last updated')),
                 ('last_export_date', models.DateTimeField(null=True)),
                 ('status', models.CharField(choices=[(oxutils.enums.audit.ExportStatus['FAILED'], 'Failed'), (oxutils.enums.audit.ExportStatus['PENDING'], 'Pending'), (oxutils.enums.audit.ExportStatus['SUCCESS'], 'Success')], default=oxutils.enums.audit.ExportStatus['PENDING'])),
-                ('data', models.FileField(storage=oxutils.s3.storages.LogStorage(), upload_to='')),
+                ('data', models.FileField(storage=get_log_storage, upload_to='')),
                 ('size', models.BigIntegerField()),
             ],
             options={

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/audit/models.py

@@ -3,7 +3,7 @@ from django.utils import timezone
 from django.db import models, transaction
 from oxutils.enums.audit import ExportStatus
 from oxutils.models.base import TimestampMixin
-from oxutils.s3.storages import LogStorage
+from oxutils.logger import get_log_storage
 
 
 
@@ -38,7 +38,7 @@ class LogExportState(TimestampMixin):
             (ExportStatus.SUCCESS, _('Success'))
         )
     )
-    data = models.FileField(storage=LogStorage())
+    data = models.FileField(storage=get_log_storage)
     size = models.BigIntegerField()
 
     @classmethod

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/jwt/auth.py

@@ -1,5 +1,5 @@
 import os
-from typing import Dict, Any, Optional, Type, Tuple
+from typing import Dict, Any, Optional, Type, Tuple, List
 from django.utils.translation import gettext_lazy as _
 from django.http import HttpRequest
 from django.contrib.auth.models import AbstractUser

oxutils-0.1.12/src/oxutils/logger/__init__.py

@@ -0,0 +1,10 @@
+from django.core.files.storage import storages, default_storage
+
+
+def get_log_storage():
+    try:
+        return storages['logs']
+    except:
+        pass
+
+    return default_storage

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/oxiliere/caches.py

@@ -1,9 +1,8 @@
-from django.conf import settings
 from cacheops import cached_as, cached
 from oxutils.oxiliere.utils import (
     get_tenant_model,
     get_tenant_user_model,
-    get_system_tenant_schema_name
+    get_system_tenant_oxi_id
 )
 
 
@@ -33,5 +32,4 @@ def get_tenant_user(oxi_org_id: str, oxi_user_id: str):
 
 @cached(timeout=60*15)
 def get_system_tenant():
-    schema_name = get_system_tenant_schema_name()
-    return get_tenant_model().objects.get(schema_name=schema_name)
+    return get_tenant_model().objects.get(oxi_id=get_system_tenant_oxi_id())

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/oxiliere/context.py

@@ -1,10 +1,10 @@
 import contextvars
-from oxutils.oxiliere.utils import get_system_tenant_schema_name
+from oxutils.oxiliere.utils import get_system_tenant_oxi_id
 
 
 current_tenant_schema_name: contextvars.ContextVar[str] = contextvars.ContextVar(
     "current_tenant_schema_name",
-    default=get_system_tenant_schema_name()
+    default=f"[oxi_id] {get_system_tenant_oxi_id()}"
 )
 
 
@@ -14,5 +14,3 @@ def get_current_tenant_schema_name() -> str:
 
 def set_current_tenant_schema_name(schema_name: str):
     current_tenant_schema_name.set(schema_name)
-
-

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/oxiliere/management/commands/init_oxiliere_system.py

@@ -1,11 +1,11 @@
 import uuid
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from django.db import transaction
+from django.db import transaction, connection
 from django.contrib.auth import get_user_model
 from django_tenants.utils import (
     get_tenant_model,
-    get_tenant_domain_model
+    get_tenant_domain_model,
 )
 from oxutils.oxiliere.utils import (
     oxid_to_schema_name,
@@ -16,7 +16,7 @@ from oxutils.oxiliere.constants import (
     OXI_SYSTEM_DOMAIN,
     OXI_SYSTEM_OWNER_EMAIL
 )
-
+from oxutils.oxiliere.authorization import grant_manager_access_to_owners
 
 
 
@@ -38,8 +38,8 @@ class Command(BaseCommand):
         self.stdout.write(self.style.WARNING(f'Initialisation du tenant système...'))
         
         # Vérifier si le tenant système existe déjà
-        if TenantModel.objects.filter(schema_name=schema_name).exists():
-            self.stdout.write(self.style.ERROR(f'Le tenant système "{schema_name}" existe déjà!'))
+        if TenantModel.objects.filter(oxi_id=system_slug).exists():
+            self.stdout.write(self.style.ERROR(f'Le tenant système "{system_slug}" existe déjà!'))
             return
         
         # Créer le tenant système
@@ -62,6 +62,8 @@ class Command(BaseCommand):
             is_primary=True
         )
         self.stdout.write(self.style.SUCCESS(f'✓ Domaine créé: {domain.domain}'))
+
+        connection.set_tenant(tenant)
         
         self.stdout.write(f'Création du superuser: {owner_email}')
         try:
@@ -88,6 +90,11 @@ class Command(BaseCommand):
         )
         if created:
             self.stdout.write(self.style.SUCCESS(f'✓ Superuser lié au tenant système'))
+            try:
+                grant_manager_access_to_owners(tenant)
+                self.stdout.write(self.style.SUCCESS(f'✓ Droits mis en place'))
+            except Exception as e:
+                self.stdout.write(self.style.ERROR(f'Erreur lors de la mise en place des droits: {str(e)}'))
         else:
             self.stdout.write(self.style.WARNING(f'⚠ Liaison existe déjà'))
         

{oxutils-0.1.10 → oxutils-0.1.12}/src/oxutils/oxiliere/utils.py

@@ -23,14 +23,10 @@ def get_tenant_user_model() -> Any:
     return get_model('TENANT_USER_MODEL')
 
 def is_system_tenant(tenant: Any) -> bool:
-    return tenant.schema_name == get_system_tenant_schema_name()
+    return tenant.oxi_id == get_system_tenant_oxi_id()
 
-def get_system_tenant_schema_name():
-    system_schema_name = oxid_to_schema_name(
-        getattr(settings, 'OXI_SYSTEM_TENANT', OXI_SYSTEM_TENANT)
-    )
-
-    return system_schema_name
+def get_system_tenant_oxi_id():
+    return getattr(settings, 'OXI_SYSTEM_TENANT', OXI_SYSTEM_TENANT)
 
 def oxid_to_schema_name(oxid: str) -> str:
     """

oxutils-0.1.12/src/oxutils/settings.py

@@ -0,0 +1,76 @@
+from typing import Optional
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+
+
+__all__ = [
+    'oxi_settings',
+]
+
+
+
+class OxUtilsSettings(BaseSettings):
+    model_config = SettingsConfigDict(
+        validate_assignment=True,
+        extra="ignore",
+        env_prefix='OXI_'
+    )
+
+    # Service
+    service_name: Optional[str] = 'Oxutils'
+    site_name: Optional[str] = 'Oxiliere'
+    site_domain: Optional[str] = 'oxiliere.com'
+    multitenancy: bool = Field(False)
+
+    # Auth JWT Settings (JWT_SIGNING_KEY)
+    jwt_signing_key: Optional[str] = None
+    jwt_verifying_key: Optional[str] = None
+    jwt_jwks_url: Optional[str] = None
+    jwt_access_token_key: str = Field('access')
+    jwt_org_access_token_key: str = Field('org_access')
+    jwt_service_token_key: str = Field('service')
+    jwt_algorithm: Optional[str] = Field('RS256')
+    jwt_access_token_lifetime: int = Field(15) # minutes
+    jwt_service_token_lifetime: int = Field(3) # minutes
+    jwt_org_access_token_lifetime: int = Field(60) # minutes
+
+
+    # AuditLog
+    log_access: bool = Field(False)
+    retention_delay: int = Field(7)  # one week
+
+    # logger
+    log_file_path: Optional[str] = Field('logs/oxiliere.log')
+
+    def model_post_init(self, __context):
+        """Called after model initialization to perform validation."""
+        self._validate_jwt_keys()
+    
+    def _validate_jwt_keys(self):
+        """Validate JWT key files if configured."""
+        import os
+        
+        if self.jwt_signing_key:
+            if not os.path.exists(self.jwt_signing_key):
+                raise ValueError(
+                    f"JWT signing key file not found at: {self.jwt_signing_key}"
+                )
+            if not os.path.isfile(self.jwt_signing_key):
+                raise ValueError(
+                    f"JWT signing key path is not a file: {self.jwt_signing_key}"
+                )
+        
+        if self.jwt_verifying_key:
+            if not os.path.exists(self.jwt_verifying_key):
+                raise ValueError(
+                    f"JWT verifying key file not found at: {self.jwt_verifying_key}"
+                )
+            if not os.path.isfile(self.jwt_verifying_key):
+                raise ValueError(
+                    f"JWT verifying key path is not a file: {self.jwt_verifying_key}"
+                )
+                
+
+oxi_settings = OxUtilsSettings()

oxutils-0.1.10/src/oxutils/s3/settings.py

@@ -1,34 +0,0 @@
-import os
-
-USE_S3 = os.getenv('USE_S3') == 'TRUE'
-
-if USE_S3:
-    # aws settings
-    AWS_ACCESS_KEY_ID = os.getenv('AWS_ACCESS_KEY_ID')
-    AWS_SECRET_ACCESS_KEY = os.getenv('AWS_SECRET_ACCESS_KEY')
-    AWS_STORAGE_BUCKET_NAME = os.getenv('AWS_STORAGE_BUCKET_NAME')
-    AWS_DEFAULT_ACL = 'public-read'
-    AWS_S3_CUSTOM_DOMAIN = f'{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com'
-    AWS_S3_OBJECT_PARAMETERS = {'CacheControl': 'max-age=86400'}
-
-    # s3 static settings
-    STATIC_LOCATION = 'static'
-    STATIC_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/'
-    STATICFILES_STORAGE = 'oxutils.s3.storages.StaticStorage'
-
-    # s3 public media settings
-    PUBLIC_MEDIA_LOCATION = 'media'
-    MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/{PUBLIC_MEDIA_LOCATION}/'
-    DEFAULT_FILE_STORAGE = 'oxutils.s3.storages.PublicMediaStorage'
-
-    # s3 private media settings
-    PRIVATE_MEDIA_LOCATION = 'private'
-    PRIVATE_FILE_STORAGE = 'oxutils.s3.storages.PrivateMediaStorage'
-else:
-    STATIC_URL = '/static/'
-    STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-
-STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)
-
-MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

oxutils-0.1.10/src/oxutils/s3/storages.py

@@ -1,130 +0,0 @@
-from storages.backends.s3boto3 import S3Boto3Storage
-from oxutils.settings import oxi_settings
-from django.core.exceptions import ImproperlyConfigured
-
-
-class StaticStorage(S3Boto3Storage):
-    def __init__(self, *args, **kwargs):
-        if not oxi_settings.use_static_s3:
-            raise ImproperlyConfigured(
-                "StaticStorage requires OXI_USE_STATIC_S3=True"
-            )
-        
-        self.access_key = oxi_settings.static_access_key_id
-        self.secret_key = oxi_settings.static_secret_access_key
-        self.bucket_name = oxi_settings.static_storage_bucket_name
-        self.custom_domain = oxi_settings.static_s3_custom_domain
-        self.location = oxi_settings.static_location
-        self.default_acl = oxi_settings.static_default_acl
-        self.file_overwrite = False
-        
-        self._validate_required_fields('StaticStorage', {
-            'access_key': self.access_key,
-            'secret_key': self.secret_key,
-            'bucket_name': self.bucket_name,
-            'custom_domain': self.custom_domain,
-        })
-        
-        super().__init__(*args, **kwargs)
-    
-    @staticmethod
-    def _validate_required_fields(storage_name: str, fields: dict):
-        """Validate that all required fields are present."""
-        missing = [name for name, value in fields.items() if not value]
-        if missing:
-            raise ImproperlyConfigured(
-                f"{storage_name} is missing required configuration: {', '.join(missing)}"
-            )
-
-
-class PublicMediaStorage(S3Boto3Storage):
-    def __init__(self, *args, **kwargs):
-        if not oxi_settings.use_default_s3:
-            raise ImproperlyConfigured(
-                "PublicMediaStorage requires OXI_USE_DEFAULT_S3=True"
-            )
-        
-        if oxi_settings.use_static_s3_as_default:
-            self.access_key = oxi_settings.static_access_key_id
-            self.secret_key = oxi_settings.static_secret_access_key
-            self.bucket_name = oxi_settings.static_storage_bucket_name
-            self.custom_domain = oxi_settings.static_s3_custom_domain
-        else:
-            self.access_key = oxi_settings.default_s3_access_key_id
-            self.secret_key = oxi_settings.default_s3_secret_access_key
-            self.bucket_name = oxi_settings.default_s3_storage_bucket_name
-            self.custom_domain = oxi_settings.default_s3_custom_domain
-        
-        self.location = oxi_settings.default_s3_location
-        self.default_acl = oxi_settings.default_s3_default_acl
-        self.file_overwrite = False
-        
-        StaticStorage._validate_required_fields('PublicMediaStorage', {
-            'access_key': self.access_key,
-            'secret_key': self.secret_key,
-            'bucket_name': self.bucket_name,
-            'custom_domain': self.custom_domain,
-        })
-        
-        super().__init__(*args, **kwargs)
-
-
-class PrivateMediaStorage(S3Boto3Storage):
-    def __init__(self, *args, **kwargs):
-        if not oxi_settings.use_private_s3:
-            raise ImproperlyConfigured(
-                "PrivateMediaStorage requires OXI_USE_PRIVATE_S3=True"
-            )
-        
-        self.access_key = oxi_settings.private_s3_access_key_id
-        self.secret_key = oxi_settings.private_s3_secret_access_key
-        self.bucket_name = oxi_settings.private_s3_storage_bucket_name
-        self.custom_domain = oxi_settings.private_s3_custom_domain
-        self.location = oxi_settings.private_s3_location
-        self.default_acl = oxi_settings.private_s3_default_acl
-        self.file_overwrite = False
-        self.querystring_auth = True
-        self.querystring_expire = 3600
-        
-        StaticStorage._validate_required_fields('PrivateMediaStorage', {
-            'access_key': self.access_key,
-            'secret_key': self.secret_key,
-            'bucket_name': self.bucket_name,
-            'custom_domain': self.custom_domain,
-        })
-        
-        super().__init__(*args, **kwargs)
-
-
-class LogStorage(S3Boto3Storage):
-    def __init__(self, *args, **kwargs):
-        if not oxi_settings.use_log_s3:
-            raise ImproperlyConfigured(
-                "LogStorage requires OXI_USE_LOG_S3=True"
-            )
-        
-        if oxi_settings.use_private_s3_as_log:
-            self.access_key = oxi_settings.private_s3_access_key_id
-            self.secret_key = oxi_settings.private_s3_secret_access_key
-            self.bucket_name = oxi_settings.private_s3_storage_bucket_name
-            self.custom_domain = oxi_settings.private_s3_custom_domain
-        else:
-            self.access_key = oxi_settings.log_s3_access_key_id
-            self.secret_key = oxi_settings.log_s3_secret_access_key
-            self.bucket_name = oxi_settings.log_s3_storage_bucket_name
-            self.custom_domain = oxi_settings.log_s3_custom_domain
-        
-        self.location = f'{oxi_settings.log_s3_location}/{oxi_settings.service_name}'
-        self.default_acl = oxi_settings.log_s3_default_acl
-        self.file_overwrite = False
-        self.querystring_auth = True
-        self.querystring_expire = 3600
-        
-        StaticStorage._validate_required_fields('LogStorage', {
-            'access_key': self.access_key,
-            'secret_key': self.secret_key,
-            'bucket_name': self.bucket_name,
-            'custom_domain': self.custom_domain,
-        })
-        
-        super().__init__(*args, **kwargs)

oxutils-0.1.10/src/oxutils/settings.py

@@ -1,264 +0,0 @@
-from typing import Optional
-from pydantic import Field, model_validator
-from pydantic_settings import BaseSettings, SettingsConfigDict
-from django.core.exceptions import ImproperlyConfigured
-
-
-
-
-__all__ = [
-    'oxi_settings',
-]
-
-
-
-class OxUtilsSettings(BaseSettings):
-    model_config = SettingsConfigDict(
-        validate_assignment=True,
-        extra="ignore",
-        env_prefix='OXI_'
-    )
-
-    # Service
-    service_name: Optional[str] = 'Oxutils'
-    site_name: Optional[str] = 'Oxiliere'
-    site_domain: Optional[str] = 'oxiliere.com'
-    multitenancy: bool = Field(False)
-
-    # Auth JWT Settings (JWT_SIGNING_KEY)
-    jwt_signing_key: Optional[str] = None
-    jwt_verifying_key: Optional[str] = None
-    jwt_jwks_url: Optional[str] = None
-    jwt_access_token_key: str = Field('access')
-    jwt_org_access_token_key: str = Field('org_access')
-    jwt_service_token_key: str = Field('service')
-    jwt_algorithm: Optional[str] = Field('RS256')
-    jwt_access_token_lifetime: int = Field(15) # minutes
-    jwt_service_token_lifetime: int = Field(3) # minutes
-    jwt_org_access_token_lifetime: int = Field(60) # minutes
-
-
-    # AuditLog
-    log_access: bool = Field(False)
-    retention_delay: int = Field(7)  # one week
-
-    # logger
-    log_file_path: Optional[str] = Field('logs/oxiliere.log')
-
-    # Static S3
-    use_static_s3: bool = Field(False)
-    static_access_key_id: Optional[str] = None
-    static_secret_access_key: Optional[str] = None
-    static_storage_bucket_name: Optional[str] = None
-    static_default_acl: str = Field('public-read')
-    static_s3_custom_domain: Optional[str] = None
-    static_location: str = Field('static')
-    static_storage: str = Field('oxutils.s3.storages.StaticStorage')
-
-    # Default S3 for media
-    use_default_s3: bool = Field(False)
-    use_static_s3_as_default: bool = Field(False)
-    default_s3_access_key_id: Optional[str] = None
-    default_s3_secret_access_key: Optional[str] = None
-    default_s3_storage_bucket_name: Optional[str] = None
-    default_s3_default_acl: str = Field('public-read')
-    default_s3_custom_domain: Optional[str] = None
-    default_s3_location: str = Field('media')
-    default_s3_storage: str = Field('oxutils.s3.storages.PublicMediaStorage')
-
-    # Private S3 for sensible data
-    use_private_s3: bool = Field(False)
-    private_s3_access_key_id: Optional[str] = None
-    private_s3_secret_access_key: Optional[str] = None
-    private_s3_storage_bucket_name: Optional[str] = None
-    private_s3_default_acl: str = Field('private')
-    private_s3_custom_domain: Optional[str] = None
-    private_s3_location: str = Field('private')
-    private_s3_storage: str = Field('oxutils.s3.storages.PrivateMediaStorage')
-
-    # Log S3
-    use_log_s3: bool = Field(False)
-    use_private_s3_as_log: bool = Field(False)
-    log_s3_access_key_id: Optional[str] = None
-    log_s3_secret_access_key: Optional[str] = None
-    log_s3_storage_bucket_name: Optional[str] = None
-    log_s3_default_acl: str = Field('private')
-    log_s3_custom_domain: Optional[str] = None
-    log_s3_location: str = Field('oxi_logs')
-    log_s3_storage: str = Field('oxutils.s3.storages.LogStorage')
-
-
-    @model_validator(mode='after')
-    def validate_s3_configurations(self):
-        """Validate S3 and JWT configurations when enabled."""
-        # Validate JWT keys if present
-        self._validate_jwt_keys()
-        
-        # Validate static S3
-        if self.use_static_s3:
-            self._validate_s3_config(
-                'static',
-                self.static_access_key_id,
-                self.static_secret_access_key,
-                self.static_storage_bucket_name,
-                self.static_s3_custom_domain
-            )
-        
-        # Validate default S3
-        if self.use_default_s3:
-            if not self.use_static_s3_as_default:
-                self._validate_s3_config(
-                    'default',
-                    self.default_s3_access_key_id,
-                    self.default_s3_secret_access_key,
-                    self.default_s3_storage_bucket_name,
-                    self.default_s3_custom_domain
-                )
-            elif not self.use_static_s3:
-                raise ValueError(
-                    "OXI_USE_STATIC_S3_AS_DEFAULT requires OXI_USE_STATIC_S3 to be True"
-                )
-        
-        # Validate private S3
-        if self.use_private_s3:
-            self._validate_s3_config(
-                'private',
-                self.private_s3_access_key_id,
-                self.private_s3_secret_access_key,
-                self.private_s3_storage_bucket_name,
-                self.private_s3_custom_domain
-            )
-        
-        # Validate log S3
-        if self.use_log_s3:
-            if not self.use_private_s3_as_log:
-                self._validate_s3_config(
-                    'log',
-                    self.log_s3_access_key_id,
-                    self.log_s3_secret_access_key,
-                    self.log_s3_storage_bucket_name,
-                    self.log_s3_custom_domain
-                )
-            elif not self.use_private_s3:
-                raise ValueError(
-                    "OXI_USE_PRIVATE_S3_AS_LOG requires OXI_USE_PRIVATE_S3 to be True"
-                )
-        
-        return self
-    
-    def _validate_jwt_keys(self):
-        """Validate JWT key files if configured."""
-        import os
-        
-        if self.jwt_signing_key:
-            if not os.path.exists(self.jwt_signing_key):
-                raise ValueError(
-                    f"JWT signing key file not found at: {self.jwt_signing_key}"
-                )
-            if not os.path.isfile(self.jwt_signing_key):
-                raise ValueError(
-                    f"JWT signing key path is not a file: {self.jwt_signing_key}"
-                )
-        
-        if self.jwt_verifying_key:
-            if not os.path.exists(self.jwt_verifying_key):
-                raise ValueError(
-                    f"JWT verifying key file not found at: {self.jwt_verifying_key}"
-                )
-            if not os.path.isfile(self.jwt_verifying_key):
-                raise ValueError(
-                    f"JWT verifying key path is not a file: {self.jwt_verifying_key}"
-                )
-    
-    def _validate_s3_config(self, name: str, access_key: Optional[str], 
-                           secret_key: Optional[str], bucket: Optional[str], 
-                           domain: Optional[str]):
-        """Validate required S3 configuration fields."""
-        missing_fields = []
-        if not access_key:
-            missing_fields.append(f'OXI_{name.upper()}_S3_ACCESS_KEY_ID')
-        if not secret_key:
-            missing_fields.append(f'OXI_{name.upper()}_S3_SECRET_ACCESS_KEY')
-        if not bucket:
-            missing_fields.append(f'OXI_{name.upper()}_S3_STORAGE_BUCKET_NAME')
-        if not domain:
-            missing_fields.append(f'OXI_{name.upper()}_S3_CUSTOM_DOMAIN')
-        
-        if missing_fields:
-            raise ValueError(
-                f"Missing required {name} S3 configuration: {', '.join(missing_fields)}"
-            )
-
-    def get_static_storage_url(self) -> str:
-        """Get static storage URL."""
-        if not self.use_static_s3:
-            raise ImproperlyConfigured(
-                "Static S3 is not enabled. Set OXI_USE_STATIC_S3=True."
-            )
-        return f'https://{self.static_s3_custom_domain}/{self.static_location}/'
-
-    def get_default_storage_url(self) -> str:
-        """Get default storage URL."""
-        if self.use_default_s3:
-            if self.use_static_s3_as_default:
-                # Use static S3 credentials but keep default_s3 specific values (location, etc.)
-                domain = self.static_s3_custom_domain
-            else:
-                domain = self.default_s3_custom_domain
-            return f'https://{domain}/{self.default_s3_location}/'
-        
-        raise ImproperlyConfigured(
-            "Default S3 is not enabled. Set OXI_USE_DEFAULT_S3=True."
-        )
-    
-    def get_private_storage_url(self) -> str:
-        """Get private storage URL."""
-        if not self.use_private_s3:
-            raise ImproperlyConfigured(
-                "Private S3 is not enabled. Set OXI_USE_PRIVATE_S3=True."
-            )
-        return f'https://{self.private_s3_custom_domain}/{self.private_s3_location}/'
-    
-    def get_log_storage_url(self) -> str:
-        """Get log storage URL."""
-        if not self.use_log_s3:
-            raise ImproperlyConfigured(
-                "Log S3 is not enabled. Set OXI_USE_LOG_S3=True."
-            )
-        if self.use_private_s3_as_log:
-            # Use private S3 credentials but keep log_s3 specific values (location, etc.)
-            domain = self.private_s3_custom_domain
-        else:
-            domain = self.log_s3_custom_domain
-        return f'https://{domain}/{self.log_s3_location}/{self.service_name}/'
-
-
-    def write_django_settings(self, django_settings_module):
-        """
-        Configure Django settings for S3 storages if enabled.
-        
-        Sets:
-        1. STATIC_URL & STATICFILES_STORAGE (if use_static_s3)
-        2. MEDIA_URL & DEFAULT_FILE_STORAGE (if use_default_s3)
-        3. PRIVATE_MEDIA_LOCATION & PRIVATE_FILE_STORAGE (if use_private_s3)
-        
-        Args:
-            django_settings_module: The Django settings module to update.
-        """
-        # Configure static storage
-        if self.use_static_s3:
-            django_settings_module.STATIC_URL = self.get_static_storage_url()
-            django_settings_module.STATICFILES_STORAGE = self.static_storage
-        
-        # Configure default/media storage
-        if self.use_default_s3:
-            django_settings_module.MEDIA_URL = self.get_default_storage_url()
-            django_settings_module.DEFAULT_FILE_STORAGE = self.default_s3_storage
-        
-        # Configure private storage
-        if self.use_private_s3:
-            django_settings_module.PRIVATE_MEDIA_LOCATION = self.private_s3_location
-            django_settings_module.PRIVATE_FILE_STORAGE = self.private_s3_storage
-
-
-oxi_settings = OxUtilsSettings()