Self hosted FLOSS fitness/workout, nutrition and weight tracker
Formatting
Roland Geidercd8f0e718833
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 68c9825d9..251df802f 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -21,8 +21,8 @@ from django.contrib.auth import authenticatefrom django.contrib.auth.models import Userfrom django.contrib.auth.password_validation import validate_passwordfrom django.http import HttpRequest-from lingua import LanguageDetectorBuilder# Third Party+from lingua import LanguageDetectorBuilderfrom rest_framework import serializersfrom rest_framework.fields import emptyfrom rest_framework.validators import UniqueValidator@@ -202,6 +202,7 @@ class LanguageCheckSerializer(serializers.Serializer):"""Serializer for language check"""+language = serializers.PrimaryKeyRelatedField(queryset=Language.objects.all(), required=False)language_code = serializers.CharField(required=False, min_length=2, max_length=2)input = serializers.CharField(min_length=10)@@ -215,41 +216,46 @@ class LanguageCheckSerializer(serializers.Serializer):language_code = data.get('language_code')if not language and not language_code:- raise serializers.ValidationError({- "language": "Either a language ID or a language code must be provided."- })+ raise serializers.ValidationError(+ {'language': 'Either a language ID or a language code must be provided.'}+ )if not language:try:language = Language.objects.get(short_name=language_code)except Language.DoesNotExist:- raise serializers.ValidationError({- "language": f'Language with code "{language_code}" does not exist.'- })+ raise serializers.ValidationError(+ {'language': f'Language with code "{language_code}" does not exist.'}+ )# Try to detect the language- detector = LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ detector = (+ LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ )input_str = data.get('input')detected_language = detector.detect_language_of(input_str)detected_language_code = detected_language.iso_code_639_1.name.lower()confidence_values = detector.compute_language_confidence_values(input_str)logger.debug(- f"Detected language: {detected_language_code}, "- f"confidence values: {confidence_values}, "- f"input: {input_str}"+ f'Detected language: {detected_language_code}, '+ f'confidence values: {confidence_values}, '+ f'input: {input_str}')if detected_language_code != language.short_name.lower():- raise serializers.ValidationError({'check': {- "result": False,- "detected_language": detected_language_code,- "message":- f'The detected language is "{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 more content '- f'or rephrasing your text, as language detection works better with longer or more '- f'complete sentences.'- }})+ raise serializers.ValidationError(+ {+ 'check': {+ 'result': False,+ 'detected_language': detected_language_code,+ 'message': f'The detected language is "{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 more content '+ f'or rephrasing your text, as language detection works better with longer or more '+ f'complete sentences.',+ }+ }+ )return super().validate(data)diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex c694554a1..4d6840231 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -36,7 +36,10 @@ from rest_framework import (status,viewsets,)-from rest_framework.decorators import action, api_view+from rest_framework.decorators import (+ action,+ api_view,+)from rest_framework.fields import (BooleanField,CharField,@@ -49,13 +52,14 @@ from rest_framework.response import Response# wgerfrom wger.core.api.serializers import (+ LanguageCheckSerializer,LanguageSerializer,LicenseSerializer,RepetitionUnitSerializer,RoutineWeightUnitSerializer,UserLoginSerializer,UserprofileSerializer,- UserRegistrationSerializer, LanguageCheckSerializer,+ UserRegistrationSerializer,)from wger.core.forms import UserLoginFormfrom wger.core.models import (diff --git a/wger/core/tests/api/test_language_check.py b/wger/core/tests/api/test_language_check.pyindex 0c11b3c5d..d1d915320 100644--- a/wger/core/tests/api/test_language_check.py+++ b/wger/core/tests/api/test_language_check.py@@ -26,8 +26,7 @@ class LanguageCheckApiTestCase(BaseTestCase, ApiBaseTestCase):Test that the language is correctly detected - using language code"""response = self.client.post(- self.url,- data={'language_code': 'de', 'input': 'Hallo Welt - das ist ein Test'}+ self.url, data={'language_code': 'de', 'input': 'Hallo Welt - das ist ein Test'}).json()self.assertEqual(response, {'result': True})self.assertFalse(response.get('check'))@@ -37,8 +36,7 @@ class LanguageCheckApiTestCase(BaseTestCase, ApiBaseTestCase):Test that the language is correctly detected - using language id"""response = self.client.post(- self.url,- data={'language': 1, 'input': 'Hallo Welt - das ist ein Test'}+ self.url, data={'language': 1, 'input': 'Hallo Welt - das ist ein Test'}).json()self.assertEqual(response, {'result': True})self.assertFalse(response.get('check'))@@ -48,8 +46,7 @@ class LanguageCheckApiTestCase(BaseTestCase, ApiBaseTestCase):Test that the wrong language results in an error"""response = self.client.post(- self.url,- data={'language_code': 'fr', 'input': 'a breed of hunting dog from Japan.'}+ self.url, data={'language_code': 'fr', 'input': 'a breed of hunting dog from Japan.'}).json()self.assertTrue(response['check'].get('detected_language'))@@ -58,8 +55,7 @@ class LanguageCheckApiTestCase(BaseTestCase, ApiBaseTestCase):Test that an unknown language returns an error"""response = self.client.post(- self.url,- data={'language_code': 'zz', 'input': 'a breed of hunting dog from Japan.'}+ self.url, data={'language_code': 'zz', 'input': 'a breed of hunting dog from Japan.'}).json()self.assertTrue(response.get('language'))@@ -68,7 +64,6 @@ class LanguageCheckApiTestCase(BaseTestCase, ApiBaseTestCase):Test that either a language ID or a language code must be provided"""response = self.client.post(- self.url,- data={'input': 'a breed of hunting dog from Japan.'}+ self.url, data={'input': 'a breed of hunting dog from Japan.'}).json()self.assertTrue(response.get('language'))diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex e7ba2f553..8755b31a2 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -17,12 +17,15 @@ from django.conf import settingsfrom django.core.cache import cachefrom django.db import transactionfrom django.db.models import Q-from lingua import LanguageDetectorBuilder# Third Party+from lingua import LanguageDetectorBuilderfrom rest_framework import serializers# wger-from wger.core.models import License, Language+from wger.core.models import (+ Language,+ License,+)from wger.exercises.models import (Alias,DeletionLog,@@ -214,33 +217,33 @@ class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):translation: Translation = kwargs.get('translation')if not translation:raise serializers.ValidationError(- "A translation object is required for creating a comment."+ 'A translation object is required for creating a comment.')# Validate the language of the description# -> This is done here instead of in the serializer's validate method# because the language is not available in the serializer's initial_data- detector = LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ detector = (+ LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ )language = translation.language# Try to detect the languagedetected_language = detector.detect_language_of(validated_data['comment'])detected_language_code = detected_language.iso_code_639_1.name.lower()if detected_language_code != language.short_name.lower():- raise serializers.ValidationError({- "language":- f'The detected language of the comment is "{detected_language.name.capitalize()}"'- f'({detected_language_code}), which does not match your selected language: '- f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '- f'this is incorrect, try adding more content or rephrasing your text, as '- f'language detection works better with longer or more complete sentences.'- })+ raise serializers.ValidationError(+ {+ 'language': f'The detected language of the comment is "{detected_language.name.capitalize()}"'+ f'({detected_language_code}), which does not match your selected language: '+ f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '+ f'this is incorrect, try adding more content or rephrasing your text, as '+ f'language detection works better with longer or more complete sentences.'+ }+ )# Create the comment with the parent translation- comment = ExerciseComment.objects.create(- translation=translation,- **validated_data- )+ comment = ExerciseComment.objects.create(translation=translation, **validated_data)return comment@@ -278,14 +281,11 @@ class ExerciseAliasSubmissionSerializer(serializers.ModelSerializer):translation = kwargs.get('translation')if not translation:raise serializers.ValidationError(- "A translation object is required for creating an alias."+ 'A translation object is required for creating an alias.')# Create the Alias with the parent translation- alias = Alias.objects.create(- translation=translation,- **validated_data- )+ alias = Alias.objects.create(translation=translation, **validated_data)return alias@@ -407,7 +407,9 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):Custom validator to ensure the detected language of the description corresponds with theprovided language."""- detector = LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ detector = (+ LanguageDetectorBuilder.from_all_languages().with_preloaded_language_models().build()+ )language = data.get('language')description = data.get('description')@@ -415,14 +417,15 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):detected_language = detector.detect_language_of(description)detected_language_code = detected_language.iso_code_639_1.name.lower()if detected_language_code != language.short_name.lower():- raise serializers.ValidationError({- "language":- f'The detected language of the description is "{detected_language.name.capitalize()}"'- f'({detected_language_code}), which does not match your selected language: '- f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '- f'this is incorrect, try adding more content or rephrasing your text, as '- f'language detection works better with longer or more complete sentences.'- })+ raise serializers.ValidationError(+ {+ 'language': f'The detected language of the description is "{detected_language.name.capitalize()}"'+ f'({detected_language_code}), which does not match your selected language: '+ f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '+ f'this is incorrect, try adding more content or rephrasing your text, as '+ f'language detection works better with longer or more complete sentences.'+ }+ )return super().validate(data)@@ -436,29 +439,20 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):exercise = kwargs.get('exercise')if not exercise:raise serializers.ValidationError(- "Translation object is required for creating an Alias"+ 'Translation object is required for creating an Alias')# Create the translation with the parent exercise- translation = Translation.objects.create(- exercise=exercise,- **validated_data- )+ translation = Translation.objects.create(exercise=exercise, **validated_data)# Create the individual aliasesfor alias_data in aliases_data:alias_serializer = self.fields['aliases'].child- alias_serializer.create(- validated_data=alias_data,- translation=translation- )+ alias_serializer.create(validated_data=alias_data, translation=translation)# Create the individual commentsfor comment_data in comments_data:comment_serializer = self.fields['comments'].child- comment_serializer.create(- validated_data=comment_data,- translation=translation- )+ comment_serializer.create(validated_data=comment_data, translation=translation)return translation@@ -577,6 +571,7 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):"""Exercise submission serializer"""+id = serializers.IntegerField(required=False, read_only=True)category = serializers.PrimaryKeyRelatedField(queryset=ExerciseCategory.objects.all())muscles = serializers.PrimaryKeyRelatedField(queryset=Muscle.objects.all(), many=True)@@ -606,7 +601,9 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):@transaction.atomicdef create(self, validated_data):+ # Standard Libraryfrom pprint import pprint+pprint(validated_data)translations_data = validated_data.pop('translations')@@ -624,9 +621,6 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):# Create the individual translationsfor translation_data in translations_data:translation_serializer = self.fields['translations'].child- translation_serializer.create(- validated_data=translation_data,- exercise=exercise- )+ translation_serializer.create(validated_data=translation_data, exercise=exercise)return exercisediff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 769eed9c2..9b441af90 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -56,12 +56,12 @@ from wger.exercises.api.serializers import (DeletionLogSerializer,EquipmentSerializer,ExerciseAliasSerializer,- ExerciseSerializer,- ExerciseSubmissionSerializer,ExerciseCategorySerializer,ExerciseCommentSerializer,ExerciseImageSerializer,ExerciseInfoSerializer,+ ExerciseSerializer,+ ExerciseSubmissionSerializer,ExerciseTranslationSerializer,ExerciseVariationSerializer,ExerciseVideoSerializer,diff --git a/wger/urls.py b/wger/urls.pyindex 55c46dd5f..11e1ea90a 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -289,11 +289,13 @@ urlpatterns += [# APIpath('api/v2/', include(router.urls)),path('api/v2/exercise/search/', exercises_api_views.search, name='exercise-search'),- path('api/v2/exercise/submission/', exercises_api_views.ExerciseSubmissionViewSet.as_view(),- name='exercise-submission', ),+ path(+ 'api/v2/exercise/submission/',+ exercises_api_views.ExerciseSubmissionViewSet.as_view(),+ name='exercise-submission',+ ),path('api/v2/ingredient/search/', nutrition_api_views.search, name='ingredient-search'),path('api/v2/check-language/', core_api_views.check_language, name='check-language'),-# The api user loginpath('api/v2/login/', core_api_views.UserAPILoginView.as_view({'post': 'post'}), name='api_user'