Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,12 @@ COPY ./app /app/app
RUN --mount=type=cache,target=/root/.cache/uv \
uv sync

CMD ["fastapi", "run", "--workers", "4", "app/main.py"]
# Copy the entrypoint script
COPY ./docker-entrypoint.sh /app/docker-entrypoint.sh
RUN chmod +x /app/docker-entrypoint.sh

# Remove the old CMD
# CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "${PORT:-8000}", "--workers", "4"]

# Set the entrypoint
ENTRYPOINT ["/app/docker-entrypoint.sh"]
7 changes: 7 additions & 0 deletions backend/app/alembic/env.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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 ###
Original file line number Diff line number Diff line change
@@ -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 ###
5 changes: 4 additions & 1 deletion backend/app/api/main.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
from fastapi import APIRouter

from app.api.routes import items, login, private, users, utils
from app.api.routes import items, login, private, users, utils, characters, admin_characters, conversations
from app.core.config import settings

api_router = APIRouter()
api_router.include_router(login.router)
api_router.include_router(users.router)
api_router.include_router(utils.router)
api_router.include_router(items.router)
api_router.include_router(characters.router)
api_router.include_router(admin_characters.router)
api_router.include_router(conversations.router)


if settings.ENVIRONMENT == "local":
Expand Down
113 changes: 113 additions & 0 deletions backend/app/api/routes/admin_characters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
# Placeholder for admin character management routes

import uuid
from typing import Any

from fastapi import APIRouter, HTTPException, Depends
from sqlmodel import Session, select, func

from app.api.deps import SessionDep, CurrentUser, get_current_active_superuser
from app import crud
from app.models import (
Character, CharacterUpdate, CharacterPublic, CharactersPublic, CharacterStatus, Message
)

router = APIRouter(prefix="/admin/characters", tags=["admin-characters"],
dependencies=[Depends(get_current_active_superuser)])


@router.get("/", response_model=CharactersPublic)
def list_all_characters(
session: SessionDep, skip: int = 0, limit: int = 100, status: CharacterStatus | None = None
) -> Any:
"""
Retrieve all characters (admin view).
Optionally filter by status.
"""
count = crud.characters.get_characters_count(session=session, status=status)
characters = crud.characters.get_characters(
session=session, skip=skip, limit=limit, status=status
)
return CharactersPublic(data=characters, count=count)


@router.get("/pending", response_model=CharactersPublic)
def list_pending_characters(
session: SessionDep, skip: int = 0, limit: int = 100
) -> Any:
"""
Retrieve characters pending approval.
"""
count = crud.characters.get_characters_count(session=session, status=CharacterStatus.PENDING)
characters = crud.characters.get_characters(
session=session, skip=skip, limit=limit, status=CharacterStatus.PENDING
)
return CharactersPublic(data=characters, count=count)


@router.patch("/{id}/approve", response_model=CharacterPublic)
def approve_character(session: SessionDep, id: uuid.UUID) -> Any:
"""
Approve a character submission.
"""
db_character = crud.characters.get_character(session=session, character_id=id)
if not db_character:
raise HTTPException(status_code=404, detail="Character not found")
if db_character.status != CharacterStatus.PENDING:
raise HTTPException(status_code=400, detail="Character is not pending approval")

character_update = CharacterUpdate(status=CharacterStatus.APPROVED)
character = crud.characters.update_character(
session=session, db_character=db_character, character_in=character_update
)
return character


@router.patch("/{id}/reject", response_model=CharacterPublic)
def reject_character(session: SessionDep, id: uuid.UUID) -> Any:
"""
Reject a character submission.
"""
db_character = crud.characters.get_character(session=session, character_id=id)
if not db_character:
raise HTTPException(status_code=404, detail="Character not found")
if db_character.status != CharacterStatus.PENDING:
raise HTTPException(status_code=400, detail="Character is not pending approval")

character_update = CharacterUpdate(status=CharacterStatus.REJECTED)
character = crud.characters.update_character(
session=session, db_character=db_character, character_in=character_update
)
return character


@router.put("/{id}", response_model=CharacterPublic)
def update_character_admin(
*, session: SessionDep, id: uuid.UUID, character_in: CharacterUpdate
) -> Any:
"""
Update any character (admin only).
"""
db_character = crud.characters.get_character(session=session, character_id=id)
if not db_character:
raise HTTPException(status_code=404, detail="Character not found")

character = crud.characters.update_character(
session=session, db_character=db_character, character_in=character_in
)
return character


@router.delete("/{id}")
def delete_character_admin(
session: SessionDep, id: uuid.UUID
) -> Message:
"""
Delete a character (admin only).
"""
db_character = crud.characters.get_character(session=session, character_id=id)
if not db_character:
raise HTTPException(status_code=404, detail="Character not found")

crud.characters.delete_character(session=session, db_character=db_character)
return Message(message="Character deleted successfully")
78 changes: 78 additions & 0 deletions backend/app/api/routes/characters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Placeholder for character submission and listing routes

import uuid
from typing import Any

from fastapi import APIRouter, HTTPException, Depends
from sqlmodel import Session, select, func

from app.api.deps import SessionDep, CurrentUser
from app import crud
from app.models import (
Character, CharacterCreate, CharacterPublic, CharactersPublic, CharacterStatus, Message
)

router = APIRouter(prefix="/characters", tags=["characters"])


@router.get("/", response_model=CharactersPublic)
def list_approved_characters(
session: SessionDep, skip: int = 0, limit: int = 100
) -> Any:
"""
Retrieve approved characters.
"""
count = crud.characters.get_characters_count(
session=session, status=CharacterStatus.APPROVED
)
characters = crud.characters.get_characters(
session=session, skip=skip, limit=limit, status=CharacterStatus.APPROVED
)
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
) -> Any:
"""
Get a specific approved character by ID.
"""
character = crud.characters.get_character(session=session, character_id=id)
if not character:
raise HTTPException(status_code=404, detail="Character not found")
if character.status != CharacterStatus.APPROVED:
# Hide non-approved characters from this public endpoint
raise HTTPException(status_code=404, detail="Character not found") # Or 403 Forbidden
return character


@router.post("/submit", response_model=CharacterPublic, status_code=201)
def submit_character(
*, session: SessionDep, current_user: CurrentUser, character_in: CharacterCreate
) -> Any:
"""
Submit a new character for review.
Status defaults to 'pending'.
"""
character = crud.characters.create_character(
session=session, character_create=character_in, creator_id=current_user.id
)
return character
Loading
Loading