drf-iam 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

drf_iam/utils/load_viewset_permissions.py

@@ -5,8 +5,8 @@ from typing import List, Dict, Any, Set, Tuple, Iterator, Type, Optional
 
 from django.conf import settings
 from django.urls import get_resolver, URLPattern, URLResolver
-from rest_framework.viewsets import ViewSetMixin
 from rest_framework.views import APIView
+from rest_framework.viewsets import ViewSetMixin
 
 from drf_iam.models import Policy
 from .logging_utils import setup_colorful_logger
@@ -36,9 +36,10 @@ def is_viewset(cls: Any) -> bool:
     """Checks if the given class is a DRF ViewSet."""
     return isinstance(cls, type) and (issubclass(cls, ViewSetMixin))
 
+
 def is_api_view(cls: Any) -> bool:
     """Checks if the given class is a DRF APIView."""
-    return isinstance(cls, type) and  issubclass(cls, APIView)
+    return isinstance(cls, type) and issubclass(cls, APIView)
 
 
 def get_viewset_actions(viewset_cls: Type[ViewSetMixin]) -> Set[str]:
@@ -47,7 +48,7 @@ def get_viewset_actions(viewset_cls: Type[ViewSetMixin]) -> Set[str]:
     Checks Django settings for 'DRF_IAM_DEFAULT_VIEWSET_ACTIONS'.
     """
     actions: Set[str] = set()
-    
+
     fallback_default_actions = {
         'list', 'retrieve', 'create', 'update', 'partial_update', 'destroy'
     }
@@ -94,10 +95,10 @@ class PermissionLoader:
                     }
 
     def _validate_conflicting_definitions(
-        self,
-        action_method: Any,
-        action_name: str,
-        iam_perms_for_action: Dict[str, Any]
+            self,
+            action_method: Any,
+            action_name: str,
+            iam_perms_for_action: Dict[str, Any]
     ) -> None:
         """
         Validates that IAM-related attributes are not defined in conflicting ways
@@ -113,7 +114,8 @@ class PermissionLoader:
             "Please choose a single source of truth."
         )
 
-        viewset_name = action_method.__self__.__class__.__name__ if hasattr(action_method, '__self__') else 'UnknownViewSet'
+        viewset_name = action_method.__self__.__class__.__name__ if hasattr(action_method,
+                                                                            '__self__') else 'UnknownViewSet'
 
         # Check for 'policy_name'
         if iam_perms_for_action.get("policy_name") and hasattr(action_method, 'policy_name'):
@@ -121,11 +123,12 @@ class PermissionLoader:
 
         # Check for 'policy_description' (key 'description' in dict, attribute 'policy_description' on method)
         if iam_perms_for_action.get("description") and hasattr(action_method, 'policy_description'):
-            conflicts.append(error_message_template.format('policy_description (dict key "description")', action_name, viewset_name))
+            conflicts.append(
+                error_message_template.format('policy_description (dict key "description")', action_name, viewset_name))
 
         # Check for 'exclude_from_iam'
         if iam_perms_for_action.get("exclude_from_iam") is not None and \
-           hasattr(action_method, 'exclude_from_iam'):
+                hasattr(action_method, 'exclude_from_iam'):
             conflicts.append(error_message_template.format('exclude_from_iam', action_name, viewset_name))
 
         if conflicts:
@@ -139,15 +142,16 @@ class PermissionLoader:
         for viewset_info in self._extract_viewsets_from_urlpatterns(self.urlpatterns):
             viewset_cls = viewset_info['callback'].cls
             actions = get_viewset_actions(viewset_cls)
-            resource_name_from_path = viewset_info['name'] # Used if iam_resource_type_name not set
 
             # Cache resource type name
             if viewset_cls not in resource_type_name_cache:
                 resource_type_name_cache[viewset_cls] = getattr(
                     viewset_cls,
-                    "iam_resource_type_name",
-                    resource_name_from_path.replace('-', '_') # Default from URL name
-                )
+                    "iam_policy_name",
+                    None
+                ) or viewset_cls.__name__.lower().replace('viewset',
+                                                          '')
+
             resource_type_name = resource_type_name_cache[viewset_cls]
 
             drf_iam_permissions = getattr(viewset_cls, "drf_iam_permissions", {})
@@ -156,7 +160,7 @@ class PermissionLoader:
                 action_method = getattr(viewset_cls, action_name, None)
                 iam_perms_for_action = drf_iam_permissions.get(action_name, {})
 
-                if action_method: # Ensure the method actually exists
+                if action_method:  # Ensure the method actually exists
                     self._validate_conflicting_definitions(
                         action_method,
                         action_name,
@@ -170,7 +174,7 @@ class PermissionLoader:
                     excluded = getattr(action_method, 'exclude_from_iam')
                 elif "exclude_from_iam" in iam_perms_for_action:
                     excluded = iam_perms_for_action.get("exclude_from_iam", False)
-                
+
                 if excluded:
                     logger.debug(
                         f"Action '{action_name}' on ViewSet "
@@ -197,14 +201,14 @@ class PermissionLoader:
                     description_str = iam_perms_for_action["description"]
                 else:
                     description_str = f"Allows to {action_name.replace('_', ' ')} for {resource_type_name.replace('_', ' ')}"
-                
+
                 raw_policy_details.append({
-                    "action": action_name, # Just the action name
+                    "action": action_name,  # Just the action name
                     "resource_type": resource_type_name,
                     "policy_name": policy_name_str,
                     "description": description_str,
                 })
-        
+
         # Remove duplicates and create PolicyDetail objects
         # Ensures that if multiple URL patterns point to the same viewset action,
         # we only consider one policy detail for it based on action and resource_type.
@@ -245,7 +249,8 @@ class PermissionLoader:
         to_create = list(desired_set - current_set)
 
         policies_to_delete_with_id: List[PolicyDetail] = []
-        current_map_for_delete = {(p.action, p.resource_type): p.id for p in self.current_db_policies if p.id is not None}
+        current_map_for_delete = {(p.action, p.resource_type): p.id for p in self.current_db_policies if
+                                  p.id is not None}
         policies_to_delete_stubs = current_set - desired_set
         for policy_stub in policies_to_delete_stubs:
             policy_id = current_map_for_delete.get((policy_stub.action, policy_stub.resource_type))

{drf_iam-0.2.7.dist-info → drf_iam-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drf-iam
-Version: 0.2.7
+Version: 0.2.8
 Summary: IAM-style roles and permissions for Django Rest Framework
 Home-page: https://github.com/tushar1328/drf-iam.git
 Author: Tushar Patel

{drf_iam-0.2.7.dist-info → drf_iam-0.2.8.dist-info}/RECORD

@@ -9,9 +9,9 @@ drf_iam/migrations/0001_initial.py,sha256=y_4jXnr7gjU4UXxVrgVrStTSFu3h1ZrmjEZDL4
 drf_iam/migrations/0002_add_policy_name.py,sha256=EUZ2OCmobOlmnlpYv0jsMBb3QR0HknW4qAjgn-zOzA0,353
 drf_iam/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 drf_iam/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-drf_iam/utils/load_viewset_permissions.py,sha256=z_0cx3UlcDs-n22wHPF5shseacf7m6Ieip9_HpZoPfc,15047
+drf_iam/utils/load_viewset_permissions.py,sha256=HtEQqZ48NOtYtpyDNLg0eMJFkdImkEaq8YEMADD0I_c,15099
 drf_iam/utils/logging_utils.py,sha256=9I9hhSVgOVW5xdKXSKofbjgl6rMYbmAI40euiB5WNlM,2074
-drf_iam-0.2.7.dist-info/METADATA,sha256=CS4IBDCUkFiuLuTf9rV1cHjDl2pEAP5seACWLgHVLR8,2763
-drf_iam-0.2.7.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-drf_iam-0.2.7.dist-info/top_level.txt,sha256=daz6AaQ9e_cfCjLk2aRoLb_PCOoFofYUX4DU85VwHSM,8
-drf_iam-0.2.7.dist-info/RECORD,,
+drf_iam-0.2.8.dist-info/METADATA,sha256=EUbV0JxfcIP6MI_CXjhbes7tR8euXBmzV8rapZgIWBA,2763
+drf_iam-0.2.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+drf_iam-0.2.8.dist-info/top_level.txt,sha256=daz6AaQ9e_cfCjLk2aRoLb_PCOoFofYUX4DU85VwHSM,8
+drf_iam-0.2.8.dist-info/RECORD,,