Update handle_whole_doc_detection, add text_chat_detectors_with_tools test for chat completions streaming, impl FromIterator for DetectorParams

Signed-off-by: declark1 <[email protected]>

Author: declark1

src/models.rs

@@ -77,6 +77,20 @@ impl std::ops::DerefMut for DetectorParams {
     }
 }
 
+impl<K, V> FromIterator<(K, V)> for DetectorParams
+where
+    K: Into<String>,
+    V: Into<serde_json::Value>,
+{
+    fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
+        let map: BTreeMap<String, serde_json::Value> = iter
+            .into_iter()
+            .map(|(k, v)| (k.into(), v.into()))
+            .collect();
+        Self(map)
+    }
+}
+
 /// User request to orchestrator
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]

src/orchestrator/handlers/chat_completions_detection/streaming.rs

@@ -463,7 +463,8 @@ async fn handle_whole_doc_detection(
     let mut warnings = Vec::new();
 
     // Create vec of choice_index->message
-    // NOTE: we create a message for text chat detectors
+    // NOTE: we build a message from chat completion chunks as it is required for text chat detectors.
+    // Text contents detectors only require the content text.
     let choices = completion_state
         .completions
         .iter()
@@ -472,9 +473,14 @@ async fn handle_whole_doc_detection(
             let chunks = entry.values().cloned().collect::<Vec<_>>();
             let tool_calls = merge_tool_calls(&chunks);
             let content_text = merge_content_text(&chunks);
+            let content = if content_text.is_empty() {
+                None
+            } else {
+                Some(Content::Text(content_text))
+            };
             let message = Message {
                 role: Role::Assistant,
-                content: Some(Content::Text(content_text)),
+                content,
                 tool_calls,
                 ..Default::default()
             };