oxutils 0.1.1__tar.gz → 0.1.3__tar.gz

{oxutils-0.1.1 → oxutils-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.1.1
+Version: 0.1.3
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,s3,audit,logging,celery,structlog
 Author: Edimedia Mutoke
@@ -47,7 +47,7 @@ Description-Content-Type: text/markdown
 [![PyPI version](https://img.shields.io/pypi/v/oxutils.svg)](https://pypi.org/project/oxutils/)
 [![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/)
 [![Django 5.0+](https://img.shields.io/badge/django-5.0+-green.svg)](https://www.djangoproject.com/)
-[![Tests](https://img.shields.io/badge/tests-126%20passed-success.svg)](tests/)
+[![Tests](https://img.shields.io/badge/tests-145%20passed-success.svg)](tests/)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
 [![Code style: ruff](https://img.shields.io/badge/code%20style-ruff-000000.svg)](https://github.com/astral-sh/ruff)
 
@@ -60,6 +60,7 @@ Description-Content-Type: text/markdown
 - ⚙️ **Celery Integration** - Pre-configured task processing
 - 🛠️ **Django Mixins** - UUID, timestamps, user tracking
 - ⚡ **Custom Exceptions** - Standardized API errors
+- 🎨 **Context Processors** - Site name and domain for templates
 
 ---
 
@@ -126,6 +127,17 @@ class Product(BaseModelMixin):  # UUID + timestamps + is_active
 # Custom Exceptions
 from oxutils.exceptions import NotFoundException
 raise NotFoundException(detail="User not found")
+
+# Context Processors
+# settings.py
+TEMPLATES = [{
+    'OPTIONS': {
+        'context_processors': [
+            'oxutils.context.site_name_processor.site_name',
+        ],
+    },
+}]
+# Now {{ site_name }} and {{ site_domain }} are available in templates
 ```
 
 ## Documentation
@@ -150,7 +162,7 @@ raise NotFoundException(detail="User not found")
 git clone https://github.com/oxiliere/oxutils.git
 cd oxutils
 uv sync
-uv run pytest  # 126 tests
+uv run pytest  # 145 tests
 ```
 
 ### Creating Migrations

{oxutils-0.1.1 → oxutils-0.1.3}/README.md

@@ -5,7 +5,7 @@
 [![PyPI version](https://img.shields.io/pypi/v/oxutils.svg)](https://pypi.org/project/oxutils/)
 [![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/)
 [![Django 5.0+](https://img.shields.io/badge/django-5.0+-green.svg)](https://www.djangoproject.com/)
-[![Tests](https://img.shields.io/badge/tests-126%20passed-success.svg)](tests/)
+[![Tests](https://img.shields.io/badge/tests-145%20passed-success.svg)](tests/)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
 [![Code style: ruff](https://img.shields.io/badge/code%20style-ruff-000000.svg)](https://github.com/astral-sh/ruff)
 
@@ -18,6 +18,7 @@
 - ⚙️ **Celery Integration** - Pre-configured task processing
 - 🛠️ **Django Mixins** - UUID, timestamps, user tracking
 - ⚡ **Custom Exceptions** - Standardized API errors
+- 🎨 **Context Processors** - Site name and domain for templates
 
 ---
 
@@ -84,6 +85,17 @@ class Product(BaseModelMixin):  # UUID + timestamps + is_active
 # Custom Exceptions
 from oxutils.exceptions import NotFoundException
 raise NotFoundException(detail="User not found")
+
+# Context Processors
+# settings.py
+TEMPLATES = [{
+    'OPTIONS': {
+        'context_processors': [
+            'oxutils.context.site_name_processor.site_name',
+        ],
+    },
+}]
+# Now {{ site_name }} and {{ site_domain }} are available in templates
 ```
 
 ## Documentation
@@ -108,7 +120,7 @@ raise NotFoundException(detail="User not found")
 git clone https://github.com/oxiliere/oxutils.git
 cd oxutils
 uv sync
-uv run pytest  # 126 tests
+uv run pytest  # 145 tests
 ```
 
 ### Creating Migrations

{oxutils-0.1.1 → oxutils-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxutils"
-version = "0.1.1"
+version = "0.1.3"
 description = "Production-ready utilities for Django applications in the Oxiliere ecosystem"
 readme = "README.md"
 license = "Apache-2.0"

{oxutils-0.1.1 → oxutils-0.1.3}/src/oxutils/__init__.py

@@ -10,7 +10,7 @@ This package provides:
 - Custom exceptions
 """
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"
 
 from oxutils.settings import oxi_settings
 from oxutils.conf import UTILS_APPS, AUDIT_MIDDLEWARE

oxutils-0.1.3/src/oxutils/context/site_name_processor.py

@@ -0,0 +1,11 @@
+"""
+Context processor for site name
+"""
+
+def site_name(request):
+    from oxutils.settings import oxi_settings
+
+    return {
+        'site_name': oxi_settings.site_name,
+        'site_domain': oxi_settings.site_domain,
+    }

{oxutils-0.1.1 → oxutils-0.1.3}/src/oxutils/functions.py

@@ -6,12 +6,15 @@ from ninja_extra.exceptions import ValidationError
 
 
 def get_absolute_url(url: str, request=None):
+    if url.startswith('http'):
+        return url
+
     if request:
         # Build absolute URL using request
         return request.build_absolute_uri(url)
     else:
-        # Fallback: build URL using MEDIA_URL and domain
-        base_url = getattr(settings, 'SITE_URL', 'http://localhost:8000')
+        # Fallback: build URL using SITE_DOMAIN and domain
+        base_url = getattr(settings, 'SITE_DOMAIN', 'http://localhost:8000')
         return urljoin(base_url, url)
 
 

{oxutils-0.1.1 → oxutils-0.1.3}/src/oxutils/s3/storages.py

@@ -53,7 +53,7 @@ class PublicMediaStorage(S3Boto3Storage):
             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_s3_custom_domain
+            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
@@ -79,7 +79,7 @@ class PrivateMediaStorage(S3Boto3Storage):
         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_s3_custom_domain
+        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
@@ -107,12 +107,12 @@ class LogStorage(S3Boto3Storage):
             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_s3_custom_domain
+            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_s3_custom_domain
+            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

{oxutils-0.1.1 → oxutils-0.1.3}/src/oxutils/settings.py

@@ -21,6 +21,8 @@ class OxUtilsSettings(BaseSettings):
 
     # Service
     service_name: Optional[str] = 'Oxutils'
+    site_name: Optional[str] = 'Oxiliere'
+    site_domain: Optional[str] = 'oxiliere.com'
 
     # Auth JWT Settings (JWT_SIGNING_KEY)
     jwt_signing_key: Optional[str] = None
@@ -52,7 +54,7 @@ class OxUtilsSettings(BaseSettings):
     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_s3_custom_domain: Optional[str] = None
+    default_s3_custom_domain: Optional[str] = None
     default_s3_location: str = Field('media')
     default_s3_storage: str = Field('oxutils.s3.storages.PublicMediaStorage')
 
@@ -62,7 +64,7 @@ class OxUtilsSettings(BaseSettings):
     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_s3_custom_domain: Optional[str] = None
+    private_s3_custom_domain: Optional[str] = None
     private_s3_location: str = Field('private')
     private_s3_storage: str = Field('oxutils.s3.storages.PrivateMediaStorage')
 
@@ -73,7 +75,7 @@ class OxUtilsSettings(BaseSettings):
     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_s3_custom_domain: Optional[str] = None
+    log_s3_custom_domain: Optional[str] = None
     log_s3_location: str = Field('oxi_logs')
     log_s3_storage: str = Field('oxutils.s3.storages.LogStorage')
 
@@ -102,7 +104,7 @@ class OxUtilsSettings(BaseSettings):
                     self.default_s3_access_key_id,
                     self.default_s3_secret_access_key,
                     self.default_s3_storage_bucket_name,
-                    self.default_s3_s3_custom_domain
+                    self.default_s3_custom_domain
                 )
             elif not self.use_static_s3:
                 raise ValueError(
@@ -116,7 +118,7 @@ class OxUtilsSettings(BaseSettings):
                 self.private_s3_access_key_id,
                 self.private_s3_secret_access_key,
                 self.private_s3_storage_bucket_name,
-                self.private_s3_s3_custom_domain
+                self.private_s3_custom_domain
             )
         
         # Validate log S3
@@ -127,7 +129,7 @@ class OxUtilsSettings(BaseSettings):
                     self.log_s3_access_key_id,
                     self.log_s3_secret_access_key,
                     self.log_s3_storage_bucket_name,
-                    self.log_s3_s3_custom_domain
+                    self.log_s3_custom_domain
                 )
             elif not self.use_private_s3:
                 raise ValueError(
@@ -166,11 +168,11 @@ class OxUtilsSettings(BaseSettings):
         """Validate required S3 configuration fields."""
         missing_fields = []
         if not access_key:
-            missing_fields.append(f'OXI_{name.upper()}_ACCESS_KEY_ID')
+            missing_fields.append(f'OXI_{name.upper()}_S3_ACCESS_KEY_ID')
         if not secret_key:
-            missing_fields.append(f'OXI_{name.upper()}_SECRET_ACCESS_KEY')
+            missing_fields.append(f'OXI_{name.upper()}_S3_SECRET_ACCESS_KEY')
         if not bucket:
-            missing_fields.append(f'OXI_{name.upper()}_STORAGE_BUCKET_NAME')
+            missing_fields.append(f'OXI_{name.upper()}_S3_STORAGE_BUCKET_NAME')
         if not domain:
             missing_fields.append(f'OXI_{name.upper()}_S3_CUSTOM_DOMAIN')
         
@@ -194,7 +196,7 @@ class OxUtilsSettings(BaseSettings):
                 # Use static S3 credentials but keep default_s3 specific values (location, etc.)
                 domain = self.static_s3_custom_domain
             else:
-                domain = self.default_s3_s3_custom_domain
+                domain = self.default_s3_custom_domain
             return f'https://{domain}/{self.default_s3_location}/'
         
         raise ImproperlyConfigured(
@@ -207,7 +209,7 @@ class OxUtilsSettings(BaseSettings):
             raise ImproperlyConfigured(
                 "Private S3 is not enabled. Set OXI_USE_PRIVATE_S3=True."
             )
-        return f'https://{self.private_s3_s3_custom_domain}/{self.private_s3_location}/'
+        return f'https://{self.private_s3_custom_domain}/{self.private_s3_location}/'
     
     def get_log_storage_url(self) -> str:
         """Get log storage URL."""
@@ -217,9 +219,9 @@ class OxUtilsSettings(BaseSettings):
             )
         if self.use_private_s3_as_log:
             # Use private S3 credentials but keep log_s3 specific values (location, etc.)
-            domain = self.private_s3_s3_custom_domain
+            domain = self.private_s3_custom_domain
         else:
-            domain = self.log_s3_s3_custom_domain
+            domain = self.log_s3_custom_domain
         return f'https://{domain}/{self.log_s3_location}/{self.service_name}/'