Send tools to text_chat_detections task

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

Author: declark1

src/orchestrator/handlers/chat_completions_detection/streaming.rs

@@ -458,7 +458,8 @@ async fn handle_whole_doc_detection(
     use DetectorType::*;
     let detector_groups = group_detectors_by_type(&ctx, detectors);
     let headers = &task.headers;
-    let input_messages = task.request.messages.as_slice();
+    let messages = task.request.messages.as_slice();
+    let tools = task.request.tools.as_ref().cloned().unwrap_or_default();
     let mut warnings = Vec::new();
 
     // Create vec of choice_index->choice_text
@@ -502,14 +503,13 @@ async fn handle_whole_doc_detection(
                         content: Some(Content::Text(choice_text.clone())),
                         ..Default::default()
                     };
-                    let messages = [input_messages, &[choice_message]].concat();
                     tokio::spawn(
                         common::text_chat_detections(
                             ctx.clone(),
                             headers.clone(),
                             detectors.clone(),
-                            messages,
-                            Vec::new(), // tools
+                            [messages, &[choice_message]].concat(),
+                            tools.clone(),
                         )
                         .in_current_span(),
                     )

src/orchestrator/handlers/chat_completions_detection/unary.rs

@@ -188,7 +188,8 @@ async fn handle_output_detection(
     use DetectorType::*;
     let detector_groups = group_detectors_by_type(&ctx, detectors);
     let headers = &task.headers;
-    let input_messages = task.request.messages.as_slice();
+    let messages = task.request.messages.as_slice();
+    let tools = task.request.tools.as_ref().cloned().unwrap_or_default();
 
     // Spawn detection tasks
     let mut tasks = Vec::with_capacity(chat_completion.choices.len() * detector_groups.len());
@@ -222,19 +223,16 @@ async fn handle_output_detection(
                     )
                     .in_current_span(),
                 ),
-                TextChat => {
-                    let messages = [input_messages, std::slice::from_ref(&choice.message)].concat();
-                    tokio::spawn(
-                        common::text_chat_detections(
-                            ctx.clone(),
-                            headers.clone(),
-                            detectors.clone(),
-                            messages,
-                            Vec::new(), // tools
-                        )
-                        .in_current_span(),
+                TextChat => tokio::spawn(
+                    common::text_chat_detections(
+                        ctx.clone(),
+                        headers.clone(),
+                        detectors.clone(),
+                        [messages, std::slice::from_ref(&choice.message)].concat(),
+                        tools.clone(),
                     )
-                }
+                    .in_current_span(),
+                ),
                 _ => unimplemented!(),
             };
             tasks.push((choice.index, *detector_type, detection_task));