Update app.py

app.py

@@ -142,7 +142,7 @@ def merlin_chat(message, history):
     prompt_data = history
     prompt_data.append(user_msg)
     prompt_data.insert(0,system_msg)
-    prompt = json.dumps(system_msg)[:-1] + ",{\"role\": \"assistant\", \"content\": \""
+    prompt = json.dumps(prompt_data)[:-1] #+ ",{\"role\": \"assistant\", \"content\": \""
     for attempt in range(3):
         # result = model(prompt, max_new_tokens=250, return_full_text=False, handle_long_generation="hole")
         result = generate_text(prompt, model_path, parameters, headers)
@@ -151,14 +151,15 @@ def merlin_chat(message, history):
         start = 0
         end = 0
         cleanStr = response.lstrip()
-        # cleanStr = cleanStr.replace(prompt,"")
+        cleanStr = cleanStr.replace(prompt,"")
+        start = cleanStr.find('{')
+        if start<=0:
+            continue
         end = cleanStr.find('}') + 1
         if end<=0:
             continue
-        cleanStr = cleanStr[:end]
-        messageStr = prompt + cleanStr + "]"
-        messages = json.loads(messageStr)
-        message = messages[-1]
+        cleanStr = cleanStr[start:end]
+        message = json.loads(cleanStr)
         if message['role'] != 'assistant':
             continue
         return message['content']