Self hosted FLOSS fitness/workout, nutrition and weight tracker
Handle case where no language could be detected
Roland Geiderd96aa9efb65d
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 0ffa73377..a53f66824 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -270,14 +270,23 @@ class LanguageCheckSerializer(serializers.Serializer):)# Try to detect the language- detector = (- LanguageDetectorBuilder.from_all_languages()- .with_preloaded_language_models()- .build()- )+ detector = LanguageDetectorBuilder.from_all_languages().build()input_str = data.get('input')detected_language = detector.detect_language_of(input_str)+ if detected_language is None:+ raise serializers.ValidationError(+ {+ 'check': {+ 'result': False,+ 'detected_language': None,+ 'message': 'Could not detect the language of the input. Try '+ 'adding more content or rephrasing your text, language '+ 'detection works better with longer or more complete sentences.',+ }+ }+ )+detected_language_code = detected_language.iso_code_639_1.name.lower()confidence_values = detector.compute_language_confidence_values(input_str)logger.debug(diff --git a/wger/exercises/api/validators.py b/wger/exercises/api/validators.pyindex 9a97f9c2c..2bb5da6ef 100644--- a/wger/exercises/api/validators.py+++ b/wger/exercises/api/validators.py@@ -30,13 +30,17 @@ def validate_language_matches(text: str, language: Language, source_label: str)error message to point the caller at the offending field."""- detector = (- LanguageDetectorBuilder.from_all_languages()- .with_preloaded_language_models()- .build()- )-+ detector = LanguageDetectorBuilder.from_all_languages().build()detected_language = detector.detect_language_of(text)+ if detected_language is None:+ raise serializers.ValidationError(+ {+ 'language': f'Could not detect the language of the {source_label}. '+ f'Try adding more content or rephrasing your text, language '+ f'detection works better with longer or more complete sentences.'+ }+ )+detected_language_code = detected_language.iso_code_639_1.name.lower()if detected_language_code != language.short_name.lower():raise serializers.ValidationError(@@ -45,7 +49,7 @@ def validate_language_matches(text: str, language: Language, source_label: str)f'"{detected_language.name.capitalize()}" ({detected_language_code}), 'f'which does not match your selected language: "{language.full_name.capitalize()}" 'f'({language.short_name}). If you believe this is incorrect, try adding '- f'more content or rephrasing your text, as language detection works'+ f'more content or rephrasing your text, as language detection works 'f'better with longer or more complete sentences.'})diff --git a/wger/exercises/views/history.py b/wger/exercises/views/history.pyindex 764e97887..8c79f4829 100644--- a/wger/exercises/views/history.py+++ b/wger/exercises/views/history.py@@ -96,7 +96,6 @@ def _content_type_map():class ActionHistoryFilter(django_filters.FilterSet):-MODEL_CHOICES = [(key, key.capitalize()) for key, *_ in TRACKED_MODELS]VERB_CHOICES = [(v.value, v.value.capitalize()) for v in StreamVerbs]