Apply comments

cvat/apps/engine/background.py

@@ -39,7 +39,7 @@
 from cvat.apps.engine.permissions import get_cloud_storage_for_import_or_export
 from cvat.apps.engine.rq_job_handler import RQId, RQJobMetaField
 from cvat.apps.engine.serializers import RqIdSerializer
-from cvat.apps.engine.types import PatchedRequest
+from cvat.apps.engine.types import Request
 from cvat.apps.engine.utils import (
     build_annotations_file_name,
     build_backup_file_name,
@@ -180,7 +180,7 @@ def location(self) -> Location:
     def __init__(
         self,
         db_instance: Union[models.Project, models.Task, models.Job],
-        request: PatchedRequest,
+        request: Request,
         export_callback: Callable,
         save_images: Optional[bool] = None,
         *,
@@ -525,7 +525,7 @@ def location(self) -> Location:
     def __init__(
         self,
         db_instance: Union[models.Project, models.Task],
-        request: PatchedRequest,
+        request: Request,
         *,
         version: int = 2,
     ) -> None:

cvat/apps/engine/backup.py

@@ -79,7 +79,7 @@
     ValidationParamsSerializer,
 )
 from cvat.apps.engine.task import JobFileMapping, _create_thread
-from cvat.apps.engine.types import PatchedRequest
+from cvat.apps.engine.types import Request
 from cvat.apps.engine.utils import (
     av_scan_paths,
     define_dependent_job,
@@ -1150,10 +1150,10 @@ def create_backup(
 
 def _import(
     importer: TaskImporter | ProjectImporter,
-    request: PatchedRequest,
-    queue: django_rq.queues.Queue,
+    request: Request,
+    queue: django_rq.queues.DjangoRQ,
     rq_id: str,
-    Serializer: TaskFileSerializer | ProjectFileSerializer,
+    Serializer: type[TaskFileSerializer] | type[ProjectFileSerializer],
     file_field_name: str,
     location_conf: dict,
     filename: str | None = None,
@@ -1245,7 +1245,7 @@ def _import(
 def get_backup_dirname():
     return TmpDirManager.TMP_ROOT
 
-def import_project(request: PatchedRequest, queue_name: str, filename: str | None = None):
+def import_project(request: Request, queue_name: str, filename: str | None = None):
     if 'rq_id' in request.data:
         rq_id = request.data['rq_id']
     else:
@@ -1274,7 +1274,7 @@ def import_project(request: PatchedRequest, queue_name: str, filename: str | Non
         filename=filename
     )
 
-def import_task(request: PatchedRequest, queue_name: str, filename: str | None = None):
+def import_task(request: Request, queue_name: str, filename: str | None = None):
     rq_id = request.data.get('rq_id', RQId(
         RequestAction.IMPORT, RequestTarget.TASK, uuid.uuid4(),
         subresource=RequestSubresource.BACKUP,

cvat/apps/engine/filters.py

@@ -21,7 +21,8 @@
 from rest_framework import filters
 from rest_framework.compat import coreapi, coreschema
 from rest_framework.exceptions import ValidationError
-from rest_framework.request import Request
+
+from cvat.apps.engine.types import Request
 
 DEFAULT_FILTER_FIELDS_ATTR = 'filter_fields'
 DEFAULT_LOOKUP_MAP_ATTR = 'lookup_fields'
@@ -39,7 +40,7 @@ def get_lookup_fields(view, fields: Optional[Iterator[str]] = None) -> dict[str,
 
 
 class SearchFilter(filters.SearchFilter):
-    def get_search_fields(self, view, request):
+    def get_search_fields(self, view, request: Request):
         search_fields = getattr(view, 'search_fields') or []
         return get_lookup_fields(view, search_fields).values()
 
@@ -82,7 +83,7 @@ class OrderingFilter(filters.OrderingFilter):
     ordering_param = 'sort'
     reverse_flag = "-"
 
-    def get_ordering(self, request, queryset, view):
+    def get_ordering(self, request: Request, queryset, view):
         ordering = []
         lookup_fields = self._get_lookup_fields(request, queryset, view)
         for term in super().get_ordering(request, queryset, view):
@@ -94,7 +95,7 @@ def get_ordering(self, request, queryset, view):
 
         return ordering
 
-    def _get_lookup_fields(self, request, queryset, view):
+    def _get_lookup_fields(self, request: Request, queryset: QuerySet, view):
         ordering_fields = self.get_valid_fields(queryset, view, {'request': request})
         ordering_fields = [v[0] for v in ordering_fields]
         return get_lookup_fields(view, ordering_fields)
@@ -201,7 +202,7 @@ def apply_filter(self,
 
         return queryset.filter(q_object)
 
-    def filter_queryset(self, request, queryset, view):
+    def filter_queryset(self, request: Request, queryset: QuerySet, view):
         json_rules = request.query_params.get(self.filter_param)
         if json_rules:
             parsed_rules = self._parse_query(json_rules)
@@ -455,7 +456,7 @@ class NonModelOrderingFilter(OrderingFilter, _NestedAttributeHandler):
     ?sort=-field1,-field2
     """
 
-    def get_ordering(self, request, queryset, view) -> tuple[list[str], bool]:
+    def get_ordering(self, request: Request, queryset: Iterable, view) -> tuple[list[str], bool]:
         ordering = super().get_ordering(request, queryset, view)
         result, reverse = [], False
         for field in ordering:

cvat/apps/engine/mixins.py

@@ -43,7 +43,7 @@
 )
 from cvat.apps.engine.rq_job_handler import RQId
 from cvat.apps.engine.serializers import DataSerializer, RqIdSerializer
-from cvat.apps.engine.types import PatchedRequest
+from cvat.apps.engine.types import Request
 from cvat.apps.engine.utils import is_dataset_export
 
 slogger = ServerLogManager(__name__)
@@ -167,7 +167,7 @@ def create_file(metadata, file_size, upload_dir):
         return tus_file
 
 class TusChunk:
-    def __init__(self, request: PatchedRequest):
+    def __init__(self, request: Request):
         self.META = request.META
         self.offset = int(request.META.get("HTTP_UPLOAD_OFFSET", 0))
         self.size = int(request.META.get("CONTENT_LENGTH", settings.TUS_DEFAULT_CHUNK_SIZE))
@@ -223,7 +223,7 @@ def _tus_response(self, status, data=None, extra_headers=None):
                 response.__setitem__(key, value)
         return response
 
-    def _get_metadata(self, request: PatchedRequest):
+    def _get_metadata(self, request: Request):
         metadata = {}
         if request.META.get("HTTP_UPLOAD_METADATA"):
             for kv in request.META.get("HTTP_UPLOAD_METADATA").split(","):
@@ -238,7 +238,7 @@ def _get_metadata(self, request: PatchedRequest):
                     metadata[splited_metadata[0]] = ""
         return metadata
 
-    def upload_data(self, request: PatchedRequest):
+    def upload_data(self, request: Request):
         tus_request = request.headers.get('Upload-Length', None) is not None or request.method == 'OPTIONS'
         bulk_file_upload = request.headers.get('Upload-Multiple', None) is not None
         start_upload = request.headers.get('Upload-Start', None) is not None
@@ -255,7 +255,7 @@ def upload_data(self, request: PatchedRequest):
         else: # backward compatibility case - no upload headers were found
             return self.upload_finished(request)
 
-    def init_tus_upload(self, request: PatchedRequest):
+    def init_tus_upload(self, request: Request):
         if request.method == 'OPTIONS':
             return self._tus_response(status=status.HTTP_204_NO_CONTENT)
         else:
@@ -329,7 +329,7 @@ def init_tus_upload(self, request: PatchedRequest):
                 extra_headers={'Location': urljoin(location, tus_file.file_id),
                                'Upload-Filename': tus_file.filename})
 
-    def append_tus_chunk(self, request: PatchedRequest, file_id: str):
+    def append_tus_chunk(self, request: Request, file_id: str):
         tus_file = TusFile(str(file_id), self.get_upload_dir())
         if request.method == 'HEAD':
             if tus_file.exists():
@@ -413,7 +413,7 @@ class PartialUpdateModelMixin:
     Almost the same as UpdateModelMixin, but has no public PUT / update() method.
     """
 
-    def _update(self, request: PatchedRequest, *args, **kwargs):
+    def _update(self, request: Request, *args, **kwargs):
         # This method must not be named "update" not to be matched with the PUT method
         return mixins.UpdateModelMixin.update(self, request, *args, **kwargs)
 
@@ -428,7 +428,7 @@ def partial_update(self, request, *args, **kwargs):
 class DatasetMixin:
     def export_dataset_v1(
         self,
-        request: PatchedRequest,
+        request: Request,
         save_images: bool,
         *,
         get_data: Optional[Callable[[int], dict[str, Any]]] = None,
@@ -474,7 +474,7 @@ def export_dataset_v1(
         },
     )
     @action(detail=True, methods=['POST'], serializer_class=None, url_path='dataset/export')
-    def export_dataset_v2(self, request: PatchedRequest, pk: int):
+    def export_dataset_v2(self, request: Request, pk: int):
         self._object = self.get_object() # force call of check_object_permissions()
 
         save_images = is_dataset_export(request)
@@ -486,11 +486,11 @@ def export_dataset_v2(self, request: PatchedRequest, pk: int):
     # FUTURE-TODO: migrate to new API
     def import_annotations(
         self,
-        request: PatchedRequest,
+        request: Request,
         db_obj: Project | Task | Job,
         import_func: Callable[..., None],
         rq_func: Callable[..., None],
-        rq_id_factory: RQId,
+        rq_id_factory: Callable[..., RQId],
     ):
         is_tus_request = request.headers.get('Upload-Length', None) is not None or \
             request.method == 'OPTIONS'
@@ -523,7 +523,7 @@ def import_annotations(
 
 
 class BackupMixin:
-    def export_backup_v1(self, request: PatchedRequest) -> Response:
+    def export_backup_v1(self, request: Request) -> Response:
         db_object = self.get_object() # force to call check_object_permissions
 
         export_backup_manager = BackupExportManager(db_object, request, version=1)
@@ -535,7 +535,7 @@ def export_backup_v1(self, request: PatchedRequest) -> Response:
         return response
 
     # FUTURE-TODO: migrate to new API
-    def import_backup_v1(self, request: PatchedRequest, import_func: Callable) -> Response:
+    def import_backup_v1(self, request: Request, import_func: Callable) -> Response:
         location = request.query_params.get("location", Location.LOCAL)
         if location == Location.CLOUD_STORAGE:
             file_name = request.query_params.get("filename", "")
@@ -569,7 +569,7 @@ def import_backup_v1(self, request: PatchedRequest, import_func: Callable) -> Re
         },
     )
     @action(detail=True, methods=['POST'], serializer_class=None, url_path='backup/export')
-    def export_backup_v2(self, request: PatchedRequest, pk: int):
+    def export_backup_v2(self, request: Request, pk: int):
         db_object = self.get_object() # force to call check_object_permissions
 
         export_backup_manager = BackupExportManager(db_object, request, version=2)

cvat/apps/engine/pagination.py

@@ -6,13 +6,13 @@
 
 from rest_framework.pagination import PageNumberPagination
 
-from cvat.apps.engine.types import PatchedRequest
+from cvat.apps.engine.types import Request
 
 
 class CustomPagination(PageNumberPagination):
     page_size_query_param = "page_size"
 
-    def get_page_size(self, request: PatchedRequest):
+    def get_page_size(self, request: Request):
         page_size = 0
         try:
             value = request.query_params[self.page_size_query_param]