Add boto3 dependency and update exercise/machine assets
- Added boto3 as a dependency in pyproject.toml and uv.lock. - Introduced multiple new exercise images in various formats (jpg, webp, avif, png). - Added new machine images to enhance the workout assets library.
This commit is contained in:
Artem Kashaev
@@ -112,12 +112,45 @@ async def logic_request(
|
||||
@app.post("/media/images", response_model=MediaUploadRead, status_code=status.HTTP_201_CREATED)
|
||||
async def upload_image(
|
||||
user: CurrentUser,
|
||||
entity_type: Annotated[str, Query(pattern="^(equipment|exercise)$")],
|
||||
entity_type: Annotated[str, Query(pattern="^(equipment|exercise|machine)$")],
|
||||
file: Annotated[UploadFile, File()],
|
||||
) -> dict[str, str]:
|
||||
if entity_type == "equipment":
|
||||
entity_type = "machine"
|
||||
return await upload_catalog_image(file, user.id, entity_type)
|
||||
|
||||
|
||||
@app.get("/catalog/activity-sources")
|
||||
async def list_activity_sources(
|
||||
user: CurrentUser,
|
||||
search: str | None = None,
|
||||
kind: Annotated[str | None, Query(pattern="^(exercise|machine|equipment)$")] = None,
|
||||
category: str | None = None,
|
||||
scope: Annotated[str, Query(pattern="^(all|builtin|mine)$")] = "all",
|
||||
) -> Any:
|
||||
params = {
|
||||
key: value
|
||||
for key, value in {
|
||||
"search": search,
|
||||
"kind": kind,
|
||||
"category": category,
|
||||
"scope": scope,
|
||||
}.items()
|
||||
if value not in (None, "")
|
||||
}
|
||||
return await logic_request(
|
||||
"GET",
|
||||
"/internal/catalog/activity-sources",
|
||||
user,
|
||||
params=params,
|
||||
)
|
||||
|
||||
|
||||
@app.post("/catalog/activity-sources", status_code=status.HTTP_201_CREATED)
|
||||
async def create_activity_source(payload: dict[str, Any], user: CurrentUser) -> Any:
|
||||
return await logic_request("POST", "/internal/catalog/activity-sources", user, json=payload)
|
||||
|
||||
|
||||
@app.get("/catalog/equipment")
|
||||
async def list_equipment(user: CurrentUser, search: str | None = None) -> Any:
|
||||
return await logic_request(
|
||||
@@ -220,7 +253,7 @@ async def remove_workout_set(item_id: str, set_id: str, user: CurrentUser) -> No
|
||||
@app.get("/analytics/progression")
|
||||
async def progression(
|
||||
user: CurrentUser,
|
||||
kind: Annotated[str, Query(pattern="^(exercise|equipment)$")] = "exercise",
|
||||
kind: Annotated[str, Query(pattern="^(exercise|machine|equipment)$")] = "exercise",
|
||||
entity_id: str | None = None,
|
||||
) -> Any:
|
||||
p: dict[str, Any] = {"kind": kind}
|
||||
|
||||
@@ -10,6 +10,7 @@ ALLOWED_CONTENT_TYPES = {
|
||||
"image/jpeg": ".jpg",
|
||||
"image/png": ".png",
|
||||
"image/webp": ".webp",
|
||||
"image/avif": ".avif",
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
"""activity sources catalog
|
||||
|
||||
Revision ID: 0003_activity_sources
|
||||
Revises: 0002_active_workout_flow
|
||||
Create Date: 2026-05-29 14:50:00.000000
|
||||
"""
|
||||
|
||||
from collections.abc import Sequence
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
revision: str = "0003_activity_sources"
|
||||
down_revision: str | None = "0002_active_workout_flow"
|
||||
branch_labels: str | Sequence[str] | None = None
|
||||
depends_on: str | Sequence[str] | None = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.create_table(
|
||||
"logic_activity_sources",
|
||||
sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
|
||||
sa.Column("owner_user_id", postgresql.UUID(as_uuid=True), nullable=True),
|
||||
sa.Column("slug", sa.String(length=180), nullable=False),
|
||||
sa.Column("kind", sa.String(length=20), nullable=False),
|
||||
sa.Column("title", sa.String(length=160), nullable=False),
|
||||
sa.Column("description", sa.Text(), nullable=True),
|
||||
sa.Column("category", sa.String(length=32), nullable=False),
|
||||
sa.Column("equipment", sa.String(length=32), nullable=False),
|
||||
sa.Column("measurement_type", sa.String(length=32), nullable=False),
|
||||
sa.Column("difficulty", sa.String(length=20), nullable=False),
|
||||
sa.Column("image_s3_url", sa.Text(), nullable=True),
|
||||
sa.Column("image_s3_key", sa.Text(), nullable=True),
|
||||
sa.Column("is_builtin", sa.Boolean(), nullable=False),
|
||||
sa.Column("default_calories_per_minute", sa.Numeric(8, 2), nullable=True),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.CheckConstraint("kind IN ('exercise', 'machine')", name="ck_activity_source_kind"),
|
||||
sa.CheckConstraint(
|
||||
"category IN ('chest', 'back', 'legs', 'shoulders', 'biceps', 'triceps', "
|
||||
"'core', 'cardio', 'full_body', 'other')",
|
||||
name="ck_activity_source_category",
|
||||
),
|
||||
sa.CheckConstraint(
|
||||
"equipment IN ('barbell', 'dumbbell', 'machine', 'cable', 'bodyweight', "
|
||||
"'kettlebell', 'cardio_machine', 'other')",
|
||||
name="ck_activity_source_equipment",
|
||||
),
|
||||
sa.CheckConstraint(
|
||||
"measurement_type IN ('weight_reps', 'reps_only', 'duration', "
|
||||
"'distance_duration', 'duration_calories')",
|
||||
name="ck_activity_source_measurement_type",
|
||||
),
|
||||
sa.CheckConstraint(
|
||||
"difficulty IN ('beginner', 'intermediate', 'advanced')",
|
||||
name="ck_activity_source_difficulty",
|
||||
),
|
||||
)
|
||||
op.create_index("ix_logic_activity_sources_category", "logic_activity_sources", ["category"])
|
||||
op.create_index("ix_logic_activity_sources_equipment", "logic_activity_sources", ["equipment"])
|
||||
op.create_index(
|
||||
"ix_logic_activity_sources_is_builtin", "logic_activity_sources", ["is_builtin"]
|
||||
)
|
||||
op.create_index("ix_logic_activity_sources_kind", "logic_activity_sources", ["kind"])
|
||||
op.create_index(
|
||||
"ix_logic_activity_sources_owner_user_id",
|
||||
"logic_activity_sources",
|
||||
["owner_user_id"],
|
||||
)
|
||||
op.create_index(
|
||||
"ix_logic_activity_sources_slug", "logic_activity_sources", ["slug"], unique=True
|
||||
)
|
||||
op.create_index("ix_logic_activity_sources_title", "logic_activity_sources", ["title"])
|
||||
|
||||
op.add_column(
|
||||
"logic_workout_items",
|
||||
sa.Column("activity_source_id", postgresql.UUID(as_uuid=True), nullable=True),
|
||||
)
|
||||
op.create_foreign_key(
|
||||
"fk_logic_workout_items_activity_source_id",
|
||||
"logic_workout_items",
|
||||
"logic_activity_sources",
|
||||
["activity_source_id"],
|
||||
["id"],
|
||||
)
|
||||
op.add_column(
|
||||
"logic_workout_items",
|
||||
sa.Column(
|
||||
"measurement_type_snapshot",
|
||||
sa.String(length=32),
|
||||
nullable=False,
|
||||
server_default="weight_reps",
|
||||
),
|
||||
)
|
||||
op.add_column(
|
||||
"logic_workout_items",
|
||||
sa.Column(
|
||||
"category_snapshot", sa.String(length=32), nullable=False, server_default="other"
|
||||
),
|
||||
)
|
||||
op.add_column(
|
||||
"logic_workout_items",
|
||||
sa.Column(
|
||||
"equipment_snapshot", sa.String(length=32), nullable=False, server_default="other"
|
||||
),
|
||||
)
|
||||
op.drop_constraint("ck_workout_item_exactly_one_entity", "logic_workout_items", type_="check")
|
||||
op.create_check_constraint(
|
||||
"ck_workout_item_exactly_one_entity",
|
||||
"logic_workout_items",
|
||||
"(CASE WHEN activity_source_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN exercise_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN equipment_id IS NOT NULL THEN 1 ELSE 0 END) = 1",
|
||||
)
|
||||
op.drop_constraint("ck_workout_item_source_kind", "logic_workout_items", type_="check")
|
||||
op.create_check_constraint(
|
||||
"ck_workout_item_source_kind",
|
||||
"logic_workout_items",
|
||||
"source_kind IN ('exercise', 'machine', 'equipment')",
|
||||
)
|
||||
op.add_column("logic_workout_sets", sa.Column("distance_km", sa.Numeric(8, 3), nullable=True))
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.drop_column("logic_workout_sets", "distance_km")
|
||||
op.drop_constraint("ck_workout_item_source_kind", "logic_workout_items", type_="check")
|
||||
op.create_check_constraint(
|
||||
"ck_workout_item_source_kind",
|
||||
"logic_workout_items",
|
||||
"source_kind IN ('exercise', 'equipment')",
|
||||
)
|
||||
op.drop_constraint("ck_workout_item_exactly_one_entity", "logic_workout_items", type_="check")
|
||||
op.create_check_constraint(
|
||||
"ck_workout_item_exactly_one_entity",
|
||||
"logic_workout_items",
|
||||
"(exercise_id IS NOT NULL AND equipment_id IS NULL) OR "
|
||||
"(exercise_id IS NULL AND equipment_id IS NOT NULL)",
|
||||
)
|
||||
op.drop_column("logic_workout_items", "equipment_snapshot")
|
||||
op.drop_column("logic_workout_items", "category_snapshot")
|
||||
op.drop_column("logic_workout_items", "measurement_type_snapshot")
|
||||
op.drop_constraint(
|
||||
"fk_logic_workout_items_activity_source_id", "logic_workout_items", type_="foreignkey"
|
||||
)
|
||||
op.drop_column("logic_workout_items", "activity_source_id")
|
||||
|
||||
op.drop_index("ix_logic_activity_sources_title", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_slug", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_owner_user_id", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_kind", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_is_builtin", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_equipment", table_name="logic_activity_sources")
|
||||
op.drop_index("ix_logic_activity_sources_category", table_name="logic_activity_sources")
|
||||
op.drop_table("logic_activity_sources")
|
||||
@@ -6,6 +6,13 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
class Settings(BaseSettings):
|
||||
database_url: str = "postgresql+psycopg://train_watcher:train_watcher@localhost:5432/train_watcher"
|
||||
service_token: str = "dev-service-token-change-me"
|
||||
s3_endpoint_url: str = "http://localhost:9000"
|
||||
s3_public_base_url: str = "http://localhost:9000"
|
||||
s3_access_key_id: str = "minioadmin"
|
||||
s3_secret_access_key: str = "minioadmin"
|
||||
s3_bucket: str = "train-watcher-media"
|
||||
s3_region: str = "us-east-1"
|
||||
builtin_assets_dir: str = "/app/workout_assets"
|
||||
|
||||
model_config = SettingsConfigDict(env_file=".env", extra="ignore")
|
||||
|
||||
|
||||
@@ -81,6 +81,13 @@ def upgrade_existing_schema(connection: Connection) -> None:
|
||||
check_sql="status IN ('active', 'finished', 'discarded')",
|
||||
)
|
||||
|
||||
connection.execute(
|
||||
text(
|
||||
"ALTER TABLE logic_workout_items "
|
||||
"ADD COLUMN IF NOT EXISTS activity_source_id UUID "
|
||||
"REFERENCES logic_activity_sources(id)"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ADD COLUMN IF NOT EXISTS source_kind VARCHAR(20)")
|
||||
)
|
||||
@@ -90,6 +97,24 @@ def upgrade_existing_schema(connection: Connection) -> None:
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ADD COLUMN IF NOT EXISTS image_s3_url_snapshot TEXT")
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"ALTER TABLE logic_workout_items "
|
||||
"ADD COLUMN IF NOT EXISTS measurement_type_snapshot VARCHAR(32) DEFAULT 'weight_reps'"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"ALTER TABLE logic_workout_items "
|
||||
"ADD COLUMN IF NOT EXISTS category_snapshot VARCHAR(32) DEFAULT 'other'"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"ALTER TABLE logic_workout_items "
|
||||
"ADD COLUMN IF NOT EXISTS equipment_snapshot VARCHAR(32) DEFAULT 'other'"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"""
|
||||
@@ -140,11 +165,63 @@ def upgrade_existing_schema(connection: Connection) -> None:
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ALTER COLUMN title_snapshot SET NOT NULL")
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"UPDATE logic_workout_items "
|
||||
"SET measurement_type_snapshot = 'weight_reps' "
|
||||
"WHERE measurement_type_snapshot IS NULL"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"UPDATE logic_workout_items "
|
||||
"SET category_snapshot = 'other' "
|
||||
"WHERE category_snapshot IS NULL"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text(
|
||||
"UPDATE logic_workout_items "
|
||||
"SET equipment_snapshot = 'other' "
|
||||
"WHERE equipment_snapshot IS NULL"
|
||||
)
|
||||
)
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ALTER COLUMN measurement_type_snapshot SET NOT NULL")
|
||||
)
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ALTER COLUMN category_snapshot SET NOT NULL")
|
||||
)
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_items ALTER COLUMN equipment_snapshot SET NOT NULL")
|
||||
)
|
||||
drop_constraint_if_exists(
|
||||
connection,
|
||||
constraint_name="ck_workout_item_exactly_one_entity",
|
||||
table_name="logic_workout_items",
|
||||
)
|
||||
add_check_constraint_if_missing(
|
||||
connection,
|
||||
constraint_name="ck_workout_item_exactly_one_entity",
|
||||
table_name="logic_workout_items",
|
||||
check_sql="(CASE WHEN activity_source_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN exercise_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN equipment_id IS NOT NULL THEN 1 ELSE 0 END) = 1",
|
||||
)
|
||||
drop_constraint_if_exists(
|
||||
connection,
|
||||
constraint_name="ck_workout_item_source_kind",
|
||||
table_name="logic_workout_items",
|
||||
)
|
||||
add_check_constraint_if_missing(
|
||||
connection,
|
||||
constraint_name="ck_workout_item_source_kind",
|
||||
table_name="logic_workout_items",
|
||||
check_sql="source_kind IN ('exercise', 'equipment')",
|
||||
check_sql="source_kind IN ('exercise', 'machine', 'equipment')",
|
||||
)
|
||||
|
||||
connection.execute(
|
||||
text("ALTER TABLE logic_workout_sets ADD COLUMN IF NOT EXISTS distance_km NUMERIC(8, 3)")
|
||||
)
|
||||
|
||||
connection.execute(
|
||||
@@ -194,6 +271,21 @@ def add_check_constraint_if_missing(
|
||||
)
|
||||
|
||||
|
||||
def drop_constraint_if_exists(
|
||||
connection: Connection,
|
||||
*,
|
||||
constraint_name: str,
|
||||
table_name: str,
|
||||
) -> None:
|
||||
exists = connection.execute(
|
||||
text("SELECT 1 FROM pg_constraint WHERE conname = :constraint_name"),
|
||||
{"constraint_name": constraint_name},
|
||||
).scalar()
|
||||
if not exists:
|
||||
return
|
||||
connection.execute(text(f"ALTER TABLE {table_name} DROP CONSTRAINT {constraint_name}"))
|
||||
|
||||
|
||||
def get_db() -> Generator[Session]:
|
||||
db: Any = SessionLocal()
|
||||
try:
|
||||
|
||||
+278
-80
@@ -1,21 +1,25 @@
|
||||
import json
|
||||
import re
|
||||
import uuid
|
||||
from collections import defaultdict
|
||||
from datetime import UTC, datetime
|
||||
from pathlib import Path
|
||||
from typing import Annotated
|
||||
|
||||
import boto3
|
||||
from fastapi import Body, Depends, FastAPI, Header, HTTPException, Query, status
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.orm import Session, selectinload
|
||||
|
||||
from app.core import settings
|
||||
from app.db import SessionLocal, create_schema, get_db
|
||||
from app.models import Base, Equipment, Exercise, Workout, WorkoutItem, WorkoutSet
|
||||
from app.models import ActivitySource, Base, Equipment, Exercise, Workout, WorkoutItem, WorkoutSet
|
||||
from app.schemas import (
|
||||
ActivitySourceCreate,
|
||||
ActivitySourceRead,
|
||||
CaloriesRead,
|
||||
EquipmentCreate,
|
||||
EquipmentRead,
|
||||
ExerciseCreate,
|
||||
ExerciseRead,
|
||||
ProgressionPoint,
|
||||
ProgressionRead,
|
||||
WorkoutCreate,
|
||||
@@ -32,6 +36,15 @@ from app.schemas import (
|
||||
|
||||
app = FastAPI(title="Train Watcher Logic Service", version="0.1.0")
|
||||
|
||||
SEED_FILE = Path(__file__).parent / "seeds" / "activity_sources.json"
|
||||
ASSET_CONTENT_TYPES = {
|
||||
".jpg": "image/jpeg",
|
||||
".jpeg": "image/jpeg",
|
||||
".png": "image/png",
|
||||
".webp": "image/webp",
|
||||
".avif": "image/avif",
|
||||
}
|
||||
|
||||
|
||||
def require_service_token(x_service_token: Annotated[str | None, Header()] = None) -> None:
|
||||
if x_service_token != settings.service_token:
|
||||
@@ -74,50 +87,74 @@ def health() -> dict[str, str]:
|
||||
|
||||
|
||||
def seed_builtin_catalog(db: Session) -> None:
|
||||
exists = db.scalar(
|
||||
select(func.count()).select_from(Equipment).where(Equipment.is_builtin.is_(True))
|
||||
)
|
||||
if exists:
|
||||
if not SEED_FILE.exists():
|
||||
return
|
||||
seed_rows = json.loads(SEED_FILE.read_text(encoding="utf-8"))
|
||||
assets_dir = resolve_builtin_assets_dir()
|
||||
if not assets_dir:
|
||||
return
|
||||
|
||||
treadmill = Equipment(
|
||||
name="Беговая дорожка",
|
||||
description="Кардио-тренажер для ходьбы и бега.",
|
||||
is_builtin=True,
|
||||
)
|
||||
smith = Equipment(
|
||||
name="Машина Смита",
|
||||
description="Силовая рама с фиксированной траекторией грифа.",
|
||||
is_builtin=True,
|
||||
)
|
||||
db.add_all([treadmill, smith])
|
||||
db.flush()
|
||||
db.add_all(
|
||||
[
|
||||
Exercise(
|
||||
name="Жим лежа",
|
||||
description="Базовое упражнение для груди, трицепса и передней дельты.",
|
||||
is_builtin=True,
|
||||
default_calories_per_minute=6,
|
||||
),
|
||||
Exercise(
|
||||
name="Приседания",
|
||||
description="Базовое упражнение для ног и корпуса.",
|
||||
is_builtin=True,
|
||||
default_calories_per_minute=8,
|
||||
),
|
||||
Exercise(
|
||||
name="Бег",
|
||||
description="Кардио-нагрузка на беговой дорожке.",
|
||||
equipment_id=treadmill.id,
|
||||
is_builtin=True,
|
||||
default_calories_per_minute=10,
|
||||
),
|
||||
]
|
||||
)
|
||||
for row in seed_rows:
|
||||
asset_path = assets_dir / row["asset_filename"]
|
||||
image = upload_builtin_asset(row["kind"], row["slug"], asset_path)
|
||||
if not image:
|
||||
continue
|
||||
activity = db.scalar(select(ActivitySource).where(ActivitySource.slug == row["slug"]))
|
||||
if activity is None:
|
||||
activity = ActivitySource(slug=row["slug"], owner_user_id=None, is_builtin=True)
|
||||
db.add(activity)
|
||||
|
||||
activity.kind = row["kind"]
|
||||
activity.title = row["title"]
|
||||
activity.description = row.get("description")
|
||||
activity.category = row["category"]
|
||||
activity.equipment = row["equipment"]
|
||||
activity.measurement_type = row["measurement_type"]
|
||||
activity.difficulty = row["difficulty"]
|
||||
activity.default_calories_per_minute = row.get("default_calories_per_minute")
|
||||
activity.image_s3_key = image["image_s3_key"]
|
||||
activity.image_s3_url = image["image_s3_url"]
|
||||
activity.is_builtin = True
|
||||
db.commit()
|
||||
|
||||
|
||||
def resolve_builtin_assets_dir() -> Path | None:
|
||||
configured = Path(settings.builtin_assets_dir)
|
||||
candidates = [configured, Path(__file__).resolve().parents[3] / "workout_assets"]
|
||||
for candidate in candidates:
|
||||
if candidate.exists() and candidate.is_dir():
|
||||
return candidate
|
||||
return None
|
||||
|
||||
|
||||
def upload_builtin_asset(kind: str, slug: str, asset_path: Path) -> dict[str, str] | None:
|
||||
if not asset_path.exists() or asset_path.suffix.lower() not in ASSET_CONTENT_TYPES:
|
||||
return None
|
||||
extension = asset_path.suffix.lower()
|
||||
object_key = f"builtin/activity-sources/{kind}/{slug}{extension}"
|
||||
try:
|
||||
boto3.client(
|
||||
"s3",
|
||||
endpoint_url=settings.s3_endpoint_url,
|
||||
aws_access_key_id=settings.s3_access_key_id,
|
||||
aws_secret_access_key=settings.s3_secret_access_key,
|
||||
region_name=settings.s3_region,
|
||||
).put_object(
|
||||
Bucket=settings.s3_bucket,
|
||||
Key=object_key,
|
||||
Body=asset_path.read_bytes(),
|
||||
ContentType=ASSET_CONTENT_TYPES[extension],
|
||||
)
|
||||
except Exception as exc: # noqa: BLE001 - failed asset upload should not block service startup
|
||||
print(f"Skipping builtin asset {asset_path}: {exc}", flush=True)
|
||||
return None
|
||||
public_base = settings.s3_public_base_url.rstrip("/")
|
||||
return {
|
||||
"image_s3_key": object_key,
|
||||
"image_s3_url": f"{public_base}/{settings.s3_bucket}/{object_key}",
|
||||
}
|
||||
|
||||
|
||||
def accessible_equipment(db: Session, user_id: uuid.UUID):
|
||||
return select(Equipment).where(
|
||||
(Equipment.is_builtin.is_(True)) | (Equipment.owner_user_id == user_id)
|
||||
@@ -130,11 +167,41 @@ def accessible_exercises(db: Session, user_id: uuid.UUID):
|
||||
)
|
||||
|
||||
|
||||
def accessible_activity_sources(db: Session, user_id: uuid.UUID):
|
||||
return select(ActivitySource).where(
|
||||
(ActivitySource.is_builtin.is_(True)) | (ActivitySource.owner_user_id == user_id)
|
||||
)
|
||||
|
||||
|
||||
def normalize_kind(kind: str | None) -> str | None:
|
||||
if kind == "equipment":
|
||||
return "machine"
|
||||
return kind
|
||||
|
||||
|
||||
def slugify(value: str) -> str:
|
||||
slug = re.sub(r"[^a-z0-9]+", "-", value.lower()).strip("-")
|
||||
return slug or "activity"
|
||||
|
||||
|
||||
def unique_user_slug(db: Session, title: str, user_id: uuid.UUID) -> str:
|
||||
base = f"custom-{slugify(title)}-{str(user_id)[:8]}"
|
||||
candidate = base
|
||||
index = 2
|
||||
while db.scalar(select(ActivitySource.id).where(ActivitySource.slug == candidate)):
|
||||
candidate = f"{base}-{index}"
|
||||
index += 1
|
||||
return candidate
|
||||
|
||||
|
||||
def load_workout(db: Session, workout_id: uuid.UUID, user_id: uuid.UUID) -> Workout:
|
||||
workout = db.scalar(
|
||||
select(Workout)
|
||||
.where(Workout.id == workout_id, Workout.user_id == user_id)
|
||||
.options(selectinload(Workout.items).selectinload(WorkoutItem.sets))
|
||||
.options(
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.sets),
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.activity_source),
|
||||
)
|
||||
)
|
||||
if not workout:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Workout not found")
|
||||
@@ -145,7 +212,10 @@ def get_active_workout_for_user(db: Session, user_id: uuid.UUID) -> Workout | No
|
||||
return db.scalar(
|
||||
select(Workout)
|
||||
.where(Workout.user_id == user_id, Workout.status == "active")
|
||||
.options(selectinload(Workout.items).selectinload(WorkoutItem.sets))
|
||||
.options(
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.sets),
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.activity_source),
|
||||
)
|
||||
.order_by(Workout.started_at.desc())
|
||||
)
|
||||
|
||||
@@ -158,64 +228,151 @@ def ensure_active_workout(workout: Workout) -> None:
|
||||
)
|
||||
|
||||
|
||||
@app.get(
|
||||
"/internal/catalog/activity-sources",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=list[ActivitySourceRead],
|
||||
)
|
||||
def list_activity_sources(
|
||||
db: Db,
|
||||
user_id: CurrentUserId,
|
||||
search: str | None = None,
|
||||
kind: Annotated[str | None, Query(pattern="^(exercise|machine|equipment)$")] = None,
|
||||
category: str | None = None,
|
||||
scope: Annotated[str, Query(pattern="^(all|builtin|mine)$")] = "all",
|
||||
) -> list[ActivitySource]:
|
||||
statement = accessible_activity_sources(db, user_id).order_by(
|
||||
ActivitySource.is_builtin.desc(), ActivitySource.title
|
||||
)
|
||||
normalized_kind = normalize_kind(kind)
|
||||
if normalized_kind:
|
||||
statement = statement.where(ActivitySource.kind == normalized_kind)
|
||||
if category:
|
||||
statement = statement.where(ActivitySource.category == category)
|
||||
if scope == "builtin":
|
||||
statement = statement.where(ActivitySource.is_builtin.is_(True))
|
||||
elif scope == "mine":
|
||||
statement = statement.where(ActivitySource.owner_user_id == user_id)
|
||||
if search:
|
||||
needle = f"%{search}%"
|
||||
statement = statement.where(
|
||||
ActivitySource.title.ilike(needle) | ActivitySource.description.ilike(needle)
|
||||
)
|
||||
return list(db.scalars(statement))
|
||||
|
||||
|
||||
@app.post(
|
||||
"/internal/catalog/activity-sources",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=ActivitySourceRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
)
|
||||
def create_activity_source(
|
||||
payload: ActivitySourceCreate, db: Db, user_id: CurrentUserId
|
||||
) -> ActivitySource:
|
||||
slug = payload.slug or unique_user_slug(db, payload.title, user_id)
|
||||
if db.scalar(select(ActivitySource.id).where(ActivitySource.slug == slug)):
|
||||
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="Slug already exists")
|
||||
data = payload.model_dump(exclude={"slug"})
|
||||
activity = ActivitySource(
|
||||
slug=slug,
|
||||
owner_user_id=user_id,
|
||||
is_builtin=False,
|
||||
**data,
|
||||
)
|
||||
db.add(activity)
|
||||
db.commit()
|
||||
db.refresh(activity)
|
||||
return activity
|
||||
|
||||
|
||||
@app.get(
|
||||
"/internal/catalog/equipment",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=list[EquipmentRead],
|
||||
response_model=list[ActivitySourceRead],
|
||||
)
|
||||
def list_equipment(db: Db, user_id: CurrentUserId, search: str | None = None) -> list[Equipment]:
|
||||
statement = accessible_equipment(db, user_id).order_by(
|
||||
Equipment.is_builtin.desc(), Equipment.name
|
||||
def list_equipment(
|
||||
db: Db, user_id: CurrentUserId, search: str | None = None
|
||||
) -> list[ActivitySource]:
|
||||
statement = (
|
||||
accessible_activity_sources(db, user_id)
|
||||
.where(ActivitySource.kind == "machine")
|
||||
.order_by(ActivitySource.is_builtin.desc(), ActivitySource.title)
|
||||
)
|
||||
if search:
|
||||
statement = statement.where(Equipment.name.ilike(f"%{search}%"))
|
||||
statement = statement.where(ActivitySource.title.ilike(f"%{search}%"))
|
||||
return list(db.scalars(statement))
|
||||
|
||||
|
||||
@app.post(
|
||||
"/internal/catalog/equipment",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=EquipmentRead,
|
||||
response_model=ActivitySourceRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
)
|
||||
def create_equipment(payload: EquipmentCreate, db: Db, user_id: CurrentUserId) -> Equipment:
|
||||
equipment = Equipment(owner_user_id=user_id, is_builtin=False, **payload.model_dump())
|
||||
db.add(equipment)
|
||||
def create_equipment(payload: EquipmentCreate, db: Db, user_id: CurrentUserId) -> ActivitySource:
|
||||
activity = ActivitySource(
|
||||
owner_user_id=user_id,
|
||||
slug=unique_user_slug(db, payload.name, user_id),
|
||||
kind="machine",
|
||||
title=payload.name,
|
||||
description=payload.description,
|
||||
category="other",
|
||||
equipment="machine",
|
||||
measurement_type="weight_reps",
|
||||
difficulty="intermediate",
|
||||
image_s3_url=payload.image_s3_url,
|
||||
image_s3_key=payload.image_s3_key,
|
||||
is_builtin=False,
|
||||
)
|
||||
db.add(activity)
|
||||
db.commit()
|
||||
db.refresh(equipment)
|
||||
return equipment
|
||||
db.refresh(activity)
|
||||
return activity
|
||||
|
||||
|
||||
@app.get(
|
||||
"/internal/catalog/exercises",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=list[ExerciseRead],
|
||||
response_model=list[ActivitySourceRead],
|
||||
)
|
||||
def list_exercises(db: Db, user_id: CurrentUserId, search: str | None = None) -> list[Exercise]:
|
||||
statement = accessible_exercises(db, user_id).order_by(
|
||||
Exercise.is_builtin.desc(), Exercise.name
|
||||
)
|
||||
def list_exercises(
|
||||
db: Db, user_id: CurrentUserId, search: str | None = None
|
||||
) -> list[ActivitySource]:
|
||||
statement = accessible_activity_sources(db, user_id).where(
|
||||
ActivitySource.kind == "exercise"
|
||||
).order_by(ActivitySource.is_builtin.desc(), ActivitySource.title)
|
||||
if search:
|
||||
statement = statement.where(Exercise.name.ilike(f"%{search}%"))
|
||||
statement = statement.where(ActivitySource.title.ilike(f"%{search}%"))
|
||||
return list(db.scalars(statement))
|
||||
|
||||
|
||||
@app.post(
|
||||
"/internal/catalog/exercises",
|
||||
dependencies=[InternalAuth],
|
||||
response_model=ExerciseRead,
|
||||
response_model=ActivitySourceRead,
|
||||
status_code=status.HTTP_201_CREATED,
|
||||
)
|
||||
def create_exercise(payload: ExerciseCreate, db: Db, user_id: CurrentUserId) -> Exercise:
|
||||
if payload.equipment_id:
|
||||
equipment = db.get(Equipment, payload.equipment_id)
|
||||
if not equipment or (not equipment.is_builtin and equipment.owner_user_id != user_id):
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Equipment not found")
|
||||
exercise = Exercise(owner_user_id=user_id, is_builtin=False, **payload.model_dump())
|
||||
db.add(exercise)
|
||||
def create_exercise(payload: ExerciseCreate, db: Db, user_id: CurrentUserId) -> ActivitySource:
|
||||
activity = ActivitySource(
|
||||
owner_user_id=user_id,
|
||||
slug=unique_user_slug(db, payload.name, user_id),
|
||||
kind="exercise",
|
||||
title=payload.name,
|
||||
description=payload.description,
|
||||
category="other",
|
||||
equipment="other",
|
||||
measurement_type="weight_reps",
|
||||
difficulty="intermediate",
|
||||
image_s3_url=payload.image_s3_url,
|
||||
image_s3_key=payload.image_s3_key,
|
||||
default_calories_per_minute=payload.default_calories_per_minute,
|
||||
is_builtin=False,
|
||||
)
|
||||
db.add(activity)
|
||||
db.commit()
|
||||
db.refresh(exercise)
|
||||
return exercise
|
||||
db.refresh(activity)
|
||||
return activity
|
||||
|
||||
|
||||
@app.get("/internal/workouts", dependencies=[InternalAuth], response_model=list[WorkoutRead])
|
||||
@@ -224,7 +381,10 @@ def list_workouts(db: Db, user_id: CurrentUserId) -> list[Workout]:
|
||||
db.scalars(
|
||||
select(Workout)
|
||||
.where(Workout.user_id == user_id)
|
||||
.options(selectinload(Workout.items).selectinload(WorkoutItem.sets))
|
||||
.options(
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.sets),
|
||||
selectinload(Workout.items).selectinload(WorkoutItem.activity_source),
|
||||
)
|
||||
.order_by(Workout.started_at.desc())
|
||||
)
|
||||
)
|
||||
@@ -341,7 +501,22 @@ def add_workout_item(
|
||||
source_kind: str
|
||||
title_snapshot: str
|
||||
image_s3_url_snapshot: str | None
|
||||
if payload.exercise_id:
|
||||
measurement_type_snapshot = "weight_reps"
|
||||
category_snapshot = "other"
|
||||
equipment_snapshot = "other"
|
||||
if payload.activity_source_id:
|
||||
activity = db.get(ActivitySource, payload.activity_source_id)
|
||||
if not activity or (not activity.is_builtin and activity.owner_user_id != user_id):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND, detail="Activity source not found"
|
||||
)
|
||||
source_kind = activity.kind
|
||||
title_snapshot = activity.title
|
||||
image_s3_url_snapshot = activity.image_s3_url
|
||||
measurement_type_snapshot = activity.measurement_type
|
||||
category_snapshot = activity.category
|
||||
equipment_snapshot = activity.equipment
|
||||
elif payload.exercise_id:
|
||||
exercise = db.get(Exercise, payload.exercise_id)
|
||||
if not exercise or (not exercise.is_builtin and exercise.owner_user_id != user_id):
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Exercise not found")
|
||||
@@ -352,7 +527,7 @@ def add_workout_item(
|
||||
equipment = db.get(Equipment, payload.equipment_id)
|
||||
if not equipment or (not equipment.is_builtin and equipment.owner_user_id != user_id):
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Equipment not found")
|
||||
source_kind = "equipment"
|
||||
source_kind = "machine"
|
||||
title_snapshot = equipment.name
|
||||
image_s3_url_snapshot = equipment.image_s3_url
|
||||
|
||||
@@ -367,6 +542,9 @@ def add_workout_item(
|
||||
source_kind=source_kind,
|
||||
title_snapshot=title_snapshot,
|
||||
image_s3_url_snapshot=image_s3_url_snapshot,
|
||||
measurement_type_snapshot=measurement_type_snapshot,
|
||||
category_snapshot=category_snapshot,
|
||||
equipment_snapshot=equipment_snapshot,
|
||||
**payload.model_dump(exclude={"order_index"}),
|
||||
order_index=next_index,
|
||||
)
|
||||
@@ -394,6 +572,7 @@ def add_workout_set(
|
||||
.where(WorkoutItem.id == item_id, Workout.user_id == user_id)
|
||||
.options(
|
||||
selectinload(WorkoutItem.sets),
|
||||
selectinload(WorkoutItem.activity_source),
|
||||
selectinload(WorkoutItem.exercise),
|
||||
selectinload(WorkoutItem.workout),
|
||||
)
|
||||
@@ -419,6 +598,7 @@ def add_workout_set(
|
||||
weight=payload.weight,
|
||||
reps=payload.reps,
|
||||
duration_seconds=payload.duration_seconds,
|
||||
distance_km=payload.distance_km,
|
||||
calories=calories,
|
||||
completed_at=payload.completed_at or datetime.now(UTC),
|
||||
)
|
||||
@@ -446,7 +626,11 @@ def add_workout_sets_batch(
|
||||
select(WorkoutItem)
|
||||
.join(Workout)
|
||||
.where(WorkoutItem.id == item_id, Workout.user_id == user_id)
|
||||
.options(selectinload(WorkoutItem.exercise), selectinload(WorkoutItem.workout))
|
||||
.options(
|
||||
selectinload(WorkoutItem.activity_source),
|
||||
selectinload(WorkoutItem.exercise),
|
||||
selectinload(WorkoutItem.workout),
|
||||
)
|
||||
)
|
||||
if not item:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Workout item not found")
|
||||
@@ -464,6 +648,7 @@ def add_workout_sets_batch(
|
||||
weight=set_payload.weight,
|
||||
reps=set_payload.reps,
|
||||
duration_seconds=set_payload.duration_seconds,
|
||||
distance_km=set_payload.distance_km,
|
||||
calories=estimate_set_calories(
|
||||
item,
|
||||
set_payload.weight,
|
||||
@@ -502,6 +687,7 @@ def update_workout_set(
|
||||
.join(Workout)
|
||||
.where(WorkoutSet.id == set_id, Workout.user_id == user_id)
|
||||
.options(
|
||||
selectinload(WorkoutSet.workout_item).selectinload(WorkoutItem.activity_source),
|
||||
selectinload(WorkoutSet.workout_item).selectinload(WorkoutItem.exercise),
|
||||
selectinload(WorkoutSet.workout_item).selectinload(WorkoutItem.workout),
|
||||
)
|
||||
@@ -516,6 +702,8 @@ def update_workout_set(
|
||||
workout_set.reps = payload.reps
|
||||
if "duration_seconds" in payload.model_fields_set:
|
||||
workout_set.duration_seconds = payload.duration_seconds
|
||||
if "distance_km" in payload.model_fields_set:
|
||||
workout_set.distance_km = payload.distance_km
|
||||
if "completed_at" in payload.model_fields_set and payload.completed_at is not None:
|
||||
workout_set.completed_at = payload.completed_at
|
||||
if "calories" in payload.model_fields_set:
|
||||
@@ -612,6 +800,15 @@ def estimate_set_calories(
|
||||
) -> float:
|
||||
if calories is not None:
|
||||
return calories
|
||||
if (
|
||||
item.activity_source
|
||||
and item.activity_source.default_calories_per_minute
|
||||
and duration_seconds
|
||||
):
|
||||
return round(
|
||||
float(item.activity_source.default_calories_per_minute) * duration_seconds / 60,
|
||||
2,
|
||||
)
|
||||
if item.exercise and item.exercise.default_calories_per_minute and duration_seconds:
|
||||
return round(
|
||||
float(item.exercise.default_calories_per_minute) * duration_seconds / 60,
|
||||
@@ -649,7 +846,7 @@ def recalculate_workout_calories(db: Session, workout_id: uuid.UUID) -> None:
|
||||
def get_progression(
|
||||
db: Db,
|
||||
user_id: CurrentUserId,
|
||||
kind: Annotated[str, Query(pattern="^(exercise|equipment)$")],
|
||||
kind: Annotated[str, Query(pattern="^(exercise|machine|equipment)$")],
|
||||
entity_id: Annotated[uuid.UUID | None, Query()] = None,
|
||||
) -> ProgressionRead:
|
||||
statement = (
|
||||
@@ -659,10 +856,11 @@ def get_progression(
|
||||
.where(Workout.user_id == user_id, Workout.status != "discarded")
|
||||
.order_by(Workout.started_at.asc(), WorkoutSet.completed_at.asc())
|
||||
)
|
||||
if entity_id and kind == "exercise":
|
||||
statement = statement.where(WorkoutItem.exercise_id == entity_id)
|
||||
elif entity_id and kind == "equipment":
|
||||
statement = statement.where(WorkoutItem.equipment_id == entity_id)
|
||||
normalized_kind = normalize_kind(kind)
|
||||
if entity_id:
|
||||
statement = statement.where(WorkoutItem.activity_source_id == entity_id)
|
||||
if normalized_kind:
|
||||
statement = statement.where(WorkoutItem.source_kind == normalized_kind)
|
||||
|
||||
rows = list(db.execute(statement))
|
||||
grouped: dict[str, dict[str, float]] = defaultdict(lambda: {"max_weight": 0, "volume": 0})
|
||||
|
||||
@@ -48,6 +48,49 @@ class Equipment(Base, TimestampMixin):
|
||||
workout_items: Mapped[list[WorkoutItem]] = relationship(back_populates="equipment")
|
||||
|
||||
|
||||
class ActivitySource(Base, TimestampMixin):
|
||||
__tablename__ = "logic_activity_sources"
|
||||
__table_args__ = (
|
||||
CheckConstraint("kind IN ('exercise', 'machine')", name="ck_activity_source_kind"),
|
||||
CheckConstraint(
|
||||
"category IN ('chest', 'back', 'legs', 'shoulders', 'biceps', 'triceps', "
|
||||
"'core', 'cardio', 'full_body', 'other')",
|
||||
name="ck_activity_source_category",
|
||||
),
|
||||
CheckConstraint(
|
||||
"equipment IN ('barbell', 'dumbbell', 'machine', 'cable', 'bodyweight', "
|
||||
"'kettlebell', 'cardio_machine', 'other')",
|
||||
name="ck_activity_source_equipment",
|
||||
),
|
||||
CheckConstraint(
|
||||
"measurement_type IN ('weight_reps', 'reps_only', 'duration', "
|
||||
"'distance_duration', 'duration_calories')",
|
||||
name="ck_activity_source_measurement_type",
|
||||
),
|
||||
CheckConstraint(
|
||||
"difficulty IN ('beginner', 'intermediate', 'advanced')",
|
||||
name="ck_activity_source_difficulty",
|
||||
),
|
||||
)
|
||||
|
||||
id: Mapped[uuid.UUID] = uuid_pk()
|
||||
owner_user_id: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), index=True)
|
||||
slug: Mapped[str] = mapped_column(String(180), unique=True, index=True)
|
||||
kind: Mapped[str] = mapped_column(String(20), index=True)
|
||||
title: Mapped[str] = mapped_column(String(160), index=True)
|
||||
description: Mapped[str | None] = mapped_column(Text)
|
||||
category: Mapped[str] = mapped_column(String(32), index=True)
|
||||
equipment: Mapped[str] = mapped_column(String(32), index=True)
|
||||
measurement_type: Mapped[str] = mapped_column(String(32))
|
||||
difficulty: Mapped[str] = mapped_column(String(20), default="intermediate")
|
||||
image_s3_url: Mapped[str | None] = mapped_column(Text)
|
||||
image_s3_key: Mapped[str | None] = mapped_column(Text)
|
||||
is_builtin: Mapped[bool] = mapped_column(Boolean, default=False, index=True)
|
||||
default_calories_per_minute: Mapped[float | None] = mapped_column(Numeric(8, 2))
|
||||
|
||||
workout_items: Mapped[list[WorkoutItem]] = relationship(back_populates="activity_source")
|
||||
|
||||
|
||||
class Exercise(Base, TimestampMixin):
|
||||
__tablename__ = "logic_exercises"
|
||||
|
||||
@@ -93,12 +136,13 @@ class WorkoutItem(Base):
|
||||
__tablename__ = "logic_workout_items"
|
||||
__table_args__ = (
|
||||
CheckConstraint(
|
||||
"(exercise_id IS NOT NULL AND equipment_id IS NULL) OR "
|
||||
"(exercise_id IS NULL AND equipment_id IS NOT NULL)",
|
||||
"(CASE WHEN activity_source_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN exercise_id IS NOT NULL THEN 1 ELSE 0 END + "
|
||||
"CASE WHEN equipment_id IS NOT NULL THEN 1 ELSE 0 END) = 1",
|
||||
name="ck_workout_item_exactly_one_entity",
|
||||
),
|
||||
CheckConstraint(
|
||||
"source_kind IN ('exercise', 'equipment')",
|
||||
"source_kind IN ('exercise', 'machine', 'equipment')",
|
||||
name="ck_workout_item_source_kind",
|
||||
),
|
||||
)
|
||||
@@ -110,6 +154,12 @@ class WorkoutItem(Base):
|
||||
source_kind: Mapped[str] = mapped_column(String(20))
|
||||
title_snapshot: Mapped[str] = mapped_column(String(160))
|
||||
image_s3_url_snapshot: Mapped[str | None] = mapped_column(Text)
|
||||
measurement_type_snapshot: Mapped[str] = mapped_column(String(32), default="weight_reps")
|
||||
category_snapshot: Mapped[str] = mapped_column(String(32), default="other")
|
||||
equipment_snapshot: Mapped[str] = mapped_column(String(32), default="other")
|
||||
activity_source_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
ForeignKey("logic_activity_sources.id")
|
||||
)
|
||||
exercise_id: Mapped[uuid.UUID | None] = mapped_column(ForeignKey("logic_exercises.id"))
|
||||
equipment_id: Mapped[uuid.UUID | None] = mapped_column(ForeignKey("logic_equipment.id"))
|
||||
order_index: Mapped[int] = mapped_column(Integer, default=0)
|
||||
@@ -117,6 +167,7 @@ class WorkoutItem(Base):
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=now)
|
||||
|
||||
workout: Mapped[Workout] = relationship(back_populates="items")
|
||||
activity_source: Mapped[ActivitySource | None] = relationship(back_populates="workout_items")
|
||||
exercise: Mapped[Exercise | None] = relationship(back_populates="workout_items")
|
||||
equipment: Mapped[Equipment | None] = relationship(back_populates="workout_items")
|
||||
sets: Mapped[list[WorkoutSet]] = relationship(
|
||||
@@ -135,6 +186,7 @@ class WorkoutSet(Base):
|
||||
weight: Mapped[float] = mapped_column(Numeric(8, 2), default=0)
|
||||
reps: Mapped[int] = mapped_column(Integer, default=0)
|
||||
duration_seconds: Mapped[int | None] = mapped_column(Integer)
|
||||
distance_km: Mapped[float | None] = mapped_column(Numeric(8, 3))
|
||||
calories: Mapped[float | None] = mapped_column(Numeric(8, 2))
|
||||
completed_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=now)
|
||||
|
||||
|
||||
@@ -6,6 +6,63 @@ from typing import Literal
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
||||
|
||||
ActivityKind = Literal["exercise", "machine"]
|
||||
ActivityCategory = Literal[
|
||||
"chest",
|
||||
"back",
|
||||
"legs",
|
||||
"shoulders",
|
||||
"biceps",
|
||||
"triceps",
|
||||
"core",
|
||||
"cardio",
|
||||
"full_body",
|
||||
"other",
|
||||
]
|
||||
ActivityEquipment = Literal[
|
||||
"barbell",
|
||||
"dumbbell",
|
||||
"machine",
|
||||
"cable",
|
||||
"bodyweight",
|
||||
"kettlebell",
|
||||
"cardio_machine",
|
||||
"other",
|
||||
]
|
||||
MeasurementType = Literal[
|
||||
"weight_reps",
|
||||
"reps_only",
|
||||
"duration",
|
||||
"distance_duration",
|
||||
"duration_calories",
|
||||
]
|
||||
Difficulty = Literal["beginner", "intermediate", "advanced"]
|
||||
|
||||
|
||||
class ActivitySourceCreate(BaseModel):
|
||||
slug: str | None = Field(default=None, min_length=1, max_length=180)
|
||||
kind: ActivityKind
|
||||
title: str = Field(min_length=1, max_length=160)
|
||||
description: str | None = None
|
||||
category: ActivityCategory = "other"
|
||||
equipment: ActivityEquipment = "other"
|
||||
measurement_type: MeasurementType = "weight_reps"
|
||||
difficulty: Difficulty = "intermediate"
|
||||
image_s3_url: str | None = None
|
||||
image_s3_key: str | None = None
|
||||
default_calories_per_minute: float | None = None
|
||||
|
||||
|
||||
class ActivitySourceRead(ActivitySourceCreate):
|
||||
id: uuid.UUID
|
||||
slug: str
|
||||
owner_user_id: uuid.UUID | None
|
||||
is_builtin: bool
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class EquipmentCreate(BaseModel):
|
||||
name: str = Field(min_length=1, max_length=160)
|
||||
@@ -61,6 +118,7 @@ class WorkoutSetCreate(BaseModel):
|
||||
weight: float = Field(default=0, ge=0)
|
||||
reps: int = Field(default=0, ge=0)
|
||||
duration_seconds: int | None = None
|
||||
distance_km: float | None = Field(default=None, ge=0)
|
||||
calories: float | None = None
|
||||
completed_at: datetime | None = None
|
||||
|
||||
@@ -73,6 +131,7 @@ class WorkoutSetUpdate(BaseModel):
|
||||
weight: float | None = Field(default=None, ge=0)
|
||||
reps: int | None = Field(default=None, ge=0)
|
||||
duration_seconds: int | None = None
|
||||
distance_km: float | None = Field(default=None, ge=0)
|
||||
calories: float | None = None
|
||||
completed_at: datetime | None = None
|
||||
|
||||
@@ -93,6 +152,7 @@ class WorkoutSetRead(WorkoutSetCreate):
|
||||
|
||||
|
||||
class WorkoutItemCreate(BaseModel):
|
||||
activity_source_id: uuid.UUID | None = None
|
||||
exercise_id: uuid.UUID | None = None
|
||||
equipment_id: uuid.UUID | None = None
|
||||
order_index: int | None = None
|
||||
@@ -100,17 +160,21 @@ class WorkoutItemCreate(BaseModel):
|
||||
|
||||
@model_validator(mode="after")
|
||||
def exactly_one_entity(self) -> WorkoutItemCreate:
|
||||
if bool(self.exercise_id) == bool(self.equipment_id):
|
||||
raise ValueError("Provide exactly one of exercise_id or equipment_id")
|
||||
provided = [self.activity_source_id, self.exercise_id, self.equipment_id]
|
||||
if sum(value is not None for value in provided) != 1:
|
||||
raise ValueError("Provide exactly one activity source, exercise, or equipment id")
|
||||
return self
|
||||
|
||||
|
||||
class WorkoutItemRead(WorkoutItemCreate):
|
||||
id: uuid.UUID
|
||||
workout_id: uuid.UUID
|
||||
source_kind: Literal["exercise", "equipment"]
|
||||
source_kind: Literal["exercise", "machine", "equipment"]
|
||||
title_snapshot: str
|
||||
image_s3_url_snapshot: str | None
|
||||
measurement_type_snapshot: MeasurementType
|
||||
category_snapshot: ActivityCategory
|
||||
equipment_snapshot: ActivityEquipment
|
||||
order_index: int
|
||||
created_at: datetime
|
||||
sets: list[WorkoutSetRead] = []
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
[
|
||||
{"slug":"bench_press","kind":"exercise","title":"Жим штанги лежа","category":"chest","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/bench_press.jpg"},
|
||||
{"slug":"incline_bench_press","kind":"exercise","title":"Жим штанги на наклонной скамье","category":"chest","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/incline_bench_press.jpg"},
|
||||
{"slug":"dumbbell_bench_press","kind":"exercise","title":"Жим гантелей лежа","category":"chest","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/dumbbell_bench_press.webp"},
|
||||
{"slug":"incline_dumbbell_press","kind":"exercise","title":"Жим гантелей на наклонной скамье","category":"chest","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/incline_dumbbell_press.jpg"},
|
||||
{"slug":"push_up","kind":"exercise","title":"Отжимания","category":"chest","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/push_up.jpg"},
|
||||
{"slug":"dip_chest","kind":"exercise","title":"Отжимания на брусьях с акцентом на грудь","category":"chest","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/dip_chest.jpg"},
|
||||
{"slug":"dumbbell_fly","kind":"exercise","title":"Разводка гантелей лежа","category":"chest","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/dumbbell_fly.jpg"},
|
||||
{"slug":"cable_fly","kind":"exercise","title":"Сведение рук в кроссовере","category":"chest","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/cable_fly.webp"},
|
||||
{"slug":"pull_up","kind":"exercise","title":"Подтягивания","category":"back","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/pull_up.jpg"},
|
||||
{"slug":"chin_up","kind":"exercise","title":"Подтягивания обратным хватом","category":"back","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/chin_up.jpg"},
|
||||
{"slug":"lat_pulldown","kind":"exercise","title":"Тяга верхнего блока","category":"back","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/lat_pulldown.jpg"},
|
||||
{"slug":"barbell_row","kind":"exercise","title":"Тяга штанги в наклоне","category":"back","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/barbell_row.jpg"},
|
||||
{"slug":"dumbbell_row","kind":"exercise","title":"Тяга гантели одной рукой","category":"back","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/dumbbell_row.jpg"},
|
||||
{"slug":"seated_cable_row","kind":"exercise","title":"Горизонтальная тяга блока","category":"back","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/seated_cable_row.jpg"},
|
||||
{"slug":"t_bar_row","kind":"exercise","title":"Тяга T-грифа","category":"back","equipment":"machine","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/t_bar_row.png"},
|
||||
{"slug":"deadlift","kind":"exercise","title":"Становая тяга","category":"back","equipment":"barbell","measurement_type":"weight_reps","difficulty":"advanced","is_builtin":true,"asset_filename":"exercises/deadlift.jpg"},
|
||||
{"slug":"hyperextension","kind":"exercise","title":"Гиперэкстензия","category":"back","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/hyperextension.jpg"},
|
||||
{"slug":"pullover","kind":"exercise","title":"Пуловер","category":"back","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/pullover.jpg"},
|
||||
{"slug":"squat","kind":"exercise","title":"Приседания со штангой","category":"legs","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/squat.webp"},
|
||||
{"slug":"front_squat","kind":"exercise","title":"Фронтальные приседания","category":"legs","equipment":"barbell","measurement_type":"weight_reps","difficulty":"advanced","is_builtin":true,"asset_filename":"exercises/front_squat.png"},
|
||||
{"slug":"goblet_squat","kind":"exercise","title":"Гоблет-присед","category":"legs","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/goblet_squat.png"},
|
||||
{"slug":"leg_press","kind":"exercise","title":"Жим ногами","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/leg_press.jpg"},
|
||||
{"slug":"lunge","kind":"exercise","title":"Выпады","category":"legs","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/lunge.png"},
|
||||
{"slug":"bulgarian_split_squat","kind":"exercise","title":"Болгарские сплит-приседы","category":"legs","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/bulgarian_split_squat.jpg"},
|
||||
{"slug":"romanian_deadlift","kind":"exercise","title":"Румынская тяга","category":"legs","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/romanian_deadlift.jpg"},
|
||||
{"slug":"leg_extension","kind":"exercise","title":"Разгибание ног","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/leg_extension.webp"},
|
||||
{"slug":"leg_curl","kind":"exercise","title":"Сгибание ног","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/leg_curl.jpg"},
|
||||
{"slug":"standing_calf_raise","kind":"exercise","title":"Подъемы на икры стоя","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/standing_calf_raise.webp"},
|
||||
{"slug":"seated_calf_raise","kind":"exercise","title":"Подъемы на икры сидя","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/seated_calf_raise.webp"},
|
||||
{"slug":"hip_thrust","kind":"exercise","title":"Ягодичный мост / hip thrust","category":"legs","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/hip_thrust.jpg"},
|
||||
{"slug":"overhead_press","kind":"exercise","title":"Жим штанги стоя","category":"shoulders","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/overhead_press.png"},
|
||||
{"slug":"seated_dumbbell_press","kind":"exercise","title":"Жим гантелей сидя","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/seated_dumbbell_press.jpg"},
|
||||
{"slug":"arnold_press","kind":"exercise","title":"Жим Арнольда","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/arnold_press.webp"},
|
||||
{"slug":"lateral_raise","kind":"exercise","title":"Махи гантелями в стороны","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/lateral_raise.jpg"},
|
||||
{"slug":"front_raise","kind":"exercise","title":"Подъем гантелей перед собой","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/front_raise.webp"},
|
||||
{"slug":"rear_delt_fly","kind":"exercise","title":"Разводка на заднюю дельту","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/rear_delt_fly.jpg"},
|
||||
{"slug":"face_pull","kind":"exercise","title":"Face pull","category":"shoulders","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/face_pull.webp"},
|
||||
{"slug":"upright_row","kind":"exercise","title":"Тяга штанги к подбородку","category":"shoulders","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/upright_row.png"},
|
||||
{"slug":"shrug","kind":"exercise","title":"Шраги","category":"shoulders","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/shrug.webp"},
|
||||
{"slug":"barbell_curl","kind":"exercise","title":"Подъем штанги на бицепс","category":"biceps","equipment":"barbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/barbell_curl.jpg"},
|
||||
{"slug":"dumbbell_curl","kind":"exercise","title":"Подъем гантелей на бицепс","category":"biceps","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/dumbbell_curl.jpg"},
|
||||
{"slug":"hammer_curl","kind":"exercise","title":"Молотковые сгибания","category":"biceps","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/hammer_curl.jpg"},
|
||||
{"slug":"preacher_curl","kind":"exercise","title":"Сгибания на скамье Скотта","category":"biceps","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/preacher_curl.jpg"},
|
||||
{"slug":"concentration_curl","kind":"exercise","title":"Концентрированные сгибания","category":"biceps","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/concentration_curl.webp"},
|
||||
{"slug":"cable_curl","kind":"exercise","title":"Сгибание рук в блоке","category":"biceps","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/cable_curl.webp"},
|
||||
{"slug":"close_grip_bench_press","kind":"exercise","title":"Жим лежа узким хватом","category":"triceps","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/close_grip_bench_press.webp"},
|
||||
{"slug":"skullcrusher","kind":"exercise","title":"Французский жим лежа","category":"triceps","equipment":"barbell","measurement_type":"weight_reps","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/skullcrusher.png"},
|
||||
{"slug":"overhead_triceps_extension","kind":"exercise","title":"Разгибание рук из-за головы","category":"triceps","equipment":"dumbbell","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/overhead_triceps_extension.jpg"},
|
||||
{"slug":"triceps_pushdown","kind":"exercise","title":"Разгибание рук на блоке","category":"triceps","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/triceps_pushdown.jpg"},
|
||||
{"slug":"rope_pushdown","kind":"exercise","title":"Разгибание рук с канатом","category":"triceps","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/rope_pushdown.jpg"},
|
||||
{"slug":"bench_dip","kind":"exercise","title":"Обратные отжимания от скамьи","category":"triceps","equipment":"bodyweight","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/bench_dip.webp"},
|
||||
{"slug":"crunch","kind":"exercise","title":"Скручивания","category":"core","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/crunch.webp"},
|
||||
{"slug":"sit_up","kind":"exercise","title":"Подъем корпуса","category":"core","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/sit_up.png"},
|
||||
{"slug":"hanging_leg_raise","kind":"exercise","title":"Подъем ног в висе","category":"core","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/hanging_leg_raise.webp"},
|
||||
{"slug":"lying_leg_raise","kind":"exercise","title":"Подъем ног лежа","category":"core","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/lying_leg_raise.jpg"},
|
||||
{"slug":"plank","kind":"exercise","title":"Планка","category":"core","equipment":"bodyweight","measurement_type":"duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/plank.jpg"},
|
||||
{"slug":"russian_twist","kind":"exercise","title":"Русские скручивания","category":"core","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/russian_twist.avif"},
|
||||
{"slug":"cable_crunch","kind":"exercise","title":"Скручивания на блоке","category":"core","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/cable_crunch.avif"},
|
||||
{"slug":"ab_wheel_rollout","kind":"exercise","title":"Ролик для пресса","category":"core","equipment":"other","measurement_type":"reps_only","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/ab_wheel_rollout.jpg"},
|
||||
{"slug":"treadmill_running","kind":"exercise","title":"Бег на дорожке","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/treadmill_running.jpg","default_calories_per_minute":10},
|
||||
{"slug":"treadmill_walking","kind":"exercise","title":"Ходьба на дорожке","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/treadmill_walking.jpg","default_calories_per_minute":5},
|
||||
{"slug":"cycling","kind":"exercise","title":"Велотренажер","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/cycling.png","default_calories_per_minute":8},
|
||||
{"slug":"rowing","kind":"exercise","title":"Гребля","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/rowing.webp","default_calories_per_minute":9},
|
||||
{"slug":"elliptical","kind":"exercise","title":"Эллипсоид","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/elliptical.jpg","default_calories_per_minute":7},
|
||||
{"slug":"stair_climber","kind":"exercise","title":"Степпер / лестница","category":"cardio","equipment":"cardio_machine","measurement_type":"duration_calories","difficulty":"beginner","is_builtin":true,"asset_filename":"exercises/stair_climber.jpg","default_calories_per_minute":8},
|
||||
{"slug":"jump_rope","kind":"exercise","title":"Скакалка","category":"cardio","equipment":"other","measurement_type":"duration_calories","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/jump_rope.avif","default_calories_per_minute":11},
|
||||
{"slug":"burpee","kind":"exercise","title":"Берпи","category":"cardio","equipment":"bodyweight","measurement_type":"reps_only","difficulty":"intermediate","is_builtin":true,"asset_filename":"exercises/burpee.jpg"},
|
||||
{"slug":"smith_machine","kind":"machine","title":"Машина Смита","category":"full_body","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/smith_machine.webp"},
|
||||
{"slug":"leg_press_machine","kind":"machine","title":"Тренажер жим ногами","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/leg_press_machine.webp"},
|
||||
{"slug":"hack_squat_machine","kind":"machine","title":"Гакк-машина","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/hack_squat_machine.jpg"},
|
||||
{"slug":"leg_extension_machine","kind":"machine","title":"Тренажер разгибания ног","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/leg_extension_machine.jpg"},
|
||||
{"slug":"leg_curl_machine","kind":"machine","title":"Тренажер сгибания ног","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/leg_curl_machine.avif"},
|
||||
{"slug":"seated_calf_raise_machine","kind":"machine","title":"Тренажер икры сидя","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/seated_calf_raise_machine.jpg"},
|
||||
{"slug":"chest_press_machine","kind":"machine","title":"Тренажер жим от груди","category":"chest","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/chest_press_machine.webp"},
|
||||
{"slug":"pec_deck_machine","kind":"machine","title":"Пек-дек / бабочка","category":"chest","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/pec_deck_machine.jpg"},
|
||||
{"slug":"shoulder_press_machine","kind":"machine","title":"Тренажер жим на плечи","category":"shoulders","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/shoulder_press_machine.avif"},
|
||||
{"slug":"lat_pulldown_machine","kind":"machine","title":"Верхний блок","category":"back","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/lat_pulldown_machine.avif"},
|
||||
{"slug":"seated_row_machine","kind":"machine","title":"Горизонтальная тяга","category":"back","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/seated_row_machine.jpg"},
|
||||
{"slug":"assisted_pullup_machine","kind":"machine","title":"Гравитрон","category":"back","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/assisted_pullup_machine.png"},
|
||||
{"slug":"cable_crossover_machine","kind":"machine","title":"Кроссовер","category":"full_body","equipment":"cable","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/cable_crossover_machine.jpeg"},
|
||||
{"slug":"preacher_curl_machine","kind":"machine","title":"Скамья Скотта / тренажер бицепс","category":"biceps","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/preacher_curl_machine.jpg"},
|
||||
{"slug":"triceps_extension_machine","kind":"machine","title":"Тренажер трицепс","category":"triceps","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/triceps_extension_machine.jpg"},
|
||||
{"slug":"ab_crunch_machine","kind":"machine","title":"Тренажер пресс","category":"core","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/ab_crunch_machine.jpg"},
|
||||
{"slug":"back_extension_bench","kind":"machine","title":"Римский стул / гиперэкстензия","category":"back","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/back_extension_bench.webp"},
|
||||
{"slug":"glute_kickback_machine","kind":"machine","title":"Тренажер отведение ноги назад","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/glute_kickback_machine.jpg"},
|
||||
{"slug":"hip_abductor_machine","kind":"machine","title":"Тренажер отведение бедра","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/hip_abductor_machine.avif"},
|
||||
{"slug":"hip_adductor_machine","kind":"machine","title":"Тренажер приведение бедра","category":"legs","equipment":"machine","measurement_type":"weight_reps","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/hip_adductor_machine.png"},
|
||||
{"slug":"treadmill","kind":"machine","title":"Беговая дорожка","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/treadmill.jpg","default_calories_per_minute":10},
|
||||
{"slug":"stationary_bike","kind":"machine","title":"Велотренажер","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/stationary_bike.png","default_calories_per_minute":8},
|
||||
{"slug":"rowing_machine","kind":"machine","title":"Гребной тренажер","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/rowing_machine.webp","default_calories_per_minute":9},
|
||||
{"slug":"elliptical_machine","kind":"machine","title":"Эллиптический тренажер","category":"cardio","equipment":"cardio_machine","measurement_type":"distance_duration","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/elliptical_machine.jpg","default_calories_per_minute":7},
|
||||
{"slug":"stair_climber_machine","kind":"machine","title":"Лестничный тренажер","category":"cardio","equipment":"cardio_machine","measurement_type":"duration_calories","difficulty":"beginner","is_builtin":true,"asset_filename":"machines/stair_climber_machine.jpg","default_calories_per_minute":8}
|
||||
]
|
||||
@@ -4,6 +4,7 @@ version = "0.1.0"
|
||||
requires-python = ">=3.14"
|
||||
dependencies = [
|
||||
"alembic>=1.16.0",
|
||||
"boto3>=1.38.23",
|
||||
"fastapi[standard]>=0.115.12",
|
||||
"psycopg[binary]>=3.2.9",
|
||||
"pydantic-settings>=2.9.1",
|
||||
|
||||
Generated
+2
@@ -992,6 +992,7 @@ version = "0.1.0"
|
||||
source = { virtual = "logic" }
|
||||
dependencies = [
|
||||
{ name = "alembic" },
|
||||
{ name = "boto3" },
|
||||
{ name = "fastapi", extra = ["standard"] },
|
||||
{ name = "psycopg", extra = ["binary"] },
|
||||
{ name = "pydantic-settings" },
|
||||
@@ -1001,6 +1002,7 @@ dependencies = [
|
||||
[package.metadata]
|
||||
requires-dist = [
|
||||
{ name = "alembic", specifier = ">=1.16.0" },
|
||||
{ name = "boto3", specifier = ">=1.38.23" },
|
||||
{ name = "fastapi", extras = ["standard"], specifier = ">=0.115.12" },
|
||||
{ name = "psycopg", extras = ["binary"], specifier = ">=3.2.9" },
|
||||
{ name = "pydantic-settings", specifier = ">=2.9.1" },
|
||||
|
||||
Reference in New Issue
Block a user