merge: integrate WP6-02 dependency for TASK-WP6-04
# Conflicts: # apps/api/src/app.ts # apps/web/src/main.tsx
This commit is contained in:
suyx
@@ -0,0 +1,24 @@
|
||||
.admin-generations { display: grid; gap: 20px; }
|
||||
.admin-generations-refresh { align-self: start; }
|
||||
.admin-generations-notice-panel { display: grid; gap: 14px; max-width: 760px; padding: 24px; border: 1px solid #d5b36a; background: #fffaf0; }
|
||||
.admin-generations-notice-panel p { margin: 0; }
|
||||
.admin-generations-notice-panel button { justify-self: start; }
|
||||
.admin-generations-error, .admin-generations-notice { padding: 12px 16px; border: 1px solid #d46a6a; background: #fff4f4; }
|
||||
.admin-generations-error button { margin-left: 12px; }
|
||||
.admin-generations-table-wrap { overflow-x: auto; border: 1px solid #d9dde5; background: #fff; }
|
||||
.admin-generations-table-wrap table { width: 100%; min-width: 1050px; border-collapse: collapse; }
|
||||
.admin-generations-table-wrap th, .admin-generations-table-wrap td { padding: 12px 14px; border-bottom: 1px solid #e9ebef; text-align: left; vertical-align: top; }
|
||||
.admin-generations-table-wrap th { background: #f5f6f8; color: #4d5664; font-size: 12px; }
|
||||
.admin-generations-table-wrap small { color: #6c7481; }
|
||||
.admin-generations-status { display: inline-block; padding: 3px 7px; border-radius: 4px; background: #edf0f4; }
|
||||
.admin-generations-status.is-succeeded { color: #23623d; background: #e6f4ea; }
|
||||
.admin-generations-status.is-failed, .admin-generations-status.is-rejected { color: #8b2b2b; background: #fff0f0; }
|
||||
.admin-generations-status.is-running { color: #7a5a10; background: #fff5d8; }
|
||||
.admin-generations-actions { display: grid; gap: 8px; min-width: 190px; }
|
||||
.admin-generations-actions button { white-space: normal; }
|
||||
.admin-generations-empty { margin: 0; padding: 28px; color: #6c7481; }
|
||||
.admin-generations-opened { display: grid; gap: 10px; padding: 18px; border: 1px solid #cbd2dd; background: #fff; }
|
||||
.admin-generations-opened header { display: flex; align-items: center; justify-content: space-between; }
|
||||
.admin-generations-opened h3 { margin: 0; }
|
||||
.admin-generations-opened pre { max-height: 360px; overflow: auto; margin: 0; padding: 14px; white-space: pre-wrap; background: #f6f7f9; }
|
||||
.admin-generations-opened img { max-width: 100%; max-height: 620px; object-fit: contain; }
|
||||
@@ -0,0 +1,156 @@
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import "./admin-generations.css";
|
||||
|
||||
interface AdminSession {
|
||||
acknowledged_private_content_notice_version: string | null;
|
||||
current_private_content_notice_version: string | null;
|
||||
csrf_token: string;
|
||||
notice_acknowledged: boolean;
|
||||
}
|
||||
|
||||
interface GenerationRecord {
|
||||
generation_id: string;
|
||||
owner_ref: string;
|
||||
project_id: string;
|
||||
model_id: string;
|
||||
ratio: string;
|
||||
status: "queued" | "running" | "succeeded" | "failed" | "rejected";
|
||||
created_at: string;
|
||||
completed_at: string | null;
|
||||
duration_ms: number | null;
|
||||
confirmed_credit_cost: number;
|
||||
reserved_credits: number;
|
||||
final_credit_state: "committed" | "released" | null;
|
||||
error_category: string | null;
|
||||
}
|
||||
|
||||
interface GenerationResponse { generated_at: string; items: GenerationRecord[] }
|
||||
interface OpenedPrompt { generation_id: string; prompt: string }
|
||||
|
||||
function idempotencyKey() {
|
||||
return `${crypto.randomUUID().replaceAll("-", "")}${crypto.randomUUID().replaceAll("-", "")}`;
|
||||
}
|
||||
|
||||
function compactId(value: string) { return `${value.slice(0, 8)}...${value.slice(-4)}`; }
|
||||
function formatTime(value: string | null) { return value ? new Intl.DateTimeFormat("zh-CN", { dateStyle: "short", timeStyle: "medium" }).format(new Date(value)) : "未完成"; }
|
||||
function statusLabel(value: GenerationRecord["status"]) { return { queued: "排队", running: "运行中", succeeded: "成功", failed: "失败", rejected: "已拒绝" }[value]; }
|
||||
|
||||
export function AdminGenerationsPage() {
|
||||
const [session, setSession] = useState<AdminSession>();
|
||||
const [records, setRecords] = useState<GenerationRecord[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [failed, setFailed] = useState(false);
|
||||
const [acknowledging, setAcknowledging] = useState(false);
|
||||
const [notice, setNotice] = useState("");
|
||||
const [openedPrompt, setOpenedPrompt] = useState<OpenedPrompt>();
|
||||
const [openedImage, setOpenedImage] = useState<{ generationId: string; url: string }>();
|
||||
|
||||
async function load() {
|
||||
setLoading(true);
|
||||
setFailed(false);
|
||||
try {
|
||||
const sessionResponse = await fetch("/api/v1/admin-auth/session", { credentials: "same-origin" });
|
||||
if (sessionResponse.status === 401) throw new Error("session_invalid");
|
||||
if (!sessionResponse.ok) throw new Error("session_unavailable");
|
||||
const current = await sessionResponse.json() as AdminSession;
|
||||
setSession(current);
|
||||
setNotice("");
|
||||
if (!current.notice_acknowledged) {
|
||||
setRecords([]);
|
||||
return;
|
||||
}
|
||||
const listResponse = await fetch("/api/v1/admin/generations", { credentials: "same-origin" });
|
||||
if (!listResponse.ok) throw new Error("generation_list_unavailable");
|
||||
setRecords((await listResponse.json() as GenerationResponse).items);
|
||||
} catch {
|
||||
setFailed(true);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => { void load(); }, []);
|
||||
useEffect(() => () => { if (openedImage) URL.revokeObjectURL(openedImage.url); }, [openedImage]);
|
||||
|
||||
async function acknowledge() {
|
||||
if (!session?.current_private_content_notice_version || acknowledging) return;
|
||||
setAcknowledging(true);
|
||||
setNotice("");
|
||||
try {
|
||||
const response = await fetch("/api/v1/admin/private-content-notice/ack", {
|
||||
body: JSON.stringify({ expected_notice_version: session.current_private_content_notice_version }),
|
||||
credentials: "same-origin",
|
||||
headers: { "Content-Type": "application/json", "Idempotency-Key": idempotencyKey(), "X-CSRF-Token": session.csrf_token },
|
||||
method: "POST",
|
||||
});
|
||||
if (!response.ok) throw new Error("notice_ack_failed");
|
||||
await load();
|
||||
} catch {
|
||||
setNotice("告知版本已变化或确认未完成，请重新读取。 ");
|
||||
} finally {
|
||||
setAcknowledging(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function openPrompt(generationId: string) {
|
||||
setNotice("");
|
||||
try {
|
||||
const response = await fetch(`/api/v1/admin/private-content/generations/${generationId}/prompt`, { credentials: "same-origin" });
|
||||
if (!response.ok) throw new Error("prompt_unavailable");
|
||||
setOpenedPrompt(await response.json() as OpenedPrompt);
|
||||
} catch {
|
||||
setNotice("内容读取未完成，访问审计未成功时不会返回内容。 ");
|
||||
}
|
||||
}
|
||||
|
||||
async function openImage(generationId: string) {
|
||||
setNotice("");
|
||||
try {
|
||||
const response = await fetch(`/api/v1/admin/private-content/generations/${generationId}/image`, { credentials: "same-origin" });
|
||||
if (!response.ok) throw new Error("image_unavailable");
|
||||
const url = URL.createObjectURL(await response.blob());
|
||||
setOpenedImage((previous) => {
|
||||
if (previous) URL.revokeObjectURL(previous.url);
|
||||
return { generationId, url };
|
||||
});
|
||||
} catch {
|
||||
setNotice("内容读取未完成，访问审计未成功时不会返回内容。 ");
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<main className="admin-generations" id="admin-main">
|
||||
<header className="admin-page-heading"><div><p>OPERATIONS / GENERATION RECORDS</p><h2>生成记录</h2></div><button className="admin-generations-refresh" onClick={() => void load()} type="button">重新读取</button></header>
|
||||
{loading ? <p aria-live="polite">正在读取生成记录</p> : null}
|
||||
{failed ? <div className="admin-generations-error" role="alert">后台生成记录暂时无法读取。<button onClick={() => void load()} type="button">重试</button></div> : null}
|
||||
{notice ? <p className="admin-generations-notice" role="alert">{notice}</p> : null}
|
||||
{session && !session.notice_acknowledged ? (
|
||||
<section aria-labelledby="private-content-notice-title" className="admin-generations-notice-panel">
|
||||
<p>PRIVATE CONTENT ACCESS</p>
|
||||
<h3 id="private-content-notice-title">查看私有内容前，请确认当前规则告知</h3>
|
||||
<p>生成记录默认只显示安全元数据。打开图片或完整提示词时，系统会自动记录本次管理员、目标和内容类型访问审计。</p>
|
||||
<button disabled={acknowledging} onClick={() => void acknowledge()} type="button">{acknowledging ? "确认中" : "确认并进入记录"}</button>
|
||||
</section>
|
||||
) : null}
|
||||
{session?.notice_acknowledged ? (
|
||||
<section aria-label="生成记录元数据" className="admin-generations-table-wrap">
|
||||
<table><thead><tr><th>任务</th><th>用户标识</th><th>模型 / 比例</th><th>状态</th><th>创建 / 完成</th><th>点数</th><th>私有内容</th></tr></thead><tbody>
|
||||
{records.map((record) => <tr key={record.generation_id}>
|
||||
<td><code>{compactId(record.generation_id)}</code></td>
|
||||
<td><code>{compactId(record.owner_ref)}</code></td>
|
||||
<td>{record.model_id}<br /><small>{record.ratio}</small></td>
|
||||
<td><span className={`admin-generations-status is-${record.status}`}>{statusLabel(record.status)}</span>{record.error_category ? <small>{record.error_category}</small> : null}</td>
|
||||
<td><time dateTime={record.created_at}>{formatTime(record.created_at)}</time><br /><small>{formatTime(record.completed_at)}</small></td>
|
||||
<td>{record.confirmed_credit_cost} / {record.final_credit_state ?? "冻结"}</td>
|
||||
<td className="admin-generations-actions"><button onClick={() => void openPrompt(record.generation_id)} type="button">打开提示词并记录审计</button><button disabled={record.status !== "succeeded"} onClick={() => void openImage(record.generation_id)} type="button">打开图片并记录审计</button></td>
|
||||
</tr>)}
|
||||
</tbody></table>
|
||||
{!records.length && !loading ? <p className="admin-generations-empty">当前无生成记录</p> : null}
|
||||
</section>
|
||||
) : null}
|
||||
{openedPrompt ? <section aria-label="已审计的完整提示词" className="admin-generations-opened"><header><h3>已记录审计的完整提示词</h3><button onClick={() => setOpenedPrompt(undefined)} type="button">关闭</button></header><p><code>{compactId(openedPrompt.generation_id)}</code></p><pre>{openedPrompt.prompt}</pre></section> : null}
|
||||
{openedImage ? <section aria-label="已审计的生成图片" className="admin-generations-opened"><header><h3>已记录审计的生成图片</h3><button onClick={() => { URL.revokeObjectURL(openedImage.url); setOpenedImage(undefined); }} type="button">关闭</button></header><img alt="已记录审计的生成图片" src={openedImage.url} /></section> : null}
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -1,9 +1,18 @@
|
||||
// Generated from openapi/openapi.json. Do not edit by hand.
|
||||
|
||||
import type { CreditAdjustmentResponse, CreditAdjustmentRequest, BrowserSupportSuccess, BrowserSupportRequest, AccountDeletionResponse, AccountDeletionCompleteRequest, AdminLoginCompleteResponse, AdminLoginCompleteRequest, LoginCompleteResponse, LoginCompleteRequest, RegistrationCompleteResponse, RegistrationCompleteRequest, GenerationCreateResponse, AccountSettingsResponse, AdminOverviewResponse, AdminSessionResponse, CreditBalanceResponse, BootstrapResponse, GenerationTaskResponse, SseEvent, ModelConfig, ModelConfigurationResponse, CreditLedgerResponse, ProjectDetailResponse, UserSessionResponse, ProjectListResponse, RecentAssetListResponse, LogoutResponse, ProjectPurgeResponse, RecentAssetRecordResponse, RecentAssetRecordRequest, ProjectRenameResponse, ProjectRenameRequest, ModelConfigUpdateRequest, ProjectRestoreResponse, ReverseGeocodeResponse, ReverseGeocodeRequest, LatestExportSaveResponse, ProjectStateSaveResponse, ProjectEditableState, AccountDeletionSendResponse, RegistrationSendResponse, AdminLoginSendRequest, LoginSendRequest, RegistrationSendRequest, FailedEmptyTrashResponse, FailedEmptyTrashRequest, ProjectTrashResponse, AccountProfileUpdateResponse, AccountProfileUpdateRequest } from "./types.gen.js";
|
||||
import type { PrivateContentNoticeAckResponse, PrivateContentNoticeAckRequest, CreditAdjustmentResponse, CreditAdjustmentRequest, BrowserSupportSuccess, BrowserSupportRequest, AccountDeletionResponse, AccountDeletionCompleteRequest, AdminLoginCompleteResponse, AdminLoginCompleteRequest, LoginCompleteResponse, LoginCompleteRequest, RegistrationCompleteResponse, RegistrationCompleteRequest, GenerationCreateResponse, AccountSettingsResponse, AdminOverviewResponse, AdminSessionResponse, CreditBalanceResponse, BootstrapResponse, GenerationTaskResponse, SseEvent, ModelConfig, ModelConfigurationResponse, CreditLedgerResponse, ProjectDetailResponse, UserSessionResponse, AdminGenerationListResponse, ProjectListResponse, RecentAssetListResponse, LogoutResponse, PrivateContentPromptResponse, ProjectPurgeResponse, RecentAssetRecordResponse, RecentAssetRecordRequest, ProjectRenameResponse, ProjectRenameRequest, ModelConfigUpdateRequest, ProjectRestoreResponse, ReverseGeocodeResponse, ReverseGeocodeRequest, LatestExportSaveResponse, ProjectStateSaveResponse, ProjectEditableState, AccountDeletionSendResponse, RegistrationSendResponse, AdminLoginSendRequest, LoginSendRequest, RegistrationSendRequest, FailedEmptyTrashResponse, FailedEmptyTrashRequest, ProjectTrashResponse, AccountProfileUpdateResponse, AccountProfileUpdateRequest } from "./types.gen.js";
|
||||
|
||||
export interface ClientOptions { baseUrl?: string; fetch?: typeof globalThis.fetch; headers?: HeadersInit; }
|
||||
|
||||
export async function ackPrivateContentNotice(body: PrivateContentNoticeAckRequest, options: ClientOptions = {}): Promise<PrivateContentNoticeAckResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const headers = new Headers(options.headers);
|
||||
headers.set("Content-Type", "application/json");
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content-notice/ack`, { body: JSON.stringify(body), method: "POST", headers });
|
||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||
return response.json() as Promise<PrivateContentNoticeAckResponse>;
|
||||
}
|
||||
|
||||
export async function adjustAdminUserCredits(body: CreditAdjustmentRequest, options: ClientOptions = {}): Promise<CreditAdjustmentResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const headers = new Headers(options.headers);
|
||||
@@ -175,6 +184,13 @@ export async function getUserSession(options: ClientOptions = {}): Promise<UserS
|
||||
return response.json() as Promise<UserSessionResponse>;
|
||||
}
|
||||
|
||||
export async function listAdminGenerations(options: ClientOptions = {}): Promise<AdminGenerationListResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/generations`, { method: "GET", headers: options.headers ?? {} });
|
||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||
return response.json() as Promise<AdminGenerationListResponse>;
|
||||
}
|
||||
|
||||
export async function listProjects(options: ClientOptions = {}): Promise<ProjectListResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects`, { method: "GET", headers: options.headers ?? {} });
|
||||
@@ -196,6 +212,20 @@ export async function logoutUser(options: ClientOptions = {}): Promise<LogoutRes
|
||||
return response.json() as Promise<LogoutResponse>;
|
||||
}
|
||||
|
||||
export async function openAdminGenerationImage(options: ClientOptions = {}): Promise<Blob> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content/generations/{generationId}/image`, { method: "GET", headers: options.headers ?? {} });
|
||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||
return response.blob() as Promise<Blob>;
|
||||
}
|
||||
|
||||
export async function openAdminGenerationPrompt(options: ClientOptions = {}): Promise<PrivateContentPromptResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/admin/private-content/generations/{generationId}/prompt`, { method: "GET", headers: options.headers ?? {} });
|
||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||
return response.json() as Promise<PrivateContentPromptResponse>;
|
||||
}
|
||||
|
||||
export async function purgeProject(options: ClientOptions = {}): Promise<ProjectPurgeResponse> {
|
||||
const request = options.fetch ?? globalThis.fetch;
|
||||
const response = await request(`${options.baseUrl ?? ""}/api/v1/projects/{projectId}/purge`, { method: "POST", headers: options.headers ?? {} });
|
||||
|
||||
@@ -60,6 +60,27 @@ export type AdminCreditParams = {
|
||||
"userId": string;
|
||||
};
|
||||
|
||||
export type AdminGenerationListResponse = {
|
||||
"generated_at": string;
|
||||
"items": Array<AdminGenerationRecord>;
|
||||
};
|
||||
|
||||
export type AdminGenerationRecord = {
|
||||
"completed_at": string | null;
|
||||
"confirmed_credit_cost": number;
|
||||
"created_at": string;
|
||||
"duration_ms": number | null;
|
||||
"error_category": "upstream_timeout" | "upstream_failed" | "safety_rejected" | "model_disabled" | "gateway_balance_insufficient" | "gateway_contract_invalid" | "reference_invalid" | "unknown_retryable" | "unknown_non_retryable" | null;
|
||||
"final_credit_state": "committed" | "released" | null;
|
||||
"generation_id": string;
|
||||
"model_id": string;
|
||||
"owner_ref": string;
|
||||
"project_id": string;
|
||||
"ratio": "3:4" | "1:1" | "4:3" | "9:16";
|
||||
"reserved_credits": number;
|
||||
"status": "queued" | "running" | "succeeded" | "failed" | "rejected";
|
||||
};
|
||||
|
||||
export type AdminLoginCompleteRequest = {
|
||||
"registration_id": string;
|
||||
"verification_code": string;
|
||||
@@ -123,6 +144,7 @@ export type AdminSessionResponse = {
|
||||
"audience": "admin";
|
||||
"authenticated": true;
|
||||
"csrf_token": string;
|
||||
"current_private_content_notice_message_key"?: string;
|
||||
"current_private_content_notice_version": string | null;
|
||||
"expires_at": string;
|
||||
"notice_acknowledged": boolean;
|
||||
@@ -582,6 +604,26 @@ export type ModelRuntimeSseEvent = {
|
||||
"runtime_availability_version": number;
|
||||
};
|
||||
|
||||
export type PrivateContentGenerationParams = {
|
||||
"generationId": string;
|
||||
};
|
||||
|
||||
export type PrivateContentNoticeAckRequest = {
|
||||
"expected_notice_version": string;
|
||||
};
|
||||
|
||||
export type PrivateContentNoticeAckResponse = {
|
||||
"acknowledged_at": string;
|
||||
"notice_version": string;
|
||||
"status": "acknowledged";
|
||||
};
|
||||
|
||||
export type PrivateContentPromptResponse = {
|
||||
"content_type": "prompt";
|
||||
"generation_id": string;
|
||||
"prompt": string;
|
||||
};
|
||||
|
||||
export type ProjectDetailResponse = {
|
||||
"canvas_state": CanvasState;
|
||||
"created_at": string;
|
||||
|
||||
@@ -8,6 +8,7 @@ import { AccountSettingsPage } from "./account-settings.js";
|
||||
import { AdminUsersPage } from "./admin-users.js";
|
||||
import { AdminModelsPage } from "./admin-models.js";
|
||||
import { AdminAssetsPage } from "./admin-assets.js";
|
||||
import { AdminGenerationsPage } from "./admin-generations.js";
|
||||
import { CreditsPage } from "./credits-page.js";
|
||||
import { ProjectDetailPage, ProjectsPage, WorkspacePage } from "./project-pages.js";
|
||||
import { EditorPage } from "./editor-page.js";
|
||||
@@ -42,7 +43,7 @@ function renderAuthenticationEntry() {
|
||||
"/admin": { content: <AdminOverviewPage />, title: "运营总览" },
|
||||
"/admin/assets": { content: <AdminAssetsPage />, title: "素材" },
|
||||
"/admin/audit": { content: <AdminPlaceholderPage title="审计" />, title: "审计" },
|
||||
"/admin/generations": { content: <AdminPlaceholderPage title="生成记录" />, title: "生成记录" },
|
||||
"/admin/generations": { content: <AdminGenerationsPage />, title: "生成记录" },
|
||||
"/admin/invites": { content: <AdminPlaceholderPage title="邀请码" />, title: "邀请码" },
|
||||
"/admin/models": { content: <AdminModelsPage />, title: "模型" },
|
||||
"/admin/preview": { content: <AdminPlaceholderPage title="内部预览" />, title: "内部预览" },
|
||||
|
||||
Reference in New Issue
Block a user