remove streem

.gitignore

@@ -1,2 +1,3 @@
 venv/
-.env
+.env
+__pycache__

app.py

@@ -17,6 +17,8 @@ SYSTEM_PROMPT_TEMPLATE = """You are an AI assistant designed to assist users wit
 Maintain clarity, conciseness, and relevance in your responses, ensuring a seamless user experience. 
 Always respond in the same **language as the user’s query** to preserve their preferred language."""
 
+
+# print(json.dumps(oitools, indent=2))
 client = OpenAI(
     base_url=f"{BASE_URL}/v1",  
     api_key=HF_TOKEN
@@ -34,15 +36,20 @@ def completion(history, model, system_prompt, tools=None):
             tools_calls = json.loads(msg.metadata.get("title", "[]")) 
             # for tool_calls in tools_calls:
             #     tool_calls["function"]["arguments"] = json.loads(tool_calls["function"]["arguments"])
-            messages.append({"role": "assistant", "tool_calls": tools_calls})
+            messages.append({"role": "assistant", "tool_calls": tools_calls, "content": ""})
             messages.append({"role": "tool", "content": msg.content})
         else:
             messages.append({"role": msg.role, "content": msg.content})
     
+    for msg in messages:
+        print(msg)
+
+    print("")
+    print("")
     request_params = {
         "model": model,
         "messages": messages,
-        "stream": True,
+        "stream": False,
         "max_tokens": 1000,
         "temperature": 0.4,
         "frequency_penalty": 1,
@@ -65,21 +72,35 @@ def llm_in_loop(history, system_prompt, recursive):
     name = ""
     chat_completion = completion(history=history, tools=oitools, model=model, system_prompt=system_prompt)  
     appended = False
-    for chunk in chat_completion:
-        if chunk.choices and chunk.choices[0].delta.tool_calls:
-            call = chunk.choices[0].delta.tool_calls[0]
-            if hasattr(call.function, "name") and call.function.name:
-                name = call.function.name
-            if hasattr(call.function, "arguments") and call.function.arguments:
-                arguments += call.function.arguments
-        elif chunk.choices[0].delta.content:
-            if not appended:
-                history.append(ChatMessage(role="assistant", content=""))
-                appended = True
-            history[-1].content += chunk.choices[0].delta.content
-            yield history[recursive:]
+    if chat_completion.choices and chat_completion.choices[0].message.tool_calls:
+        call = chat_completion.choices[0].message.tool_calls[0]
+        if hasattr(call.function, "name") and call.function.name:
+            name = call.function.name
+        if hasattr(call.function, "arguments") and call.function.arguments:
+            arguments += call.function.arguments
+    elif chat_completion.choices[0].message.content:
+        if not appended:
+            history.append(ChatMessage(role="assistant", content=""))
+            appended = True
+        history[-1].content += chat_completion.choices[0].message.content
+        yield history[recursive:]
+    # for chunk in chat_completion:
+    #     if chunk.choices and chunk.choices[0].delta.tool_calls:
+    #         call = chunk.choices[0].delta.tool_calls[0]
+    #         if hasattr(call.function, "name") and call.function.name:
+    #             name = call.function.name
+    #         if hasattr(call.function, "arguments") and call.function.arguments:
+    #             arguments += call.function.arguments
+    #     elif chunk.choices[0].delta.content:
+    #         if not appended:
+    #             history.append(ChatMessage(role="assistant", content=""))
+    #             appended = True
+    #         history[-1].content += chunk.choices[0].delta.content
+    #         yield history[recursive:]
     
-    arguments = json.loads(clean_json_string(arguments) if arguments else "{}")
+    arguments = clean_json_string(arguments) if arguments else "{}"
+    print(name, arguments)
+    arguments = json.loads(arguments)
     if appended:
         recursive -= 1
     if name: