Rename to QUEUE_SELECTOR

Author: Marishka17

cvat/apps/redis_handler/apps.py

@@ -21,7 +21,7 @@ def __getitem__(self, key: str | tuple) -> str:
         return super().__getitem__(key)
 
 
-ACTION_TO_QUEUE = LayeredKeyDict()
+QUEUE_SELECTOR = LayeredKeyDict()
 QUEUE_TO_PARSED_JOB_ID_CLS = {}
 
 REQUEST_ID_SUBCLASSES = set()
@@ -47,7 +47,7 @@ def init_subclasses(cur_cls: type[RequestId] = RequestId):
             for queue_selector in parsed_job_id_cls.QUEUE_SELECTORS:
                 if not isinstance(queue_selector, (tuple, str)):
                     raise ImproperlyConfigured("Wrong queue selector, must be either tuple or str")
-                ACTION_TO_QUEUE[queue_selector] = queue_name
+                QUEUE_SELECTOR[queue_selector] = queue_name
 
             QUEUE_TO_PARSED_JOB_ID_CLS[queue_name] = parsed_job_id_cls
 
@@ -62,7 +62,7 @@ def init_subclasses(cur_cls: type[RequestId] = RequestId):
 
         if subclass.QUEUE_SELECTORS:
             for queue_selector in subclass.QUEUE_SELECTORS:
-                if not ACTION_TO_QUEUE.get(queue_selector):
+                if not QUEUE_SELECTOR.get(queue_selector):
                     raise ImproperlyConfigured(
                         f"Queue selector {queue_selector!r} for the class {subclass.__name__!r} is missed in the queue configuration"
                     )

cvat/apps/redis_handler/rq.py

@@ -11,7 +11,7 @@
 from rq.job import Job as RQJob
 
 from cvat.apps.redis_handler.apps import (
-    ACTION_TO_QUEUE,
+    QUEUE_SELECTOR,
     QUEUE_TO_PARSED_JOB_ID_CLS,
     REQUEST_ID_SUBCLASSES,
 )
@@ -161,7 +161,7 @@ def parse(
                         f"Unable to parse request ID: {escape(request_id)!r}"
                     )
 
-                queue = ACTION_TO_QUEUE[
+                queue = QUEUE_SELECTOR[
                     actual_cls.QUEUE_SELECTORS[0]
                 ]  # each selector match the same queue
                 fragments = match.groupdict()
@@ -178,7 +178,7 @@ def parse(
 
             if not queue:
                 # try to define queue dynamically based on action/target/subresource
-                queue = ACTION_TO_QUEUE[
+                queue = QUEUE_SELECTOR[
                     (dict_repr["action"], dict_repr["target"], dict_repr.get("subresource"))
                 ]
 

cvat/apps/redis_handler/views.py

@@ -25,7 +25,7 @@
 from cvat.apps.engine.log import ServerLogManager
 from cvat.apps.engine.rq import is_rq_job_owner
 from cvat.apps.engine.types import ExtendedRequest
-from cvat.apps.redis_handler.apps import ACTION_TO_QUEUE
+from cvat.apps.redis_handler.apps import QUEUE_SELECTOR
 from cvat.apps.redis_handler.rq import CustomRQJob, RequestId
 from cvat.apps.redis_handler.serializers import RequestSerializer, RequestStatus
 
@@ -107,7 +107,7 @@ def get_queryset(self):
 
     @property
     def queues(self) -> Iterable[DjangoRQ]:
-        return (django_rq.get_queue(queue_name) for queue_name in set(ACTION_TO_QUEUE.values()))
+        return (django_rq.get_queue(queue_name) for queue_name in set(QUEUE_SELECTOR.values()))
 
     def _get_rq_jobs_from_queue(self, queue: DjangoRQ, user_id: int) -> list[RQJob]:
         job_ids = set(