Async write path for the flexsiebels owner-mode UI: flexsiebels INSERTs into imagen.jobs, the worker on mRiver claims pending rows via LISTEN/NOTIFY + 5s safety poll, runs the same generate pipeline imagen generate uses, and writes the result through internal/cloud into imagen.images. - Schema migration imagen_jobs_init: table + status CHECK + two indexes + owner-scoped RLS + grants + AFTER INSERT trigger publishing on the imagen_jobs channel via pg_notify. - internal/worker: DB-agnostic loop over a Queue interface. Drains the whole pending backlog on each wake. Job-scoped contexts are derived from Background so SIGTERM lets the in-flight generation finish (no half-state). ResetStaleRunning at startup unsticks rows left over from a previous crash. Eight unit tests cover the done / failed / missing-id / drain / NOTIFY-wake / shutdown / transient-error paths against a fake queue (no real Postgres in CI). - cmd/imagen/worker.go: pgx-backed Queue (one dedicated conn for LISTEN + UPDATE), plus the workerPipeline that reuses buildBackend + attachUsageSink + prompt.Apply + buildWriter + maybeCloudSync. The per-job owner_user_id overrides the env-level fallback so each row in imagen.images is attributed correctly. - maybeCloudSync now returns (*cloud.SyncResult, error) so the worker can link imagen.jobs.image_id to the inserted imagen.images row. The CLI generate path keeps printing its stderr summary unchanged. - scripts/imagen-worker.service + .env.example for the systemd --user unit on mRiver. EnvironmentFile lives in ~/.dotfiles and is never committed. - docs/setup-worker-mriver.md walks through installation + the spec's SQL-INSERT smoke; docs/architecture.md grows an "async write path" section. - worker_integration_test.go (env-guarded by IMAGEN_WORKER_INTEGRATION=1) drives one real job through the full pipeline against msupabase using the mock backend, then verifies imagen.images + Storage object landed and the row flipped to done with image_id linked. Verified end-to-end: pickup latency ~7ms, total 74ms, failure path captures error text.
84 lines
2.2 KiB
Go
84 lines
2.2 KiB
Go
// Command imagen is the model-agnostic image-generation CLI. It dispatches
|
|
// `generate`, `backends`, and `config` subcommands against backends that
|
|
// register themselves at package init time.
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
|
|
_ "mgit.msbls.de/m/ImaGen/internal/backend"
|
|
)
|
|
|
|
const helpText = `imagen — model-agnostic image generation
|
|
|
|
Usage:
|
|
imagen generate <prompt> [flags] generate one image
|
|
imagen worker [flags] consume the imagen.jobs queue (daemon)
|
|
imagen backends list registered backend types
|
|
imagen config init print a sample imagen.yaml on stdout
|
|
imagen config validate validate the active config
|
|
imagen serve [--addr :8080] (stub) start the HTTP server
|
|
imagen usage [--since DATE] show cost-tracking rows
|
|
imagen version print version
|
|
imagen help show this help
|
|
|
|
Run "imagen <subcommand> --help" for subcommand-specific flags.
|
|
`
|
|
|
|
// Version is overridable at link time via -ldflags '-X main.Version=...'.
|
|
var Version = "dev"
|
|
|
|
func main() {
|
|
if len(os.Args) < 2 {
|
|
fmt.Fprint(os.Stderr, helpText)
|
|
os.Exit(2)
|
|
}
|
|
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
|
defer cancel()
|
|
|
|
args := os.Args[2:]
|
|
var err error
|
|
switch os.Args[1] {
|
|
case "generate":
|
|
err = runGenerate(ctx, args)
|
|
case "worker":
|
|
err = runWorker(ctx, args)
|
|
case "backends":
|
|
err = runBackends(args)
|
|
case "config":
|
|
err = runConfig(args)
|
|
case "serve":
|
|
err = runServe(args)
|
|
case "usage":
|
|
err = runUsage(ctx, args)
|
|
case "version", "-v", "--version":
|
|
fmt.Println(Version)
|
|
case "help", "-h", "--help":
|
|
fmt.Print(helpText)
|
|
default:
|
|
fmt.Fprintf(os.Stderr, "imagen: unknown subcommand %q\n\n%s", os.Args[1], helpText)
|
|
os.Exit(2)
|
|
}
|
|
if err != nil {
|
|
fmt.Fprintln(os.Stderr, "imagen:", err)
|
|
var u *userError
|
|
if errors.As(err, &u) {
|
|
os.Exit(2)
|
|
}
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
// userError signals "user did the wrong thing" so we exit 2 rather than 1.
|
|
type userError struct{ msg string }
|
|
|
|
func (u *userError) Error() string { return u.msg }
|
|
func userErr(format string, a ...any) error {
|
|
return &userError{msg: fmt.Sprintf(format, a...)}
|
|
}
|