better python things (#37)

Makefile

@@ -27,7 +27,7 @@ all:
 # ------------------------ #
 
 start-backend:
-	@python 'linguaphoto/main.py'
+	@uvicorn linguaphoto.main:app --reload --port 8080 --host localhost
 
 start-frontend:
 	@cd frontend && npm start

frontend/src/api/auth.ts

@@ -21,7 +21,9 @@ export const read_me = async (token: string): Promise<Response | null> => {
   }
 };
 export const signin = async (data: SigninData): Promise<Response> => {
+  console.log("signing in... url:", `${API_URL}/signin`);
   const response = await axios.post(`${API_URL}/signin`, data);
+  console.log("signing in... response:", response.data);
   return response.data;
 };
 export const social_facebook_login = async (

linguaphoto/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.1"

linguaphoto/ai/cli.py

@@ -7,8 +7,9 @@
 
 from openai import AsyncOpenAI
 from PIL import Image
-from transcribe import transcribe_image
-from tts import synthesize_text
+
+from linguaphoto.ai.transcribe import transcribe_image
+from linguaphoto.ai.tts import synthesize_text
 
 logger = logging.getLogger(__name__)
 

linguaphoto/ai/transcribe.py

@@ -1,17 +1,15 @@
 """Uses the OpenAI API to transcribe an image to text."""
 
-# import argparse
-
-# import asyncio
 import base64
 import logging
 from io import BytesIO
 
 import aiohttp
-from models import TranscriptionResponse
 from openai import AsyncOpenAI
 from PIL import Image
 
+from linguaphoto.models import TranscriptionResponse
+
 logger = logging.getLogger(__name__)
 
 PROMPT = """

linguaphoto/ai/tts.py

@@ -6,9 +6,10 @@
 from pathlib import Path
 from typing import AsyncIterator
 
-from ai.transcribe import TranscriptionResponse
 from openai import AsyncOpenAI
 
+from linguaphoto.ai.transcribe import TranscriptionResponse
+
 logger = logging.getLogger(__name__)
 
 

linguaphoto/api/api.py

@@ -12,9 +12,10 @@
 to handle routing for the entire API.
 """
 
-from api import collection, image, subscription, user
 from fastapi import APIRouter
 
+from linguaphoto.api import collection, image, subscription, user
+
 # Create a new API router
 router = APIRouter()
 

linguaphoto/api/collection.py

@@ -2,12 +2,13 @@
 
 from typing import List
 
-from crud.collection import CollectionCrud
-from errors import NotAuthorizedError
 from fastapi import APIRouter, Depends
-from models import Collection
-from schemas.collection import CollectionCreateFragment, CollectionEditFragment
-from utils.auth import get_current_user_id
+
+from linguaphoto.crud.collection import CollectionCrud
+from linguaphoto.errors import NotAuthorizedError
+from linguaphoto.models import Collection
+from linguaphoto.schemas.collection import CollectionCreateFragment, CollectionEditFragment
+from linguaphoto.utils.auth import get_current_user_id
 
 router = APIRouter()
 

linguaphoto/api/image.py

@@ -2,12 +2,13 @@
 
 from typing import Annotated, List
 
-from crud.collection import CollectionCrud
-from crud.image import ImageCrud
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile
-from models import Image
 from pydantic import BaseModel
-from utils.auth import get_current_user_id, subscription_validate
+
+from linguaphoto.crud.collection import CollectionCrud
+from linguaphoto.crud.image import ImageCrud
+from linguaphoto.models import Image
+from linguaphoto.utils.auth import get_current_user_id, subscription_validate
 
 
 class TranslateFramgement(BaseModel):

linguaphoto/api/subscription.py

@@ -1,10 +1,11 @@
 """Collection API."""
 
 import stripe
-from crud.user import UserCrud
 from fastapi import APIRouter, Depends, HTTPException
-from settings import settings
-from utils.auth import get_current_user_id
+
+from linguaphoto.crud.user import UserCrud
+from linguaphoto.settings import settings
+from linguaphoto.utils.auth import get_current_user_id
 
 router = APIRouter()
 

linguaphoto/api/user.py

@@ -2,14 +2,15 @@
 
 from datetime import timedelta
 
-from crud.user import UserCrud
 from fastapi import APIRouter, Depends, HTTPException
-from schemas.user import (
+
+from linguaphoto.crud.user import UserCrud
+from linguaphoto.schemas.user import (
     UserSigninFragment,
     UserSigninRespondFragment,
     UserSignupFragment,
 )
-from utils.auth import create_access_token, decode_access_token, oauth2_schema
+from linguaphoto.utils.auth import create_access_token, decode_access_token, oauth2_schema
 
 router = APIRouter()
 

linguaphoto/config.py

@@ -24,7 +24,8 @@
 import aioboto3
 import aioboto3.session
 from botocore.exceptions import NoCredentialsError
-from settings import settings
+
+from linguaphoto.settings import settings
 
 
 async def get_dynamodb_resource() -> Any:  # noqa: ANN401

linguaphoto/crud/base.py

@@ -7,12 +7,13 @@
 import aioboto3
 from boto3.dynamodb.conditions import ComparisonCondition, Key
 from botocore.exceptions import ClientError
-from errors import InternalError, ItemNotFoundError
-from models import BaseModel, LinguaBaseModel
-from settings import settings
 from types_aiobotocore_dynamodb.service_resource import DynamoDBServiceResource
 from types_aiobotocore_s3.service_resource import S3ServiceResource
 
+from linguaphoto.errors import InternalError, ItemNotFoundError
+from linguaphoto.models import BaseModel, LinguaBaseModel
+from linguaphoto.settings import settings
+
 T = TypeVar("T", bound=BaseModel)
 
 TABLE_NAME = settings.dynamodb_table_name

linguaphoto/crud/collection.py

@@ -2,8 +2,8 @@
 
 from typing import List
 
-from crud.base import BaseCrud
-from models import Collection
+from linguaphoto.crud.base import BaseCrud
+from linguaphoto.models import Collection
 
 
 class CollectionCrud(BaseCrud):

linguaphoto/crud/image.py

@@ -6,16 +6,17 @@
 from typing import List
 
 import requests
-from ai.transcribe import transcribe_image
-from ai.tts import synthesize_text
 from boto3.dynamodb.conditions import Key
-from crud.base import BaseCrud
-from errors import ItemNotFoundError
 from fastapi import HTTPException, UploadFile
-from models import Collection, Image
 from openai import AsyncOpenAI
-from settings import settings
-from utils.cloudfront_url_signer import CloudFrontUrlSigner
+
+from linguaphoto.ai.transcribe import transcribe_image
+from linguaphoto.ai.tts import synthesize_text
+from linguaphoto.crud.base import BaseCrud
+from linguaphoto.errors import ItemNotFoundError
+from linguaphoto.models import Collection, Image
+from linguaphoto.settings import settings
+from linguaphoto.utils.cloudfront_url_signer import CloudFrontUrlSigner
 
 key_pair_id = settings.key_pair_id
 media_hosting_server = settings.media_hosting_server

linguaphoto/crud/user.py

@@ -2,9 +2,9 @@
 
 from typing import List
 
-from crud.base import BaseCrud
-from models import User
-from schemas.user import UserSigninFragment, UserSignupFragment
+from linguaphoto.crud.base import BaseCrud
+from linguaphoto.models import User
+from linguaphoto.schemas.user import UserSigninFragment, UserSignupFragment
 
 
 class UserCrud(BaseCrud):

linguaphoto/main.py

@@ -1,10 +1,11 @@
 """Defines the main entrypoint for the FastAPI app."""
 
 import uvicorn
-from api.api import router
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from settings import settings
+
+from linguaphoto.api.api import router
+from linguaphoto.settings import settings
 
 app = FastAPI()
 

linguaphoto/models.py

@@ -5,7 +5,8 @@
 
 from bcrypt import checkpw, gensalt, hashpw
 from pydantic import BaseModel
-from schemas.user import UserSignupFragment
+
+from linguaphoto.schemas.user import UserSignupFragment
 
 
 class LinguaBaseModel(BaseModel):

linguaphoto/utils/auth.py

@@ -15,10 +15,11 @@
 from typing import Union
 
 import jwt
-from crud.user import UserCrud
 from fastapi import Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer
 
+from linguaphoto.crud.user import UserCrud
+
 SECRET_KEY = "your_secret_key"
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30