Skip to content

World's first open-source enterprise world model.

Name-vector recall skips a near name whose class is declared disjoint, as containment and type drift already do (#1308)

Szabo Bogdanf37bef6478d6
diff --git a/crates/utopia-store/src/name_vectors.rs b/crates/utopia-store/src/name_vectors.rs
index ff3e4afe..22bfa3cb 100644
--- a/crates/utopia-store/src/name_vectors.rs
+++ b/crates/utopia-store/src/name_vectors.rs
@@ -85,6 +85,7 @@ pub struct Near {
pub entity_id: Uuid,
pub fact_id: Uuid,
pub name: String,
+ pub type_id: Option<Uuid>,
pub type_label: Option<String>,
pub similarity: f32,
}
@@ -115,6 +116,7 @@ pub async fn nearest(pool: &PgPool, kb_id: Uuid, query: &[f32], k: usize) -> App
)
SELECT n.entity_id, n.id AS fact_id,
f.object_value->>'value' AS name,
+ e.type_id,
et.label AS type_label,
(1 - n.distance)::real AS similarity
FROM near n
diff --git a/crates/utopia-store/src/resolution.rs b/crates/utopia-store/src/resolution.rs
index 10471241..5cd4502b 100644
--- a/crates/utopia-store/src/resolution.rs
+++ b/crates/utopia-store/src/resolution.rs
@@ -328,6 +328,7 @@ async fn propose_by_name_vector(
.and_then(crate::governance::type_family),
None => None,
};
+ let disjoint = declared_disjoint_from(pool, kb_id, type_id).await?;
let mut seen: HashSet<Uuid> = r.reviews.iter().map(|v| v.other_id).collect();
seen.insert(r.entity_id);
seen.extend(exclude.iter().copied());
@@ -352,6 +353,10 @@ async fn propose_by_name_vector(
continue;
}
}
+ // 大类认不出的类(Spec、Test……)靠本体声明分开,与 containment、类型漂移同一张表
+ if near.type_id.is_some_and(|t| disjoint.contains(&t)) {
+ continue;
+ }
r.reviews.push(ReviewRequest {
other_id: near.entity_id,
score: near.similarity,
diff --git a/crates/utopia-store/tests/store/a_declared_disjointness_keeps_names_apart.rs b/crates/utopia-store/tests/store/a_declared_disjointness_keeps_names_apart.rs
index 4974f8e9..f56f1fe3 100644
--- a/crates/utopia-store/tests/store/a_declared_disjointness_keeps_names_apart.rs
+++ b/crates/utopia-store/tests/store/a_declared_disjointness_keeps_names_apart.rs
@@ -12,7 +12,7 @@
//! 没有 `UTOPIA_DATABASE_URL` 时跳过而不是失败。自建自拆,绝不碰已有的库。
use sqlx::PgPool;
-use utopia_store::{ontology, resolution};
+use utopia_store::{name_vectors, names, ontology, resolution};
use uuid::Uuid;
struct Fx {
@@ -196,3 +196,64 @@ async fn a_declared_disjointness_keeps_names_apart() -> anyhow::Result<()> {
.await;
run
}
+
+/// 名字向量那条通道也听声明(#1293):project 认不出大类,从前声明了互斥照样排对
+#[tokio::test]
+async fn a_declared_disjointness_keeps_near_names_apart() -> anyhow::Result<()> {
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ let f = seed(&pool).await?;
+
+ let run = async {
+ let orion = entity(&pool, &f, "Orion Labs", f.organization).await?;
+ let fact = names::record(&pool, f.kb, orion, "Orion Labs", None, None)
+ .await?
+ .expect("a named entity gets a name fact");
+ let near = vec![1.0, 0.0, 0.0];
+ name_vectors::set(&pool, f.kb, &[(fact, orion, near.clone())]).await?;
+ let proposed = |mention: &'static str| {
+ let (pool, near) = (&pool, &near);
+ async move {
+ let r = resolution::resolve_mention(
+ pool,
+ f.kb,
+ Some(f.project),
+ mention,
+ None,
+ Some(near),
+ None,
+ &[],
+ )
+ .await?;
+ anyhow::Ok(
+ r.reviews
+ .iter()
+ .filter(|v| v.reason.starts_with("name_vector|"))
+ .map(|v| v.other_id)
+ .collect::<Vec<Uuid>>(),
+ )
+ }
+ };
+
+ assert_eq!(
+ proposed("Nebula Rollout").await?,
+ vec![orion],
+ "without a declaration a near organization name is proposed for a project"
+ );
+ ontology::set_disjoint_for(&pool, f.kb, f.organization, &[f.project]).await?;
+ assert!(
+ proposed("Nebula Migration").await?.is_empty(),
+ "organization declared disjoint from project: no name_vector pair"
+ );
+ Ok::<_, anyhow::Error>(())
+ }
+ .await;
+
+ let _ = sqlx::query("DELETE FROM organizations WHERE id = $1")
+ .bind(f.org)
+ .execute(&pool)
+ .await;
+ run
+}