khoj 2.0.0b14.dev43__py3-none-any.whl → 2.0.0b15.dev22__py3-none-any.whl

khoj/routers/api_chat.py

@@ -90,7 +90,6 @@ from khoj.utils.helpers import (
     is_operator_enabled,
 )
 from khoj.utils.rawconfig import (
-    FileAttachment,
     FileFilterRequest,
     FilesFilterRequest,
     LocationData,
@@ -732,7 +731,6 @@ async def event_generator(
     attached_file_context = gather_raw_query_files(query_files)
 
     generated_images: List[str] = []
-    generated_files: List[FileAttachment] = []
     generated_mermaidjs_diagram: str = None
     generated_asset_results: Dict = dict()
     program_execution_context: List[str] = []
@@ -769,7 +767,6 @@ async def event_generator(
                                 train_of_thought=train_of_thought,
                                 raw_query_files=raw_query_files,
                                 generated_images=generated_images,
-                                raw_generated_files=generated_asset_results,
                                 generated_mermaidjs_diagram=generated_mermaidjs_diagram,
                                 user_message_time=user_message_time,
                                 tracer=tracer,
@@ -816,7 +813,6 @@ async def event_generator(
                         train_of_thought=train_of_thought,
                         raw_query_files=raw_query_files,
                         generated_images=generated_images,
-                        raw_generated_files=generated_asset_results,
                         generated_mermaidjs_diagram=generated_mermaidjs_diagram,
                         user_message_time=user_message_time,
                         tracer=tracer,
@@ -927,9 +923,7 @@ async def event_generator(
 
     # Automated tasks are handled before to allow mixing them with other conversation commands
     cmds_to_rate_limit = []
-    is_automated_task = False
     if q.startswith("/automated_task"):
-        is_automated_task = True
         q = q.replace("/automated_task", "").lstrip()
         cmds_to_rate_limit += [ConversationCommand.AutomatedTask]
 
@@ -989,7 +983,6 @@ async def event_generator(
             chosen_io = await aget_data_sources_and_output_format(
                 q,
                 chat_history,
-                is_automated_task,
                 user=user,
                 query_images=uploaded_images,
                 agent=agent,
@@ -1021,7 +1014,6 @@ async def event_generator(
             return
 
     defiltered_query = defilter_query(q)
-    file_filters = conversation.file_filters if conversation and conversation.file_filters else []
 
     if conversation_commands == [ConversationCommand.Research]:
         async for research_result in research(
@@ -1035,12 +1027,11 @@ async def event_generator(
             send_status_func=partial(send_event, ChatEvent.STATUS),
             user_name=user_name,
             location=location,
-            file_filters=file_filters,
             query_files=attached_file_context,
-            tracer=tracer,
             cancellation_event=cancellation_event,
             interrupt_queue=child_interrupt_queue,
             abort_message=ChatEvent.END_EVENT.value,
+            tracer=tracer,
         ):
             if isinstance(research_result, ResearchIteration):
                 if research_result.summarizedResult:
@@ -1075,8 +1066,8 @@ async def event_generator(
             logger.debug(f"Researched Results: {''.join(r.summarizedResult or '' for r in research_results)}")
 
     # Gather Context
-    ## Extract Document References
-    if ConversationCommand.Research not in conversation_commands:
+    ## Gather Document References
+    if ConversationCommand.Notes in conversation_commands:
         try:
             async for result in search_documents(
                 q,
@@ -1194,7 +1185,7 @@ async def event_generator(
             ):
                 yield result
 
-    ## Gather Code Results
+    ## Run Code
     if ConversationCommand.Code in conversation_commands:
         try:
             context = f"# Iteration 1:\n#---\nNotes:\n{compiled_references}\n\nOnline Results:{online_results}"
@@ -1220,6 +1211,8 @@ async def event_generator(
                 f"Failed to use code tool: {e}. Attempting to respond without code results",
                 exc_info=True,
             )
+
+    ## Operate Computer
     if ConversationCommand.Operator in conversation_commands:
         try:
             async for result in operate_environment(
@@ -1300,7 +1293,7 @@ async def event_generator(
             generated_images.append(generated_image)
 
             generated_asset_results["images"] = {
-                "query": improved_image_prompt,
+                "description": improved_image_prompt,
             }
 
             async for result in send_event(
@@ -1316,8 +1309,6 @@ async def event_generator(
             yield result
 
         inferred_queries = []
-        diagram_description = ""
-
         async for result in generate_mermaidjs_diagram(
             q=defiltered_query,
             chat_history=chat_history,
@@ -1337,9 +1328,7 @@ async def event_generator(
                 better_diagram_description_prompt, mermaidjs_diagram_description = result
                 if better_diagram_description_prompt and mermaidjs_diagram_description:
                     inferred_queries.append(better_diagram_description_prompt)
-                    diagram_description = mermaidjs_diagram_description
-
-                    generated_mermaidjs_diagram = diagram_description
+                    generated_mermaidjs_diagram = mermaidjs_diagram_description
 
                     generated_asset_results["diagrams"] = {
                         "query": better_diagram_description_prompt,
@@ -1386,7 +1375,6 @@ async def event_generator(
         user_name,
         uploaded_images,
         attached_file_context,
-        generated_files,
         program_execution_context,
         generated_asset_results,
         is_subscribed,
@@ -1447,7 +1435,6 @@ async def event_generator(
             train_of_thought=train_of_thought,
             raw_query_files=raw_query_files,
             generated_images=generated_images,
-            raw_generated_files=generated_files,
             generated_mermaidjs_diagram=generated_mermaidjs_diagram,
             tracer=tracer,
         )