Revert "pass user to update_tasks_states and update_tasks_counters_and_task_states everywhere"

This reverts commit 8f92a5e.

Author: matt-bernstein

label_studio/data_import/api.py

@@ -321,7 +321,6 @@ def sync_import(self, request, project, preannotated_from_fields, commit_to_proj
                 overlap_cohort_percentage_changed=False,
                 tasks_number_changed=True,
                 recalculate_stats_counts=recalculate_stats_counts,
-                user=self.request.user,
             )
             logger.info('Tasks bulk_update finished (sync import)')
 
@@ -658,7 +657,6 @@ def sync_reimport(self, project, file_upload_ids, files_as_tasks_list):
                 'annotation_count': annotation_count,
                 'prediction_count': prediction_count,
             },
-            user=self.request.user,
         )
         logger.info('Tasks bulk_update finished (sync reimport)')
 

label_studio/data_import/functions.py

@@ -126,7 +126,6 @@ def async_import_background(
                     overlap_cohort_percentage_changed=False,
                     tasks_number_changed=True,
                     recalculate_stats_counts=recalculate_stats_counts,
-                    user=user,
                 )
                 logger.info('Tasks bulk_update finished (async import)')
 
@@ -373,7 +372,6 @@ def _async_reimport_background_streaming(reimport, project, organization_id, use
                 overlap_cohort_percentage_changed=False,
                 tasks_number_changed=True,
                 recalculate_stats_counts=recalculate_stats_counts,
-                user=user,
             )
             logger.info('Tasks bulk_update finished (async streaming reimport)')
 
@@ -530,7 +528,6 @@ def _async_import_background_streaming(project_import, user):
                 overlap_cohort_percentage_changed=False,
                 tasks_number_changed=True,
                 recalculate_stats_counts=recalculate_stats_counts,
-                user=user,
             )
             logger.info('Tasks bulk_update finished (async streaming import)')
 
@@ -614,7 +611,6 @@ def async_reimport_background(reimport_id, organization_id, user, **kwargs):
                 overlap_cohort_percentage_changed=False,
                 tasks_number_changed=True,
                 recalculate_stats_counts=recalculate_stats_counts,
-                user=user,
             )
             logger.info('Tasks bulk_update finished (async reimport)')
 

label_studio/data_manager/actions/basic.py

@@ -41,9 +41,6 @@ def delete_tasks(project, queryset, **kwargs):
     count = len(tasks_ids)
     tasks_ids_list = [task['id'] for task in tasks_ids]
     project_count = project.tasks.count()
-
-    user = kwargs.get('request').user if 'request' in kwargs else None
-
     # unlink tasks from project
     queryset = Task.objects.filter(id__in=tasks_ids_list)
     queryset.update(project=None)
@@ -59,10 +56,7 @@ def delete_tasks(project, queryset, **kwargs):
         start_job_async_or_sync(async_project_summary_recalculation, tasks_ids_list, project.id)
 
     project.update_tasks_states(
-        maximum_annotations_changed=False,
-        overlap_cohort_percentage_changed=False,
-        tasks_number_changed=True,
-        user=user,
+        maximum_annotations_changed=False, overlap_cohort_percentage_changed=False, tasks_number_changed=True
     )
     # emit webhooks for project
     emit_webhooks_for_instance(project.organization, project, WebhookAction.TASKS_DELETED, tasks_ids)

label_studio/data_manager/actions/remove_duplicates.py

@@ -27,13 +27,11 @@ def remove_duplicates(project, queryset, **kwargs):
     Duplicated tasks will be deleted and all annotations will be moved to the first of the duplicated tasks.
     Storage links will be restored for the first task.
     """
-    user = kwargs.get('request').user if 'request' in kwargs else None
     start_job_async_or_sync(
         remove_duplicates_job,
         project,
         queryset,
         organization_id=project.organization_id,
-        user=user,
     )
     return {'response_code': 200}
 
@@ -52,7 +50,6 @@ def remove_duplicates_job(project, queryset, **kwargs):
         overlap_cohort_percentage_changed=True,
         tasks_number_changed=False,
         from_scratch=True,
-        user=kwargs.get('user', None),
     )
 
 

label_studio/io_storages/base_models.py

@@ -17,7 +17,6 @@
 import django_rq
 import rq
 import rq.exceptions
-from core.current_request import get_current_request
 from core.feature_flags import flag_set
 from core.redis import is_job_in_queue, is_job_on_worker, redis_connected, start_job_async_or_sync
 from core.utils.common import load_func
@@ -652,14 +651,8 @@ def _scan_and_create_links(self, link_class):
 
         backfill_fsm_states_for_tasks(self.id, tasks_created, link_class)
 
-        request = get_current_request()
-        user = request.user if request else None
-
         self.project.update_tasks_states(
-            maximum_annotations_changed=False,
-            overlap_cohort_percentage_changed=False,
-            tasks_number_changed=True,
-            user=user,
+            maximum_annotations_changed=False, overlap_cohort_percentage_changed=False, tasks_number_changed=True
         )
         if validation_errors:
             # sync is finished, set completed with errors status for storage info

label_studio/tasks/models.py

@@ -1313,14 +1313,10 @@ def update_all_task_states_after_deleting_task(sender, instance, **kwargs):
     but call only tasks_number_changed section
     """
     try:
-        request = get_current_request()
-        user = request.user if request else None
-        instance.project.update_tasks_counters_and_task_states(
-            instance.project.tasks.all(),
+        instance.project.update_tasks_states(
             maximum_annotations_changed=False,
             overlap_cohort_percentage_changed=False,
             tasks_number_changed=True,
-            user=user,
         )
     except Exception as exc:
         logger.error('Error in update_all_task_states_after_deleting_task: ' + str(exc))