feat(server): W4-A integration endpoints and contract gaps
- POST /acquisition-plans: manual submit via download.plan -> download.submit
(same authorization/audit/idempotency path as the agent), slotId or entityId
- read-only /media-assets, /asset-locations, /asset-unit-coverage, /path-bindings,
/reconcile-runs, /server-mappings, /artifacts, GET /title-aliases/{id};
unimplemented write endpoints removed from api.ts; registry test now checks both directions
- candidate evaluation upsert per (slot, source_release) + migration 0022 dedupe/unique index
- organization records expose downloadTaskId (+ list filter); inventory adds
subscribed/candidateReasons; feed sources expose derived possibleGap
- GET /events?after=&limit= JSON replay page for API key callers (same sse_event table)
- preference tag revision history from audit_event; subscriptions/identities/aliases
lists carry mediaEntityTitle; subscription q/mediaKind search; slot subscriptionId
filter + currentAsset summary; policy preview samples carry title/reasons
- DecisionSummary, IdentityRevisionList, ReleaseIdentityResult, PolicyPreviewSummary exported from contracts
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
ea4c384664
commit
d3ab54f2bd
34 files changed
+1083
-123
No files matched your search
@@ -1,5 +1,6 @@
|
||||
import { type EventEnvelope, EventType } from "@umt/contracts";
|
||||
import { Hono } from "hono";
|
||||
import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
|
||||
import { Api, apiResponse, type EventEnvelope, type EventReplayPage, EventType } from "@umt/contracts";
|
||||
import type { Context } from "hono";
|
||||
import { streamSSE } from "hono/streaming";
|
||||
import { ApiException } from "./errors.ts";
|
||||
|
||||
@@ -79,14 +80,60 @@ export interface SseOptions {
|
||||
keepaliveMs?: number;
|
||||
}
|
||||
|
||||
/** GET /events?after=<seq>(也接受 Last-Event-ID 头) */
|
||||
const REPLAY_DEFAULT_LIMIT = 100;
|
||||
|
||||
/** JSON 补读还是 SSE:带 limit,或 Accept 只要 JSON(不含 text/event-stream)时走 JSON */
|
||||
function wantsJson(accept: string | undefined, limit: string | undefined): boolean {
|
||||
if (limit !== undefined) return true;
|
||||
const a = (accept ?? "").toLowerCase();
|
||||
return a.includes("application/json") && !a.includes("text/event-stream");
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /events?after=<seq>(也接受 Last-Event-ID 头):
|
||||
* - 控制台(cookie 会话)用 EventSource 走 SSE 流;
|
||||
* - API Key 调用者用 `GET /events?after=<seq>&limit=<n>` 取 JSON 页(同一 sse_event 表),按 nextAfter 续读。
|
||||
*/
|
||||
export function sseRoutes({ bus, keepaliveMs = 15_000 }: SseOptions) {
|
||||
const app = new Hono();
|
||||
app.get("/events", (c) => {
|
||||
const app = new OpenAPIHono();
|
||||
const def = Api.events.list;
|
||||
const route = createRoute({
|
||||
method: "get",
|
||||
path: def.path,
|
||||
tags: ["events"],
|
||||
summary: def.summary,
|
||||
responses: {
|
||||
200: {
|
||||
description: "JSON 补读页(带 limit 或 Accept: application/json);否则为 text/event-stream",
|
||||
content: {
|
||||
"application/json": { schema: apiResponse(def.response) },
|
||||
"text/event-stream": { schema: { type: "string" } },
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
app.openapi(route, (async (c: Context) => {
|
||||
const raw = c.req.query("after") ?? c.req.header("last-event-id") ?? "0";
|
||||
const after = Number(raw);
|
||||
if (!Number.isInteger(after) || after < 0) throw new ApiException("bad_request", "after 必须是非负整数");
|
||||
|
||||
const limitRaw = c.req.query("limit");
|
||||
if (wantsJson(c.req.header("accept"), limitRaw)) {
|
||||
const limit = limitRaw === undefined ? REPLAY_DEFAULT_LIMIT : Number(limitRaw);
|
||||
if (!Number.isInteger(limit) || limit < 1 || limit > 1000)
|
||||
throw new ApiException("bad_request", "limit 必须是 1–1000 的整数");
|
||||
const r = await bus.since(after, limit + 1);
|
||||
const items = r.events.slice(0, limit);
|
||||
const data: EventReplayPage = {
|
||||
items,
|
||||
nextAfter: items.at(-1)?.seq ?? after,
|
||||
hasMore: r.events.length > limit,
|
||||
latestSeq: r.latestSeq,
|
||||
gap: r.gap,
|
||||
};
|
||||
return c.json({ ok: true as const, data });
|
||||
}
|
||||
|
||||
return streamSSE(c, async (stream) => {
|
||||
const queue: EventEnvelope[] = [];
|
||||
let wake: (() => void) | null = null;
|
||||
@@ -140,6 +187,6 @@ export function sseRoutes({ bus, keepaliveMs = 15_000 }: SseOptions) {
|
||||
unsubscribe();
|
||||
}
|
||||
});
|
||||
});
|
||||
}) as never);
|
||||
return app;
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import type { ServerContext, ServerModule } from "../types.ts";
|
||||
import { registerAoCapabilities } from "./capabilities.ts";
|
||||
import { registerAoTasks } from "./handlers.ts";
|
||||
import { type AoOptions, type AoPorts, createPorts } from "./ports.ts";
|
||||
import { registerAssetRoutes } from "./routes/assets.ts";
|
||||
import { registerDashboardRoutes } from "./routes/dashboard.ts";
|
||||
import { registerDownloadRoutes } from "./routes/downloads.ts";
|
||||
import { registerLibraryRoutes } from "./routes/library.ts";
|
||||
@@ -67,6 +68,7 @@ export function createAcquisitionOrganizeModule(overrides: AoOverrides = {}): Se
|
||||
registerOrganizationRoutes(app, d);
|
||||
registerLibraryRoutes(app, d);
|
||||
registerDashboardRoutes(app, d);
|
||||
registerAssetRoutes(app, d);
|
||||
},
|
||||
registerTasks(registry, ctx) {
|
||||
registerAoTasks(registry, lazy(ctx));
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
import { Api, type EndpointDef } from "@umt/contracts";
|
||||
import type { ModuleApp } from "../../types.ts";
|
||||
import type { AoDeps } from "../services/common.ts";
|
||||
import { notFound, toApi, toApiList } from "../util.ts";
|
||||
import { mount, paginate } from "./helpers.ts";
|
||||
|
||||
// 资产 / 位置 / 覆盖 / 路径绑定 / 校验运行 / 库存映射:只读列表与详情。
|
||||
// 这些表只由整理、对账、媒体服务器同步流程写入,不开放直接修改(api.ts 已移除对应写端点)。
|
||||
|
||||
const TAG = "assets";
|
||||
|
||||
type Table =
|
||||
| "media_asset"
|
||||
| "asset_unit_coverage"
|
||||
| "asset_location"
|
||||
| "path_binding"
|
||||
| "reconcile_run"
|
||||
| "server_mapping";
|
||||
|
||||
interface ReadOnly {
|
||||
list: EndpointDef;
|
||||
get: EndpointDef;
|
||||
table: Table;
|
||||
what: string;
|
||||
/** query 字段 → 列名 */
|
||||
filters: Record<string, string>;
|
||||
}
|
||||
|
||||
const READ_ONLY: ReadOnly[] = [
|
||||
{
|
||||
...Api.mediaAssets,
|
||||
table: "media_asset",
|
||||
what: "资产",
|
||||
filters: { mediaEntityId: "media_entity_id", status: "status" },
|
||||
},
|
||||
{
|
||||
...Api.assetUnitCoverage,
|
||||
table: "asset_unit_coverage",
|
||||
what: "资产覆盖",
|
||||
filters: { mediaAssetId: "media_asset_id", contentUnitId: "content_unit_id" },
|
||||
},
|
||||
{
|
||||
...Api.assetLocations,
|
||||
table: "asset_location",
|
||||
what: "资产位置",
|
||||
filters: { mediaAssetId: "media_asset_id", status: "status" },
|
||||
},
|
||||
{
|
||||
...Api.pathBindings,
|
||||
table: "path_binding",
|
||||
what: "路径绑定",
|
||||
filters: { mediaEntityId: "media_entity_id", status: "status" },
|
||||
},
|
||||
{
|
||||
...Api.reconcileRuns,
|
||||
table: "reconcile_run",
|
||||
what: "校验运行",
|
||||
filters: { kind: "kind", status: "status" },
|
||||
},
|
||||
{
|
||||
...Api.serverMappings,
|
||||
table: "server_mapping",
|
||||
what: "库存映射",
|
||||
filters: {
|
||||
mediaServerInstanceId: "media_server_instance_id",
|
||||
mediaEntityId: "media_entity_id",
|
||||
matchStatus: "match_status",
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
export function registerAssetRoutes(app: ModuleApp, d: AoDeps) {
|
||||
const db = () => d.ctx.db;
|
||||
for (const r of READ_ONLY) {
|
||||
mount(
|
||||
app,
|
||||
r.list,
|
||||
async (_c, { query }) => {
|
||||
// biome-ignore lint/suspicious/noExplicitAny: 表名在 READ_ONLY 里枚举,列名随表变化
|
||||
let q = (db() as any).selectFrom(r.table).selectAll();
|
||||
for (const [key, col] of Object.entries(r.filters)) {
|
||||
const v = (query as Record<string, unknown>)[key];
|
||||
if (v !== undefined) q = q.where(col, "=", v);
|
||||
}
|
||||
const p = await paginate(q, query);
|
||||
return { items: toApiList(p.rows as object[]), nextCursor: p.nextCursor };
|
||||
},
|
||||
{ tag: TAG },
|
||||
);
|
||||
mount(
|
||||
app,
|
||||
r.get,
|
||||
async (_c, { params }) => {
|
||||
const row = await db().selectFrom(r.table).selectAll().where("id", "=", params.id).executeTakeFirst();
|
||||
return toApi((row as object | undefined) ?? notFound(r.what));
|
||||
},
|
||||
{ tag: TAG },
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -317,6 +317,42 @@ export function registerLibraryRoutes(app: ModuleApp, d: AoDeps) {
|
||||
.where("dt.status", "in", [...ACTIVE_DL])
|
||||
.execute(),
|
||||
]);
|
||||
const [subs, cands] = await Promise.all([
|
||||
db()
|
||||
.selectFrom("subscription")
|
||||
.select("media_entity_id")
|
||||
.where("media_entity_id", "in", ids)
|
||||
.where("status", "=", "active")
|
||||
.execute(),
|
||||
db()
|
||||
.selectFrom("artifact as a")
|
||||
.innerJoin("acquisition_slot as s", (j) =>
|
||||
j.on(sql<boolean>`a.subject_id = s.id and a.subject_type = 'acquisition_slot'`),
|
||||
)
|
||||
.select(["s.media_entity_id", "s.name as slot_name", "a.content"])
|
||||
.where("a.title", "=", CANDIDATE_ARTIFACT_TITLE)
|
||||
.where("s.media_entity_id", "in", ids)
|
||||
.orderBy("a.updated_at", "desc")
|
||||
.limit(50 * ids.length)
|
||||
.execute(),
|
||||
]);
|
||||
const subscribed = new Set(subs.map((r) => r.media_entity_id));
|
||||
const reasonsOf = (entityId: string) =>
|
||||
cands
|
||||
.filter((c) => c.media_entity_id === entityId)
|
||||
.slice(0, 50)
|
||||
.map((c) => {
|
||||
const ev = c.content as CandidateEvaluation;
|
||||
return {
|
||||
slotId: ev.slotId,
|
||||
slotName: c.slot_name,
|
||||
sourceReleaseId: ev.sourceReleaseId,
|
||||
decision: ev.decision,
|
||||
reasons: [...new Set([...(ev.rejected ?? []).map((r) => r.message), ...(ev.reasons ?? [])])],
|
||||
planId: ev.planId ?? null,
|
||||
evaluatedAt: ev.evaluatedAt,
|
||||
};
|
||||
});
|
||||
return {
|
||||
items: ids.map((entityId) => ({
|
||||
entityId,
|
||||
@@ -340,6 +376,8 @@ export function registerLibraryRoutes(app: ModuleApp, d: AoDeps) {
|
||||
downloading: dts
|
||||
.filter((t) => t.entity_id === entityId)
|
||||
.map((t) => ({ downloadTaskId: t.id, name: t.name, status: t.status, progress: t.progress })),
|
||||
subscribed: subscribed.has(entityId),
|
||||
candidateReasons: reasonsOf(entityId),
|
||||
})),
|
||||
};
|
||||
},
|
||||
|
||||
@@ -23,6 +23,7 @@ export function registerOrganizationRoutes(app: ModuleApp, d: AoDeps) {
|
||||
if (query.status) q = q.where("status", "=", query.status);
|
||||
if (query.trigger) q = q.where("trigger", "=", query.trigger);
|
||||
if (query.mediaEntityId) q = q.where("media_entity_id", "=", query.mediaEntityId);
|
||||
if (query.downloadTaskId) q = q.where("download_task_id", "=", query.downloadTaskId);
|
||||
if (query.q) {
|
||||
const like = `%${String(query.q).replace(/[\\%_]/g, (m) => `\\${m}`)}%`;
|
||||
q = q.where((eb) =>
|
||||
|
||||
@@ -10,6 +10,8 @@ import {
|
||||
import { type DB, sql, type Transaction } from "@umt/db";
|
||||
import { evaluateCandidate, parseRelease } from "@umt/domain";
|
||||
import { slotSpecFromRow } from "@umt/mapping";
|
||||
import type { Context } from "hono";
|
||||
import type { AuthEnv } from "../../../http/auth.ts";
|
||||
import { ApiException } from "../../../http/errors.ts";
|
||||
import type { ModuleApp } from "../../types.ts";
|
||||
import { createSlotsFromTemplates, publishedAcquisitionPolicies } from "../services/acquisition.ts";
|
||||
@@ -34,6 +36,48 @@ async function kickEvaluate(d: AoDeps, input: { subscriptionId?: string; acquisi
|
||||
}
|
||||
}
|
||||
|
||||
/** 偏好标签写入审计(修订历史端点据此回放):payload 带写入后快照与改动字段 */
|
||||
async function auditPref(
|
||||
trx: Transaction<DB>,
|
||||
c: Context<AuthEnv>,
|
||||
action: "created" | "updated" | "deleted",
|
||||
row: {
|
||||
id: string;
|
||||
label: string;
|
||||
kind: string;
|
||||
status: string;
|
||||
scope: unknown;
|
||||
rule: unknown;
|
||||
description: string | null;
|
||||
revision: number;
|
||||
},
|
||||
changedFields: string[],
|
||||
) {
|
||||
const actor = c.get("actor");
|
||||
await trx
|
||||
.insertInto("audit_event")
|
||||
.values({
|
||||
actor_type: actor?.type === "api_key" ? "api_key" : "user",
|
||||
actor_id: actor?.id ?? null,
|
||||
action: `preference_tag.${action}`,
|
||||
target_type: "preference_tag",
|
||||
target_id: row.id,
|
||||
payload: jsonb({
|
||||
revision: row.revision,
|
||||
changedFields,
|
||||
snapshot: {
|
||||
label: row.label,
|
||||
kind: row.kind,
|
||||
status: row.status,
|
||||
scope: row.scope,
|
||||
rule: row.rule,
|
||||
description: row.description,
|
||||
},
|
||||
}),
|
||||
})
|
||||
.execute();
|
||||
}
|
||||
|
||||
export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
const db = () => d.ctx.db;
|
||||
|
||||
@@ -42,10 +86,32 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
app,
|
||||
Api.subscriptions.list,
|
||||
async (_c, { query }) => {
|
||||
let q = db().selectFrom("subscription").selectAll();
|
||||
if (query.status) q = q.where("status", "=", query.status);
|
||||
if (query.mediaEntityId) q = q.where("media_entity_id", "=", query.mediaEntityId);
|
||||
const p = await paginate(q, query);
|
||||
let q = db()
|
||||
.selectFrom("subscription as s")
|
||||
.leftJoin("media_entity as e", "e.id", "s.media_entity_id")
|
||||
.selectAll("s")
|
||||
.select("e.title as media_entity_title");
|
||||
if (query.status) q = q.where("s.status", "=", query.status);
|
||||
if (query.mediaEntityId) q = q.where("s.media_entity_id", "=", query.mediaEntityId);
|
||||
if (query.mediaKind) q = q.where("s.media_kind", "=", query.mediaKind);
|
||||
if (query.q) {
|
||||
const like = `%${String(query.q).replace(/[\\%_]/g, (m) => `\\${m}`)}%`;
|
||||
q = q.where((eb) =>
|
||||
eb.or([
|
||||
eb("e.title", "ilike", like),
|
||||
eb("e.original_title", "ilike", like),
|
||||
eb("s.title_query", "ilike", like),
|
||||
eb.exists(
|
||||
eb
|
||||
.selectFrom("title_alias as t")
|
||||
.select("t.id")
|
||||
.whereRef("t.media_entity_id", "=", "s.media_entity_id")
|
||||
.where("t.alias", "ilike", like),
|
||||
),
|
||||
]),
|
||||
);
|
||||
}
|
||||
const p = await paginate(q, query, "s.");
|
||||
return { items: toApiList<Subscription>(p.rows), nextCursor: p.nextCursor };
|
||||
},
|
||||
{ tag: TAG },
|
||||
@@ -152,8 +218,34 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
let q = db().selectFrom("acquisition_slot").selectAll();
|
||||
if (query.mediaEntityId) q = q.where("media_entity_id", "=", query.mediaEntityId);
|
||||
if (query.status) q = q.where("status", "=", query.status);
|
||||
if (query.subscriptionId) q = q.where("subscription_id", "=", query.subscriptionId);
|
||||
const p = await paginate(q, query);
|
||||
return { items: toApiList<AcquisitionSlot>(p.rows), nextCursor: p.nextCursor };
|
||||
const assetIds = p.rows.map((r) => r.current_asset_id).filter((x): x is string => !!x);
|
||||
const assets = assetIds.length
|
||||
? await db()
|
||||
.selectFrom("media_asset")
|
||||
.select(["id", "delivery", "size_bytes", "status"])
|
||||
.where("id", "in", assetIds)
|
||||
.execute()
|
||||
: [];
|
||||
const items = p.rows.map((r) => {
|
||||
const a = assets.find((x) => x.id === r.current_asset_id);
|
||||
const dv = (a?.delivery ?? {}) as { resolution?: string; sourceType?: string; releaseGroup?: string };
|
||||
return {
|
||||
...toApi<AcquisitionSlot>(r),
|
||||
currentAsset: a
|
||||
? {
|
||||
id: a.id,
|
||||
resolution: dv.resolution ?? null,
|
||||
sourceType: dv.sourceType ?? null,
|
||||
releaseGroup: dv.releaseGroup ?? null,
|
||||
sizeBytes: a.size_bytes,
|
||||
status: a.status,
|
||||
}
|
||||
: null,
|
||||
};
|
||||
});
|
||||
return { items, nextCursor: p.nextCursor };
|
||||
},
|
||||
{ tag: TAG },
|
||||
);
|
||||
@@ -484,6 +576,7 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
.returningAll()
|
||||
.executeTakeFirst();
|
||||
if (!ins) conflict("已存在同一语义的偏好标签");
|
||||
await auditPref(trx, c, "created", ins!, []);
|
||||
return ins!;
|
||||
});
|
||||
return toApi<PreferenceTag>(r);
|
||||
@@ -519,7 +612,10 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
}
|
||||
if (fp !== cur!.fingerprint && cur!.status === "active")
|
||||
await suppress(trx, cur!.id, cur!.fingerprint, actorOf(c), "edited");
|
||||
return trx
|
||||
const changed = (["label", "kind", "scope", "rule", "description", "evidence", "status"] as const).filter(
|
||||
(k) => body[k] !== undefined && JSON.stringify(body[k]) !== JSON.stringify(toApi<PreferenceTag>(cur!)[k]),
|
||||
);
|
||||
const next_ = await trx
|
||||
.updateTable("preference_tag")
|
||||
.set({
|
||||
...(body.label !== undefined ? { label: body.label } : {}),
|
||||
@@ -535,6 +631,8 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
.where("id", "=", params.id)
|
||||
.returningAll()
|
||||
.executeTakeFirstOrThrow();
|
||||
await auditPref(trx, c, "updated", next_, changed);
|
||||
return next_;
|
||||
});
|
||||
return toApi<PreferenceTag>(r);
|
||||
},
|
||||
@@ -559,6 +657,7 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
.set({ status: "deleted", revision: cur!.revision + 1 })
|
||||
.where("id", "=", params.id)
|
||||
.execute();
|
||||
await auditPref(trx, c, "deleted", { ...cur!, status: "deleted", revision: cur!.revision + 1 }, []);
|
||||
await suppress(trx, cur!.id, cur!.fingerprint, actorOf(c), "deleted");
|
||||
});
|
||||
return { ok: true as const };
|
||||
@@ -566,6 +665,53 @@ export function registerRuleRoutes(app: ModuleApp, d: AoDeps) {
|
||||
{ tag: TAG, status: 200 },
|
||||
);
|
||||
|
||||
mount(
|
||||
app,
|
||||
Api.preferenceTags.revisions,
|
||||
async (_c, { params }) => {
|
||||
const tag = await db().selectFrom("preference_tag").select("id").where("id", "=", params.id).executeTakeFirst();
|
||||
if (!tag) notFound("偏好标签");
|
||||
const rows = await db()
|
||||
.selectFrom("audit_event")
|
||||
.selectAll()
|
||||
.where("target_type", "=", "preference_tag")
|
||||
.where("target_id", "=", params.id)
|
||||
.where("action", "like", "preference_tag.%")
|
||||
.orderBy("at", "desc")
|
||||
.orderBy("id", "desc")
|
||||
.limit(200)
|
||||
.execute();
|
||||
return {
|
||||
items: rows.map((r) => {
|
||||
const p = (r.payload ?? {}) as {
|
||||
revision?: number;
|
||||
changedFields?: string[];
|
||||
snapshot?: Record<string, unknown>;
|
||||
};
|
||||
const snap = p.snapshot ?? {};
|
||||
return {
|
||||
id: r.id,
|
||||
at: r.at.toISOString(),
|
||||
action: r.action.slice("preference_tag.".length),
|
||||
actorType: r.actor_type,
|
||||
actorId: r.actor_id,
|
||||
revision: p.revision ?? null,
|
||||
changedFields: p.changedFields ?? [],
|
||||
snapshot: {
|
||||
label: String(snap.label ?? ""),
|
||||
kind: String(snap.kind ?? ""),
|
||||
status: String(snap.status ?? ""),
|
||||
scope: (snap.scope ?? {}) as Record<string, unknown>,
|
||||
rule: (snap.rule ?? {}) as Record<string, unknown>,
|
||||
description: (snap.description as string | null | undefined) ?? null,
|
||||
},
|
||||
};
|
||||
}),
|
||||
};
|
||||
},
|
||||
{ tag: TAG },
|
||||
);
|
||||
|
||||
// ── 抑制记录 ──
|
||||
mount(
|
||||
app,
|
||||
@@ -696,7 +842,14 @@ export async function previewPolicy(d: AoDeps, rules: unknown) {
|
||||
.execute();
|
||||
let matched = 0;
|
||||
let excluded = 0;
|
||||
const samples: { sourceReleaseId: string; template: string; decision: string }[] = [];
|
||||
const samples: {
|
||||
sourceReleaseId: string;
|
||||
title: string;
|
||||
sizeBytes: number | null;
|
||||
template: string;
|
||||
decision: string;
|
||||
reasons: string[];
|
||||
}[] = [];
|
||||
for (const rel of rels) {
|
||||
const parsed = {
|
||||
...parseRelease(rel.title, rel.subtitle ? { subtitle: rel.subtitle } : {}),
|
||||
@@ -715,7 +868,24 @@ export async function previewPolicy(d: AoDeps, rules: unknown) {
|
||||
const ev = evaluateCandidate(spec, parsed, null);
|
||||
if (ev.decision === "accept") matched++;
|
||||
else excluded++;
|
||||
if (samples.length < 20) samples.push({ sourceReleaseId: rel.id, template: t.name, decision: ev.decision });
|
||||
if (samples.length < 20) {
|
||||
const reasons =
|
||||
ev.decision === "reject"
|
||||
? ev.violations.map((v) => `${v.field}:${v.code}`)
|
||||
: ev.decision === "unknown_field"
|
||||
? ev.missing.map((m) => `missing:${m}`)
|
||||
: "reasons" in ev
|
||||
? (ev.reasons ?? [])
|
||||
: [];
|
||||
samples.push({
|
||||
sourceReleaseId: rel.id,
|
||||
title: rel.title,
|
||||
sizeBytes: rel.size_bytes,
|
||||
template: t.name,
|
||||
decision: ev.decision,
|
||||
reasons,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
|
||||
@@ -56,6 +56,10 @@ export async function upsertDecision(d: AoDeps, exec: Exec, input: DecisionInput
|
||||
|
||||
export const CANDIDATE_ARTIFACT_TITLE = "candidate_evaluation";
|
||||
|
||||
/**
|
||||
* 同一 (Slot, 来源资源) 只保留最新一条评估(唯一索引 artifact_candidate_slot_release);
|
||||
* 重复评估覆盖内容与 updated_at,不再追加新行。
|
||||
*/
|
||||
export async function recordCandidate(exec: Exec, ev: CandidateEvaluation): Promise<void> {
|
||||
const content = { ...ev };
|
||||
const contentHash = hashJson({
|
||||
@@ -66,32 +70,12 @@ export async function recordCandidate(exec: Exec, ev: CandidateEvaluation): Prom
|
||||
reasons: ev.reasons,
|
||||
planId: ev.planId,
|
||||
});
|
||||
const dup = await exec
|
||||
.selectFrom("artifact")
|
||||
.select("id")
|
||||
.where("subject_type", "=", "acquisition_slot")
|
||||
.where("subject_id", "=", ev.slotId)
|
||||
.where("content_hash", "=", contentHash)
|
||||
.executeTakeFirst();
|
||||
if (dup) {
|
||||
await exec
|
||||
.updateTable("artifact")
|
||||
.set({ content: jsonb(content), updated_at: new Date() })
|
||||
.where("id", "=", dup.id)
|
||||
.execute();
|
||||
return;
|
||||
}
|
||||
await exec
|
||||
.insertInto("artifact")
|
||||
.values({
|
||||
kind: "evidence",
|
||||
subject_type: "acquisition_slot",
|
||||
subject_id: ev.slotId,
|
||||
title: CANDIDATE_ARTIFACT_TITLE,
|
||||
content: jsonb(content),
|
||||
content_hash: contentHash,
|
||||
})
|
||||
.execute();
|
||||
await sql`
|
||||
insert into artifact (kind, subject_type, subject_id, title, content, content_hash)
|
||||
values ('evidence', 'acquisition_slot', ${ev.slotId}, ${CANDIDATE_ARTIFACT_TITLE}, ${jsonb(content)}::jsonb, ${contentHash})
|
||||
on conflict (subject_id, (content->>'sourceReleaseId'))
|
||||
where title = 'candidate_evaluation' and subject_type = 'acquisition_slot'
|
||||
do update set content = excluded.content, content_hash = excluded.content_hash, updated_at = now()`.execute(exec);
|
||||
}
|
||||
|
||||
// ── 业务任务行(task 表:时间线投影;引擎只管推进) ──
|
||||
|
||||
@@ -1222,6 +1222,7 @@ export async function loadRecordsPublic(exec: Exec, rows: OrganizationRecordRow[
|
||||
return {
|
||||
id: r.id,
|
||||
taskId: r.task_id,
|
||||
downloadTaskId: r.download_task_id,
|
||||
operationIds: ops.filter((o) => o.organization_record_id === r.id).map((o) => o.id),
|
||||
media: e
|
||||
? {
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
Api,
|
||||
CAPABILITY_CATALOG,
|
||||
type CapabilityDescriptor,
|
||||
type DownloadPlanOutput,
|
||||
type KnownCapabilityId,
|
||||
} from "@umt/contracts";
|
||||
import { type AgentRunRow, sql } from "@umt/db";
|
||||
@@ -341,23 +342,106 @@ export function registerAgentRoutes(app: ModuleApp, ctx: ServerContext) {
|
||||
planId: typeof o.planId === "string" ? o.planId : typeof o.plan?.id === "string" ? o.plan.id : null,
|
||||
};
|
||||
} catch (err) {
|
||||
if (!isCapabilityError(err)) throw err;
|
||||
const code =
|
||||
err.code === "unauthorized"
|
||||
? "forbidden"
|
||||
: err.code === "not_found"
|
||||
? "not_found"
|
||||
: err.code === "conflict"
|
||||
? "conflict"
|
||||
: err.code === "precondition" || err.code === "budget"
|
||||
? "precondition_failed"
|
||||
: err.code === "invalid_input"
|
||||
? "validation_failed"
|
||||
: "internal";
|
||||
throw new ApiException(code, err.message);
|
||||
capabilityHttpError(err);
|
||||
}
|
||||
});
|
||||
|
||||
// ── 手动提交下载:同一条 download.plan → download.submit 能力路径(授权/审计/幂等与 Agent 一致)──
|
||||
route(app, Api.acquisitionPlans.create, async ({ body, actorId, c }) => {
|
||||
const rel = await db()
|
||||
.selectFrom("source_release")
|
||||
.select(["id", "media_entity_id"])
|
||||
.where("id", "=", body.sourceReleaseId)
|
||||
.executeTakeFirst();
|
||||
if (!rel) throw new ApiException("not_found", "来源资源不存在");
|
||||
let slotIds: string[];
|
||||
if (body.slotId) {
|
||||
const s = await db().selectFrom("acquisition_slot").select("id").where("id", "=", body.slotId).executeTakeFirst();
|
||||
if (!s) throw new ApiException("not_found", "收录目标(Slot)不存在");
|
||||
slotIds = [s.id];
|
||||
} else {
|
||||
const entityId = body.entityId ?? rel.media_entity_id;
|
||||
if (!entityId)
|
||||
throw new ApiException("precondition_failed", "来源资源尚未识别到本地作品,请先在“身份与元数据”指定作品");
|
||||
slotIds = (
|
||||
await db()
|
||||
.selectFrom("acquisition_slot")
|
||||
.select("id")
|
||||
.where("media_entity_id", "=", entityId)
|
||||
.orderBy("created_at")
|
||||
.execute()
|
||||
).map((r) => r.id);
|
||||
}
|
||||
const rejected: { slotId: string | null; code: string; message: string }[] = [];
|
||||
if (slotIds.length === 0)
|
||||
rejected.push({ slotId: null, code: "no_slot", message: "该作品没有版本目标(Slot),请先在订阅里建目标" });
|
||||
const invokeCtx = {
|
||||
actorId,
|
||||
taskId: `http:${c.get("requestId") ?? "req"}`,
|
||||
scopeIds: [],
|
||||
signal: c.req.raw.signal,
|
||||
source: "web" as const,
|
||||
};
|
||||
try {
|
||||
for (const slotId of slotIds) {
|
||||
const out = (await ctx.capabilities.invoke(
|
||||
"download.plan",
|
||||
{ slotId, sourceReleaseId: rel.id },
|
||||
invokeCtx,
|
||||
)) as DownloadPlanOutput;
|
||||
if (!out.plan) {
|
||||
for (const r of out.rejected) rejected.push({ slotId, ...r });
|
||||
continue;
|
||||
}
|
||||
const sub = (await ctx.capabilities.invoke("download.submit", { planId: out.plan.id }, invokeCtx)) as {
|
||||
taskId: string;
|
||||
};
|
||||
const plan = await db()
|
||||
.selectFrom("acquisition_plan")
|
||||
.selectAll()
|
||||
.where("id", "=", out.plan.id)
|
||||
.executeTakeFirstOrThrow();
|
||||
await audit(ctx, actorId, "acquisition_plan.manual_submit", plan.id, {
|
||||
sourceReleaseId: rel.id,
|
||||
slotId,
|
||||
taskId: sub.taskId,
|
||||
note: body.note ?? null,
|
||||
});
|
||||
return { submitted: true, plan: camel(plan), slotId, taskId: sub.taskId, rejected };
|
||||
}
|
||||
} catch (err) {
|
||||
capabilityHttpError(err);
|
||||
}
|
||||
return { submitted: false, plan: null, slotId: null, taskId: null, rejected };
|
||||
});
|
||||
|
||||
// ── 产物(整理计划 / 汇报 / 证据):只读 ──
|
||||
route(app, Api.artifacts.list, async ({ query: raw }) => {
|
||||
const query = raw as ListQuery & { agentRunId?: string; taskId?: string };
|
||||
let q = db().selectFrom("artifact").selectAll();
|
||||
if (query.agentRunId) q = q.where("agent_run_id", "=", query.agentRunId);
|
||||
if (query.taskId) q = q.where("task_id", "=", query.taskId);
|
||||
if (query.kind) q = q.where("kind", "=", query.kind as never);
|
||||
const cur = decode(query.cursor);
|
||||
if (cur) q = q.where(sql<boolean>`(created_at, id) < (${cur.at}::timestamptz, ${cur.id}::uuid)`);
|
||||
const rows = await q
|
||||
.orderBy("created_at", "desc")
|
||||
.orderBy("id", "desc")
|
||||
.limit(query.limit + 1)
|
||||
.execute();
|
||||
const items = rows.slice(0, query.limit);
|
||||
const last = items.at(-1);
|
||||
return {
|
||||
items: items.map(camel),
|
||||
nextCursor: rows.length > query.limit && last ? encode(last.created_at, last.id) : null,
|
||||
};
|
||||
});
|
||||
route(app, Api.artifacts.get, async ({ params }) => {
|
||||
const r = await db().selectFrom("artifact").selectAll().where("id", "=", params.id).executeTakeFirst();
|
||||
if (!r) throw new ApiException("not_found", "产物不存在");
|
||||
return camel(r);
|
||||
});
|
||||
|
||||
// ── 业务任务 ──
|
||||
route(app, Api.tasks.list, async ({ query: raw }) => {
|
||||
const query = raw as ListQuery;
|
||||
@@ -413,6 +497,24 @@ export function registerAgentRoutes(app: ModuleApp, ctx: ServerContext) {
|
||||
});
|
||||
}
|
||||
|
||||
/** 能力错误 → HTTP 错误码 */
|
||||
function capabilityHttpError(err: unknown): never {
|
||||
if (!isCapabilityError(err)) throw err;
|
||||
const code =
|
||||
err.code === "unauthorized"
|
||||
? "forbidden"
|
||||
: err.code === "not_found"
|
||||
? "not_found"
|
||||
: err.code === "conflict"
|
||||
? "conflict"
|
||||
: err.code === "precondition" || err.code === "budget"
|
||||
? "precondition_failed"
|
||||
: err.code === "invalid_input"
|
||||
? "validation_failed"
|
||||
: "internal";
|
||||
throw new ApiException(code, err.message);
|
||||
}
|
||||
|
||||
async function audit(ctx: ServerContext, actorId: string, action: string, targetId: string, payload: object) {
|
||||
await ctx.db
|
||||
.insertInto("audit_event")
|
||||
|
||||
@@ -243,6 +243,7 @@ export const D = {
|
||||
{ mediaEntityId: Id.optional(), q: z.string().max(200).optional() },
|
||||
TI,
|
||||
),
|
||||
get: get("/title-aliases/{id}", "别名详情", TitleAlias, TI),
|
||||
create: write("post", "/title-aliases", "organize.execute", "新增别名", TitleAliasCreate, TitleAlias, TI, false),
|
||||
remove: write("delete", "/title-aliases/{id}", "organize.execute", "删除别名", undefined, OkResult, TI),
|
||||
},
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
ReleaseIdentityAssign,
|
||||
type TitleAlias,
|
||||
} from "@umt/contracts";
|
||||
import { sql } from "@umt/db";
|
||||
import { type DB, type Kysely, sql } from "@umt/db";
|
||||
import { normalizeTitle } from "@umt/domain";
|
||||
import { z } from "zod";
|
||||
import { ApiException } from "../../../http/errors.ts";
|
||||
@@ -44,6 +44,30 @@ const T_ID = ["identity"];
|
||||
const Accepted = z.object({ taskId: Id });
|
||||
const FieldParam = z.object({ id: Id, field: EntityMetadataField });
|
||||
|
||||
/** 列表带作品标题:按 media_entity_id 批量取;只挂在内容单元上的行以 `cu:<id>` 为键取所属作品标题 */
|
||||
async function entityTitles(
|
||||
db: Kysely<DB>,
|
||||
rows: readonly { media_entity_id: string | null; content_unit_id?: string | null }[],
|
||||
): Promise<Map<string, string>> {
|
||||
const out = new Map<string, string>();
|
||||
const ids = [...new Set(rows.map((r) => r.media_entity_id).filter((x): x is string => !!x))];
|
||||
const cus = [...new Set(rows.filter((r) => !r.media_entity_id && r.content_unit_id).map((r) => r.content_unit_id!))];
|
||||
if (ids.length) {
|
||||
for (const e of await db.selectFrom("media_entity").select(["id", "title"]).where("id", "in", ids).execute())
|
||||
out.set(e.id, e.title);
|
||||
}
|
||||
if (cus.length) {
|
||||
const units = await db
|
||||
.selectFrom("content_unit as u")
|
||||
.innerJoin("media_entity as e", "e.id", "u.media_entity_id")
|
||||
.select(["u.id", "e.title"])
|
||||
.where("u.id", "in", cus)
|
||||
.execute();
|
||||
for (const u of units) out.set(`cu:${u.id}`, u.title);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
export function identityRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
const db = () => rt().ctx.db;
|
||||
|
||||
@@ -329,7 +353,16 @@ export function identityRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
.limit(query.limit + 1)
|
||||
.execute();
|
||||
const p = page(rows, off, query.limit);
|
||||
return { items: toApiList<TitleAlias>(p.items), nextCursor: p.nextCursor };
|
||||
const titles = await entityTitles(db(), p.items);
|
||||
return {
|
||||
items: p.items.map((r) => ({ ...toApi<TitleAlias>(r), mediaEntityTitle: titles.get(r.media_entity_id) ?? null })),
|
||||
nextCursor: p.nextCursor,
|
||||
};
|
||||
});
|
||||
route(app, D.titleAliases.get, async ({ params }) => {
|
||||
const row = await db().selectFrom("title_alias").selectAll().where("id", "=", params.id).executeTakeFirst();
|
||||
if (!row) throw new ApiException("not_found", "别名不存在");
|
||||
return toApi<TitleAlias>(row);
|
||||
});
|
||||
route(app, D.titleAliases.create, async ({ body, actor }) => {
|
||||
const id = await resolveEntityId(db(), body.mediaEntityId);
|
||||
@@ -379,7 +412,14 @@ export function identityRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
.limit(query.limit + 1)
|
||||
.execute();
|
||||
const p = page(rows, off, query.limit);
|
||||
return { items: toApiList<ExternalIdentity>(p.items), nextCursor: p.nextCursor };
|
||||
const titles = await entityTitles(db(), p.items);
|
||||
return {
|
||||
items: p.items.map((r) => ({
|
||||
...toApi<ExternalIdentity>(r),
|
||||
mediaEntityTitle: titles.get(r.media_entity_id ?? `cu:${r.content_unit_id}`) ?? null,
|
||||
})),
|
||||
nextCursor: p.nextCursor,
|
||||
};
|
||||
});
|
||||
route(app, D.externalIdentities.get, async ({ params }) => {
|
||||
const row = await db().selectFrom("external_identity").selectAll().where("id", "=", params.id).executeTakeFirst();
|
||||
|
||||
@@ -22,7 +22,7 @@ import { ApiException } from "../../../http/errors.ts";
|
||||
import type { ModuleApp } from "../../types.ts";
|
||||
import { D } from "../defs.ts";
|
||||
import { route } from "../http.ts";
|
||||
import { decodeCursor, jsonb, page, toApi, toApiList } from "../rows.ts";
|
||||
import { decodeCursor, feedToApi, jsonb, page, toApi, toApiList } from "../rows.ts";
|
||||
import type { SourcesRuntime } from "../runtime.ts";
|
||||
import { audit, closeDecisions } from "../service/common.ts";
|
||||
import { assignReleaseIdentity } from "../service/identity-admin.ts";
|
||||
@@ -328,9 +328,9 @@ export function sourcesRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
.limit(query.limit + 1)
|
||||
.execute();
|
||||
const p = page(rows, off, query.limit);
|
||||
return { items: toApiList<FeedSource>(p.items), nextCursor: p.nextCursor };
|
||||
return { items: p.items.map((r) => feedToApi<FeedSource>(r)), nextCursor: p.nextCursor };
|
||||
});
|
||||
route(app, D.feedSources.get, async ({ params }) => toApi(await getFeed(params.id)));
|
||||
route(app, D.feedSources.get, async ({ params }) => feedToApi(await getFeed(params.id)));
|
||||
route(app, D.feedSources.create, async ({ body, actor }) => {
|
||||
if (body.siteId) await getSite(body.siteId);
|
||||
if (body.siteAccountId) await checkAccount(body.siteAccountId, body.siteId ?? null);
|
||||
@@ -352,7 +352,7 @@ export function sourcesRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
.returningAll()
|
||||
.executeTakeFirstOrThrow();
|
||||
await audit(db(), actor, "feed_source.created", { type: "feed_source", id: row.id }, { url: row.url_display });
|
||||
return toApi(row);
|
||||
return feedToApi(row);
|
||||
});
|
||||
route(app, D.feedSources.update, async ({ params, body, actor }) => {
|
||||
const feed = await getFeed(params.id);
|
||||
@@ -402,7 +402,7 @@ export function sourcesRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
fields: Object.keys(patch).filter((k) => k !== "url_secret_ref"),
|
||||
},
|
||||
);
|
||||
return toApi(row);
|
||||
return feedToApi(row);
|
||||
});
|
||||
for (const enabled of [true, false]) {
|
||||
route(
|
||||
@@ -432,7 +432,7 @@ export function sourcesRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
type: "feed_source",
|
||||
id: params.id,
|
||||
});
|
||||
return toApi(row);
|
||||
return feedToApi(row);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -485,7 +485,7 @@ export function sourcesRoutes(app: ModuleApp, rt: () => SourcesRuntime) {
|
||||
await audit(trx, actor, "feed_source.reset", { type: "feed_source", id: params.id });
|
||||
return r;
|
||||
});
|
||||
return toApi(row);
|
||||
return feedToApi(row);
|
||||
},
|
||||
);
|
||||
route(app, D.feedSources.fetchNow, async ({ params }) => {
|
||||
|
||||
@@ -35,3 +35,18 @@ export function page<T>(rows: T[], offset: number, limit: number): { items: T[];
|
||||
|
||||
/** jsonb 写入:数组/对象都先 JSON.stringify(pg 会把 JS 数组当 PG 数组) */
|
||||
export const jsonb = (v: unknown): string => JSON.stringify(v ?? null);
|
||||
|
||||
/** feed_source 行 → FeedSource(补派生字段 possibleGap,取自 cursor.gap) */
|
||||
export function feedToApi<T>(row: { cursor: unknown }): T {
|
||||
const gap = (row.cursor as { gap?: { detectedAt?: unknown; previousFetchedAt?: unknown; backfillQueued?: unknown } })
|
||||
?.gap;
|
||||
const possibleGap =
|
||||
gap && typeof gap.detectedAt === "string"
|
||||
? {
|
||||
detectedAt: gap.detectedAt,
|
||||
previousFetchedAt: typeof gap.previousFetchedAt === "string" ? gap.previousFetchedAt : null,
|
||||
backfillQueued: gap.backfillQueued === true,
|
||||
}
|
||||
: null;
|
||||
return { ...toApi<Record<string, unknown>>(row), possibleGap } as T;
|
||||
}
|
||||
@@ -17,9 +17,11 @@ import { clip, type Exec, openDecision } from "./common.ts";
|
||||
// FeedFetchState / FeedCursor 持久化在 feed_source 行;enclosure 只存脱敏值(适配器已脱敏)。
|
||||
|
||||
/** feed_source.cursor 的形状:重叠窗口游标 + 熔断打开时间 */
|
||||
interface StoredCursor {
|
||||
export interface StoredCursor {
|
||||
window?: FeedCursor;
|
||||
circuitOpenedAt?: string;
|
||||
/** 最近一次疑似缺口(窗口零重叠);下一次成功抓取重新衔接后清空 */
|
||||
gap?: { detectedAt: string; previousFetchedAt: string | null; backfillQueued: boolean };
|
||||
}
|
||||
|
||||
const AUTH_BACKOFF_MS = 24 * 3600_000;
|
||||
@@ -144,9 +146,21 @@ export async function ingestFeed(
|
||||
const lastError = auth
|
||||
? { ...(state.lastError ?? {}), kind: "auth", message: "Feed 凭证失效或过期(401/403/过期提示),已停止自动重试" }
|
||||
: (state.lastError ?? null);
|
||||
// 疑似缺口:本次 ok 且零重叠 → 记下;本次 ok 且衔接上 → 清空;抓取失败 → 保留上次状态
|
||||
const gap: StoredCursor["gap"] =
|
||||
result.kind === "ok"
|
||||
? out.possibleGap
|
||||
? {
|
||||
detectedAt: now.toISOString(),
|
||||
previousFetchedAt: cursor.window?.lastFetchedAt ?? null,
|
||||
backfillQueued: !!site?.id,
|
||||
}
|
||||
: undefined
|
||||
: cursor.gap;
|
||||
const nextCursor: StoredCursor = {
|
||||
window,
|
||||
...(state.circuit === "open" && state.circuitOpenedAt ? { circuitOpenedAt: state.circuitOpenedAt } : {}),
|
||||
...(gap ? { gap } : {}),
|
||||
};
|
||||
await trx
|
||||
.updateTable("feed_source")
|
||||
|
||||
Reference in new issue
Block a user