Skip to content

World's first open-source enterprise world model.

An extracted value has an object (#772)

WaylandYang966b4028f663
diff --git a/crates/utopia-store/src/graph.rs b/crates/utopia-store/src/graph.rs
index ceacf4c0..1b832fca 100644
--- a/crates/utopia-store/src/graph.rs
+++ b/crates/utopia-store/src/graph.rs
@@ -1809,7 +1809,10 @@ pub async fn document_extractions(
f.subject_id, s.canonical_name AS subject,
COALESCE(r.label, fact_surface_predicate(f.id)) AS predicate,
r.id IS NULL AS inferred,
- f.object_id, o.canonical_name AS object,
+ -- 宾语是一样东西就用它的名字,是字面值(名字、金额、百分比)就用那个值。
+ -- 只取 canonical_name 的话,每一条值宾语的陈述在阅读页右栏都是主语加短语、
+ -- 后面空着一片——「Hugging Face, Inc. known as」后面什么都没有
+ f.object_id, COALESCE(o.canonical_name, f.object_value #>> '{value}') AS object,
f.valid_from, f.valid_to, f.confidence
FROM fact_evidence fe
JOIN chunks c ON c.id = fe.chunk_id AND c.document_id = $1
diff --git a/crates/utopia-store/tests/no_predicate_still_shows.rs b/crates/utopia-store/tests/no_predicate_still_shows.rs
index 4ae2357c..60870ecf 100644
--- a/crates/utopia-store/tests/no_predicate_still_shows.rs
+++ b/crates/utopia-store/tests/no_predicate_still_shows.rs
@@ -216,6 +216,31 @@ async fn a_fact_without_a_predicate_is_still_visible_everywhere() -> anyhow::Res
"文档页看不见没有说法的事实"
);
+ // 宾语是字面值的那条:阅读页右栏只认 canonical_name 的时候,它在界面上是
+ // 主语加短语、后面空着一片(「Hugging Face, Inc. known as」)
+ let valued = Uuid::now_v7();
+ sqlx::query(
+ "INSERT INTO facts (id, kb_id, subject_id, layer, phrase, object_value, confidence)
+ VALUES ($1, $2, $3, 'open', 'known as', jsonb_build_object('value', 'Acme Inc.'), 0.9)",
+ )
+ .bind(valued)
+ .bind(f.kb)
+ .bind(f.subject)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO fact_evidence (fact_id, chunk_id, document_id, quote)
+ SELECT $1, chunk_id, document_id, 'Acme Inc.' FROM fact_evidence WHERE fact_id = $2 LIMIT 1",
+ )
+ .bind(valued)
+ .bind(f.surfaced)
+ .execute(&pool)
+ .await?;
+ let chunk_facts = utopia_store::graph::document_extractions(&pool, f.doc).await?;
+ let v = chunk_facts.iter().find(|c| c.fact_id == valued).unwrap();
+ assert_eq!(v.object.as_deref(), Some("Acme Inc."), "值宾语在文档页是空的");
+ assert!(v.object_id.is_none(), "字面值没有实体可跳");
+
// 5. 实体历史(外层 FROM 是 CTE,别名写错会直接报 missing FROM-clause)
let (hist, _) = utopia_store::graph::entity_history(&pool, f.kb, f.subject, 50, 0).await?;
let h = hist.iter().find(|e| e.fact_id == Some(f.surfaced));
diff --git a/web/src/pages/DocViewer.tsx b/web/src/pages/DocViewer.tsx
index 964a82fe..87841896 100644
--- a/web/src/pages/DocViewer.tsx
+++ b/web/src/pages/DocViewer.tsx
@@ -132,17 +132,25 @@ export function DocViewer() {
{c.text}
</div>
- {/* 抽取对照栏:这个分块产出了哪些事实(实体可跳图谱) */}
+ {/* 抽取对照栏:这个分块产出了哪些事实(实体可跳图谱)。
+ **宽度跟着屏幕走**:每一条都是一个三元组,窄栏里一条要折三行,
+ 读者要在原文和它之间来回看,折行越多越难对上。384 的时候大多数
+ 三元组占一到两行 */}
{facts.length > 0 && (
- <aside className="w-64 shrink-0 rounded-panel border border-line bg-surface p-3">
+ <aside className="w-64 shrink-0 rounded-panel border border-line bg-surface p-3 xl:w-80 2xl:w-96">
<GroupLabel className="mb-2" count={facts.length}>
{S.doc.extracted}
</GroupLabel>
- <div className="space-y-2">
+ {/* **条与条之间画一条线**:一条折了三行、下一条折了两行,只靠 8px 的
+ 间距分不开,一栏读下来是一团字。线比加大间距省地方 */}
+ <div className="divide-y divide-line">
{facts.map((f) => {
const range = factRange(f);
return (
- <div key={f.fact_id} className="text-small leading-snug">
+ <div
+ key={f.fact_id}
+ className="py-2 text-small leading-snug first:pt-0 last:pb-0"
+ >
<div>
<Link
to="/kb/$kbId/graph"
@@ -177,7 +185,10 @@ export function DocViewer() {
{f.object}
</Link>
) : (
- <span className="text-ink-2">{f.object ?? ""}</span>
+ /* 字面值的宾语与实体的宾语**一样深**:浅一档的话它和
+ 中间的短语同色,三元组读起来就断不开哪里是关系、
+ 哪里是值 */
+ <span className="text-ink">{f.object ?? ""}</span>
)}
</div>
{range && <div className="u-num text-fine text-ink-2">{range}</div>}