Skip to content

World's first open-source enterprise world model.

Count phrase signatures by statements rather than evidence rows (#802)

Maya Kid75951c7ef832
diff --git a/crates/utopia-store/src/phrase_bindings.rs b/crates/utopia-store/src/phrase_bindings.rs
index 44e76e45..c3031ef3 100644
--- a/crates/utopia-store/src/phrase_bindings.rs
+++ b/crates/utopia-store/src/phrase_bindings.rs
@@ -50,6 +50,8 @@ pub struct PhraseSignature {
/// 库里每条 distinct 的签名:活着的开放陈述,按短语、两端的类、宾语是不是字面值分组。
pub async fn signatures(pool: &PgPool, kb_id: Uuid) -> AppResult<Vec<PhraseSignature>> {
+ // 一条陈述可以有多条证据。计数、取例句前先为每条陈述选一条稳定的引用,
+ // 优先有完整位置的证据,避免证据多的陈述挤掉其他陈述。
let sql = format!(
"WITH live AS (
SELECT f.id, {phrase} AS phrase,
@@ -61,7 +63,12 @@ pub async fn signatures(pool: &PgPool, kb_id: Uuid) -> AppResult<Vec<PhraseSigna
FROM facts f
JOIN entities s ON s.id = f.subject_id
LEFT JOIN entities o ON o.id = f.object_id
- LEFT JOIN fact_evidence fe ON fe.fact_id = f.id
+ LEFT JOIN LATERAL (
+ SELECT chunk_id, quote_start, quote_end FROM fact_evidence
+ WHERE fact_id = f.id
+ ORDER BY (quote_start IS NULL OR quote_end IS NULL), chunk_id
+ LIMIT 1
+ ) fe ON true
WHERE f.kb_id = $1 AND f.layer = 'open' AND f.invalidated_at IS NULL
AND f.phrase IS NOT NULL AND btrim(f.phrase) <> ''
),
diff --git a/crates/utopia-store/tests/phrase_signature_evidence.rs b/crates/utopia-store/tests/phrase_signature_evidence.rs
new file mode 100644
index 00000000..e56ad1cd
--- /dev/null
+++ b/crates/utopia-store/tests/phrase_signature_evidence.rs
@@ -0,0 +1,136 @@
+//! 签名的陈述数和例句名额不随证据条数增长。
+use sqlx::PgPool;
+use utopia_store::{graph, phrase_bindings};
+use uuid::Uuid;
+
+#[tokio::test]
+async fn multiple_evidence_does_not_multiply_statements_or_examples() -> anyhow::Result<()> {
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ utopia_store::db::migrate(&pool).await?;
+ let (org, ws, kb) = (Uuid::now_v7(), Uuid::now_v7(), Uuid::now_v7());
+ sqlx::query("INSERT INTO organizations(id,name) VALUES($1,'signature-evidence')")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ let result = async {
+ sqlx::query("INSERT INTO workspaces(id,org_id,name) VALUES($1,$2,'signature-evidence')")
+ .bind(ws)
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO knowledge_bases(id,workspace_id,name) VALUES($1,$2,'signature-evidence')",
+ )
+ .bind(kb)
+ .bind(ws)
+ .execute(&pool)
+ .await?;
+ let mut statements = Vec::new();
+ for name in ["甲", "乙", "丙", "丁"] {
+ let subject =
+ utopia_store::resolution::resolve_mention(&pool, kb, None, name, None, None, &[])
+ .await?
+ .entity_id;
+ let object =
+ utopia_store::resolution::resolve_mention(&pool, kb, None, "买方", None, None, &[])
+ .await?
+ .entity_id;
+ statements.push(
+ graph::insert_open_statement(
+ &pool,
+ kb,
+ subject,
+ "supplies",
+ graph::FactObject::Entity(object),
+ None,
+ 1.0,
+ )
+ .await?
+ .0,
+ );
+ }
+ // 同一陈述有三条证据,也只能占一个例句名额。最早的证据没有引用位置,
+ // 后来的完整位置必须优先;只按 chunk_id 排序会选错。
+ for i in 0..3 {
+ let (doc, chunk) = (Uuid::now_v7(), Uuid::now_v7());
+ let text = if i == 2 {
+ "前言。甲向买方供货。替代引文"
+ } else {
+ "前言。甲向买方供货。后记"
+ };
+ sqlx::query("INSERT INTO documents(id,kb_id,filename,sha256) VALUES($1,$2,$3,$3)")
+ .bind(doc)
+ .bind(kb)
+ .bind(doc.to_string())
+ .execute(&pool)
+ .await?;
+ sqlx::query("INSERT INTO chunks(id,kb_id,document_id,seq,text) VALUES($1,$2,$3,0,$4)")
+ .bind(chunk)
+ .bind(kb)
+ .bind(doc)
+ .bind(text)
+ .execute(&pool)
+ .await?;
+ graph::add_evidence_located(
+ &pool,
+ statements[0],
+ chunk,
+ Some(if i == 2 {
+ "替代引文"
+ } else {
+ "甲向买方供货。"
+ }),
+ None,
+ match i {
+ 0 => None,
+ 1 => Some((3, 10)),
+ _ => Some((10, 14)),
+ },
+ )
+ .await?;
+ let signatures = phrase_bindings::signatures(&pool, kb).await?;
+ anyhow::ensure!(signatures.len() == 1);
+ let s = &signatures[0];
+ anyhow::ensure!(
+ s.count == 4,
+ "after {} evidence rows, four statements counted as {}",
+ i + 1,
+ s.count
+ );
+ anyhow::ensure!(s.examples.len() == 3);
+ let distinct: std::collections::HashSet<_> = s.examples.iter().collect();
+ anyhow::ensure!(
+ distinct.len() == 3,
+ "one statement filled multiple representative slots: {:?}",
+ s.examples
+ );
+ anyhow::ensure!(
+ s.quotes[0] == if i == 0 { "" } else { "甲向买方供货。" },
+ "Unicode quote offsets must stay character-based: {:?}",
+ s.quotes
+ );
+ anyhow::ensure!(
+ s.quotes[1..].iter().all(String::is_empty),
+ "statements without evidence remain eligible"
+ );
+ }
+ sqlx::query("UPDATE facts SET invalidated_at=now() WHERE id=$1")
+ .bind(statements[0])
+ .execute(&pool)
+ .await?;
+ let s = phrase_bindings::signatures(&pool, kb).await?.remove(0);
+ anyhow::ensure!(s.count == 3 && s.examples.len() == 3);
+ anyhow::ensure!(s.quotes.iter().all(String::is_empty));
+ anyhow::Ok(())
+ }
+ .await;
+ sqlx::query("DELETE FROM organizations WHERE id=$1")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ pool.close().await;
+ result
+}