idenr

model/custom_agent.py

@@ -112,6 +112,8 @@ class CustomHfAgent(Agent):
         if chat_mode:
             if self.chat_history is None:
                 prompt = self.chat_prompt_template.replace("<<all_tools>>", description)
+                prompt += CHAT_MESSAGE_PROMPT.replace("<<task>>", task)
+
                 messages = [
                     {
                         "role": "user",
@@ -121,16 +123,15 @@ class CustomHfAgent(Agent):
                 prompt = tokenizer.apply_chat_template(messages, add_generation_prompt=True, tokenize=False)
             else:
                 prompt = self.chat_history
-                cmp = ""
-                cmp = CHAT_MESSAGE_PROMPT.replace("<<task>>", task)
+                prompt += CHAT_MESSAGE_PROMPT.replace("<<task>>", task)
                 messages = [
                     {
                         "role": "user",
-                        "content": cmp,
+                        "content": prompt,
                     } 
                 ]
-                cmp = tokenizer.apply_chat_template(messages, add_generation_prompt=True, tokenize=False)
-            prompt += cmp
+                prompt = tokenizer.apply_chat_template(messages, add_generation_prompt=True, tokenize=False)
+            prompt 
         else:
             prompt = self.run_prompt_template.replace("<<all_tools>>", description)
             prompt = prompt.replace("<<prompt>>", task)