lots of changes routes, apis, idk

Author: kiyo9w

backend/Dockerfile

@@ -40,4 +40,5 @@ COPY ./app /app/app
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync
 
-CMD ["fastapi", "run", "--workers", "4", "app/main.py"]
+# Use Uvicorn directly for better compatibility with Render's $PORT
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "${PORT:-8000}", "--workers", "4"]

backend/app/alembic/env.py

@@ -1,9 +1,16 @@
 import os
+import sys
+from pathlib import Path
 from logging.config import fileConfig
 
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
+# Add project root to sys.path
+# Assumes env.py is in backend/app/alembic/
+project_root = Path(__file__).parents[2]
+sys.path.insert(0, str(project_root))
+
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config

backend/app/alembic/versions/47b3823eff09_add_on_delete_cascade_to_message_.py

@@ -0,0 +1,55 @@
+"""Add ON DELETE CASCADE to message.conversation_id
+
+Revision ID: 47b3823eff09
+Revises: cba8d126b9ac
+Create Date: 2025-04-19 06:25:27.717138
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '47b3823eff09'
+down_revision = 'cba8d126b9ac'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Manually added to apply ON DELETE CASCADE
+    op.drop_constraint(
+        'message_conversation_id_fkey', # Default constraint name might vary, check DB if needed
+        'message',
+        type_='foreignkey'
+    )
+    op.create_foreign_key(
+        'message_conversation_id_fkey',
+        'message',
+        'conversation',
+        ['conversation_id'],
+        ['id'],
+        ondelete='CASCADE'
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Manually added to revert ON DELETE CASCADE
+    op.drop_constraint(
+        'message_conversation_id_fkey',
+        'message',
+        type_='foreignkey'
+    )
+    op.create_foreign_key(
+        'message_conversation_id_fkey',
+        'message',
+        'conversation',
+        ['conversation_id'],
+        ['id']
+        # No ondelete here
+    )
+    # ### end Alembic commands ###

backend/app/alembic/versions/cba8d126b9ac_add_character_conversation_message_.py

@@ -0,0 +1,61 @@
+"""Add Character, Conversation, Message models
+
+Revision ID: cba8d126b9ac
+Revises: 1a31ce608336
+Create Date: 2025-04-19 06:13:38.566914
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = 'cba8d126b9ac'
+down_revision = '1a31ce608336'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('character',
+    sa.Column('name', sqlmodel.sql.sqltypes.AutoString(length=100), nullable=False),
+    sa.Column('description', sqlmodel.sql.sqltypes.AutoString(length=1000), nullable=True),
+    sa.Column('image_url', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
+    sa.Column('greeting_message', sqlmodel.sql.sqltypes.AutoString(length=1000), nullable=True),
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('status', sa.Enum('PENDING', 'APPROVED', 'REJECTED', name='characterstatus'), nullable=False),
+    sa.Column('creator_id', sa.Uuid(), nullable=False),
+    sa.ForeignKeyConstraint(['creator_id'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_character_name'), 'character', ['name'], unique=False)
+    op.create_table('conversation',
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('user_id', sa.Uuid(), nullable=False),
+    sa.Column('character_id', sa.Uuid(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['character_id'], ['character.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('message',
+    sa.Column('content', sqlmodel.sql.sqltypes.AutoString(length=5000), nullable=False),
+    sa.Column('id', sa.Uuid(), nullable=False),
+    sa.Column('conversation_id', sa.Uuid(), nullable=False),
+    sa.Column('sender', sa.Enum('USER', 'AI', name='messagesender'), nullable=False),
+    sa.Column('timestamp', sa.DateTime(), nullable=False),
+    sa.ForeignKeyConstraint(['conversation_id'], ['conversation.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('message')
+    op.drop_table('conversation')
+    op.drop_index(op.f('ix_character_name'), table_name='character')
+    op.drop_table('character')
+    # ### end Alembic commands ###

backend/app/api/routes/characters.py

@@ -31,6 +31,23 @@ def list_approved_characters(
     return CharactersPublic(data=characters, count=count)
 
 
+@router.get("/my-submissions", response_model=CharactersPublic)
+def list_my_character_submissions(
+    session: SessionDep, current_user: CurrentUser, skip: int = 0, limit: int = 100
+) -> Any:
+    """
+    Retrieve characters submitted by the current user.
+    Includes characters with any status (pending, approved, rejected).
+    """
+    count = crud.characters.get_characters_count(
+        session=session, creator_id=current_user.id
+    )
+    characters = crud.characters.get_characters(
+        session=session, creator_id=current_user.id, skip=skip, limit=limit
+    )
+    return CharactersPublic(data=characters, count=count)
+
+
 @router.get("/{id}", response_model=CharacterPublic)
 def get_approved_character(
     session: SessionDep, id: uuid.UUID

backend/app/crud/__init__.py

@@ -0,0 +1,24 @@
+from . import characters
+from . import conversations
+
+# Import functions from the original crud file (now named base.py)
+from .base import (
+    create_user,
+    update_user,
+    get_user_by_email,
+    authenticate,
+    create_item,
+)
+
+# Now, when other modules do 'from app import crud',
+# they can access crud.create_user, crud.authenticate,
+# crud.characters.create_character, etc.
+
+# You can also import specific functions if preferred, e.g.:
+# from .users import get_user_by_email, create_user, authenticate, update_user # Assuming users crud is also needed
+# from .items import create_item # Assuming items crud is also needed
+
+# We need to import the existing user and item crud functions as well
+# Check where user/item crud functions are defined (likely crud.py initially)
+# Let's assume they are in a top-level crud.py that needs to be refactored or imported here
+# For now, just importing the new modules: 

backend/app/crud/base.py

@@ -0,0 +1,54 @@
+import uuid
+from typing import Any
+
+from sqlmodel import Session, select
+
+from app.core.security import get_password_hash, verify_password
+from app.models import Item, ItemCreate, User, UserCreate, UserUpdate
+
+
+def create_user(*, session: Session, user_create: UserCreate) -> User:
+    db_obj = User.model_validate(
+        user_create, update={"hashed_password": get_password_hash(user_create.password)}
+    )
+    session.add(db_obj)
+    session.commit()
+    session.refresh(db_obj)
+    return db_obj
+
+
+def update_user(*, session: Session, db_user: User, user_in: UserUpdate) -> Any:
+    user_data = user_in.model_dump(exclude_unset=True)
+    extra_data = {}
+    if "password" in user_data:
+        password = user_data["password"]
+        hashed_password = get_password_hash(password)
+        extra_data["hashed_password"] = hashed_password
+    db_user.sqlmodel_update(user_data, update=extra_data)
+    session.add(db_user)
+    session.commit()
+    session.refresh(db_user)
+    return db_user
+
+
+def get_user_by_email(*, session: Session, email: str) -> User | None:
+    statement = select(User).where(User.email == email)
+    session_user = session.exec(statement).first()
+    return session_user
+
+
+def authenticate(*, session: Session, email: str, password: str) -> User | None:
+    db_user = get_user_by_email(session=session, email=email)
+    if not db_user:
+        return None
+    if not verify_password(password, db_user.hashed_password):
+        return None
+    return db_user
+
+
+def create_item(*, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> Item:
+    db_item = Item.model_validate(item_in, update={"owner_id": owner_id})
+    session.add(db_item)
+    session.commit()
+    session.refresh(db_item)
+    return db_item

backend/app/crud/characters.py

@@ -0,0 +1,81 @@
+# Placeholder for character CRUD operations 
+
+import uuid
+from typing import Sequence
+
+from sqlmodel import Session, select, col, func
+
+from app.models import Character, CharacterCreate, CharacterUpdate, CharacterStatus, User
+
+
+def create_character(
+    *, session: Session, character_create: CharacterCreate, creator_id: uuid.UUID
+) -> Character:
+    """Creates a new character with status 'pending'."""
+    db_obj = Character.model_validate(
+        character_create, update={"creator_id": creator_id, "status": CharacterStatus.PENDING}
+    )
+    session.add(db_obj)
+    session.commit()
+    session.refresh(db_obj)
+    return db_obj
+
+
+def get_character(*, session: Session, character_id: uuid.UUID) -> Character | None:
+    """Gets a single character by its ID."""
+    return session.get(Character, character_id)
+
+
+def get_characters(
+    *,
+    session: Session,
+    skip: int = 0,
+    limit: int = 100,
+    status: CharacterStatus | None = None,
+    creator_id: uuid.UUID | None = None,
+) -> Sequence[Character]:
+    """Gets a list of characters with optional filters."""
+    statement = select(Character).offset(skip).limit(limit)
+    if status is not None:
+        statement = statement.where(Character.status == status)
+    if creator_id is not None:
+        statement = statement.where(Character.creator_id == creator_id)
+
+    characters = session.exec(statement).all()
+    return characters
+
+
+def get_characters_count(
+    *,
+    session: Session,
+    status: CharacterStatus | None = None,
+    creator_id: uuid.UUID | None = None,
+) -> int:
+    """Gets the total count of characters with optional filters."""
+    statement = select(func.count(Character.id))
+    if status is not None:
+        statement = statement.where(Character.status == status)
+    if creator_id is not None:
+        statement = statement.where(Character.creator_id == creator_id)
+
+    count = session.exec(statement).one()
+    return count
+
+
+def update_character(
+    *, session: Session, db_character: Character, character_in: CharacterUpdate
+) -> Character:
+    """Updates an existing character."""
+    update_data = character_in.model_dump(exclude_unset=True)
+    db_character.sqlmodel_update(update_data)
+    session.add(db_character)
+    session.commit()
+    session.refresh(db_character)
+    return db_character
+
+
+def delete_character(*, session: Session, db_character: Character) -> None:
+    """Deletes a character."""
+    # Add cascade delete for conversations/messages if needed, handled by relationship cascade
+    session.delete(db_character)
+    session.commit()