mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-27 07:16:19 +09:00
refactor: content-addressed assets, cross-channel multimodal, infra simplification (#63)
* refactor(attachment): multimodal attachment refactor with snapshot schema and storage layer - Add snapshot schema migration (0008) and update init/versions/snapshots - Add internal/attachment and internal/channel normalize for unified attachment handling - Move containerfs provider from internal/media to internal/storage - Update agent types, channel adapters (Telegram/Feishu), inbound and handlers - Add containerd snapshot lineage and local_channel tests - Regenerate sqlc, swagger and SDK * refactor(media): content-addressed asset system with unified naming - Replace asset_id foreign key with content_hash as sole identifier for bot_history_message_assets (pure soft-link model) - Remove mime, size_bytes, storage_key from DB; derive at read time via media.Resolve from actual storage - Merge migrations 0008/0009 into single 0008; keep 0001 as canonical schema - Add Docker initdb script for deterministic migration execution order - Fix cross-channel real-time image display (Telegram → WebUI SSE) - Fix message disappearing on refresh (null assets fallback) - Fix file icon instead of image preview (mime derivation from storage) - Unify AssetID → ContentHash naming across Go, Agent, and Frontend - Change storage key prefix from 4-char to 2-char for directory sharding - Add server-entrypoint.sh for Docker deployment migration handling * refactor(infra): embedded migrations, Docker simplification, and config consolidation - Embed SQL migrations into Go binary, removing shell-based migration scripts - Consolidate config files into conf/ directory (app.example.toml, app.docker.toml, app.dev.toml) - Simplify Docker setup: remove initdb.d scripts, streamline nginx config and entrypoint - Remove legacy CLI, feishu-echo commands, and obsolete incremental migration files - Update install script and docs to require sudo for one-click install - Add mise tasks for dev environment orchestration * chore: recover migrations --------- Co-authored-by: Acbox <acbox0328@gmail.com>
This commit is contained in:
BBQ
@@ -11,8 +11,147 @@ import (
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
const insertSnapshot = `-- name: InsertSnapshot :exec
|
||||
INSERT INTO snapshots (id, container_id, parent_snapshot_id, snapshotter, digest)
|
||||
const getSnapshotByContainerAndRuntimeName = `-- name: GetSnapshotByContainerAndRuntimeName :one
|
||||
SELECT
|
||||
id,
|
||||
container_id,
|
||||
runtime_snapshot_name,
|
||||
parent_runtime_snapshot_name,
|
||||
snapshotter,
|
||||
source,
|
||||
created_at
|
||||
FROM snapshots
|
||||
WHERE container_id = $1
|
||||
AND runtime_snapshot_name = $2
|
||||
LIMIT 1
|
||||
`
|
||||
|
||||
type GetSnapshotByContainerAndRuntimeNameParams struct {
|
||||
ContainerID string `json:"container_id"`
|
||||
RuntimeSnapshotName string `json:"runtime_snapshot_name"`
|
||||
}
|
||||
|
||||
func (q *Queries) GetSnapshotByContainerAndRuntimeName(ctx context.Context, arg GetSnapshotByContainerAndRuntimeNameParams) (Snapshot, error) {
|
||||
row := q.db.QueryRow(ctx, getSnapshotByContainerAndRuntimeName, arg.ContainerID, arg.RuntimeSnapshotName)
|
||||
var i Snapshot
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.ContainerID,
|
||||
&i.RuntimeSnapshotName,
|
||||
&i.ParentRuntimeSnapshotName,
|
||||
&i.Snapshotter,
|
||||
&i.Source,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const listSnapshotsByContainerID = `-- name: ListSnapshotsByContainerID :many
|
||||
SELECT
|
||||
id,
|
||||
container_id,
|
||||
runtime_snapshot_name,
|
||||
parent_runtime_snapshot_name,
|
||||
snapshotter,
|
||||
source,
|
||||
created_at
|
||||
FROM snapshots
|
||||
WHERE container_id = $1
|
||||
ORDER BY created_at DESC
|
||||
`
|
||||
|
||||
func (q *Queries) ListSnapshotsByContainerID(ctx context.Context, containerID string) ([]Snapshot, error) {
|
||||
rows, err := q.db.Query(ctx, listSnapshotsByContainerID, containerID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var items []Snapshot
|
||||
for rows.Next() {
|
||||
var i Snapshot
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.ContainerID,
|
||||
&i.RuntimeSnapshotName,
|
||||
&i.ParentRuntimeSnapshotName,
|
||||
&i.Snapshotter,
|
||||
&i.Source,
|
||||
&i.CreatedAt,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const listSnapshotsWithVersionByContainerID = `-- name: ListSnapshotsWithVersionByContainerID :many
|
||||
SELECT
|
||||
s.id,
|
||||
s.container_id,
|
||||
s.runtime_snapshot_name,
|
||||
s.parent_runtime_snapshot_name,
|
||||
s.snapshotter,
|
||||
s.source,
|
||||
s.created_at,
|
||||
cv.version
|
||||
FROM snapshots s
|
||||
LEFT JOIN container_versions cv ON cv.snapshot_id = s.id
|
||||
WHERE s.container_id = $1
|
||||
ORDER BY s.created_at DESC
|
||||
`
|
||||
|
||||
type ListSnapshotsWithVersionByContainerIDRow struct {
|
||||
ID pgtype.UUID `json:"id"`
|
||||
ContainerID string `json:"container_id"`
|
||||
RuntimeSnapshotName string `json:"runtime_snapshot_name"`
|
||||
ParentRuntimeSnapshotName pgtype.Text `json:"parent_runtime_snapshot_name"`
|
||||
Snapshotter string `json:"snapshotter"`
|
||||
Source string `json:"source"`
|
||||
CreatedAt pgtype.Timestamptz `json:"created_at"`
|
||||
Version pgtype.Int4 `json:"version"`
|
||||
}
|
||||
|
||||
func (q *Queries) ListSnapshotsWithVersionByContainerID(ctx context.Context, containerID string) ([]ListSnapshotsWithVersionByContainerIDRow, error) {
|
||||
rows, err := q.db.Query(ctx, listSnapshotsWithVersionByContainerID, containerID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var items []ListSnapshotsWithVersionByContainerIDRow
|
||||
for rows.Next() {
|
||||
var i ListSnapshotsWithVersionByContainerIDRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.ContainerID,
|
||||
&i.RuntimeSnapshotName,
|
||||
&i.ParentRuntimeSnapshotName,
|
||||
&i.Snapshotter,
|
||||
&i.Source,
|
||||
&i.CreatedAt,
|
||||
&i.Version,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const upsertSnapshot = `-- name: UpsertSnapshot :one
|
||||
INSERT INTO snapshots (
|
||||
container_id,
|
||||
runtime_snapshot_name,
|
||||
parent_runtime_snapshot_name,
|
||||
snapshotter,
|
||||
source
|
||||
)
|
||||
VALUES (
|
||||
$1,
|
||||
$2,
|
||||
@@ -20,24 +159,39 @@ VALUES (
|
||||
$4,
|
||||
$5
|
||||
)
|
||||
ON CONFLICT (id) DO NOTHING
|
||||
ON CONFLICT (container_id, runtime_snapshot_name) DO UPDATE
|
||||
SET
|
||||
parent_runtime_snapshot_name = EXCLUDED.parent_runtime_snapshot_name,
|
||||
snapshotter = EXCLUDED.snapshotter,
|
||||
source = EXCLUDED.source
|
||||
RETURNING id, container_id, runtime_snapshot_name, parent_runtime_snapshot_name, snapshotter, source, created_at
|
||||
`
|
||||
|
||||
type InsertSnapshotParams struct {
|
||||
ID string `json:"id"`
|
||||
ContainerID string `json:"container_id"`
|
||||
ParentSnapshotID pgtype.Text `json:"parent_snapshot_id"`
|
||||
Snapshotter string `json:"snapshotter"`
|
||||
Digest pgtype.Text `json:"digest"`
|
||||
type UpsertSnapshotParams struct {
|
||||
ContainerID string `json:"container_id"`
|
||||
RuntimeSnapshotName string `json:"runtime_snapshot_name"`
|
||||
ParentRuntimeSnapshotName pgtype.Text `json:"parent_runtime_snapshot_name"`
|
||||
Snapshotter string `json:"snapshotter"`
|
||||
Source string `json:"source"`
|
||||
}
|
||||
|
||||
func (q *Queries) InsertSnapshot(ctx context.Context, arg InsertSnapshotParams) error {
|
||||
_, err := q.db.Exec(ctx, insertSnapshot,
|
||||
arg.ID,
|
||||
func (q *Queries) UpsertSnapshot(ctx context.Context, arg UpsertSnapshotParams) (Snapshot, error) {
|
||||
row := q.db.QueryRow(ctx, upsertSnapshot,
|
||||
arg.ContainerID,
|
||||
arg.ParentSnapshotID,
|
||||
arg.RuntimeSnapshotName,
|
||||
arg.ParentRuntimeSnapshotName,
|
||||
arg.Snapshotter,
|
||||
arg.Digest,
|
||||
arg.Source,
|
||||
)
|
||||
return err
|
||||
var i Snapshot
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.ContainerID,
|
||||
&i.RuntimeSnapshotName,
|
||||
&i.ParentRuntimeSnapshotName,
|
||||
&i.Snapshotter,
|
||||
&i.Source,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user