World's first open-source enterprise world model.
Rust agent-memorybitemporalgraphragknowledge-baseknowledge-graphllmontologypgvectorpostgresqlragrustself-hostedsemantic-searchtemporal-knowledge-graphworld-model
The duplicates queue filters by type and decides a page at a time (#430)
WaylandYang3bd687583eb5
diff --git a/web/src/api.ts b/web/src/api.tsindex 599c98a1..034ba663 100644--- a/web/src/api.ts+++ b/web/src/api.ts@@ -438,11 +438,17 @@ export type ReviewQueue =| "defects"| "merges";+/** 重复项按两边类型的关系筛:any 全部;same 两边都有类型且相等;conflict 都有且不等 */+export type ReviewTypeFilter = "any" | "same" | "conflict";+/** 各档的真实条数。左栏的徽标读它,不读列表长度 */export interface ReviewCounts {/** 记忆抽出、等人点头的事实(0015) */pending: number;duplicates: number;+ /** 重复项里两边同类型 / 类型冲突的各多少(#428);没类型的一侧哪档都不算 */+ duplicates_same_type: number;+ duplicates_type_conflict: number;conflicts: number;unconfirmed: number;lowconf: number;@@ -1934,15 +1940,31 @@ export const api = {/** 审核队列的各档**真实条数**。与列表分开取——列表有一页的上限,数数没有。* 从前徽标读的是数组长度,而接口固定只回 100 条,于是 164 条写成 100。 */- review: (kbId: string, queue: ReviewQueue, limit: number, offset: number) =>+ review: (+ kbId: string,+ queue: ReviewQueue,+ limit: number,+ offset: number,+ /** 只对 duplicates 有意义:按两边类型的关系筛(#428) */+ types: ReviewTypeFilter = "any",+ ) =>request<{counts: ReviewCounts;queue: ReviewQueue;/** 只有当前这一档的一页。类型按档不同,调用处按 queue 收窄 */items: unknown[];}>(- `/api/v1/kbs/${kbId}/review?queue=${queue}&limit=${limit}&offset=${offset}`,+ `/api/v1/kbs/${kbId}/review?queue=${queue}&limit=${limit}&offset=${offset}&types=${types}`,),+ /** 一批重复项同一个动作(#428):每条各自裁、各自记台账,回来逐条说成没成 */+ reviewBatch: (kbId: string, ids: string[], action: "merge" | "keep") =>+ request<{+ decided: number;+ outcomes: { id: string; error: string | null }[];+ }>(`/api/v1/kbs/${kbId}/review/batch`, {+ method: "POST",+ body: JSON.stringify({ ids, action }),+ }),/** 闭合日期带精度(year | month | day):写多少位就是多少精度,服务端照存 */closeFact: (kbId: string, factId: string, validTo: string, precision: string) =>request<{ ok: boolean }>(`/api/v1/kbs/${kbId}/facts/${factId}/close`, {diff --git a/web/src/i18n/en.ts b/web/src/i18n/en.tsindex 1749cc3f..ba5c3ae7 100644--- a/web/src/i18n/en.ts+++ b/web/src/i18n/en.ts@@ -1562,6 +1562,25 @@ export const en = {noFacts: "No recorded facts",merge: "Merge",keep: "Keep separate",+ // 重复项的类型筛选与批量裁决(#428)+ typesAny: "All",+ typesSame: "Same type",+ typesConflict: "Types differ",+ typesEmpty: "Nothing in this group.",+ typesDiffer: (a: string, b: string) => `${a} / ${b}`,+ typesDifferHint:+ "The two sides are different kinds of thing. Merging them would fold one meaning into another.",+ pickPair: "Select this pair",+ selectPage: "Select this page",+ selected: (n: number) => (n === 1 ? "1 selected" : `${n} selected`),+ mergeSelected: "Merge selected",+ keepSelected: "Keep selected apart",+ batchDone: (ok: number, failed: number) =>+ failed === 0+ ? ok === 1+ ? "1 pair decided"+ : `${ok} pairs decided`+ : `${ok} decided, ${failed} could not be — they stay in the queue`,lowConfidence: "Low-confidence facts",defects: "Ontology contradicts itself",defectsHint:diff --git a/web/src/i18n/zh.ts b/web/src/i18n/zh.tsindex bb800cf7..cdda46fc 100644--- a/web/src/i18n/zh.ts+++ b/web/src/i18n/zh.ts@@ -1365,6 +1365,19 @@ export const zh: Strings = {noFacts: "没有记录的事实",merge: "合并",keep: "保持分开",+ typesAny: "全部",+ typesSame: "同类型",+ typesConflict: "类型不同",+ typesEmpty: "这一档没有东西。",+ typesDiffer: (a, b) => `${a} / ${b}`,+ typesDifferHint: "两边不是一种东西,合了等于把一个意思并进另一个。",+ pickPair: "选中这一对",+ selectPage: "全选本页",+ selected: (n) => `已选 ${n} 对`,+ mergeSelected: "合并所选",+ keepSelected: "所选保持分开",+ batchDone: (ok, failed) =>+ failed === 0 ? `已裁 ${ok} 对` : `已裁 ${ok} 对,${failed} 对没成,留在队列里`,lowConfidence: "低置信度事实",defects: "本体自相矛盾",defectsHint:diff --git a/web/src/pages/Review.tsx b/web/src/pages/Review.tsxindex d88f0f85..448852fc 100644--- a/web/src/pages/Review.tsx+++ b/web/src/pages/Review.tsx@@ -1,4 +1,4 @@-import { useState } from "react";+import { useEffect, useState } from "react";import { LayoutDashboard } from "lucide-react";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { useNavigate, useSearch } from "@tanstack/react-router";@@ -6,6 +6,7 @@ import {api,type AxiomViolation,type ReviewQueue,+ type ReviewTypeFilter,type OntologyDefect,type ConflictItem,type FactReviewItem,@@ -21,14 +22,18 @@ import { PendingFactRow, useCanDecide } from "./PendingFacts";import { ReviewOverview } from "./ReviewOverview";import { S } from "../i18n";import { useKb, useKbId } from "../kb";+import { toast } from "../toast";import {Button,+ Checkbox,Chip,type ChipTone,+ cn,Input,Pager,RAIL_CLS,RailItem,+ Segmented,} from "../ui";const DUP_PAGE = 6;@@ -87,20 +92,42 @@ function SideCard({ side }: { side: ReviewSide }) {);}+/** 两边都有类型且不一样:同名异义,合了就错。这是扫一屏重复项时最该一眼+ * 看到的一件事,所以提成标记,不让人去两张卡片里各读一行小字 */+function typesDiffer(item: ReviewItem): boolean {+ return (+ item.left.type_label !== null &&+ item.right.type_label !== null &&+ item.left.type_label !== item.right.type_label+ );+}+function DuplicateCard({item,busy,+ picked,+ onPick,onDecide,}: {item: ReviewItem;busy: boolean;+ /** 批量选中(#428):勾在卡片左上,选了就跟着上面的批量按钮走 */+ picked: boolean;+ onPick: (picked: boolean) => void;onDecide: (action: "merge" | "keep") => void;}) {const reasonCode = item.reason?.split("|", 1)[0];return (- <div className="glass rounded-xl p-4">+ <div className={cn("glass rounded-xl p-4", picked && "u-picked")}><div className="flex gap-4">+ <Checkbox+ className="shrink-0 self-start"+ checked={picked}+ disabled={busy}+ onChange={(e) => onPick(e.target.checked)}+ label={<span className="sr-only">{S.review.pickPair}</span>}+ /><SideCard side={item.left} /><div className="self-center text-ink-3 text-body shrink-0">≟</div><SideCard side={item.right} />@@ -113,6 +140,14 @@ function DuplicateCard({? S.review.stageHuman: S.review.stageAdjudicating}</span>+ {typesDiffer(item) && (+ <Chip tone="warn" title={S.review.typesDifferHint}>+ {S.review.typesDiffer(+ item.left.type_label ?? "",+ item.right.type_label ?? "",+ )}+ </Chip>+ )}{reasonCode !== "namesake" && (<span className="text-small text-ink-3">{S.review.similarity(Math.round(item.score * 100))}@@ -829,6 +864,11 @@ export function Review() {QUEUE_ORDER.includes(search.queue as Sel) ? (search.queue as Sel) : null,);const [page, setPage] = useState(0);+ // 重复项的类型筛选与批量选中(#428)。选中集合按页清:翻页、换档、换筛选+ // 之后勾着的东西已经不在眼前,留着会让「合并所选」合掉看不见的东西+ const [types, setTypes] = useState<ReviewTypeFilter>("any");+ const [picked, setPicked] = useState<Set<string>>(() => new Set());+ useEffect(() => setPicked(new Set()), [page, sel, types]);// 队列变化经 SSE 事件流推送(useKbEvents 挂在 Shell),无需轮询。//@@ -840,14 +880,16 @@ export function Review() {)? ((sel ?? "duplicates") as ReviewQueue): "duplicates";+ const typesForQuery = queueSel === "duplicates" ? types : "any";const review = useQuery({- queryKey: ["review", kb?.id, queueSel, page],+ queryKey: ["review", kb?.id, queueSel, page, typesForQuery],queryFn: () =>api.review(kb!.id,queueSel,PAGE_SIZE[queueSel as Paged],page * PAGE_SIZE[queueSel as Paged],+ typesForQuery,),enabled: !!kb,// 翻页时别把上一页闪成空白——计数与骨架都还在,只有条目在换@@ -879,6 +921,21 @@ export function Review() {api.decideReview(kb!.id, id, action),onSettled: invalidate,});+ // 批量裁决:一批一个动作,回来逐条说成没成;没成的留在列表里,成了的消失+ const batch = useMutation({+ mutationFn: ({ ids, action }: { ids: string[]; action: "merge" | "keep" }) =>+ api.reviewBatch(kb!.id, ids, action),+ onSuccess: (r) => {+ const failed = r.outcomes.filter((o) => o.error).length;+ if (failed > 0) toast.error(S.review.batchDone(r.decided, failed));+ else toast.success(S.review.batchDone(r.decided, 0));+ },+ onError: (e) => toast.error((e as Error).message),+ onSettled: () => {+ setPicked(new Set());+ invalidate();+ },+ });const factAction = useMutation({mutationFn: ({id,@@ -1187,12 +1244,95 @@ export function Review() {{active === "duplicates" && counts.duplicates > 0 && (<div className="space-y-3">+ {/* 按两边类型的关系筛(#428):同名同类那一档是人最先想一把+ 合掉的,类型冲突那一档是绝不能合的;三档各带真实条数 */}+ <div className="flex flex-wrap items-center gap-3">+ <Segmented+ size="sm"+ value={types}+ onChange={(v) => {+ setTypes(v);+ setPage(0);+ }}+ options={[+ { value: "any", label: S.review.typesAny, count: counts.duplicates },+ {+ value: "same",+ label: S.review.typesSame,+ count: c?.duplicates_same_type ?? 0,+ },+ {+ value: "conflict",+ label: S.review.typesConflict,+ count: c?.duplicates_type_conflict ?? 0,+ },+ ]}+ />+ {/* 批量:勾选这一页的,一个动作裁一批。按钮只在有选中时出现 */}+ <Checkbox+ className="ml-auto"+ checked={+ asDuplicates().length > 0 &&+ asDuplicates().every((d) => picked.has(d.id))+ }+ onChange={(e) =>+ setPicked(+ e.target.checked+ ? new Set(asDuplicates().map((d) => d.id))+ : new Set(),+ )+ }+ label={S.review.selectPage}+ />+ {picked.size > 0 && (+ <>+ <span className="u-num text-small text-ink-3">+ {S.review.selected(picked.size)}+ </span>+ <Button+ variant="secondary"+ size="sm"+ disabled={batch.isPending}+ onClick={() =>+ batch.mutate({ ids: [...picked], action: "keep" })+ }+ >+ {S.review.keepSelected}+ </Button>+ <Button+ variant="primary"+ size="sm"+ disabled={batch.isPending}+ onClick={() =>+ batch.mutate({ ids: [...picked], action: "merge" })+ }+ >+ {S.review.mergeSelected}+ </Button>+ </>+ )}+ </div>+ {asDuplicates().length === 0 && (+ <div className="glass rounded-xl p-8 text-center text-body text-ink-3">+ {S.review.typesEmpty}+ </div>+ )}{asDuplicates().map((item) => (<DuplicateCardkey={item.id}item={item}+ picked={picked.has(item.id)}+ onPick={(on) =>+ setPicked((prev) => {+ const next = new Set(prev);+ if (on) next.add(item.id);+ else next.delete(item.id);+ return next;+ })+ }busy={- decide.isPending && decide.variables?.id === item.id+ (decide.isPending && decide.variables?.id === item.id) ||+ (batch.isPending && picked.has(item.id))}onDecide={(action) =>decide.mutate({ id: item.id, action })diff --git a/web/src/styles.css b/web/src/styles.cssindex c706c7d1..cb50a62c 100644--- a/web/src/styles.css+++ b/web/src/styles.css@@ -782,6 +782,11 @@ select.input-dark option {pointer-events: none;}+/* 批量选中的卡片:边框亮一档说「这张在批里」——不涂底,底还是玻璃 */+.u-picked {+ border-color: var(--u-line-strong);+}+/* 一行的壳:自己不是按钮(里面还有按钮)但整行要有 hover */.u-row-shell {transition: background-color var(--u-fast);