Make possible to pass resource kwargs in api

Also simplify ImportJobViewSet not to use filterset class

import_export_extensions/api/serializers/export_job.py

@@ -49,6 +49,7 @@ class CreateExportJob(serializers.Serializer):
     """
 
     resource_class: typing.Type[resources.CeleryModelResource]
+    resource_kwargs = serializers.JSONField(required=False)
 
     def __init__(
         self,
@@ -86,11 +87,10 @@ def create(
         ]
         return models.ExportJob.objects.create(
             resource_path=self.resource_class.class_path,
-            file_format_path=(
-                f"{file_format_class.__module__}.{file_format_class.__name__}"
-            ),
+            file_format_path=f"{file_format_class.__module__}.{file_format_class.__name__}",
             resource_kwargs=dict(
                 filter_kwargs=self._filter_kwargs,
+                **validated_data.get("resource_kwargs", {}),
             ),
             created_by=self._user,
         )
@@ -108,7 +108,6 @@ class _CreateExportJob(CreateExportJob):
         """Serializer to start export job."""
 
         resource_class: typing.Type[resources.CeleryModelResource] = resource
-
         file_format = serializers.ChoiceField(
             required=True,
             choices=[

import_export_extensions/api/serializers/import_job.py

@@ -3,7 +3,6 @@
 from rest_framework import request, serializers
 
 from celery import states
-from django_filters.utils import translate_validation
 
 from ... import models, resources
 from .progress import ProgressSerializer
@@ -50,30 +49,19 @@ class CreateImportJob(serializers.Serializer):
 
     resource_class: typing.Type[resources.CeleryModelResource]
 
+    file = serializers.FileField(required=True)
+    resource_kwargs = serializers.JSONField(required=False)
+
     def __init__(
         self,
-        filter_kwargs: typing.Optional[dict[str, typing.Any]] = None,
         *args,
         **kwargs,
     ):
         """Set filter kwargs and current user."""
         super().__init__(*args, **kwargs)
-        self._filter_kwargs: typing.Optional[dict[str, typing.Any]] = (
-            filter_kwargs
-        )
         self._request: request.Request = self.context.get("request")
         self._user = getattr(self._request, "user", None)
 
-    def validate(self, attrs: dict[str, typing.Any]) -> dict[str, typing.Any]:
-        """Check that filter kwargs are valid."""
-        if self._filter_kwargs:
-            filter_instance = self.resource_class.filterset_class(
-                data=self._filter_kwargs,
-            )
-            if not filter_instance.is_valid():
-                raise translate_validation(error_dict=filter_instance.errors)
-        return attrs
-
     def create(
         self,
         validated_data: dict[str, typing.Any],
@@ -82,9 +70,7 @@ def create(
         return models.ImportJob.objects.create(
             data_file=validated_data["file"],
             resource_path=self.resource_class.class_path,
-            resource_kwargs=dict(
-                filter_kwargs=self._filter_kwargs,
-            ),
+            resource_kwargs=validated_data.get("resource_kwargs", {}),
             created_by=self._user,
         )
 
@@ -102,8 +88,6 @@ class _CreateImportJob(CreateImportJob):
 
         resource_class: typing.Type[resources.CeleryModelResource] = resource
 
-        file = serializers.FileField(required=True)
-
     return type(
         f"{resource.__name__}CreateImportJob",
         (_CreateImportJob,),

import_export_extensions/api/views/import_job.py

@@ -9,9 +9,6 @@
     viewsets,
 )
 from rest_framework.exceptions import ValidationError
-from rest_framework.request import Request
-
-import django_filters
 
 from ... import models, resources
 from .. import serializers
@@ -23,9 +20,7 @@ class ImportBase(type):
     def __new__(cls, name, bases, attrs, **kwargs):
         """Dynamically create an import start api endpoint.
 
-        We need this to specify on fly action's filterset_class and queryset
-        (django-filters requires view's queryset and filterset_class's
-        queryset model to match). Also, if drf-spectacular is installed
+        If drf-spectacular is installed
         specify request and response, and enable filters.
 
         """
@@ -41,40 +36,13 @@ def __new__(cls, name, bases, attrs, **kwargs):
         if name == "ImportJobViewSet":
             return viewset
 
-        def start(self: "ImportJobViewSet", request: Request):
-            """Validate request data and start ImportJob."""
-            serializer = self.get_serializer(
-                data=request.data,
-                filter_kwargs=request.query_params,
-            )
-            serializer.is_valid(raise_exception=True)
-            import_job = serializer.save()
-            return response.Response(
-                data=self.get_detail_serializer_class()(
-                    instance=import_job,
-                ).data,
-                status=status.HTTP_201_CREATED,
-            )
-
-        viewset.start = decorators.action(
-            methods=["POST"],
-            detail=False,
-            queryset=viewset.resource_class.get_model_queryset(),
-            filterset_class=getattr(
-                viewset.resource_class, "filterset_class", None,
-            ),
-            filter_backends=[
-                django_filters.rest_framework.DjangoFilterBackend,
-            ],
-        )(start)
         # Correct specs of drf-spectacular if it is installed
         try:
             from drf_spectacular.utils import extend_schema, extend_schema_view
 
             detail_serializer_class = viewset().get_detail_serializer_class()
             return extend_schema_view(
                 start=extend_schema(
-                    filters=True,
                     request=viewset().get_import_create_serializer_class(),
                     responses={
                         status.HTTP_201_CREATED: detail_serializer_class,
@@ -125,7 +93,6 @@ class ImportJobViewSet(
     resource_class: typing.Optional[
         typing.Type[resources.CeleryModelResource]
     ] = None
-    filterset_class: django_filters.rest_framework.FilterSet = None
 
     def get_queryset(self):
         """Filter import jobs by resource used in viewset."""
@@ -149,6 +116,21 @@ def get_import_create_serializer_class(self):
             self.resource_class,
         )
 
+    @decorators.action(methods=["POST"], detail=False)
+    def start(self, request, *args, **kwargs):
+        """Validate request data and start ImportJob."""
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        import_job = serializer.save()
+
+        return response.Response(
+            data=self.get_detail_serializer_class()(
+                instance=import_job,
+            ).data,
+            status=status.HTTP_201_CREATED,
+        )
+
     @decorators.action(methods=["POST"], detail=True)
     def confirm(self, *args, **kwargs):
         """Confirm import job that has `parsed` status."""

tests/settings.py

@@ -110,6 +110,7 @@
 # Configure `drf-spectacular` to check it works for import-export API
 REST_FRAMEWORK = {
     "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
+    "COMPONENT_SPLIT_REQUEST": True,  # Allows to upload import file from Swagger UI
 }
 
 # Don't use celery when you're local