Skip to content

World's first open-source enterprise world model.

A pair that was kept apart is not queued again the next time either entity is mentioned (#1113)

WaylandYang4ca70a5bbc35
diff --git a/crates/utopia-store/src/resolution.rs b/crates/utopia-store/src/resolution.rs
index a4e54444..54f56426 100644
--- a/crates/utopia-store/src/resolution.rs
+++ b/crates/utopia-store/src/resolution.rs
@@ -256,9 +256,49 @@ pub async fn resolve_mention(
exclude: &[Uuid],
) -> AppResult<Resolution> {
let mut r = resolve_by_name(pool, kb_id, type_id, raw_name, context, text, exclude).await?;
- let Some(query) = name_vector else {
- return Ok(r);
- };
+ if let Some(query) = name_vector {
+ propose_by_name_vector(pool, kb_id, type_id, raw_name, query, exclude, &mut r).await?;
+ }
+ // 判过「不是一个」的对不再排。新建的实体没有过去,没东西要排的也不用问
+ if !r.created && !r.reviews.is_empty() {
+ let kept = kept_apart_from(pool, kb_id, r.entity_id).await?;
+ r.reviews.retain(|v| !kept.contains(&v.other_id));
+ }
+ Ok(r)
+}
+
+/// 跟这个实体判过「不是一个」的那些实体。
+///
+/// **每次提到都会走到召回**:名字向量通道不分新建还是归并,同名易混类型那条路也是
+/// 归并之后照常入队。而审核表的唯一索引只管 pending 的行——判完的一对下次被提到,
+/// 就又是一条新的 pending。一个有六万实体的库上,`migration 395` 每出现在一篇新文档里,
+/// 它跟 `migration 394` 等八个近邻就重新排一遍队,裁决器(或人)分开过多少次都一样
+/// (#1104)。分开这个决定要记得住,[`crate::names::pair_shared_name`] 早就是这么做的。
+///
+/// 人仍然可以在审核页把分开过的一对合并:这里拦的是自动重提,不是合并本身。
+async fn kept_apart_from(pool: &PgPool, kb_id: Uuid, entity_id: Uuid) -> AppResult<HashSet<Uuid>> {
+ let rows: Vec<(Uuid,)> = sqlx::query_as(
+ "SELECT CASE WHEN left_id = $2 THEN right_id ELSE left_id END
+ FROM resolution_reviews
+ WHERE kb_id = $1 AND status = 'kept' AND (left_id = $2 OR right_id = $2)",
+ )
+ .bind(kb_id)
+ .bind(entity_id)
+ .fetch_all(pool)
+ .await?;
+ Ok(rows.into_iter().map(|(id,)| id).collect())
+}
+
+/// 通道 2:mention 名字向量的近邻,各排一对(规矩见 [`resolve_mention`])
+async fn propose_by_name_vector(
+ pool: &PgPool,
+ kb_id: Uuid,
+ type_id: Option<Uuid>,
+ raw_name: &str,
+ query: &[f32],
+ exclude: &[Uuid],
+ r: &mut Resolution,
+) -> AppResult<()> {
let mention_name = normalize_name(raw_name).to_lowercase();
let mention_family = match type_id {
Some(t) => type_label(pool, t)
@@ -298,7 +338,7 @@ pub async fn resolve_mention(
stage: ReviewStage::Adjudicating,
});
}
- Ok(r)
+ Ok(())
}
async fn type_label(pool: &PgPool, type_id: Uuid) -> AppResult<Option<String>> {
diff --git a/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs b/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs
index 2af38290..42f32f55 100644
--- a/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs
+++ b/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs
@@ -332,3 +332,77 @@ async fn a_new_name_is_pending_until_its_vector_is_set() -> anyhow::Result<()> {
teardown(&pool, &f).await?;
run
}
+
+/// 判过「不是一个」的一对,实体再被提到时不再排(#1104)。名字向量通道每次提到都跑,
+/// 而审核表只对 pending 的行去重:从前裁决器分开过的一对,下一篇文档一提到就又是一条
+/// 新的 pending。还没判的那一对不受影响,照常提议
+#[tokio::test]
+async fn a_pair_kept_apart_is_not_proposed_again() -> anyhow::Result<()> {
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ let f = seed(&pool, "name-vector-kept-apart").await?;
+ let run = async {
+ let near: Vec<f32> = vec![0.95, 0.31, 0.0];
+ let mention = || {
+ utopia_store::resolution::resolve_mention(
+ &pool,
+ f.kb,
+ Some(f.device),
+ "海探1",
+ None,
+ Some(&near),
+ None,
+ &[],
+ )
+ };
+ let first = mention().await?;
+ assert!(first.created);
+ for v in &first.reviews {
+ utopia_store::resolution::create_review(
+ &pool,
+ f.kb,
+ first.entity_id,
+ v.other_id,
+ v.score,
+ &v.reason,
+ v.stage,
+ )
+ .await?;
+ }
+ // 裁决器判 海探1 与 海洋探测器1号 不是一个;跟 海洋探测队长 的那一对还没判
+ let (review,): (Uuid,) = sqlx::query_as(
+ "SELECT id FROM resolution_reviews WHERE kb_id = $1 AND status = 'pending'
+ AND $2 IN (left_id, right_id)",
+ )
+ .bind(f.kb)
+ .bind(f.probe)
+ .fetch_one(&pool)
+ .await?;
+ utopia_store::resolution::close_review_auto(&pool, review, "kept", "kept_apart|test")
+ .await?;
+
+ let again = mention().await?;
+ assert!(!again.created, "同一个字面名字归到上一轮建的实体");
+ assert_eq!(again.entity_id, first.entity_id);
+ let proposed: Vec<Uuid> = vector_reviews(&again)
+ .into_iter()
+ .map(|(id, _)| id)
+ .collect();
+ assert!(
+ !proposed.contains(&f.probe),
+ "分开过的一对不该再提议:{:?}",
+ again.reviews
+ );
+ assert!(
+ proposed.contains(&f.captain),
+ "还没判的一对照常提议(入队时对 pending 幂等):{:?}",
+ again.reviews
+ );
+ Ok::<_, anyhow::Error>(())
+ }
+ .await;
+ teardown(&pool, &f).await?;
+ run
+}
diff --git a/crates/utopia-store/tests/store/main.rs b/crates/utopia-store/tests/store/main.rs
index e2de9ad5..029c0ba2 100644
--- a/crates/utopia-store/tests/store/main.rs
+++ b/crates/utopia-store/tests/store/main.rs
@@ -86,6 +86,7 @@ mod a_search_puts_the_exact_name_first;
mod a_search_reads_the_base_as_it_was;
mod a_secret_is_sealed_at_rest;
mod a_signature_holds_on_every_path;
+mod a_similar_name_is_proposed_not_merged;
mod a_source_kind_is_listed_once;
mod a_source_reaches_only_where_it_was_granted;
mod a_statement_is_attested_by_what_its_document_says;