working models

.gitignore

@@ -1,2 +1,4 @@
 __pycache__
-venv
+venv
+.env
+.pytest_cache

alembic.ini

@@ -0,0 +1,119 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = migrations
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to migrations/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+version_path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = sqlite:///./app.db
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

database.py

@@ -1,19 +1,14 @@
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-SQLALCHEMY_DATABASE_URL = "sqlite:///./test.db"
-
-engine = create_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-)
+SQLALCHEMY_DATABASE_URL = "sqlite:///./app.db"
+engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
-Base = declarative_base()
 
 def get_db():
     db = SessionLocal()
     try:
         yield db
     finally:
-        db.close()
+        db.close()

main.py

@@ -1,14 +1,17 @@
 from fastapi import FastAPI
-from routes.extract_product_info_from_barcode import router as extract_product_info_router
-from routes.fetch_product_data import router as fetch_product_data_router
-from routes.auth import router as auth_router
-from routes.analysis import router as analysis_router
-from routes.history import router as history_router
+from routers.auth import router as auth_router
+from routers.analysis import router as analysis_router
+from routers.history import router as history_router
+from database import get_db,engine
+from models.base import Base
 
 app = FastAPI()
+db = get_db()
 
-app.include_router(extract_product_info_router, prefix="/api")
-app.include_router(fetch_product_data_router, prefix="/api")
+@app.on_event("startup")
+async def create_tables():
+    Base.metadata.create_all(bind=engine)
+    
 app.include_router(auth_router, prefix="/api")
 app.include_router(analysis_router, prefix="/api")
 app.include_router(history_router, prefix="/api")

migrations/README

@@ -0,0 +1 @@
+Generic single-database configuration.

migrations/env.py

@@ -0,0 +1,53 @@
+from logging.config import fileConfig
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from alembic import context
+
+# Import your models and Base
+from models.base import Base
+from models.user import User
+from models.user_preferences import UserPreferences
+# Import other models as needed
+
+# this is the Alembic Config object
+config = context.config
+
+# Interpret the config file for Python logging
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# Set target metadata
+target_metadata = Base.metadata
+
+def run_migrations_offline() -> None:
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+def run_migrations_online() -> None:
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, 
+            target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

migrations/script.py.mako

@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}

migrations/versions/605bfa8313bb_create_initial_tables.py

@@ -0,0 +1,52 @@
+"""create initial tables
+
+Revision ID: 605bfa8313bb
+Revises: 
+Create Date: 2025-03-21 14:59:03.528627
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '605bfa8313bb'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('ingredients',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(), nullable=True),
+    sa.Column('nutritional_info', sa.JSON(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_ingredients_id'), 'ingredients', ['id'], unique=False)
+    op.create_index(op.f('ix_ingredients_name'), 'ingredients', ['name'], unique=True)
+    op.create_table('scan_history',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('scan_date', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_scan_history_id'), 'scan_history', ['id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_scan_history_id'), table_name='scan_history')
+    op.drop_table('scan_history')
+    op.drop_index(op.f('ix_ingredients_name'), table_name='ingredients')
+    op.drop_index(op.f('ix_ingredients_id'), table_name='ingredients')
+    op.drop_table('ingredients')
+    # ### end Alembic commands ###

migrations/versions/fcf5a0dab27d_add_scan_history_relationship.py

@@ -0,0 +1,36 @@
+"""add scan history relationship
+
+Revision ID: fcf5a0dab27d
+Revises: 605bfa8313bb
+Create Date: 2025-03-21 17:33:44.076205
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'fcf5a0dab27d'
+down_revision: Union[str, None] = '605bfa8313bb'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index('ix_scan_history_id', table_name='scan_history')
+    op.drop_constraint(None, 'scan_history', type_='foreignkey')
+    op.create_foreign_key(None, 'scan_history', 'users', ['user_id'], ['id'], ondelete='CASCADE')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'scan_history', type_='foreignkey')
+    op.create_foreign_key(None, 'scan_history', 'users', ['user_id'], ['id'])
+    op.create_index('ix_scan_history_id', 'scan_history', ['id'], unique=False)
+    # ### end Alembic commands ###

models/__init__.py

@@ -0,0 +1,7 @@
+from .base import Base
+from .user import User
+from .user_preferences import UserPreferences
+from .ingredient import Ingredient
+from .scan_history import ScanHistory
+
+__all__ = ["Base", "User", "UserPreferences", "Ingredient", "ScanHistory"]

models/base.py

@@ -0,0 +1,4 @@
+from sqlalchemy.orm import DeclarativeBase
+
+class Base(DeclarativeBase):
+    pass

models/ingredient.py

@@ -1,5 +1,5 @@
 from sqlalchemy import Column, Integer, String, JSON
-from database import Base
+from .base import Base
 
 class Ingredient(Base):
     __tablename__ = "ingredients"

models/scan_history.py

@@ -1,13 +1,16 @@
-from sqlalchemy import Column, Integer, ForeignKey, DateTime
-from sqlalchemy.orm import relationship
-from database import Base
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import ForeignKey, Integer, DateTime
+from datetime import datetime
+from .base import Base
+from typing import Optional
 
 class ScanHistory(Base):
     __tablename__ = "scan_history"
 
-    id = Column(Integer, primary_key=True, index=True)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
-    product_id = Column(Integer, nullable=False)
-    scan_date = Column(DateTime, nullable=False)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
+    product_id: Mapped[int] = mapped_column(Integer)
+    scan_date: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow)
 
-    user = relationship("User", back_populates="scan_history")
+    # Add relationship to user
+    user: Mapped["User"] = relationship("User", back_populates="scan_history")

models/user.py

@@ -1,10 +1,28 @@
-from sqlalchemy import Column, Integer, String
-from database import Base
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import String, Boolean
+from typing import List, TYPE_CHECKING
+from .base import Base
+
+if TYPE_CHECKING:
+    from .user_preferences import UserPreferences
 
 class User(Base):
     __tablename__ = "users"
 
-    id = Column(Integer, primary_key=True, index=True)
-    username = Column(String, unique=True, index=True)
-    email = Column(String, unique=True, index=True)
-    hashed_password = Column(String)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    username: Mapped[str] = mapped_column(String, unique=True, index=True)
+    email: Mapped[str] = mapped_column(String, unique=True, index=True)
+    hashed_password: Mapped[str] = mapped_column(String)
+    is_active: Mapped[bool] = mapped_column(Boolean, default=True)
+    
+    preferences: Mapped[List["UserPreferences"]] = relationship(
+        "UserPreferences", 
+        back_populates="user",
+        cascade="all, delete-orphan"
+    )
+    # Add relationship to scan history
+    scan_history: Mapped[List["ScanHistory"]] = relationship(
+        "ScanHistory", 
+        back_populates="user",
+        cascade="all, delete-orphan"
+    )

models/user_preferences.py

@@ -1,15 +1,19 @@
-from sqlalchemy import Column, Integer, String, ForeignKey
-from sqlalchemy.orm import relationship
-from database import Base
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import ForeignKey, String
+from typing import Optional, TYPE_CHECKING
+from .base import Base
+
+if TYPE_CHECKING:
+    from .user import User
 
 class UserPreferences(Base):
     __tablename__ = "user_preferences"
 
-    id = Column(Integer, primary_key=True, index=True)
-    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
-    dietary_restrictions = Column(String, nullable=True)
-    allergens = Column(String, nullable=True)
-    preferred_ingredients = Column(String, nullable=True)
-    disliked_ingredients = Column(String, nullable=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
+    dietary_restrictions: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    allergens: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    preferred_ingredients: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    disliked_ingredients: Mapped[Optional[str]] = mapped_column(String, nullable=True)
 
-    user = relationship("User", back_populates="preferences")
+    user: Mapped["User"] = relationship("User", back_populates="preferences")

requirements.txt

@@ -8,3 +8,11 @@ sqlalchemy
 alembic
 redis
 transformers
+passlib
+python-jose
+python-multipart
+cachetools
+pytest
+pytest-cov
+httpx
+bcrypt

routes/extract_product_info_from_barcode.py

@@ -1,45 +0,0 @@
-from fastapi import APIRouter, HTTPException
-from utils import fetch_product_data_from_api
-from models import ProductInfo
-
-router = APIRouter()
-
-@router.get("/extract_product_info", response_model=ProductInfo)
-def extract_product_info(barcode: str):
-    data = fetch_product_data_from_api(barcode)
-    product = data.get('product', {})
-
-    product_info = {
-        "product_name": product.get('product_name_en', product.get('product_name', 'N/A')),
-        "generic_name": product.get('generic_name_en', product.get('generic_name', 'N/A')),
-        "brands": product.get('brands', 'N/A'),
-        "ingredients": [],
-        "ingredients_text": product.get('ingredients_text_en', product.get('ingredients_text', 'N/A')),
-        "ingredients_analysis": product.get('ingredients_analysis', {}),
-        "nutriscore": product.get('nutriscore', {}),
-        "nutrient_levels": product.get('nutrient_levels', {}),
-        "nutriments": product.get('nutriments', {}),
-        "data_quality_warnings": product.get('data_quality_warnings_tags', [])
-    }
-
-    ingredients_list = product.get('ingredients', [])
-    for ingredient in ingredients_list:
-        ingredient_info = {
-            "text": ingredient.get('text', 'N/A'),
-            "percent": ingredient.get('percent', ingredient.get('percent_estimate', 'N/A')),
-            "vegan": ingredient.get('vegan', 'N/A'),
-            "vegetarian": ingredient.get('vegetarian', 'N/A'),
-            "sub_ingredients": []
-        }
-        sub_ingredients = ingredient.get('ingredients', [])
-        for sub_ingredient in sub_ingredients:
-            sub_ingredient_info = {
-                "text": sub_ingredient.get('text', 'N/A'),
-                "percent": sub_ingredient.get('percent', sub_ingredient.get('percent_estimate', 'N/A')),
-                "vegan": sub_ingredient.get('vegan', 'N/A'),
-                "vegetarian": sub_ingredient.get('vegetarian', 'N/A')
-            }
-            ingredient_info["sub_ingredients"].append(sub_ingredient_info)
-        product_info["ingredients"].append(ingredient_info)
-
-    return product_info

routes/fetch_product_data.py

@@ -1,12 +0,0 @@
-from fastapi import APIRouter
-from models import Barcodes
-from utils import fetch_product_data_from_api, save_json_file
-
-router = APIRouter()
-
-@router.post("/fetch_product_data")
-def fetch_product_data(barcodes: Barcodes):
-    for item, barcode in barcodes.barcodes.items():
-        data = fetch_product_data_from_api(barcode)
-        save_json_file(item, data)
-    return {"message": "Data fetched and saved successfully"}

services/auth_service.py

@@ -3,7 +3,7 @@ from jose import JWTError, jwt
 from datetime import datetime, timedelta
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session,Mapped
 from database import get_db
 from models.user import User
 from pydantic import BaseModel
@@ -24,8 +24,6 @@ class Token(BaseModel):
 class TokenData(BaseModel):
     username: str | None = None
 
-class UserInDB(User):
-    hashed_password: str
 
 def verify_password(plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)

services/scan_history.py

@@ -2,12 +2,19 @@ from sqlalchemy.orm import Session
 from models.scan_history import ScanHistory
 from datetime import datetime
 
-def record_scan(db: Session, user_id: int, product_id: int):
-    scan_entry = ScanHistory(user_id=user_id, product_id=product_id, scan_date=datetime.utcnow())
+def record_scan(db: Session, user_id: int, product_id: int) -> ScanHistory:
+    scan_entry = ScanHistory(
+        user_id=user_id,
+        product_id=product_id,
+        scan_date=datetime.utcnow()
+    )
     db.add(scan_entry)
     db.commit()
     db.refresh(scan_entry)
     return scan_entry
 
-def get_scan_history(db: Session, user_id: int):
-    return db.query(ScanHistory).filter(ScanHistory.user_id == user_id).all()
+def get_scan_history(db: Session, user_id: int) -> list[ScanHistory]:
+    return db.query(ScanHistory)\
+        .filter(ScanHistory.user_id == user_id)\
+        .order_by(ScanHistory.scan_date.desc())\
+        .all()

tests/test_auth_service.py

@@ -2,7 +2,8 @@ import pytest
 from fastapi.testclient import TestClient
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from database import Base, get_db
+from database import get_db
+from models.base import Base
 from main import app
 from services.auth_service import create_user, get_password_hash
 from models.user import User