Skip to content
Snippets Groups Projects

Remove thumbnail generation from process

Merged Theo Lesage requested to merge remove-thumbnail-gen into master
All threads resolved!
3 files
+ 13
12
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -258,9 +258,6 @@ class FilesProcessSerializer(serializers.ModelSerializer):
# Automatically set the creator on the process
creator = serializers.HiddenField(default=serializers.CurrentUserDefault())
# Always start the process with thumbnail generation enabled
generate_thumbnails = serializers.HiddenField(default=True)
default_error_messages = {
"mode_not_allowed": "This mode is not allowed when importing from files",
"files_required": "At least one file is required to start an import process",
@@ -287,7 +284,6 @@ class FilesProcessSerializer(serializers.ModelSerializer):
"element_type",
"farm_id",
"creator",
"generate_thumbnails",
)
def validate_mode(self, mode):
@@ -389,7 +385,6 @@ class StartProcessSerializer(serializers.Serializer):
validators=[MaxValueValidator(lambda: settings.MAX_CHUNKS)],
default=1,
)
thumbnails = serializers.BooleanField(default=False, source="generate_thumbnails")
farm = serializers.PrimaryKeyRelatedField(queryset=Farm.objects.all(), default=None, allow_null=True)
use_cache = serializers.BooleanField(default=False)
use_gpu = serializers.BooleanField(default=False, allow_null=True)
@@ -421,8 +416,6 @@ class StartProcessSerializer(serializers.Serializer):
elif not any(ds.dataset.corpus_id == self.instance.corpus.id for ds in self.instance.sets.all()):
errors["non_field_errors"].append("At least one of the process sets must be from the same corpus as the process.")
if validated_data.get("generate_thumbnails"):
errors["thumbnails"].append("Thumbnails generation is not supported on Dataset processes.")
if validated_data.get("worker_activity"):
errors["worker_activity"].append("Worker activities are not supported on Dataset processes.")
if validated_data.get("use_cache"):
@@ -481,14 +474,7 @@ class StartProcessSerializer(serializers.Serializer):
)
else:
if validated_data.get("worker_activity"):
errors["worker_activity"].append("The process must have workers attached to handle their activity.")
if validated_data.get("use_cache"):
errors["use_cache"].append("The process must have workers attached to use cached results.")
if validated_data.get("use_gpu"):
errors["use_gpu"].append("The process must have workers attached to use GPUs.")
if not validated_data.get("generate_thumbnails"):
errors["__all__"].append("The process must either use thumbnail generation or have worker runs.")
errors["__all__"].append("The process must have worker runs to be started.")
if errors:
raise ValidationError(errors)
Loading