Self hosted FLOSS fitness/workout, nutrition and weight tracker
ruff and isort commands
Bonicki Wojciech70903b383822
diff --git a/wger/exercises/cache.py b/wger/exercises/cache.pyindex deda67bd3..cd1fc70a7 100644--- a/wger/exercises/cache.py+++ b/wger/exercises/cache.py@@ -12,24 +12,26 @@## You should have received a copy of the GNU Affero General Public License-from typing import Callable# Standard Library-from wger.exercises.models import (- Exercise,-)-from wger.utils.cache import reset_exercise_api_cache+from typing import Callable++# wgerfrom wger.exercises.api.serializers import ExerciseInfoSerializer+from wger.exercises.models import Exercise+from wger.utils.cache import reset_exercise_api_cache-def cache_exercise(exercise: Exercise, force=False, print_fn: Callable=print, style_fn: Callable=lambda x: x):+def cache_exercise(+ exercise: Exercise, force=False, print_fn: Callable = print, style_fn: Callable = lambda x: x+):"""Caches a provided exercise."""if force:- print_fn(f"Force updating cache for exercise base {exercise.uuid}")+ print_fn(f'Force updating cache for exercise base {exercise.uuid}')reset_exercise_api_cache(exercise.uuid)else:- print_fn(f"Warming cache for exercise base {exercise.uuid}")+ print_fn(f'Warming cache for exercise base {exercise.uuid}')serializer = ExerciseInfoSerializer(exercise)serializer.data@@ -38,9 +40,9 @@ def cache_exercise(exercise: Exercise, force=False, print_fn: Callable=print, stdef cache_api_exercises(print_fn: Callable,force: bool,- style_fn: Callable=lambda x: x,+ style_fn: Callable = lambda x: x,):- print_fn("*** Caching API exercises ***")+ print_fn('*** Caching API exercises ***')for exercise in Exercise.with_translations.all():cache_exercise(exercise, force, print_fn, style_fn)- print_fn(style_fn("Exercises cached!\n"))+ print_fn(style_fn('Exercises cached!\n'))diff --git a/wger/exercises/management/commands/warmup-exercise-api-cache.py b/wger/exercises/management/commands/warmup-exercise-api-cache.pyindex a73200cb8..fd5a7d96b 100644--- a/wger/exercises/management/commands/warmup-exercise-api-cache.py+++ b/wger/exercises/management/commands/warmup-exercise-api-cache.py@@ -16,8 +16,9 @@from django.core.management.base import BaseCommand# wger-from wger.exercises.models import Exercisefrom wger.exercises.cache import cache_exercise+from wger.exercises.models import Exercise+class Command(BaseCommand):"""@@ -51,4 +52,3 @@ class Command(BaseCommand):for exercise in Exercise.with_translations.all():cache_exercise(exercise, force, self.stdout.write)-diff --git a/wger/exercises/tasks.py b/wger/exercises/tasks.pyindex 6113f1668..2659bc9f1 100644--- a/wger/exercises/tasks.py+++ b/wger/exercises/tasks.py@@ -24,6 +24,7 @@ from celery.schedules import crontab# wgerfrom wger.celery_configuration import app+from wger.exercises.cache import cache_api_exercisesfrom wger.exercises.sync import (download_exercise_images,download_exercise_videos,@@ -35,7 +36,6 @@ from wger.exercises.sync import (sync_licenses,sync_muscles,)-from wger.exercises.cache import cache_api_exerciseslogger = logging.getLogger(__name__)@@ -76,13 +76,13 @@ def cache_api_exercises_task():"""Fetches all exercises from database and caches them."""- force = settings.WGER_SETTINGS["CACHE_API_EXERCISES_CELERY_FORCE_UPDATE"]+ force = settings.WGER_SETTINGS['CACHE_API_EXERCISES_CELERY_FORCE_UPDATE']cache_api_exercises(logger.info, force)@app.on_after_finalize.connectdef setup_periodic_tasks(sender, **kwargs):- if settings.WGER_SETTINGS["SYNC_EXERCISES_CELERY"]:+ if settings.WGER_SETTINGS['SYNC_EXERCISES_CELERY']:sender.add_periodic_task(crontab(hour=str(random.randint(0, 23)),@@ -90,10 +90,10 @@ def setup_periodic_tasks(sender, **kwargs):day_of_week=str(random.randint(0, 6)),),sync_exercises_task.s(),- name="Sync exercises",+ name='Sync exercises',)- if settings.WGER_SETTINGS["SYNC_EXERCISE_IMAGES_CELERY"]:+ if settings.WGER_SETTINGS['SYNC_EXERCISE_IMAGES_CELERY']:sender.add_periodic_task(crontab(hour=str(random.randint(0, 23)),@@ -101,10 +101,10 @@ def setup_periodic_tasks(sender, **kwargs):day_of_week=str(random.randint(0, 6)),),sync_images_task.s(),- name="Sync exercise images",+ name='Sync exercise images',)- if settings.WGER_SETTINGS["SYNC_EXERCISE_VIDEOS_CELERY"]:+ if settings.WGER_SETTINGS['SYNC_EXERCISE_VIDEOS_CELERY']:sender.add_periodic_task(crontab(hour=str(random.randint(0, 23)),@@ -112,10 +112,10 @@ def setup_periodic_tasks(sender, **kwargs):day_of_week=str(random.randint(0, 6)),),sync_videos_task.s(),- name="Sync exercise videos",+ name='Sync exercise videos',)- if settings.WGER_SETTINGS["CACHE_API_EXERCISES_CELERY"]:+ if settings.WGER_SETTINGS['CACHE_API_EXERCISES_CELERY']:sender.add_periodic_task(crontab(hour=str(random.randint(0, 23)),@@ -123,5 +123,5 @@ def setup_periodic_tasks(sender, **kwargs):day_of_week=str(random.randint(0, 6)),),cache_api_exercises_task.s(),- name="Cache API exercises",+ name='Cache API exercises',)diff --git a/wger/exercises/tests/test_cache.py b/wger/exercises/tests/test_cache.pyindex 3ff8fd89c..7903a6ae9 100644--- a/wger/exercises/tests/test_cache.py+++ b/wger/exercises/tests/test_cache.py@@ -1,11 +1,19 @@-from unittest.mock import patch, MagicMock+# Standard Library+from unittest.mock import (+ MagicMock,+ patch,+)++# wgerfrom wger.core.tests.base_testcase import WgerTestCase+from wger.exercises.cache import (+ cache_api_exercises,+ cache_exercise,+)from wger.exercises.models import Exercise-from wger.exercises.cache import cache_exercise, cache_api_exercisesclass TestCacheExercise(WgerTestCase):-@patch('wger.exercises.cache.reset_exercise_api_cache')@patch('wger.exercises.cache.ExerciseInfoSerializer')def test_cache_exercise_force_true(self, mock_serializer, mock_reset_cache):@@ -20,7 +28,7 @@ class TestCacheExercise(WgerTestCase):mock_reset_cache.assert_called_once_with(exercise.uuid)mock_serializer.assert_called_once_with(exercise)- self.assertTrue(any("Force updating cache" in msg for msg in output))+ self.assertTrue(any('Force updating cache' in msg for msg in output))@patch('wger.exercises.cache.reset_exercise_api_cache')@patch('wger.exercises.cache.ExerciseInfoSerializer')@@ -36,15 +44,17 @@ class TestCacheExercise(WgerTestCase):mock_reset_cache.assert_not_called()mock_serializer.assert_called_once_with(exercise)- self.assertTrue(any("Warming cache" in msg for msg in output))+ self.assertTrue(any('Warming cache' in msg for msg in output))@patch('wger.exercises.cache.cache_exercise')def test_cache_api_exercises_calls_all(self, mock_cache_exercise):output = []called_exercises = []+def fake_cache(exercise, force, print_fn, style_fn):called_exercises.append(exercise)+mock_cache_exercise.side_effect = fake_cachecache_api_exercises(print_fn=output.append, force=True)- self.assertTrue(len(called_exercises) > 0)\ No newline at end of file+ self.assertTrue(len(called_exercises) > 0)