Skip to content

Commit

Permalink
feat: logs are avaible on task endpoint
Browse files Browse the repository at this point in the history
Signed-off-by: SdgJlbl <sarah.diot-girard@owkin.com>
  • Loading branch information
SdgJlbl committed Feb 15, 2024
1 parent e44d388 commit 60b69c2
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 2 deletions.
1 change: 1 addition & 0 deletions backend/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
router.register(r"function", views.FunctionViewSet, basename="function")
router.register(r"function", views.FunctionPermissionViewSet, basename="function")
router.register(r"task", views.ComputeTaskViewSet, basename="task")
router.register(r"task", views.ComputeTaskPermissionViewSet, basename="task")
router.register(r"compute_plan", views.ComputePlanViewSet, basename="compute_plan")
router.register(r"compute_plan_metadata", views.ComputePlanMetadataViewSet, basename="compute_plan_metadata")
router.register(r"news_feed", views.NewsFeedViewSet, basename="news_feed")
Expand Down
2 changes: 2 additions & 0 deletions backend/api/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from .compute_plan_graph import get_cp_graph
from .computeplan import ComputePlanViewSet
from .computetask import ComputeTaskPermissionViewSet
from .computetask import ComputeTaskViewSet
from .computetask import CPTaskViewSet
from .datamanager import DataManagerPermissionViewSet
Expand Down Expand Up @@ -28,6 +29,7 @@
"FunctionViewSet",
"FunctionPermissionViewSet",
"ComputeTaskViewSet",
"ComputeTaskPermissionViewSet",
"ComputePlanViewSet",
"CPTaskViewSet",
"CPFunctionViewSet",
Expand Down
43 changes: 43 additions & 0 deletions backend/api/views/computetask.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
from rest_framework.viewsets import GenericViewSet

from api.errors import AlreadyExistsError
from api.errors import AssetPermissionError
from api.errors import BadRequestError
from api.models import ComputePlan
from api.models import ComputeTask
from api.models import ComputeTaskInputAsset
from api.models import ComputeTaskOutputAsset
from api.models.function import Function
from api.models.function import FunctionInput
from api.models.function import FunctionOutput
from api.serializers import ComputeTaskInputAssetSerializer
Expand All @@ -33,12 +35,15 @@
from api.views.filters_utils import MatchFilter
from api.views.filters_utils import MetadataFilterBackend
from api.views.utils import ApiResponse
from api.views.utils import PermissionMixin
from api.views.utils import get_channel_name
from api.views.utils import get_file_response
from api.views.utils import validate_key
from api.views.utils import validate_metadata
from libs.pagination import DefaultPageNumberPagination
from orchestrator import computetask
from orchestrator.resources import TAG_KEY
from substrapp.models import AssetFailureReport
from substrapp.orchestrator import get_orchestrator_client

logger = structlog.get_logger(__name__)
Expand Down Expand Up @@ -280,6 +285,44 @@ def get_queryset(self):
)


class ComputeTaskPermissionViewSet(PermissionMixin, GenericViewSet):
queryset = ComputeTask.objects.all()
serializer_class = ComputeTaskSerializer

@action(detail=True)
def logs(self, request, pk):
task = self.get_object()
channel_name = get_channel_name(request)
if task.error_type == ComputeTask.ErrorType.ERROR_TYPE_BUILD:
asset_class = Function
key = str(task.function.key)
else:
asset_class = ComputeTask
key = str(task.key)

try:
asset = self.get_asset(request, key, channel_name, asset_class)
except AssetPermissionError as e:
return ApiResponse({"detail": str(e)}, status=status.HTTP_403_FORBIDDEN)

url = task.logs_address
if not url:
return ApiResponse({"detail": "Asset not available anymore"}, status=status.HTTP_410_GONE)

response = get_file_response(
local_file_class=AssetFailureReport,
key=key,
content_field="logs",
channel_name=channel_name,
url=url,
asset_owner=asset.get_owner(),
)

response.headers["Content-Type"] = "text/plain; charset=utf-8"
response.headers["Content-Disposition"] = f'attachment; filename="tuple_logs_{pk}.txt"'
return response


class CPTaskViewSet(ComputeTaskViewSetConfig, mixins.ListModelMixin, GenericViewSet):
serializer_class = ComputeTaskSerializer

Expand Down
3 changes: 1 addition & 2 deletions backend/api/views/failed_asset_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from api.models import ComputeTask
from api.models import Function
from api.views import utils as view_utils
from api.views.utils import ApiResponse
from substrapp.models import asset_failure_report


Expand All @@ -31,7 +30,7 @@ def file(self, request, pk=None) -> drf_response.Response:

url = report.logs_address
if not url:
return ApiResponse({"detail": "Asset not available anymore"}, status=status.HTTP_410_GONE)
return view_utils.ApiResponse({"detail": "Asset not available anymore"}, status=status.HTTP_410_GONE)

response = view_utils.get_file_response(
local_file_class=asset_failure_report.AssetFailureReport,
Expand Down

0 comments on commit 60b69c2

Please sign in to comment.