Rename variables as well

Author: koopmant

app/grandchallenge/algorithms/models.py

@@ -1256,7 +1256,7 @@ def get_civ_for_interface(self, interface):
         return self.inputs.get(interface=interface)
 
     def validate_values_and_execute_linked_task(
-        self, *, values, user, linked_task=None
+        self, *, civ_data_objects, user, linked_task=None
     ):
         from grandchallenge.algorithms.tasks import (
             execute_algorithm_job_for_inputs,
@@ -1267,7 +1267,9 @@ def validate_values_and_execute_linked_task(
         )
 
         return super().validate_values_and_execute_linked_task(
-            values=values, user=user, linked_task=linked_task
+            civ_data_objects=civ_data_objects,
+            user=user,
+            linked_task=linked_task,
         )
 
     @property

app/grandchallenge/algorithms/serializers.py

@@ -268,7 +268,7 @@ def create(self, validated_data):
 
         try:
             job.validate_values_and_execute_linked_task(
-                values=self.inputs, user=validated_data["creator"]
+                civ_data_objects=self.inputs, user=validated_data["creator"]
             )
         except CIVNotEditableException as e:
             if job.status == job.CANCELLED:

app/grandchallenge/algorithms/views.py

@@ -622,7 +622,7 @@ def form_valid(self, form):
 
         try:
             self.object.validate_values_and_execute_linked_task(
-                values=inputs, user=self.object.creator
+                civ_data_objects=inputs, user=self.object.creator
             )
         except CIVNotEditableException as e:
             if self.object.status == self.object.CANCELLED:

app/grandchallenge/components/forms.py

@@ -262,10 +262,10 @@ def parse_slug(*, slug):
         return interface_slug
 
     def process_object_data(self):
-        civs = []
+        civ_data_objects = []
         for key, value in self.cleaned_data.items():
             if key.startswith(INTERFACE_FORM_FIELD_PREFIX):
-                civs.append(
+                civ_data_objects.append(
                     CIVData(
                         interface_slug=key[len(INTERFACE_FORM_FIELD_PREFIX) :],
                         value=value,
@@ -274,8 +274,7 @@ def process_object_data(self):
 
         try:
             self.instance.validate_values_and_execute_linked_task(
-                values=civs,
-                user=self.user,
+                civ_data_objects=civ_data_objects, user=self.user
             )
         except CIVNotEditableException as e:
             error_handler = self.instance.get_error_handler()

app/grandchallenge/components/models.py

@@ -2392,9 +2392,9 @@ def remove_civ(self, *, civ):
             raise CIVNotEditableException(f"{self} is not editable.")
 
     def validate_values_and_execute_linked_task(
-        self, *, values, user, linked_task=None
+        self, *, civ_data_objects, user, linked_task=None
     ):
-        for civ_data in values:
+        for civ_data in civ_data_objects:
             self.create_civ(
                 civ_data=civ_data,
                 user=user,

app/grandchallenge/components/serializers.py

@@ -238,24 +238,23 @@ def update(self, instance, validated_data):
 
         request = self.context["request"]
 
-        civs = []
+        civ_data_objects = []
 
         for value in values:
             interface = value["interface"]
             upload_session = value.get("upload_session", None)
             user_upload = value.get("user_upload", None)
             image = value.get("image", None)
             value = value.get("value", None)
-            civs.append(
+            civ_data_objects.append(
                 CIVData(
                     interface_slug=interface.slug,
                     value=upload_session or user_upload or image or value,
                 )
             )
         try:
             instance.validate_values_and_execute_linked_task(
-                values=civs,
-                user=request.user,
+                civ_data_objects=civ_data_objects, user=request.user
             )
         except CIVNotEditableException as e:
             error_handler = instance.get_error_handler()

app/grandchallenge/evaluation/models.py

@@ -1681,7 +1681,7 @@ def create_evaluation(self, *, additional_inputs):
 
         if additional_inputs:
             evaluation.validate_values_and_execute_linked_task(
-                values=additional_inputs,
+                civ_data_objects=additional_inputs,
                 user=self.creator,
             )
         else:
@@ -2107,7 +2107,7 @@ def get_civ_for_interface(self, interface):
         return self.inputs.get(interface=interface)
 
     def validate_values_and_execute_linked_task(
-        self, *, values, user, linked_task=None
+        self, *, civ_data_objects, user, linked_task=None
     ):
         from grandchallenge.evaluation.tasks import (
             check_prerequisites_for_evaluation_execution,
@@ -2120,7 +2120,9 @@ def validate_values_and_execute_linked_task(
             immutable=True,
         )
         return super().validate_values_and_execute_linked_task(
-            values=values, user=user, linked_task=linked_task
+            civ_data_objects=civ_data_objects,
+            user=user,
+            linked_task=linked_task,
         )
 
     @property

app/tests/components_tests/test_models.py

@@ -1827,7 +1827,7 @@ def test_component_interface_custom_queue(kind, expected_kwargs, mocker):
         "grandchallenge.components.tasks.add_file_to_object"
     )
     ai.validate_values_and_execute_linked_task(
-        values=[
+        civ_data_objects=[
             CIVData(
                 interface_slug=ci.slug,
                 value=UserUploadFactory(creator=user),