base-api-utils 1.1.113__tar.gz → 1.1.115__tar.gz

{base_api_utils-1.1.113/src/base_api_utils.egg-info → base_api_utils-1.1.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.113
+Version: 1.1.115
 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.113 → base_api_utils-1.1.115}/pyproject.toml

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

base_api_utils-1.1.115/src/base_api_utils/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from .views import TasksResultAPIView
+
+private_tasks_admin_patterns = ([
+    path('', TasksResultAPIView.as_view({'get': 'list'}), name='tasks_result'),
+    path('/<str:task_id>', TasksResultAPIView.as_view({'get': 'retrieve_async_task_status'}), name='retrieve_async_task_status'),
+    path('/<str:task_id>/retry', TasksResultAPIView.as_view({'post': 'retry'}), name='retry'),
+], 'private-tasks-admin-endpoints')

{base_api_utils-1.1.113 → base_api_utils-1.1.115}/src/base_api_utils/views/tasks_result_view.py

@@ -1,3 +1,4 @@
+from celery.result import AsyncResult
 from rest_framework import viewsets, status
 from rest_framework.response import Response
 from django_celery_results.models import TaskResult
@@ -5,10 +6,9 @@ from celery import current_app
 
 from ..security import oauth2_scope_required, group_required
 from ..serializers import TaskResultSerializer
-from ..utils import LookupValueMixin
 
 
-class TasksResultAPIView(LookupValueMixin, viewsets.ReadOnlyModelViewSet):
+class TasksResultAPIView(viewsets.ReadOnlyModelViewSet):
     """
     ViewSet to view failed Celery tasks and retry them manually.
     """
@@ -17,10 +17,9 @@ class TasksResultAPIView(LookupValueMixin, viewsets.ReadOnlyModelViewSet):
 
     @oauth2_scope_required()
     @group_required()
-    def retry(self, request, *args, **kwargs):
+    def retry(self, request, task_id, *args, **kwargs):
         """Rerun a failed task manually"""
-        pk = self.get_lookup_value()
-        task_result = self.get_queryset().filter(task_id=pk).first()
+        task_result = self.get_queryset().filter(task_id=task_id).first()
         if not task_result:
              return Response({"error": "Task not registered as failed"}, status=status.HTTP_404_NOT_FOUND)
 
@@ -35,4 +34,17 @@ class TasksResultAPIView(LookupValueMixin, viewsets.ReadOnlyModelViewSet):
             new_task = task.apply_async(args=args, kwargs=kwargs)
             return Response({"message": "Task resubmitted", "new_task_id": new_task.id})
         else:
-            return Response({"error": "Task not found"}, status=status.HTTP_404_NOT_FOUND)
+            return Response({"error": "Task not found"}, status=status.HTTP_404_NOT_FOUND)
+
+    @oauth2_scope_required()
+    @group_required()
+    def retrieve_async_task_status(self, request, task_id, *args, **kwargs):
+        result = AsyncResult(task_id)
+        response_data = {'task_id': task_id, 'status': result.status}
+
+        if result.status == 'SUCCESS':
+            response_data['result'] = result.result
+        elif result.status == 'FAILURE':
+            response_data['error'] = str(result.result)
+
+        return Response(response_data, status=status.HTTP_200_OK)

{base_api_utils-1.1.113 → base_api_utils-1.1.115/src/base_api_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.113
+Version: 1.1.115
 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.113/src/base_api_utils/urls.py

@@ -1,8 +0,0 @@
-from django.urls import path
-
-from .views import TasksResultAPIView
-
-private_tasks_admin_patterns = ([
-    path('', TasksResultAPIView.as_view({'get': 'list'}), name='tasks_result'),
-    path('/<str:pk>/retry', TasksResultAPIView.as_view({'post': 'retry'}), name='retry'),
-], 'private-tasks-admin-endpoints')