Update backend dependencies

treiher · Apr 13, 2024 · 06c5357 · 06c5357
1 parent e139800
commit 06c5357
Show file tree

Hide file tree

Showing 12 changed files with 499 additions and 472 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -92,6 +92,9 @@ exclude = '''
 
 [tool.ruff]
 target-version = "py39"
+line-length = 100
+
+[tool.ruff.lint]
 select = [
     "F",    # pyflakes
     "E",    # pycodestyle
@@ -176,12 +179,11 @@ ignore = [
     "PLC1901", # compare-to-empty-string
     "PLR2004", # magic-value-comparison
 ]
-line-length = 100
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 combine-as-imports = true
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-args = 6
 max-branches = 12
 max-returns = 10

diff --git a/valens/api.py b/valens/api.py
@@ -98,9 +98,11 @@ def model_to_dict(
 
 def to_routine_parts(json: list[dict[str, Any]]) -> list[RoutinePart]:  # type: ignore[misc]
     return [
-        to_routine_section(part, position)
-        if "rounds" in part
-        else to_routine_activity(part, position)
+        (
+            to_routine_section(part, position)
+            if "rounds" in part
+            else to_routine_activity(part, position)
+        )
         for position, part in enumerate(json, start=1)
     ]
 
@@ -133,24 +135,26 @@ def to_routine_activity(  # type: ignore[misc]
 
 def to_workout_elements(json: list[dict[str, Any]]) -> list[WorkoutElement]:  # type: ignore[misc]
     return [
-        WorkoutSet(
-            position=position,
-            exercise_id=element["exercise_id"],
-            reps=element["reps"],
-            time=element["time"],
-            weight=element["weight"],
-            rpe=element["rpe"],
-            target_reps=element["target_reps"],
-            target_time=element["target_time"],
-            target_weight=element["target_weight"],
-            target_rpe=element["target_rpe"],
-            automatic=element["automatic"],
-        )
-        if "exercise_id" in element
-        else WorkoutRest(
-            position=position,
-            target_time=element["target_time"],
-            automatic=element["automatic"],
+        (
+            WorkoutSet(
+                position=position,
+                exercise_id=element["exercise_id"],
+                reps=element["reps"],
+                time=element["time"],
+                weight=element["weight"],
+                rpe=element["rpe"],
+                target_reps=element["target_reps"],
+                target_time=element["target_time"],
+                target_weight=element["target_weight"],
+                target_rpe=element["target_rpe"],
+                automatic=element["automatic"],
+            )
+            if "exercise_id" in element
+            else WorkoutRest(
+                position=position,
+                target_time=element["target_time"],
+                automatic=element["automatic"],
+            )
         )
         for position, element in enumerate(json, start=1)
     ]

diff --git a/valens/assets.py b/valens/assets.py
@@ -5,7 +5,7 @@
 
 
 def public_url() -> str:
-    return current_app.config["PUBLIC_URL"] if "PUBLIC_URL" in current_app.config else ""
+    return current_app.config.get("PUBLIC_URL", "")
 
 
 @bp.route("/")

diff --git a/valens/demo.py b/valens/demo.py
@@ -208,22 +208,30 @@ def _workouts(user_id: int = 1) -> tuple[list[Exercise], list[Routine], list[Wor
                         for reps, time, weight, rpe in (
                             [
                                 (
-                                    5 + week + random.randint(0, 1)
-                                    if exercise_names[routine_activity.exercise.name].reps
-                                    else None,
                                     (
-                                        random.randint(3, 4)
+                                        5 + week + random.randint(0, 1)
                                         if exercise_names[routine_activity.exercise.name].reps
-                                        else 10 + 5 * week + 5 * random.randint(0, 2)
-                                    )
-                                    if exercise_names[routine_activity.exercise.name].time
-                                    else None,
-                                    5 + (week + random.randint(0, 1)) * 0.5
-                                    if exercise_names[routine_activity.exercise.name].weight
-                                    else None,
-                                    min(7 + (week % 4) + (random.randint(0, 1) * 0.5), 10)
-                                    if exercise_names[routine_activity.exercise.name].rpe
-                                    else None,
+                                        else None
+                                    ),
+                                    (
+                                        (
+                                            random.randint(3, 4)
+                                            if exercise_names[routine_activity.exercise.name].reps
+                                            else 10 + 5 * week + 5 * random.randint(0, 2)
+                                        )
+                                        if exercise_names[routine_activity.exercise.name].time
+                                        else None
+                                    ),
+                                    (
+                                        5 + (week + random.randint(0, 1)) * 0.5
+                                        if exercise_names[routine_activity.exercise.name].weight
+                                        else None
+                                    ),
+                                    (
+                                        min(7 + (week % 4) + (random.randint(0, 1) * 0.5), 10)
+                                        if exercise_names[routine_activity.exercise.name].rpe
+                                        else None
+                                    ),
                                 )
                             ]
                         )

diff --git a/valens/migrations/versions/06f82ead211b_merge_duration_and_tempo_in_routine_activity.py b/valens/migrations/versions/06f82ead211b_merge_duration_and_tempo_in_routine_activity.py
@@ -6,6 +6,7 @@
 Create Date: 2023-04-02
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

diff --git a/valens/migrations/versions/22f3ddb25741_add_reps_weight_and_rpe_to_routine_activity.py b/valens/migrations/versions/22f3ddb25741_add_reps_weight_and_rpe_to_routine_activity.py
@@ -6,6 +6,7 @@
 Create Date: 2023-04-01
 
 """
+
 from typing import Union
 
 import sqlalchemy as sa

diff --git a/valens/migrations/versions/3e7317eb4efa_add_foreign_key_on_delete_cascade.py b/valens/migrations/versions/3e7317eb4efa_add_foreign_key_on_delete_cascade.py
@@ -6,6 +6,7 @@
 Create Date: 2021-07-18
 
 """
+
 from typing import Any
 
 from alembic import op

diff --git a/valens/migrations/versions/4b6051594962_add_type_checking.py b/valens/migrations/versions/4b6051594962_add_type_checking.py
@@ -6,6 +6,7 @@
 Create Date: 2022-01-22
 
 """
+
 from alembic import op
 
 revision = "4b6051594962"

diff --git a/valens/migrations/versions/4cacd61cb0c5_add_routine_id_to_workout.py b/valens/migrations/versions/4cacd61cb0c5_add_routine_id_to_workout.py
@@ -6,6 +6,7 @@
 Create Date: 2021-07-03 21:19:40.634728
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

diff --git a/valens/migrations/versions/8a0dc258bf2a_extend_workouts.py b/valens/migrations/versions/8a0dc258bf2a_extend_workouts.py
@@ -6,6 +6,7 @@
 Create Date: 2023-02-16
 
 """
+
 from typing import Union
 
 import sqlalchemy as sa

diff --git a/valens/migrations/versions/b9f4e42c7135_add_routine_sections.py b/valens/migrations/versions/b9f4e42c7135_add_routine_sections.py
@@ -6,6 +6,7 @@
 Create Date: 2022-11-13
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy import Boolean, Integer, String
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     Create Date: 2023-04-02
     """
     import sqlalchemy as sa
     from alembic import op
@@ Expand Down @@