base-api-utils 1.1.103__tar.gz → 1.1.105__tar.gz

{base_api_utils-1.1.103/src/base_api_utils.egg-info → base_api_utils-1.1.105}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.103
+Version: 1.1.105
 Summary: Django Rest Framework micro services common utilities
 Author-email: Román Gutierrez <roman@tipit.net>, Sebastian Marcet <sebastian@tipit.net>
 Project-URL: Homepage, https://github.com/fntechgit/base-api-utils

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "base-api-utils"
-version = "1.1.103"
+version = "1.1.105"
 dependencies = [
     "boto3",
     "celery",

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/security/shared.py

@@ -11,8 +11,7 @@ _PATH_PARAMETER_COMPONENT_RE = re.compile(
 def get_path(request) -> str:
     path = simplify_regex(request.resolver_match.route)
     # Strip Django 2.0 convertors as they are incompatible with uritemplate format
-    path = re.sub(_PATH_PARAMETER_COMPONENT_RE, r'{\g<parameter>}', path)
-    return path.replace('{pk}', '{id}')
+    return re.sub(_PATH_PARAMETER_COMPONENT_RE, r'{\g<parameter>}', path)
 
 client_secret_basic_auth_method = 'client_secret_basic'
 

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/utils/expand_queryset_optimization_mixin.py

@@ -2,14 +2,15 @@ from typing import Any, Iterable, List, Set, Tuple
 
 from rest_framework.response import Response
 
-from ..serializers.v2.query_params import (
+from base_api_utils.serializers.v2.query_params import (
     parse_request_trees,
     should_expand,
     subtree,
 )
 
 class ExpandQuerysetOptimizationMixin:
-    """Auto-optimizes queryset from serializer.expand_mappings (recursive), plus runs bulk hooks for computed relations."""
+    # Auto-optimizes queryset from serializer.expand_mappings (recursive),
+    # plus runs bulk hooks for computed relations."""
 
     def _parse_trees(self):
         return parse_request_trees(self.request)

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/views/base_view.py

@@ -6,6 +6,10 @@ from ..utils import config, ReadWriteSerializerMixin, ExpandQuerysetOptimization
 class BaseView(ReadWriteSerializerMixin, ExpandQuerysetOptimizationMixin, ModelViewSet):
     ordering_fields = {}
 
+    lookup_field = 'id'
+
+    serializer_class = ReadWriteSerializerMixin
+
     def get_queryset(self):
         return self.queryset
 
@@ -39,5 +43,4 @@ class BaseView(ReadWriteSerializerMixin, ExpandQuerysetOptimizationMixin, ModelV
         if ordering_fields:
             queryset = queryset.order_by(*ordering_fields)
 
-
         return queryset

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/views/parent_children_crud.py

@@ -62,8 +62,9 @@ class ParentChildrenCRUDView(BaseView):
 
     @oauth2_scope_required()
     @group_required()
-    def retrieve(self, request, pk=None, *args, **kwargs):
+    def retrieve(self, request, *args, **kwargs):
         parent = self._get_parent_or_404()
+        pk = self.kwargs.get(self.lookup_field)
         child = self._get_child_by_id(parent, pk)
         serializer = self.get_serializer(child)
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -80,18 +81,20 @@ class ParentChildrenCRUDView(BaseView):
 
     @oauth2_scope_required()
     @group_required()
-    def update(self, request, pk=None, *args, **kwargs):
+    def update(self, request, *args, **kwargs):
         parent = self._get_parent_or_404()
         instance = self.get_object()
         serializer = self.get_serializer(instance, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
+        pk = self.kwargs.get(self.lookup_field)
         item_child = self._update_child(parent, pk, serializer.validated_data)
         response_serializer = self.get_serializer(item_child)
         return Response(response_serializer.data, status=status.HTTP_200_OK)
 
     @oauth2_scope_required()
     @group_required()
-    def destroy(self, request, pk=None, *args, **kwargs):
+    def destroy(self, request, *args, **kwargs):
         parent = self._get_parent_or_404()
+        pk = self.kwargs.get(self.lookup_field)
         self._delete_child(parent, pk)
         return Response(status=status.HTTP_204_NO_CONTENT)

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/views/root_entity_crud.py

@@ -54,7 +54,8 @@ class RootEntityCRUDView(BaseView):
 
     @oauth2_scope_required()
     @group_required()
-    def retrieve(self, request, pk=None, *args, **kwargs):
+    def retrieve(self, request, *args, **kwargs):
+        pk = self.kwargs.get(self.lookup_field)
         entity = self._get_by_id(pk)
         serializer = self.get_serializer(entity)
         return Response(serializer.data, status=status.HTTP_200_OK)
@@ -70,16 +71,18 @@ class RootEntityCRUDView(BaseView):
 
     @oauth2_scope_required()
     @group_required()
-    def update(self, request, pk=None, *args, **kwargs):
+    def update(self, request, *args, **kwargs):
         instance = self.get_object()
         serializer = self.get_serializer(instance, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
+        pk = self.kwargs.get(self.lookup_field)
         entity = self._update(pk, serializer.validated_data)
         response_serializer = self.get_serializer(entity)
         return Response(response_serializer.data, status=status.HTTP_200_OK)
 
     @oauth2_scope_required()
     @group_required()
-    def destroy(self, request, pk=None, *args, **kwargs):
+    def destroy(self, request, *args, **kwargs):
+        pk = self.kwargs.get(self.lookup_field)
         self._delete(pk)
         return Response(status=status.HTTP_204_NO_CONTENT)

{base_api_utils-1.1.103 → base_api_utils-1.1.105}/src/base_api_utils/views/tasks_result_view.py

@@ -16,8 +16,9 @@ class TasksResultAPIView(viewsets.ReadOnlyModelViewSet):
 
     @oauth2_scope_required()
     @group_required()
-    def retry(self, request, pk=None, *args, **kwargs):
+    def retry(self, request, *args, **kwargs):
         """Rerun a failed task manually"""
+        pk = self.kwargs.get(self.lookup_field)
         task_result = self.get_queryset().filter(task_id=pk).first()
         if not task_result:
              return Response({"error": "Task not registered as failed"}, status=status.HTTP_404_NOT_FOUND)

{base_api_utils-1.1.103 → base_api_utils-1.1.105/src/base_api_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.103
+Version: 1.1.105
 Summary: Django Rest Framework micro services common utilities
 Author-email: Román Gutierrez <roman@tipit.net>, Sebastian Marcet <sebastian@tipit.net>
 Project-URL: Homepage, https://github.com/fntechgit/base-api-utils