Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fe37ccdba4 | |||
| 79cdd4a132 | |||
| aa2f79b125 | |||
| 8551d14591 | |||
| ff610c0466 | |||
| acbc518b4a |
@@ -8,7 +8,7 @@ from sqlalchemy.ext.asyncio import create_async_engine
|
||||
|
||||
from app.config import settings
|
||||
from app.database import Base
|
||||
from app.models import user, session, world, asset, group # noqa: F401
|
||||
from app.models import user, session, world, asset # noqa: F401
|
||||
|
||||
# this is the Alembic Config object, which provides
|
||||
# access to the values within the .ini file in use.
|
||||
|
||||
@@ -19,16 +19,16 @@ depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Upgrade database schema."""
|
||||
# Create ENUM types (create once, reuse below)
|
||||
world_visibility_enum = postgresql.ENUM(
|
||||
# Create ENUM types
|
||||
world_visibility = postgresql.ENUM(
|
||||
"public", "private", "friends_only", name="world_visibility"
|
||||
)
|
||||
world_visibility_enum.create(op.get_bind(), checkfirst=True)
|
||||
world_visibility.create(op.get_bind(), checkfirst=True)
|
||||
|
||||
asset_type_enum = postgresql.ENUM(
|
||||
asset_type = postgresql.ENUM(
|
||||
"image", "audio", "video", "document", "model_3d", "other", name="asset_type"
|
||||
)
|
||||
asset_type_enum.create(op.get_bind(), checkfirst=True)
|
||||
asset_type.create(op.get_bind(), checkfirst=True)
|
||||
|
||||
# Create users table
|
||||
op.create_table(
|
||||
@@ -59,7 +59,7 @@ def upgrade() -> None:
|
||||
)
|
||||
op.create_index(op.f("ix_sessions_token"), "sessions", ["token"], unique=True)
|
||||
|
||||
# Create worlds table — reuse world_visibility_enum (no second create)
|
||||
# Create worlds table
|
||||
op.create_table(
|
||||
"worlds",
|
||||
sa.Column("id", sa.Integer(), primary_key=True),
|
||||
@@ -68,7 +68,10 @@ def upgrade() -> None:
|
||||
sa.Column("owner_id", sa.Integer(), nullable=False),
|
||||
sa.Column(
|
||||
"visibility",
|
||||
world_visibility_enum,
|
||||
postgresql.ENUM(
|
||||
"public", "private", "friends_only", name="world_visibility",
|
||||
create_type=False,
|
||||
),
|
||||
nullable=True,
|
||||
),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
@@ -77,7 +80,7 @@ def upgrade() -> None:
|
||||
)
|
||||
op.create_index(op.f("ix_worlds_id"), "worlds", ["id"], unique=False)
|
||||
|
||||
# Create assets table — reuse asset_type_enum (no second create)
|
||||
# Create assets table
|
||||
op.create_table(
|
||||
"assets",
|
||||
sa.Column("id", sa.Integer(), primary_key=True),
|
||||
@@ -85,7 +88,10 @@ def upgrade() -> None:
|
||||
sa.Column("description", sa.Text(), nullable=True),
|
||||
sa.Column(
|
||||
"asset_type",
|
||||
asset_type_enum,
|
||||
postgresql.ENUM(
|
||||
"image", "audio", "video", "document", "model_3d", "other",
|
||||
name="asset_type", create_type=False,
|
||||
),
|
||||
nullable=False,
|
||||
),
|
||||
sa.Column("file_path", sa.String(length=512), nullable=False),
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
"""add groups and group_members tables
|
||||
|
||||
Revision ID: 0003_add_groups_and_members
|
||||
Revises: 0002_add_date_of_birth_to_users
|
||||
Create Date: 2025-01-01 00:00:00.000000
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "0003_add_groups_and_members"
|
||||
down_revision: Union[str, None] = "0002_add_date_of_birth_to_users"
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
"""Create groups and group_members tables."""
|
||||
# Create group_member_role ENUM type
|
||||
group_member_role = postgresql.ENUM(
|
||||
"owner", "admin", "member", name="group_member_role"
|
||||
)
|
||||
group_member_role.create(op.get_bind(), checkfirst=True)
|
||||
|
||||
# Create groups table
|
||||
op.create_table(
|
||||
"groups",
|
||||
sa.Column("id", sa.Integer(), primary_key=True, index=True),
|
||||
sa.Column("name", sa.String(length=255), nullable=False),
|
||||
sa.Column("description", sa.Text(), nullable=True),
|
||||
sa.Column(
|
||||
"owner_id",
|
||||
sa.Integer(),
|
||||
sa.ForeignKey("users.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), onupdate=sa.func.now()),
|
||||
)
|
||||
|
||||
# Create group_members table
|
||||
op.create_table(
|
||||
"group_members",
|
||||
sa.Column(
|
||||
"group_id",
|
||||
sa.Integer(),
|
||||
sa.ForeignKey("groups.id", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
sa.Column(
|
||||
"user_id",
|
||||
sa.Integer(),
|
||||
sa.ForeignKey("users.id", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
),
|
||||
sa.Column(
|
||||
"role",
|
||||
postgresql.ENUM(
|
||||
"owner", "admin", "member", name="group_member_role", create_type=False
|
||||
),
|
||||
nullable=False,
|
||||
default="member",
|
||||
),
|
||||
sa.Column("joined_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
"""Drop group_members and groups tables."""
|
||||
op.drop_table("group_members")
|
||||
op.drop_table("groups")
|
||||
|
||||
# Drop group_member_role ENUM type
|
||||
postgresql.ENUM(name="group_member_role").drop(op.get_bind(), checkfirst=True)
|
||||
@@ -2,6 +2,5 @@ from app.models.user import User
|
||||
from app.models.session import Session
|
||||
from app.models.world import World
|
||||
from app.models.asset import Asset
|
||||
from app.models.group import Group, GroupMember, GroupMemberRole
|
||||
|
||||
__all__ = ["User", "Session", "World", "Asset", "Group", "GroupMember", "GroupMemberRole"]
|
||||
__all__ = ["User", "Session", "World", "Asset"]
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
import enum
|
||||
|
||||
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, Enum
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
from app.database import Base
|
||||
|
||||
|
||||
class GroupMemberRole(str, enum.Enum):
|
||||
OWNER = "owner"
|
||||
ADMIN = "admin"
|
||||
MEMBER = "member"
|
||||
|
||||
|
||||
class Group(Base):
|
||||
__tablename__ = "groups"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
name = Column(String(255), nullable=False)
|
||||
description = Column(Text, nullable=True)
|
||||
owner_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
updated_at = Column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
|
||||
|
||||
owner = relationship("User", back_populates="owned_groups")
|
||||
members = relationship(
|
||||
"GroupMember",
|
||||
back_populates="group",
|
||||
cascade="all, delete-orphan",
|
||||
order_by="GroupMember.joined_at",
|
||||
)
|
||||
|
||||
|
||||
class GroupMember(Base):
|
||||
__tablename__ = "group_members"
|
||||
|
||||
group_id = Column(
|
||||
Integer,
|
||||
ForeignKey("groups.id", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
)
|
||||
user_id = Column(
|
||||
Integer,
|
||||
ForeignKey("users.id", ondelete="CASCADE"),
|
||||
primary_key=True,
|
||||
)
|
||||
role = Column(
|
||||
Enum(GroupMemberRole, name="group_member_role", create_type=False),
|
||||
nullable=False,
|
||||
default=GroupMemberRole.MEMBER,
|
||||
)
|
||||
joined_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
group = relationship("Group", back_populates="members")
|
||||
user = relationship("User", back_populates="group_memberships")
|
||||
@@ -23,8 +23,6 @@ class User(Base):
|
||||
sessions = relationship("Session", back_populates="user", cascade="all, delete-orphan")
|
||||
worlds = relationship("World", back_populates="owner")
|
||||
assets = relationship("Asset", back_populates="owner")
|
||||
owned_groups = relationship("Group", back_populates="owner")
|
||||
group_memberships = relationship("GroupMember", back_populates="user")
|
||||
|
||||
@property
|
||||
def is_adult(self) -> bool:
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"""Asset management router."""
|
||||
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
@@ -37,6 +38,7 @@ class AssetResponse(BaseModel):
|
||||
file_path: str
|
||||
file_size: Optional[int]
|
||||
mime_type: Optional[str]
|
||||
metadata_json: Optional[dict]
|
||||
world_id: Optional[int]
|
||||
owner_id: int
|
||||
is_public: bool
|
||||
@@ -45,6 +47,18 @@ class AssetResponse(BaseModel):
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
@classmethod
|
||||
def model_validate(cls, obj, **kwargs):
|
||||
"""Override to handle metadata_json stored as JSON string."""
|
||||
if isinstance(obj, dict):
|
||||
obj = dict(obj)
|
||||
if "metadata_json" in obj and isinstance(obj["metadata_json"], str):
|
||||
try:
|
||||
obj["metadata_json"] = json.loads(obj["metadata_json"])
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
obj["metadata_json"] = None
|
||||
return super().model_validate(obj, **kwargs)
|
||||
|
||||
|
||||
class AssetUpdate(BaseModel):
|
||||
"""Schema for updating an asset."""
|
||||
@@ -64,6 +78,144 @@ def _sanitize_filename(filename: str) -> str:
|
||||
return safe or "file"
|
||||
|
||||
|
||||
def _extract_gltf_metadata(content: bytes) -> Optional[dict]:
|
||||
"""Extract metadata from a glTF/GLB file.
|
||||
|
||||
Returns a dict with mesh_count, vertex_count, has_animation, texture_refs
|
||||
if the file is a valid glTF/GLB, or None otherwise.
|
||||
|
||||
Uses only the standard library (struct, json) so no extra dependencies
|
||||
are required.
|
||||
"""
|
||||
if not content:
|
||||
return None
|
||||
|
||||
# --- GLB detection ---
|
||||
# GLB magic: 0x676C5442 ("glTF") followed by version 2 and payload length.
|
||||
if len(content) >= 12:
|
||||
magic = int.from_bytes(content[0:4], "little")
|
||||
if magic == 0x46546C67: # "glTF"
|
||||
version = int.from_bytes(content[4:8], "little")
|
||||
if version == 2:
|
||||
return _parse_glb(content)
|
||||
|
||||
# --- .gltf JSON detection ---
|
||||
# Try parsing as JSON; if it has a top-level "scene" or "scenes" key,
|
||||
# it's likely a .gltf file.
|
||||
try:
|
||||
data = json.loads(content)
|
||||
except (json.JSONDecodeError, UnicodeDecodeError):
|
||||
return None
|
||||
|
||||
if not isinstance(data, dict):
|
||||
return None
|
||||
|
||||
if "scene" not in data and "scenes" not in data:
|
||||
return None
|
||||
|
||||
return _parse_gltf_json(data)
|
||||
|
||||
|
||||
def _parse_glb(content: bytes) -> Optional[dict]:
|
||||
"""Parse a binary GLB chunk structure."""
|
||||
# Header: magic(4) + version(4) + length(4) = 12 bytes
|
||||
# Then chunks: length(4) + type(4) + data...
|
||||
offset = 12
|
||||
json_start = None
|
||||
json_length = 0
|
||||
binary_start = None
|
||||
binary_length = 0
|
||||
|
||||
while offset < len(content):
|
||||
if offset + 8 > len(content):
|
||||
break
|
||||
chunk_length = int.from_bytes(content[offset:offset + 4], "little")
|
||||
chunk_type = int.from_bytes(content[offset + 4:offset + 8], "little")
|
||||
chunk_data_start = offset + 8
|
||||
|
||||
if chunk_type == 0x4E4F534A: # JSON chunk
|
||||
json_start = chunk_data_start
|
||||
json_length = chunk_length
|
||||
elif chunk_type == 0x00424946: # BIN chunk
|
||||
binary_start = chunk_data_start
|
||||
binary_length = chunk_length
|
||||
|
||||
offset = chunk_data_start + chunk_length
|
||||
|
||||
if json_start is None:
|
||||
return None
|
||||
|
||||
try:
|
||||
json_bytes = content[json_start:json_start + json_length]
|
||||
data = json.loads(json_bytes)
|
||||
except (json.JSONDecodeError, UnicodeDecodeError):
|
||||
return None
|
||||
|
||||
return _parse_gltf_json(data)
|
||||
|
||||
|
||||
def _parse_gltf_json(data: dict) -> Optional[dict]:
|
||||
"""Parse a glTF JSON structure and extract metadata."""
|
||||
meshes = data.get("meshes") or []
|
||||
animations = data.get("animations") or []
|
||||
textures = data.get("textures") or []
|
||||
images = data.get("images") or []
|
||||
accessors = data.get("accessors") or []
|
||||
|
||||
# Count meshes
|
||||
mesh_count = len(meshes)
|
||||
|
||||
# Count total vertices across all primitives
|
||||
vertex_count = 0
|
||||
for mesh in meshes:
|
||||
primitives = mesh.get("primitives") or []
|
||||
for primitive in primitives:
|
||||
indices = primitive.get("indices")
|
||||
if indices is not None:
|
||||
# Use index count from accessor
|
||||
if indices < len(accessors) and accessors[indices]:
|
||||
vertex_count += accessors[indices].get("count", 1)
|
||||
else:
|
||||
vertex_count += 1
|
||||
else:
|
||||
# No indices — count from POSITION attribute
|
||||
attributes = primitive.get("attributes") or {}
|
||||
pos_accessor = attributes.get("POSITION")
|
||||
if pos_accessor is not None:
|
||||
if pos_accessor < len(accessors) and accessors[pos_accessor]:
|
||||
vertex_count += accessors[pos_accessor].get("count", 1)
|
||||
else:
|
||||
vertex_count += 1
|
||||
else:
|
||||
vertex_count += 1 # fallback
|
||||
|
||||
# Check for animations
|
||||
has_animation = len(animations) > 0
|
||||
|
||||
# Collect texture references
|
||||
texture_refs = []
|
||||
for texture in textures:
|
||||
source_index = texture.get("source")
|
||||
ref = {}
|
||||
if source_index is not None and source_index < len(images):
|
||||
image = images[source_index]
|
||||
if isinstance(image, dict):
|
||||
if image.get("name"):
|
||||
ref["name"] = image["name"]
|
||||
if image.get("uri"):
|
||||
ref["uri"] = image["uri"]
|
||||
if image.get("mimeType"):
|
||||
ref["mime_type"] = image["mimeType"]
|
||||
texture_refs.append(ref)
|
||||
|
||||
return {
|
||||
"mesh_count": mesh_count,
|
||||
"vertex_count": vertex_count,
|
||||
"has_animation": has_animation,
|
||||
"texture_refs": texture_refs,
|
||||
}
|
||||
|
||||
|
||||
# --- Endpoints ---
|
||||
|
||||
@router.post("/", response_model=AssetResponse, status_code=201)
|
||||
@@ -204,6 +356,13 @@ async def upload_asset_file(
|
||||
asset.mime_type = file.content_type
|
||||
asset.file_size = file_size
|
||||
|
||||
# Extract glTF metadata for glTF/GLB files.
|
||||
filename_lower = (file.filename or "").lower()
|
||||
if filename_lower.endswith(".glb") or filename_lower.endswith(".gltf"):
|
||||
metadata = _extract_gltf_metadata(content)
|
||||
if metadata is not None:
|
||||
asset.metadata_json = json.dumps(metadata)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(asset)
|
||||
return asset
|
||||
|
||||
@@ -8,7 +8,7 @@ services:
|
||||
POSTGRES_PASSWORD: agp_password
|
||||
POSTGRES_DB: agp_db
|
||||
ports:
|
||||
- "${POSTGRES_PORT:-5432}:5432"
|
||||
- "${POSTGRES_HOST_PORT:-5432}:5432"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
@@ -20,7 +20,7 @@ services:
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
ports:
|
||||
- "${REDIS_PORT:-6379}:6379"
|
||||
- "${REDIS_HOST_PORT:-6379}:6379"
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
healthcheck:
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
# MVP Vertical Slice: Client-Server Wiring — Plan
|
||||
|
||||
## Goal
|
||||
Prove the real Godot client and the real backend can talk: **a user can register/log in
|
||||
and see a list of worlds from the game client**. Nothing more. Gameplay, join-a-world,
|
||||
chat, avatar, Discovery search/tags/trending, Social/Economy/Trust & Safety are all
|
||||
explicitly out of scope.
|
||||
|
||||
## Verified backend contract (as of this writing)
|
||||
- `POST /api/auth/register` — JSON body `{username, email, password, date_of_birth}`.
|
||||
`date_of_birth` is a `YYYY-MM-DD` string. Returns `201 {access_token, token_type}`.
|
||||
Rejects under-18 with `400`.
|
||||
- `POST /api/auth/login` — OAuth2 **form-encoded** (`application/x-www-form-urlencoded`)
|
||||
`username` + `password` (this is NOT a JSON endpoint). Returns `{access_token, token_type}`.
|
||||
- `GET /api/worlds` — **requires auth** (`CurrentUser`), returns a JSON array of
|
||||
`{id, name, description, visibility, owner_id, created_at}`. There is no unauthenticated
|
||||
public-worlds path, so the worlds list screen can only be shown after login/register.
|
||||
- `GET /api/health` — unauthenticated, `{status, app}`.
|
||||
- Base URL: uvicorn default `http://127.0.0.1:8000` (must be configurable in the client).
|
||||
- CORS is irrelevant to the native Godot `HTTPRequest` client (no browser origin).
|
||||
|
||||
## Task breakdown
|
||||
| # | Type | Task | Depends on |
|
||||
|---|------|------|-----------|
|
||||
| 1 | architecture | `ApiClient` autoload: HTTP + JWT storage + error contract | — |
|
||||
| 2 | implementation | Main-menu **login** wiring (form-encoded) | 1 |
|
||||
| 3 | implementation | Main-menu **register** wiring (JSON + age gate) | 2 |
|
||||
| 4 | implementation | **World list** screen consuming `GET /api/worlds` | 2 |
|
||||
| 5 | testing | End-to-end headless smoke test + manual verify | 1,3,4 |
|
||||
|
||||
## Design decisions captured (resolved in task 1)
|
||||
- Token storage: in-memory singleton property for the MVP; a `save_to_disk` seam is left
|
||||
open but not required yet (no re-login on restart in this slice).
|
||||
- Error contract: every call returns a discriminated result (`ok`/`error`) so callers
|
||||
never crash on network failure; non-2xx surfaces `{status, detail}` from the backend.
|
||||
- Base URL: read from a ProjectSetting, defaulting to `http://127.0.0.1:8000`.
|
||||
- Login is form-encoded; register is JSON — the client helper must support both content types.
|
||||
Reference in New Issue
Block a user