From 0774f6d7f744047a40f0f887b84bc0f61536fc39 Mon Sep 17 00:00:00 2001
From: cotran <cotran2@utexas.edu>
Date: Thu, 10 Oct 2024 15:57:45 -0700
Subject: [PATCH] fix

---
 arch/src/stream_context.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/src/stream_context.rs b/arch/src/stream_context.rs
index 03c289d4..50ac0462 100644
--- a/arch/src/stream_context.rs
+++ b/arch/src/stream_context.rs
@@ -728,14 +728,14 @@ impl StreamContext {
                 None => HashMap::new(), // Return an empty HashMap if v is not an object
             };
 
-            let mut user_messages = String::new();
+            let mut user_messages = Vec::new();
             let messages = &callout_context.request_body.messages;
             let mut arch_assistant = false;
 
             if messages.len() >= 2 {
                 let latest_assistant_message = &messages[messages.len() - 2];
                 if let Some(model) = latest_assistant_message.model.as_ref() {
-                    if model.contains(ARCH_MODEL_PREFIX) {
+                    if model.starts_with(ARCH_MODEL_PREFIX) {
                         arch_assistant = true;
                     }
                 }
@@ -746,23 +746,26 @@ impl StreamContext {
             if arch_assistant {
                 for message in messages.iter() {
                     if let Some(model) = message.model.as_ref() {
-                        if !model.contains(ARCH_MODEL_PREFIX) {
+                        if !model.starts_with(ARCH_MODEL_PREFIX) {
                             break;
                         }
                     }
                     if message.role == "user" {
                         if let Some(content) = &message.content {
-                            user_messages = format!("{} , {}", user_messages, content);
+                            user_messages.push(content.clone());
                         }
                     }
                 }
             } else {
-                user_messages = callout_context.user_message.as_ref().unwrap().clone();
+                if let Some(user_message) = callout_context.user_message.as_ref() {
+                    user_messages.push(user_message.clone());
+                }
             }
-            info!("user messages: {}", user_messages);
+            let user_messages_str = user_messages.join(", ");
+            info!("user messages: {}", user_messages_str);
 
             let hallucination_classification_request = HallucinationClassificationRequest {
-                prompt: user_messages,
+                prompt: user_messages_str,
                 model: String::from(DEFAULT_INTENT_MODEL),
                 parameters: tool_params_dict,
             };