Update app.py

app.py

@@ -52,7 +52,9 @@ def chat_gpt(prompt=None, history=[], model=model, client=client, tools=[None]):
     completion = client.chat.completions.create(
     model=model,
     messages=messages,
-    tools=tools
+    tools=tools,
+    tool_choice="required",
+    temperature=0.0
 )
     return completion
 
@@ -232,44 +234,70 @@ def chat(question, manual, history, liked):
 
         """
     # conv = [{"role": "system", "content": f"{first_hop}"}]
-    conv.append({"role": "system", "content": f"{first_hop}"})
+    # conv.append({"role": "system", "content": f"{first_hop}"})
+    # first_hop_response = chat_gpt(prompt=f"Soru: {question}", history=conv, tools=retrieval_functions)
+    # conv.append(first_hop_response.choices[-1].message)
+
+    conv = [{"role": "system", "content": f"{first_hop}"}]
     first_hop_response = chat_gpt(prompt=f"Soru: {question}", history=conv, tools=retrieval_functions)
-    conv.append(first_hop_response.choices[-1].message)
+    
+    tool_calls = first_hop_response.choices[-1].message.tool_calls
+    arg_list = []
+    for i in range(3)
+    
+        if tool_calls:
+            for tool_call in tool_calls:
+              function_name = tool_call.function.name
+              args = json.loads(tool_call.function.arguments)
+              arg_list.append(args)
+              print(f"Will call {function_name} with arguments {args}")
+            break
+        else:
+            conv = [{"role": "system", "content": f"{first_hop}"}]
+            first_hop_response = chat_gpt(prompt=f"Soru: {question}", history=conv, tools=retrieval_functions)
+            print("No tool calls")
+      
     print("First_hop:--- %s seconds ---" % (time.time() - start_time))
     
     path = "Contents/" + manual + ".json"
 
-    start_time = time.time()
-    i = 0
-    while(i < 2):
-        tool_calls = first_hop_response.choices[-1].message.tool_calls
-        if tool_calls:
-            for tool_call in tool_calls:
-                function_name = tool_call.function.name
-                args = json.loads(tool_call.function.arguments)
-                print(f"Will call {function_name} with arguments {args}")
+    # start_time = time.time()
+    # i = 0
+    # while(i < 2):
+#         tool_calls = first_hop_response.choices[-1].message.tool_calls
+#         if tool_calls:
+#             for tool_call in tool_calls:
+#                 function_name = tool_call.function.name
+#                 args = json.loads(tool_call.function.arguments)
+#                 print(f"Will call {function_name} with arguments {args}")
             
-                if function_name == 'get_section_content':
-                    addition = get_section_content(str(args['section_title']), str(args['sub_section_title']), str(args['sub_sub_section_title']), content_path=path)
-                    if not addition:
-                        addition = ' '
+#                 if function_name == 'get_section_content':
+#                     addition = get_section_content(str(args['section_title']), str(args['sub_section_title']), str(args['sub_sub_section_title']), content_path=path)
+#                     if not addition:
+#                         addition = ' '
                         
-                conv.append({
-                    "tool_call_id": tool_call.id,
-                    "role": "tool",
-                    "name": function_name,
-                    "content": addition
-                    })
-            first_hop_response = chat_gpt(prompt=None, history=conv, tools=retrieval_functions)
-        else:
-            conv.append(first_hop_response.choices[-1].message)
-            break
-        i += 1
-
-    print("Second_hop:--- %s seconds ---" % (time.time() - start_time))
-
+#                 conv.append({
+#                     "tool_call_id": tool_call.id,
+#                     "role": "tool",
+#                     "name": function_name,
+#                     "content": addition
+#                     })
+#             first_hop_response = chat_gpt(prompt=None, history=conv, tools=retrieval_functions)
+#         else:
+#             conv.append(first_hop_response.choices[-1].message)
+#             break
+#         i += 1
+
+    # print("Second_hop:--- %s seconds ---" % (time.time() - start_time))
+    
     start_time = time.time()
-    documents = retriever.invoke(question)
+    documents = []
+    for i in arg_list:
+        documents.append(get_section_content(str(args['section_title']), str(args['sub_section_title']), str(args['sub_sub_section_title']), content_path=path))
+    
+    documents_db = retriever.invoke(question)
+    documents.append(documents_db)
+    
     print("Retriever:--- %s seconds ---" % (time.time() - start_time))
 
     start_time = time.time()