oxutils 0.1.0__tar.gz → 0.1.2__tar.gz

{oxutils-0.1.0 → oxutils-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.1.0
+Version: 0.1.2
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,s3,audit,logging,celery,structlog
 Author: Edimedia Mutoke
@@ -153,6 +153,18 @@ uv sync
 uv run pytest  # 126 tests
 ```
 
+### Creating Migrations
+
+To generate Django migrations for the audit module:
+
+```bash
+make migrations
+# or
+uv run make_migrations.py
+```
+
+See [MIGRATIONS.md](MIGRATIONS.md) for detailed documentation.
+
 ## Advanced Examples
 
 ### JWT with Django Ninja
@@ -189,7 +201,7 @@ print(f"Exported to {export.data.url}")
 
 ## License
 
-MIT License - see [LICENSE](LICENSE)
+Apache 2.0 License - see [LICENSE](LICENSE)
 
 ## Support
 

{oxutils-0.1.0 → oxutils-0.1.2}/README.md

@@ -111,6 +111,18 @@ uv sync
 uv run pytest  # 126 tests
 ```
 
+### Creating Migrations
+
+To generate Django migrations for the audit module:
+
+```bash
+make migrations
+# or
+uv run make_migrations.py
+```
+
+See [MIGRATIONS.md](MIGRATIONS.md) for detailed documentation.
+
 ## Advanced Examples
 
 ### JWT with Django Ninja
@@ -147,7 +159,7 @@ print(f"Exported to {export.data.url}")
 
 ## License
 
-MIT License - see [LICENSE](LICENSE)
+Apache 2.0 License - see [LICENSE](LICENSE)
 
 ## Support
 

{oxutils-0.1.0 → oxutils-0.1.2}/pyproject.toml

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

{oxutils-0.1.0 → oxutils-0.1.2}/src/oxutils/__init__.py

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

oxutils-0.1.2/src/oxutils/audit/__init__.py

@@ -0,0 +1,20 @@
+"""
+Oxutils Audit Module
+
+Provides audit log export functionality with S3 storage.
+"""
+
+# Models are imported lazily to avoid AppRegistryNotReady errors
+# Use: from oxutils.audit.models import LogExportState, LogExportHistory
+
+__all__ = [
+    'LogExportState',
+    'LogExportHistory',
+]
+
+def __getattr__(name):
+    """Lazy import of models to avoid AppRegistryNotReady errors."""
+    if name in __all__:
+        from oxutils.audit.models import LogExportState, LogExportHistory
+        return locals()[name]
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{oxutils-0.1.0 → oxutils-0.1.2}/src/oxutils/audit/apps.py

@@ -3,10 +3,10 @@ from django.utils.translation import gettext_lazy as _
 
 
 
-class OxutilsConfig(AppConfig):
+class OxutilsAuditConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'oxutils_export'
-    verbose_name = _("Oxutils Export")
+    name = 'oxutils.audit'
+    verbose_name = _("Oxutils Audit")
 
     def ready(self):
         return super().ready()

oxutils-0.1.2/src/oxutils/audit/migrations/0001_initial.py

@@ -0,0 +1,41 @@
+# Generated by Django 5.2.8 on 2025-12-03 21:53
+
+import django.db.models.deletion
+import oxutils.enums.audit
+import oxutils.s3.storages
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LogExportState',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Date and time when this record was created')),
+                ('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='')),
+                ('size', models.BigIntegerField()),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='LogExportHistory',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('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'])),
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Date and time when this record was created')),
+                ('state', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='log_histories', to='audit.logexportstate')),
+            ],
+        ),
+    ]

{oxutils-0.1.0 → oxutils-0.1.2}/src/oxutils/conf.py

@@ -3,6 +3,7 @@ UTILS_APPS = (
     'auditlog',
     'cid.apps.CidAppConfig',
     'django_celery_results',
+    'oxutils.audit',
 )
 
 AUDIT_MIDDLEWARE = (

{oxutils-0.1.0 → oxutils-0.1.2}/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.0 → oxutils-0.1.2}/src/oxutils/settings.py

@@ -52,7 +52,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 +62,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 +73,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 +102,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 +116,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 +127,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 +166,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 +194,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 +207,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 +217,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}/'