Skip to content

Commit d860a8e

Browse files
committed
Update method name
1 parent 50ee1e8 commit d860a8e

8 files changed

Lines changed: 12 additions & 13 deletions

File tree

app/grandchallenge/algorithms/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ def remove_civ(self, *, civ):
12551255
def get_civ_for_interface(self, interface):
12561256
return self.inputs.get(interface=interface)
12571257

1258-
def validate_values_and_execute_linked_task(
1258+
def validate_civ_data_objects_and_execute_linked_task(
12591259
self, *, civ_data_objects, user, linked_task=None
12601260
):
12611261
from grandchallenge.algorithms.tasks import (
@@ -1266,7 +1266,7 @@ def validate_values_and_execute_linked_task(
12661266
kwargs={"job_pk": self.pk}, immutable=True
12671267
)
12681268

1269-
return super().validate_values_and_execute_linked_task(
1269+
return super().validate_civ_data_objects_and_execute_linked_task(
12701270
civ_data_objects=civ_data_objects,
12711271
user=user,
12721272
linked_task=linked_task,

app/grandchallenge/algorithms/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def create(self, validated_data):
267267
)
268268

269269
try:
270-
job.validate_values_and_execute_linked_task(
270+
job.validate_civ_data_objects_and_execute_linked_task(
271271
civ_data_objects=self.inputs, user=validated_data["creator"]
272272
)
273273
except CIVNotEditableException as e:

app/grandchallenge/algorithms/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ def form_valid(self, form):
621621
)
622622

623623
try:
624-
self.object.validate_values_and_execute_linked_task(
624+
self.object.validate_civ_data_objects_and_execute_linked_task(
625625
civ_data_objects=inputs, user=self.object.creator
626626
)
627627
except CIVNotEditableException as e:

app/grandchallenge/components/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def process_object_data(self):
273273
)
274274

275275
try:
276-
self.instance.validate_values_and_execute_linked_task(
276+
self.instance.validate_civ_data_objects_and_execute_linked_task(
277277
civ_data_objects=civ_data_objects, user=self.user
278278
)
279279
except CIVNotEditableException as e:

app/grandchallenge/components/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ def remove_civ(self, *, civ):
23912391
if not self.is_editable:
23922392
raise CIVNotEditableException(f"{self} is not editable.")
23932393

2394-
def validate_values_and_execute_linked_task(
2394+
def validate_civ_data_objects_and_execute_linked_task(
23952395
self, *, civ_data_objects, user, linked_task=None
23962396
):
23972397
for civ_data in civ_data_objects:

app/grandchallenge/components/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def update(self, instance, validated_data):
253253
)
254254
)
255255
try:
256-
instance.validate_values_and_execute_linked_task(
256+
instance.validate_civ_data_objects_and_execute_linked_task(
257257
civ_data_objects=civ_data_objects, user=request.user
258258
)
259259
except CIVNotEditableException as e:

app/grandchallenge/evaluation/models.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,9 +1680,8 @@ def create_evaluation(self, *, additional_inputs):
16801680
)
16811681

16821682
if additional_inputs:
1683-
evaluation.validate_values_and_execute_linked_task(
1684-
civ_data_objects=additional_inputs,
1685-
user=self.creator,
1683+
evaluation.validate_civ_data_objects_and_execute_linked_task(
1684+
civ_data_objects=additional_inputs, user=self.creator
16861685
)
16871686
else:
16881687
e = check_prerequisites_for_evaluation_execution.signature(
@@ -2106,7 +2105,7 @@ def remove_civ(self, *, civ):
21062105
def get_civ_for_interface(self, interface):
21072106
return self.inputs.get(interface=interface)
21082107

2109-
def validate_values_and_execute_linked_task(
2108+
def validate_civ_data_objects_and_execute_linked_task(
21102109
self, *, civ_data_objects, user, linked_task=None
21112110
):
21122111
from grandchallenge.evaluation.tasks import (
@@ -2119,7 +2118,7 @@ def validate_values_and_execute_linked_task(
21192118
},
21202119
immutable=True,
21212120
)
2122-
return super().validate_values_and_execute_linked_task(
2121+
return super().validate_civ_data_objects_and_execute_linked_task(
21232122
civ_data_objects=civ_data_objects,
21242123
user=user,
21252124
linked_task=linked_task,

app/tests/components_tests/test_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@ def test_component_interface_custom_queue(kind, expected_kwargs, mocker):
18261826
mock_task = mocker.patch(
18271827
"grandchallenge.components.tasks.add_file_to_object"
18281828
)
1829-
ai.validate_values_and_execute_linked_task(
1829+
ai.validate_civ_data_objects_and_execute_linked_task(
18301830
civ_data_objects=[
18311831
CIVData(
18321832
interface_slug=ci.slug,

0 commit comments

Comments
 (0)