oxutils 0.5.0__tar.gz → 0.5.2__tar.gz

{oxutils-0.5.0 → oxutils-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxutils
-Version: 0.5.0
+Version: 0.5.2
 Summary: Production-ready utilities for Django applications in the Oxiliere ecosystem
 Keywords: django,utilities,jwt,audit,logging,celery,structlog
 Author: Edimedia Mutoke

{oxutils-0.5.0 → oxutils-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oxutils"
-version = "0.5.0"
+version = "0.5.2"
 description = "Production-ready utilities for Django applications in the Oxiliere ecosystem"
 readme = "README.md"
 license = "LGPL-3.0-only"
@@ -100,6 +100,7 @@ dev = [
     "ruff>=0.8.0",
     "twine>=6.0.0",
     "psycopg[binary]>=3.3.2",
+    "django-stubs>=6.0.7",
 ]
 
 

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/__init__.py

@@ -18,7 +18,7 @@ Infrastructure & tooling:
     - Structured logging with correlation IDs, request metadata binding,
       and pre-built ``LOGGING`` configuration (structlog)
     - Audit log export to S3 with export-state tracking and status history
-    - Cursor-based pagination for Django Ninja APIs
+    - Paginated APIs via Django Ninja Extra (``PageNumberPaginationExtra``)
     - PDF generation via WeasyPrint (``Printer`` class and ``WeasyTemplateView``)
     - Multi-currency support with rate syncing (BCC, Open Exchange Rates)
     - Celery app with task auto-discovery and structlog integration
@@ -40,7 +40,7 @@ Other:
       image validation, bound-request detection
 """
 
-__version__ = "0.5.0"
+__version__ = "0.5.2"
 
 from oxutils.conf import AUDIT_MIDDLEWARE, UTILS_APPS
 from oxutils.settings import oxi_settings

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/currency/models.py

@@ -9,8 +9,8 @@ from oxutils.models import (
 )
 
 from .enums import CurrencySource
+from .signals import currency_sync_failed, currency_sync_succeeded
 from .utils import load_rates
-from .signals import currency_sync_succeeded, currency_sync_failed
 
 logger = structlog.get_logger(__name__)
 
@@ -20,6 +20,7 @@ AVAILABLES_CURRENCIES = [
     "AUD",
     "BIF",
     "CAD",
+    "CDF",
     "CHF",
     "CNY",
     "EUR",

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/jwt/utils.py

@@ -1,12 +1,10 @@
 from functools import wraps
+
 import structlog
 from django.contrib.auth import get_user_model
 from django.http import HttpRequest
-
 from ninja_jwt.exceptions import InvalidToken
 
-
-
 logger = structlog.getLogger("django")
 User = get_user_model()
 
@@ -26,11 +24,13 @@ def load_user(f):
             # self.request.user will be the complete user object
             pass
     """
+
     @wraps(f)
     def wrapper(self, *args, **kwargs):
         populate_user(self.context.request)
         res = f(self, *args, **kwargs)
         return res
+
     return wrapper
 
 
@@ -41,5 +41,5 @@ def populate_user(request: HttpRequest):
     try:
         request.user = User.objects.get(oxi_id=request.user.id)
     except User.DoesNotExist as exc:
-        logger.exception('user_not_found', oxi_id=request.user.id, message=str(exc))
-        raise InvalidToken()
+        logger.exception("user_not_found", oxi_id=request.user.id, message=str(exc))
+        raise InvalidToken() from exc

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/oxiliere/authorization.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.db import transaction
 
 from oxutils.oxiliere.models import BaseTenant
@@ -9,21 +8,28 @@ from oxutils.permissions.utils import assign_role
 
 @transaction.atomic
 def grant_manager_access_to_owners(tenant: BaseTenant):
+    """
+    Grant **all** configured permissions to every tenant owner.
+
+    Idempotent — can be called multiple times without creating duplicates.
+    Uses :func:`assign_role` which performs an upsert per (user, scope, role).
+    """
     tenant_user_model = get_tenant_user_model()
     tenant_users = tenant_user_model.objects.select_related("user").filter(
         tenant=tenant, is_owner=True
     )
 
-    access_scope = settings.ACCESS_MANAGER_SCOPE
-
-    # Vérifier qu'il y a des RoleGrants pour ce scope
-    role_grants = list(RoleGrant.objects.filter(scope=access_scope))
+    role_grants = list(RoleGrant.objects.select_related("role").all())
 
     if not role_grants:
         return
 
     for tenant_user in tenant_users:
-        for grant in role_grants:
+        for rg in role_grants:
             assign_role(
-                user=tenant_user.user, role=grant.role, scope=grant.scope, by=None, user_group=None
+                user=tenant_user.user,
+                role=rg.role.slug,
+                scope=rg.scope,
+                by=None,
+                user_group=None,
             )

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/oxiliere/controllers.py

@@ -2,43 +2,43 @@ from uuid import UUID
 
 from ninja_extra import (
     api_controller,
+    http_delete,
     http_get,
     http_put,
-    http_delete,
-)
-from ninja_extra.permissions import (
-    IsAuthenticated,
 )
 from ninja_extra.pagination import (
-    paginate,
-    PaginatedResponseSchema,
     PageNumberPaginationExtra,
+    PaginatedResponseSchema,
+    paginate,
+)
+from ninja_extra.permissions import (
+    IsAuthenticated,
 )
+
 from oxutils.oxiliere.permissions import (
     IsTenantAdmin,
     IsTenantOwner,
 )
+
 from .schemas import (
-    get_tenant_user_list_schema,
-    get_tenant_user_detail_schema,
-    UpdateTenantUserSchema,
     SetAdminSchema,
     SetOwnerSchema,
+    UpdateTenantUserSchema,
+    get_tenant_user_detail_schema,
+    get_tenant_user_list_schema,
 )
 from .services import TenantUserService
 
-
 TenantUserListSchema = get_tenant_user_list_schema()
 TenantUserDetailSchema = get_tenant_user_detail_schema()
 
 service = TenantUserService()
 
 
-@api_controller('/users')
+@api_controller("/users")
 class UserController:
-
     @http_get(
-        '',
+        "",
         response=PaginatedResponseSchema[TenantUserListSchema],
         permissions=[IsAuthenticated, IsTenantAdmin],
     )
@@ -47,7 +47,7 @@ class UserController:
         return service.list()
 
     @http_get(
-        '/{user_id}',
+        "/{user_id}",
         response=TenantUserDetailSchema,
         permissions=[IsAuthenticated, IsTenantAdmin],
     )
@@ -55,7 +55,7 @@ class UserController:
         return service.get(user_id)
 
     @http_put(
-        '/{user_id}',
+        "/{user_id}",
         response=TenantUserDetailSchema,
         permissions=[IsAuthenticated, IsTenantOwner],
     )
@@ -63,7 +63,7 @@ class UserController:
         return service.update(user_id, payload.dict(exclude_unset=True))
 
     @http_put(
-        '/{user_id}/set-admin',
+        "/{user_id}/set-admin",
         response=TenantUserDetailSchema,
         permissions=[IsAuthenticated, IsTenantOwner],
     )
@@ -71,7 +71,7 @@ class UserController:
         return service.set_admin(user_id, payload.is_admin)
 
     @http_put(
-        '/{user_id}/set-owner',
+        "/{user_id}/set-owner",
         response=TenantUserDetailSchema,
         permissions=[IsAuthenticated, IsTenantOwner],
     )
@@ -79,7 +79,7 @@ class UserController:
         return service.set_owner(user_id, payload.is_owner)
 
     @http_delete(
-        '/{user_id}',
+        "/{user_id}",
         response={204: None},
         permissions=[IsAuthenticated, IsTenantOwner],
     )

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/oxiliere/management/commands/init_oxiliere_system.py

@@ -95,7 +95,12 @@ class Command(BaseCommand):
 
         with tenant_context(tenant):
             stats = load_preset()
-            print(stats)
+            self.stdout.write(
+                f"  Permissions loaded: "
+                f"roles +{stats['roles']['created']}/~{stats['roles']['updated']}, "
+                f"groups +{stats['groups']['created']}/~{stats['groups']['updated']}, "
+                f"role_grants +{stats['role_grants']['created']}/~{stats['role_grants']['updated']}"
+            )
 
         if created:
             self.stdout.write(self.style.SUCCESS(f'✓ Superuser lié au tenant système'))

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/oxiliere/services.py

@@ -1,10 +1,10 @@
 """
 Oxiliere services — TenantUser management + Tenant lifecycle.
 """
-import structlog
-from typing import Optional
+
 from uuid import UUID
 
+import structlog
 from django.contrib.auth.models import AbstractBaseUser
 from django.db import transaction
 from django.db.models import QuerySet
@@ -19,6 +19,7 @@ logger = structlog.get_logger(__name__)
 
 # ── TenantUserService (existing) ────────────────────────────────────
 
+
 class TenantUserService(BaseService):
     logger = logger
 
@@ -98,6 +99,7 @@ class TenantUserService(BaseService):
 
 # ── TenantService (new) ─────────────────────────────────────────────
 
+
 class TenantService:
     """Thin service layer for tenant lifecycle operations."""
 
@@ -127,7 +129,9 @@ class TenantService:
         tenant.save(update_fields=["status", "is_active"])
 
     @staticmethod
-    def add_user(tenant, user: AbstractBaseUser, is_owner: bool = False, is_admin: bool = False) -> None:
+    def add_user(
+        tenant, user: AbstractBaseUser, is_owner: bool = False, is_admin: bool = False
+    ) -> None:
         tenant.add_user(user, is_owner=is_owner, is_admin=is_admin)
 
     @staticmethod

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/permissions/actions.py

@@ -33,6 +33,7 @@ no hierarchy expansion occurs (actions are treated as independent).
 
 from __future__ import annotations
 
+
 def _get_all_actions() -> dict[str, dict[str, dict]]:
     """Return all action definitions from ``PERMISSION_PRESET["actions"]``."""
     from django.conf import settings
@@ -129,10 +130,7 @@ def validate_actions_for_scope(scope: str, actions: list[str]) -> list[str]:
 
     invalid = [a for a in actions if a not in valid]
     if invalid:
-        raise ValueError(
-            f"Invalid actions for scope '{scope}': {invalid}. "
-            f"Valid actions: {valid}"
-        )
+        raise ValueError(f"Invalid actions for scope '{scope}': {invalid}. Valid actions: {valid}")
     return actions
 
 
@@ -172,7 +170,4 @@ def get_scope_actions_labels(scope: str) -> dict[str, str]:
     Returns:
         Dict mapping action key → translated label.
     """
-    return {
-        action: get_action_label(scope, action)
-        for action in get_valid_actions(scope)
-    }
+    return {action: get_action_label(scope, action) for action in get_valid_actions(scope)}

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/permissions/caches.py

@@ -1,33 +1,32 @@
 from django.conf import settings
 
-
-
-CACHE_CHECK_PERMISSION = getattr(settings, 'CACHE_CHECK_PERMISSION', False)
+CACHE_CHECK_PERMISSION = getattr(settings, "CACHE_CHECK_PERMISSION", False)
 
 if CACHE_CHECK_PERMISSION:
     from cacheops import cached_as
+
     from .models import Grant
-    from .utils import check, any_action_check, any_permission_check
+    from .utils import any_action_check, any_permission_check, check
 
-    @cached_as(Grant, timeout=60*15)
-    def cache_check(user, scope, actions, role = None, **context):
+    @cached_as(Grant, timeout=60 * 15)
+    def cache_check(user, scope, actions, role=None, **context):
         return check(user, scope, actions, role=role, **context)
-    
-    @cached_as(Grant, timeout=60*15)
-    def cache_any_action_check(user, scope, required, role = None, **context):
+
+    @cached_as(Grant, timeout=60 * 15)
+    def cache_any_action_check(user, scope, required, role=None, **context):
         return any_action_check(user, scope, required, role=role, **context)
-    
-    @cached_as(Grant, timeout=60*15)
+
+    @cached_as(Grant, timeout=60 * 15)
     def cache_any_permission_check(user, *str_perms):
         return any_permission_check(user, *str_perms)
 else:
-    from .utils import check, any_action_check, any_permission_check
+    from .utils import any_action_check, any_permission_check, check
 
-    def cache_check(user, scope, actions, role = None, **context):
+    def cache_check(user, scope, actions, role=None, **context):
         return check(user, scope, actions, role=role, **context)
-    
-    def cache_any_action_check(user, scope, required, role = None, **context):
+
+    def cache_any_action_check(user, scope, required, role=None, **context):
         return any_action_check(user, scope, required, role=role, **context)
-    
+
     def cache_any_permission_check(user, *str_perms):
         return any_permission_check(user, *str_perms)

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/permissions/checks.py

@@ -23,7 +23,7 @@ Example configuration in settings.py:
 
     PERMISSION_PRESET = {
         "roles": [...],
-        "group": [...],
+        "groups": [...],
         "role_grants": [...]
     }
 """
@@ -134,14 +134,14 @@ def check_permission_settings(app_configs, **kwargs):
             )
         else:
             # Check required keys
-            required_keys = ["roles", "group", "role_grants"]
+            required_keys = ["roles", "groups", "role_grants"]
             for key in required_keys:
                 if key not in preset:
                     errors.append(
                         Error(
                             f"PERMISSION_PRESET is missing required key: {key}",
                             hint=f'Add "{key}" key to PERMISSION_PRESET',
-                            id=f"permissions.E007",
+                            id="permissions.E007",
                         )
                     )
 
@@ -206,15 +206,15 @@ def check_permission_settings(app_configs, **kwargs):
         and settings.ACCESS_MANAGER_GROUP is not None
         and hasattr(settings, "PERMISSION_PRESET")
         and isinstance(settings.PERMISSION_PRESET, dict)
-        and "group" in settings.PERMISSION_PRESET
+        and "groups" in settings.PERMISSION_PRESET
     ):
-        group_slugs = [g.get("slug") for g in settings.PERMISSION_PRESET.get("group", [])]
+        group_slugs = [g.get("slug") for g in settings.PERMISSION_PRESET.get("groups", [])]
 
         if settings.ACCESS_MANAGER_GROUP not in group_slugs:
             errors.append(
                 Error(
                     f'ACCESS_MANAGER_GROUP "{settings.ACCESS_MANAGER_GROUP}" is not in PERMISSION_PRESET groups',
-                    hint=f'Add a group with slug "{settings.ACCESS_MANAGER_GROUP}" to PERMISSION_PRESET["group"]',
+                    hint=f'Add a group with slug "{settings.ACCESS_MANAGER_GROUP}" to PERMISSION_PRESET["groups"]',
                     id="permissions.E009",
                 )
             )
@@ -257,7 +257,7 @@ def check_permission_settings(app_configs, **kwargs):
                     )
                 )
 
-        for group_data in settings.PERMISSION_PRESET.get("group", []):
+        for group_data in settings.PERMISSION_PRESET.get("groups", []):
             app = group_data.get("app")
             if app and app not in apps_list:
                 errors.append(
@@ -268,17 +268,12 @@ def check_permission_settings(app_configs, **kwargs):
                     )
                 )
 
-    # Cross-validation: scope ownership — each scope in actions must be unique across apps
+    # Cross-validation: scope ownership — each scope in actions must be unique across apps.
+    # (Conflicts between settings.PERMISSION_PRESET and app presets are already caught
+    #  by register_preset() which raises ImproperlyConfigured at startup.)
     if hasattr(settings, "PERMISSION_PRESET") and isinstance(settings.PERMISSION_PRESET, dict):
         scope_owners: dict[str, str] = {}
 
-        # Collect scopes from the base preset (settings.py)
-        base_actions = settings.PERMISSION_PRESET.get("actions", {})
-        if isinstance(base_actions, dict):
-            for scope in base_actions:
-                scope_owners[scope] = "settings.PERMISSION_PRESET"
-
-        # Collect scopes from discovered app presets
         from oxutils.permissions.presets import discover_app_presets
 
         for preset in discover_app_presets():
@@ -290,13 +285,10 @@ def check_permission_settings(app_configs, **kwargs):
                 if scope in scope_owners:
                     errors.append(
                         Error(
-                            f'Scope "{scope}" is already owned by "{scope_owners[scope]}". '
-                            f'App "{app_label}" cannot redefine it.',
-                            hint=(
-                                f"Each scope must be owned by exactly one app. "
-                                f'Remove the scope "{scope}" from app "{app_label}" '
-                                f"or use a different scope name."
-                            ),
+                            f'Scope "{scope}" is defined in both '
+                            f'"{scope_owners[scope]}" and "{app_label}". '
+                            f'Each scope must be owned by exactly one app.',
+                            hint=f'Remove the scope "{scope}" from one of the apps.',
                             id="permissions.E022",
                         )
                     )
@@ -316,7 +308,7 @@ def check_permission_settings(app_configs, **kwargs):
                 break
 
         if not has_app_attr:
-            for group_data in settings.PERMISSION_PRESET.get("group", []):
+            for group_data in settings.PERMISSION_PRESET.get("groups", []):
                 if group_data.get("app"):
                     has_app_attr = True
                     break
@@ -384,7 +376,7 @@ def check_permission_settings(app_configs, **kwargs):
                     )
                     continue
                 try:
-                    cls = import_string(path)
+                    import_string(path)
                 except ImportError:
                     errors.append(
                         Error(

{oxutils-0.5.0 → oxutils-0.5.2}/src/oxutils/permissions/exceptions.py

@@ -1,60 +1,70 @@
 from django.utils.translation import gettext_lazy as _
+
 from oxutils.exceptions import (
-    APIException,
-    NotFoundException,
-    ValidationException,
     DuplicateEntryException,
+    ExceptionCode,
+    NotFoundException,
     PermissionDeniedException,
-    ExceptionCode
+    ValidationException,
 )
 
 
 class RoleNotFoundException(NotFoundException):
     """Exception levée quand un rôle n'est pas trouvé."""
-    default_detail = _('The requested role does not exist')
+
+    default_detail = _("The requested role does not exist")
 
 
 class GroupNotFoundException(NotFoundException):
     """Exception levée quand un groupe n'est pas trouvé."""
-    default_detail = _('The requested group does not exist')
+
+    default_detail = _("The requested group does not exist")
 
 
 class GrantNotFoundException(NotFoundException):
     """Exception levée quand un grant n'est pas trouvé."""
-    default_detail = _('The requested grant does not exist')
+
+    default_detail = _("The requested grant does not exist")
 
 
 class RoleGrantNotFoundException(NotFoundException):
     """Exception levée quand un role grant n'est pas trouvé."""
-    default_detail = _('The requested role grant does not exist')
+
+    default_detail = _("The requested role grant does not exist")
 
 
 class RoleAlreadyAssignedException(DuplicateEntryException):
     """Exception levée quand un rôle est déjà assigné à un utilisateur."""
-    default_detail = _('This role is already assigned to the user')
+
+    default_detail = _("This role is already assigned to the user")
 
 
 class GroupAlreadyAssignedException(DuplicateEntryException):
     """Exception levée quand un groupe est déjà assigné à un utilisateur."""
-    default_detail = _('This group is already assigned to the user')
+
+    default_detail = _("This group is already assigned to the user")
 
 
 class InvalidActionsException(ValidationException):
     """Exception levée quand des actions invalides sont fournies."""
-    default_detail = _('The provided actions are invalid')
+
+    default_detail = _("The provided actions are invalid")
 
 
 class InsufficientPermissionsException(PermissionDeniedException):
     """Exception levée quand l'utilisateur n'a pas les permissions suffisantes."""
+
     default_code = ExceptionCode.INSUFFICIENT_PERMISSIONS
-    default_detail = _('Insufficient permissions to perform this action')
+    default_detail = _("Insufficient permissions to perform this action")
 
 
 class RoleGrantConflictException(DuplicateEntryException):
     """Exception levée quand un role grant existe déjà pour ce rôle et scope."""
-    default_detail = _('A role grant already exists for this role and scope')
+
+    default_detail = _("A role grant already exists for this role and scope")
 
 
 class GrantConflictException(DuplicateEntryException):
     """Exception levée quand un grant existe déjà pour cet utilisateur et scope."""
-    default_detail = _('A grant already exists for this user and scope')
+
+    default_detail = _("A grant already exists for this user and scope")