Release v1.17.0

Cargo.toml

@@ -48,8 +48,8 @@ itoa = "1.0"
 # oasysdb = "0.7.3"
 # once_cell = "1.20"
 # ort = { version = "=2.0.0-rc.0", default-features = false }
-paste = "1.0"
-redb = "2.2"
+# paste = "1.0"
+redb = "2.3"
 regex = "1.11"
 reqwest = { version = "0.12", features = ["stream"] }
 rkyv = {version = "0.8", features = ["aligned", "alloc", "bytecheck"]}

src/flow/rt/convertor.rs

@@ -349,7 +349,7 @@ fn convert_node(main_flow_id: &str, node: &mut Node) -> Result<()> {
         }
         Node::KnowledgeBaseAnswerNode(n) => {
             let node = KnowledgeBaseAnswerNode {
-                recall_thresholds: n.recall_thresholds as f64 / 100f64,
+                recall_distance: 1f64 - n.recall_thresholds as f64 / 100f64,
                 no_recall_then: n.no_answer_then.clone(),
                 next_node_id: n.branches[0].target_node_id.clone(),
             };

src/flow/rt/node.rs

@@ -550,11 +550,32 @@ pub(crate) enum KnowledgeBaseAnswerNoRecallThen {
 #[derive(Archive, Clone, Deserialize, Serialize)]
 #[rkyv(compare(PartialEq))]
 pub(crate) struct KnowledgeBaseAnswerNode {
-    pub(super) recall_thresholds: f64,
+    pub(super) recall_distance: f64,
     pub(super) no_recall_then: KnowledgeBaseAnswerNoRecallThen,
     pub(super) next_node_id: String,
 }
 
+impl KnowledgeBaseAnswerNode {
+    fn fallback_answer(&self, ctx: &mut Context, response: &mut Response) -> bool {
+        match &self.no_recall_then {
+            KnowledgeBaseAnswerNoRecallThen::GotoAnotherNode => {
+                add_next_node(ctx, &self.next_node_id);
+                false
+            }
+            KnowledgeBaseAnswerNoRecallThen::ReturnAlternateAnswerInstead(s) => {
+                response.answers.push(AnswerData {
+                    text: s.clone(),
+                    answer_type: AnswerType::TextPlain,
+                });
+                let r = RuntimeNnodeEnum::KnowledgeBaseAnswerNode(self.clone());
+                let bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&r).unwrap();
+                ctx.node = Some(bytes.into_vec());
+                true
+            }
+        }
+    }
+}
+
 impl RuntimeNode for KnowledgeBaseAnswerNode {
     fn exec(&mut self, req: &Request, ctx: &mut Context, response: &mut Response) -> bool {
         // log::info!("Into LlmChaKnowledgeBaseAnswerNodetNode");
@@ -565,33 +586,26 @@ impl RuntimeNode for KnowledgeBaseAnswerNode {
             ))
         });
         match result {
-            Ok((answer, thresholds)) => {
-                if answer.is_some() && thresholds >= self.recall_thresholds {
+            Ok((answer, distance)) => {
+                log::info!(
+                    "distance {} recall_distance {}",
+                    distance,
+                    self.recall_distance
+                );
+                if answer.is_some() && distance <= self.recall_distance {
                     response.answers.push(AnswerData {
                         text: answer.unwrap().answer,
                         answer_type: AnswerType::TextPlain,
                     });
-                    true
+                    add_next_node(ctx, &self.next_node_id);
+                    false
                 } else {
-                    match &self.no_recall_then {
-                        KnowledgeBaseAnswerNoRecallThen::GotoAnotherNode => {
-                            add_next_node(ctx, &self.next_node_id);
-                            false
-                        }
-                        KnowledgeBaseAnswerNoRecallThen::ReturnAlternateAnswerInstead(s) => {
-                            response.answers.push(AnswerData {
-                                text: s.clone(),
-                                answer_type: AnswerType::TextPlain,
-                            });
-                            true
-                        }
-                    }
+                    self.fallback_answer(ctx, response)
                 }
             }
             Err(e) => {
                 log::error!("KnowledgeBaseAnswerNode answer failed: {:?}", &e);
-                add_next_node(ctx, &self.next_node_id);
-                false
+                self.fallback_answer(ctx, response)
             }
         }
     }