db2df87fc6
Storage Media now goes through `storage_service`, which has two backends: the container volume, and S3/MinIO. A volume can only be mounted by one host, has no presigned URLs and no lifecycle rules, none of which suits ~860 MB of media. Reads fall back to the volume when an object is missing, so the existing uploads keep working and files can migrate gradually rather than in one risky pass. A row stores the object key, never a URL: a URL embeds the backend, so a row holding `http://minio:9000/...` breaks the moment the backend changes. MinIO publishes no host ports — the backend reaches it over the compose network, and 9000/9001 are already taken on this host by other stacks. Image libraries (migration d2e3f4a5b6c7) An image belongs to a library, and a person is granted a library the way they are granted a category, so access can be given to some images without giving away all of them. Tags reuse the shared `question_tags` vocabulary rather than inventing a media-only one. Uploads are type- and size-checked, stored through the service, and embedded so an image can be found by what it shows. Classification finished The 316 questions the chooser had declined are now filed with `--force`, which takes the nearest candidate from the same shortlist the chooser saw. 306 were forced, 10 the chooser accepted on this pass. No question sits on a bare system any more: system only 2,730 -> 0 condition/subsystem 214 -> 1,782 full depth 4 -> 1,166 A forced match is a weaker signal than a chosen one, so expect more errors among those 306 — but the original system stays as a cross-link, so nothing is lost and they can be corrected by hand. Tests: 8 new backend covering library scoping, edit confinement, shared-vocabulary tags, storage indirection on upload, and type/size limits. 131 backend green. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WgRcMaScVEL7TBLpnAoSV9
55 lines
2.2 KiB
Python
55 lines
2.2 KiB
Python
"""Image libraries, and per-library access grants.
|
|
|
|
An image lives in one library; a person is granted a library the way they are
|
|
granted a category, so access can be given to some images without giving away
|
|
all of them.
|
|
|
|
Revision ID: d2e3f4a5b6c7
|
|
Revises: c1d2e3f4a5b6
|
|
"""
|
|
from alembic import op
|
|
|
|
revision = "d2e3f4a5b6c7"
|
|
down_revision = "c1d2e3f4a5b6"
|
|
branch_labels = None
|
|
depends_on = None
|
|
|
|
|
|
def upgrade():
|
|
op.execute("""
|
|
CREATE TABLE IF NOT EXISTS media_libraries (
|
|
id SERIAL PRIMARY KEY,
|
|
name VARCHAR(200) UNIQUE NOT NULL,
|
|
description TEXT,
|
|
user_id INTEGER REFERENCES users(id) ON DELETE SET NULL,
|
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
)
|
|
""")
|
|
op.execute("""
|
|
CREATE TABLE IF NOT EXISTS media_library_grants (
|
|
id SERIAL PRIMARY KEY,
|
|
library_id INTEGER NOT NULL REFERENCES media_libraries(id) ON DELETE CASCADE,
|
|
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
granted_by INTEGER REFERENCES users(id) ON DELETE SET NULL,
|
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
CONSTRAINT uq_media_library_grant UNIQUE (library_id, user_id)
|
|
)
|
|
""")
|
|
op.execute("ALTER TABLE media_assets ADD COLUMN IF NOT EXISTS library_id INTEGER REFERENCES media_libraries(id) ON DELETE SET NULL")
|
|
op.execute("ALTER TABLE media_assets ADD COLUMN IF NOT EXISTS storage VARCHAR(10) NOT NULL DEFAULT 'local'")
|
|
op.execute("ALTER TABLE media_assets ADD COLUMN IF NOT EXISTS byte_size INTEGER")
|
|
op.execute("CREATE INDEX IF NOT EXISTS ix_media_library ON media_assets(library_id)")
|
|
op.execute("""
|
|
INSERT INTO media_libraries (name, description)
|
|
VALUES ('General', 'Images that have not been sorted into a library yet')
|
|
ON CONFLICT (name) DO NOTHING
|
|
""")
|
|
|
|
|
|
def downgrade():
|
|
op.execute("DROP INDEX IF EXISTS ix_media_library")
|
|
op.execute("ALTER TABLE media_assets DROP COLUMN IF EXISTS byte_size")
|
|
op.execute("ALTER TABLE media_assets DROP COLUMN IF EXISTS storage")
|
|
op.execute("ALTER TABLE media_assets DROP COLUMN IF EXISTS library_id")
|
|
op.execute("DROP TABLE IF EXISTS media_library_grants")
|
|
op.execute("DROP TABLE IF EXISTS media_libraries")
|