feat: add a separate watch thumbnail gallery and logical device
This commit is contained in:
@@ -601,7 +601,8 @@ def create_app(settings=None, start_worker=True):
|
||||
return [
|
||||
assets.info(r["id"])
|
||||
for r in db.all(
|
||||
"SELECT assets.id FROM assets LEFT JOIN asset_metadata ON asset_metadata.asset_id=assets.id WHERE kind!='cache' AND "
|
||||
"SELECT assets.id FROM assets LEFT JOIN asset_metadata ON asset_metadata.asset_id=assets.id WHERE kind!='cache' "
|
||||
"AND NOT EXISTS (SELECT 1 FROM asset_sources s WHERE s.asset_id=assets.id AND json_extract(s.payload,'$.type')='thumbnail') AND "
|
||||
"(?='all' OR (?='uploaded' AND kind='images') OR (?='generated' AND kind='generated')) "
|
||||
"AND (?='all' OR COALESCE(origin,'unknown')=?) AND (? IS NULL OR job_id=?) "
|
||||
"ORDER BY created_at DESC LIMIT ? OFFSET ?",
|
||||
@@ -642,6 +643,16 @@ def create_app(settings=None, start_worker=True):
|
||||
db.execute("DELETE FROM asset_metadata WHERE asset_id=?", (asset_id,))
|
||||
db.execute("DELETE FROM asset_sources WHERE asset_id=?", (asset_id,))
|
||||
db.execute("DELETE FROM assets WHERE id=?", (asset_id,))
|
||||
for row in db.all(
|
||||
"SELECT key,payload FROM app_config WHERE key LIKE 'wrist-thumbnail:%'"
|
||||
):
|
||||
import json
|
||||
|
||||
if json.loads(row["payload"]).get("asset_id") == asset_id:
|
||||
db.execute(
|
||||
"DELETE FROM app_config WHERE key=? AND payload=?",
|
||||
(row["key"], row["payload"]),
|
||||
)
|
||||
return Response(status_code=204)
|
||||
|
||||
@app.put(
|
||||
@@ -1095,6 +1106,14 @@ def create_app(settings=None, start_worker=True):
|
||||
or bool(settings.api_key)
|
||||
or any(registry.keys),
|
||||
),
|
||||
GalleryDestination(
|
||||
id="watch",
|
||||
adapter="watch-thumbnails",
|
||||
name="Watch",
|
||||
storage="local",
|
||||
connected=True,
|
||||
supports_upload=True,
|
||||
),
|
||||
GalleryDestination(
|
||||
id="local",
|
||||
adapter="local-assets",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import json
|
||||
from uuid import uuid4
|
||||
|
||||
from fastapi import Depends
|
||||
from fastapi import Depends, Query
|
||||
from fastapi.responses import Response
|
||||
from pydantic import Field
|
||||
|
||||
@@ -24,6 +24,50 @@ class ThumbnailRequest(StrictModel):
|
||||
|
||||
|
||||
def install_thumbnails(app, service):
|
||||
from pigway_frame_flow.display.thumbnail_gallery import record, recover
|
||||
|
||||
recover(service)
|
||||
|
||||
@app.get(
|
||||
"/api/v1/thumbnail-devices", dependencies=[Depends(require("images:read"))]
|
||||
)
|
||||
def devices():
|
||||
return [
|
||||
{
|
||||
"id": "watch",
|
||||
"name": "Watch",
|
||||
"width": 410,
|
||||
"height": 502,
|
||||
"transport_connected": False,
|
||||
"status": "generation_only",
|
||||
}
|
||||
]
|
||||
|
||||
@app.get("/api/v1/thumbnails", dependencies=[Depends(require("images:read"))])
|
||||
def gallery(offset: int = Query(0, ge=0), limit: int = Query(50, ge=1, le=200)):
|
||||
rows = service.db.all(
|
||||
"SELECT assets.id,asset_sources.payload FROM assets JOIN asset_sources ON asset_sources.asset_id=assets.id "
|
||||
"WHERE json_extract(asset_sources.payload,'$.type')='thumbnail' "
|
||||
"ORDER BY assets.created_at DESC,assets.id DESC LIMIT ? OFFSET ?",
|
||||
(limit, offset),
|
||||
)
|
||||
total = service.db.one(
|
||||
"SELECT COUNT(*) AS count FROM assets JOIN asset_sources ON asset_sources.asset_id=assets.id "
|
||||
"WHERE json_extract(asset_sources.payload,'$.type')='thumbnail'"
|
||||
)["count"]
|
||||
return {
|
||||
"items": [
|
||||
{
|
||||
**service.assets.info(row["id"]),
|
||||
"thumbnail": json.loads(row["payload"]),
|
||||
}
|
||||
for row in rows
|
||||
],
|
||||
"total": total,
|
||||
"offset": offset,
|
||||
"limit": limit,
|
||||
}
|
||||
|
||||
@app.get("/api/v1/thumbnail-plans", dependencies=[Depends(require("images:read"))])
|
||||
def plans():
|
||||
return [
|
||||
@@ -113,6 +157,18 @@ def install_thumbnails(app, service):
|
||||
|
||||
@app.post("/api/v1/thumbnails/generate", dependencies=[Depends(require("admin"))])
|
||||
def generate(request: ThumbnailRequest):
|
||||
return service.assets.put(
|
||||
asset = service.assets.put(
|
||||
image(request), request.plan.name + ".jpg", "generated"
|
||||
)
|
||||
record(
|
||||
service,
|
||||
asset["asset_id"],
|
||||
{
|
||||
"width": request.plan.width,
|
||||
"height": request.plan.height,
|
||||
"plan": request.plan.model_dump(),
|
||||
"generated_at": asset["created_at"],
|
||||
"source": {"source_id": request.source_id, "item_id": request.item_id},
|
||||
},
|
||||
)
|
||||
return asset
|
||||
|
||||
Reference in New Issue
Block a user