From c556147e380094721a745b3b3ff7fd943907cae0 Mon Sep 17 00:00:00 2001 From: Ferrariic Date: Sat, 3 Dec 2022 09:45:40 -0600 Subject: [PATCH] clean imports --- Dockerfile | 2 ++ api/routers/challenge.py | 13 ------------- api/routers/dashboard.py | 16 +++++----------- api/routers/event.py | 14 +------------- api/routers/profile.py | 21 ++++++++------------- api/routers/trainer.py | 10 +++------- api/routers/workout.py | 14 +------------- 7 files changed, 20 insertions(+), 70 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74c600a..3e0bcbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,5 +5,7 @@ COPY . /code/ EXPOSE 5000 +RUN apt-get update +RUN apt-get install ffmpeg libsm6 libxext6 -y RUN pip install -r requirements.txt CMD ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5000"] \ No newline at end of file diff --git a/api/routers/challenge.py b/api/routers/challenge.py index 653915f..fcbdc29 100644 --- a/api/routers/challenge.py +++ b/api/routers/challenge.py @@ -1,19 +1,6 @@ import json from fastapi import APIRouter -from pydantic import BaseModel -from typing import List, Optional -from pymysql import Timestamp -import datetime - -from api.database.functions import hashbrown, sqlalchemy_result -from api.database.models import Registration, Tokens -from sqlalchemy.sql.expression import select, update -from api.database.database import USERDATA_ENGINE -from fastapi import APIRouter, HTTPException, Request -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.sql.expression import select, update router = APIRouter() diff --git a/api/routers/dashboard.py b/api/routers/dashboard.py index a16c26c..40a6f1e 100644 --- a/api/routers/dashboard.py +++ b/api/routers/dashboard.py @@ -1,20 +1,14 @@ import json -from fastapi import APIRouter -from pydantic import BaseModel -from typing import List, Optional -from pymysql import Timestamp -import datetime - -from api.database.functions import hashbrown, sqlalchemy_result -from api.database.models import Registration, Tokens, TrainerStats, TrainerClientHistory -from sqlalchemy.sql.expression import select, update -from api.database.database import USERDATA_ENGINE -from fastapi import APIRouter, HTTPException, Request, status +from fastapi import APIRouter, HTTPException, status from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql.expression import select, update +from api.database.database import USERDATA_ENGINE +from api.database.functions import sqlalchemy_result +from api.database.models import Tokens, TrainerClientHistory, TrainerStats + router = APIRouter() diff --git a/api/routers/event.py b/api/routers/event.py index 877d87e..7a95f10 100644 --- a/api/routers/event.py +++ b/api/routers/event.py @@ -1,24 +1,12 @@ import json from fastapi import APIRouter -from pydantic import BaseModel -from typing import List, Optional -from pymysql import Timestamp -import datetime - -from api.database.functions import hashbrown, sqlalchemy_result -from api.database.models import Registration, Tokens -from sqlalchemy.sql.expression import select, update -from api.database.database import USERDATA_ENGINE -from fastapi import APIRouter, HTTPException, Request -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql.expression import select, update router = APIRouter() -@router.get("/v1/events/{token}", tags=['event']) +@router.get("/v1/events/{token}", tags=["event"]) async def get_event_information(token: str) -> json: """ Params: token:string diff --git a/api/routers/profile.py b/api/routers/profile.py index b6f46fc..dc75e88 100644 --- a/api/routers/profile.py +++ b/api/routers/profile.py @@ -1,31 +1,26 @@ -import datetime +import glob import json import os -from typing import List, Optional +import time -from fastapi import APIRouter, File, HTTPException, Request, UploadFile, status +import cv2 +from fastapi import APIRouter, File, HTTPException, UploadFile, status from fastapi.responses import FileResponse -from pydantic import BaseModel -from pymysql import Timestamp from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.sql.expression import select, update from sqlalchemy.sql import or_ +from sqlalchemy.sql.expression import select from api.database.database import USERDATA_ENGINE -from api.database.functions import hashbrown, sqlalchemy_result +from api.database.functions import sqlalchemy_result from api.database.models import ( - Registration, - Tokens, - UserInformation, FitnessGoals, Ratings, + Registration, Relationships, + Tokens, TrainerInformation, ) -import cv2 -import time -import glob router = APIRouter() diff --git a/api/routers/trainer.py b/api/routers/trainer.py index 0eff19e..1ce5d3f 100644 --- a/api/routers/trainer.py +++ b/api/routers/trainer.py @@ -1,16 +1,12 @@ import json from fastapi import APIRouter -from pydantic import BaseModel -from typing import List, Optional -from pymysql import Timestamp -import datetime -from api.database.functions import hashbrown, sqlalchemy_result -from api.database.models import Registration, Tokens, TrainerInformation +from api.database.functions import sqlalchemy_result +from api.database.models import Tokens, TrainerInformation from sqlalchemy.sql.expression import select, update from api.database.database import USERDATA_ENGINE -from fastapi import APIRouter, HTTPException, Request, UploadFile, File, status +from fastapi import APIRouter, HTTPException, UploadFile, File, status from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql.expression import select, update diff --git a/api/routers/workout.py b/api/routers/workout.py index c44344d..1594e47 100644 --- a/api/routers/workout.py +++ b/api/routers/workout.py @@ -1,24 +1,12 @@ import json from fastapi import APIRouter -from pydantic import BaseModel -from typing import List, Optional -from pymysql import Timestamp -import datetime - -from api.database.functions import hashbrown, sqlalchemy_result -from api.database.models import Registration, Tokens -from sqlalchemy.sql.expression import select, update -from api.database.database import USERDATA_ENGINE -from fastapi import APIRouter, HTTPException, Request -from sqlalchemy import select -from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.sql.expression import select, update router = APIRouter() -@router.get("/v1/workout/{token}/{user_id}", tags=['workout']) +@router.get("/v1/workout/{token}/{user_id}", tags=["workout"]) async def get_workout_plan(token: str, user_id: str) -> json: """ Params: