khoj 1.42.1.dev8__py3-none-any.whl → 1.42.2.dev1__py3-none-any.whl

khoj/routers/api_chat.py

@@ -752,7 +752,7 @@ async def chat(
                                 q,
                                 chat_response="",
                                 user=user,
-                                meta_log=meta_log,
+                                chat_history=chat_history,
                                 compiled_references=compiled_references,
                                 online_results=online_results,
                                 code_results=code_results,
@@ -918,7 +918,7 @@ async def chat(
         if city or region or country or country_code:
             location = LocationData(city=city, region=region, country=country, country_code=country_code)
         user_message_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        meta_log = conversation.conversation_log
+        chat_history = conversation.messages
 
         # If interrupt flag is set, wait for the previous turn to be saved before proceeding
         if interrupt_flag:
@@ -964,14 +964,14 @@ async def chat(
             operator_results = [OperatorRun(**iter_dict) for iter_dict in last_message.operatorContext or []]
             train_of_thought = [thought.model_dump() for thought in last_message.trainOfThought or []]
             # Drop the interrupted message from conversation history
-            meta_log["chat"].pop()
+            chat_history.pop()
             logger.info(f"Loaded interrupted partial context from conversation {conversation_id}.")
 
         if conversation_commands == [ConversationCommand.Default]:
             try:
                 chosen_io = await aget_data_sources_and_output_format(
                     q,
-                    meta_log,
+                    chat_history,
                     is_automated_task,
                     user=user,
                     query_images=uploaded_images,
@@ -1011,7 +1011,7 @@ async def chat(
                 user=user,
                 query=defiltered_query,
                 conversation_id=conversation_id,
-                conversation_history=meta_log,
+                conversation_history=conversation.messages,
                 previous_iterations=list(research_results),
                 query_images=uploaded_images,
                 agent=agent,
@@ -1078,7 +1078,7 @@ async def chat(
                     q=q,
                     user=user,
                     file_filters=file_filters,
-                    meta_log=meta_log,
+                    chat_history=conversation.messages,
                     query_images=uploaded_images,
                     agent=agent,
                     send_status_func=partial(send_event, ChatEvent.STATUS),
@@ -1123,7 +1123,7 @@ async def chat(
         if ConversationCommand.Automation in conversation_commands:
             try:
                 automation, crontime, query_to_run, subject = await create_automation(
-                    q, timezone, user, request.url, meta_log, tracer=tracer
+                    q, timezone, user, request.url, chat_history, tracer=tracer
                 )
             except Exception as e:
                 logger.error(f"Error scheduling task {q} for {user.email}: {e}")
@@ -1139,7 +1139,7 @@ async def chat(
                     q,
                     llm_response,
                     user,
-                    meta_log,
+                    chat_history,
                     user_message_time,
                     intent_type="automation",
                     client_application=request.user.client_app,
@@ -1163,7 +1163,7 @@ async def chat(
             try:
                 async for result in extract_references_and_questions(
                     user,
-                    meta_log,
+                    chat_history,
                     q,
                     (n or 7),
                     d,
@@ -1212,7 +1212,7 @@ async def chat(
             try:
                 async for result in search_online(
                     defiltered_query,
-                    meta_log,
+                    chat_history,
                     location,
                     user,
                     partial(send_event, ChatEvent.STATUS),
@@ -1240,7 +1240,7 @@ async def chat(
             try:
                 async for result in read_webpages(
                     defiltered_query,
-                    meta_log,
+                    chat_history,
                     location,
                     user,
                     partial(send_event, ChatEvent.STATUS),
@@ -1281,7 +1281,7 @@ async def chat(
                 context = f"# Iteration 1:\n#---\nNotes:\n{compiled_references}\n\nOnline Results:{online_results}"
                 async for result in run_code(
                     defiltered_query,
-                    meta_log,
+                    chat_history,
                     context,
                     location,
                     user,
@@ -1306,7 +1306,7 @@ async def chat(
                 async for result in operate_environment(
                     defiltered_query,
                     user,
-                    meta_log,
+                    chat_history,
                     location,
                     list(operator_results)[-1] if operator_results else None,
                     query_images=uploaded_images,
@@ -1356,7 +1356,7 @@ async def chat(
             async for result in text_to_image(
                 defiltered_query,
                 user,
-                meta_log,
+                chat_history,
                 location_data=location,
                 references=compiled_references,
                 online_results=online_results,
@@ -1400,7 +1400,7 @@ async def chat(
 
             async for result in generate_mermaidjs_diagram(
                 q=defiltered_query,
-                conversation_history=meta_log,
+                chat_history=chat_history,
                 location_data=location,
                 note_references=compiled_references,
                 online_results=online_results,
@@ -1456,7 +1456,7 @@ async def chat(
 
         llm_response, chat_metadata = await agenerate_chat_response(
             defiltered_query,
-            meta_log,
+            chat_history,
             conversation,
             compiled_references,
             online_results,

khoj/routers/helpers.py

@@ -55,6 +55,7 @@ from khoj.database.adapters import (
 )
 from khoj.database.models import (
     Agent,
+    ChatMessageModel,
     ChatModel,
     ClientApplication,
     Conversation,
@@ -285,7 +286,7 @@ async def acreate_title_from_history(
     """
     Create a title from the given conversation history
     """
-    chat_history = construct_chat_history(conversation.conversation_log)
+    chat_history = construct_chat_history(conversation.messages)
 
     title_generation_prompt = prompts.conversation_title_generation.format(chat_history=chat_history)
 
@@ -345,7 +346,7 @@ async def acheck_if_safe_prompt(system_prompt: str, user: KhojUser = None, lax:
 
 async def aget_data_sources_and_output_format(
     query: str,
-    conversation_history: dict,
+    chat_history: list[ChatMessageModel],
     is_task: bool,
     user: KhojUser,
     query_images: List[str] = None,
@@ -386,7 +387,7 @@ async def aget_data_sources_and_output_format(
         if len(agent_outputs) == 0 or output.value in agent_outputs:
             output_options_str += f'- "{output.value}": "{description}"\n'
 
-    chat_history = construct_chat_history(conversation_history, n=6)
+    chat_history_str = construct_chat_history(chat_history, n=6)
 
     if query_images:
         query = f"[placeholder for {len(query_images)} user attached images]\n{query}"
@@ -399,7 +400,7 @@ async def aget_data_sources_and_output_format(
         query=query,
         sources=source_options_str,
         outputs=output_options_str,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         personality_context=personality_context,
     )
 
@@ -462,7 +463,7 @@ async def aget_data_sources_and_output_format(
 async def infer_webpage_urls(
     q: str,
     max_webpages: int,
-    conversation_history: dict,
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     user: KhojUser,
     query_images: List[str] = None,
@@ -475,7 +476,7 @@ async def infer_webpage_urls(
     """
     location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user.get_full_name() else ""
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     utc_date = datetime.now(timezone.utc).strftime("%Y-%m-%d")
     personality_context = (
@@ -485,7 +486,7 @@ async def infer_webpage_urls(
     online_queries_prompt = prompts.infer_webpages_to_read.format(
         query=q,
         max_webpages=max_webpages,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         current_date=utc_date,
         location=location,
         username=username,
@@ -526,7 +527,7 @@ async def infer_webpage_urls(
 
 async def generate_online_subqueries(
     q: str,
-    conversation_history: dict,
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     user: KhojUser,
     query_images: List[str] = None,
@@ -540,7 +541,7 @@ async def generate_online_subqueries(
     """
     location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user.get_full_name() else ""
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     utc_date = datetime.now(timezone.utc).strftime("%Y-%m-%d")
     personality_context = (
@@ -549,7 +550,7 @@ async def generate_online_subqueries(
 
     online_queries_prompt = prompts.online_search_conversation_subqueries.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         max_queries=max_queries,
         current_date=utc_date,
         location=location,
@@ -591,16 +592,16 @@ async def generate_online_subqueries(
 
 
 def schedule_query(
-    q: str, conversation_history: dict, user: KhojUser, query_images: List[str] = None, tracer: dict = {}
+    q: str, chat_history: List[ChatMessageModel], user: KhojUser, query_images: List[str] = None, tracer: dict = {}
 ) -> Tuple[str, str, str]:
     """
     Schedule the date, time to run the query. Assume the server timezone is UTC.
     """
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     crontime_prompt = prompts.crontime_prompt.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
     )
 
     raw_response = send_message_to_model_wrapper_sync(
@@ -619,16 +620,16 @@ def schedule_query(
 
 
 async def aschedule_query(
-    q: str, conversation_history: dict, user: KhojUser, query_images: List[str] = None, tracer: dict = {}
+    q: str, chat_history: List[ChatMessageModel], user: KhojUser, query_images: List[str] = None, tracer: dict = {}
 ) -> Tuple[str, str, str]:
     """
     Schedule the date, time to run the query. Assume the server timezone is UTC.
     """
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     crontime_prompt = prompts.crontime_prompt.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
     )
 
     raw_response = await send_message_to_model_wrapper(
@@ -681,7 +682,7 @@ async def extract_relevant_info(
 async def extract_relevant_summary(
     q: str,
     corpus: str,
-    conversation_history: dict,
+    chat_history: List[ChatMessageModel] = [],
     query_images: List[str] = None,
     user: KhojUser = None,
     agent: Agent = None,
@@ -698,11 +699,11 @@ async def extract_relevant_summary(
         prompts.personality_context.format(personality=agent.personality) if agent and agent.personality else ""
     )
 
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     extract_relevant_information = prompts.extract_relevant_summary.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         corpus=corpus.strip(),
         personality_context=personality_context,
     )
@@ -725,7 +726,7 @@ async def generate_summary_from_files(
     q: str,
     user: KhojUser,
     file_filters: List[str],
-    meta_log: dict,
+    chat_history: List[ChatMessageModel] = [],
     query_images: List[str] = None,
     agent: Agent = None,
     send_status_func: Optional[Callable] = None,
@@ -766,7 +767,7 @@ async def generate_summary_from_files(
         response = await extract_relevant_summary(
             q,
             contextual_data,
-            conversation_history=meta_log,
+            chat_history=chat_history,
             query_images=query_images,
             user=user,
             agent=agent,
@@ -782,7 +783,7 @@ async def generate_summary_from_files(
 
 async def generate_excalidraw_diagram(
     q: str,
-    conversation_history: Dict[str, Any],
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     note_references: List[Dict[str, Any]],
     online_results: Optional[dict] = None,
@@ -799,7 +800,7 @@ async def generate_excalidraw_diagram(
 
     better_diagram_description_prompt = await generate_better_diagram_description(
         q=q,
-        conversation_history=conversation_history,
+        chat_history=chat_history,
         location_data=location_data,
         note_references=note_references,
         online_results=online_results,
@@ -834,7 +835,7 @@ async def generate_excalidraw_diagram(
 
 async def generate_better_diagram_description(
     q: str,
-    conversation_history: Dict[str, Any],
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     note_references: List[Dict[str, Any]],
     online_results: Optional[dict] = None,
@@ -857,7 +858,7 @@ async def generate_better_diagram_description(
 
     user_references = "\n\n".join([f"# {item['compiled']}" for item in note_references])
 
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     simplified_online_results = {}
 
@@ -870,7 +871,7 @@ async def generate_better_diagram_description(
 
     improve_diagram_description_prompt = prompts.improve_excalidraw_diagram_description_prompt.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         location=location,
         current_date=today_date,
         references=user_references,
@@ -939,7 +940,7 @@ async def generate_excalidraw_diagram_from_description(
 
 async def generate_mermaidjs_diagram(
     q: str,
-    conversation_history: Dict[str, Any],
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     note_references: List[Dict[str, Any]],
     online_results: Optional[dict] = None,
@@ -956,7 +957,7 @@ async def generate_mermaidjs_diagram(
 
     better_diagram_description_prompt = await generate_better_mermaidjs_diagram_description(
         q=q,
-        conversation_history=conversation_history,
+        chat_history=chat_history,
         location_data=location_data,
         note_references=note_references,
         online_results=online_results,
@@ -985,7 +986,7 @@ async def generate_mermaidjs_diagram(
 
 async def generate_better_mermaidjs_diagram_description(
     q: str,
-    conversation_history: Dict[str, Any],
+    chat_history: List[ChatMessageModel],
     location_data: LocationData,
     note_references: List[Dict[str, Any]],
     online_results: Optional[dict] = None,
@@ -1008,7 +1009,7 @@ async def generate_better_mermaidjs_diagram_description(
 
     user_references = "\n\n".join([f"# {item['compiled']}" for item in note_references])
 
-    chat_history = construct_chat_history(conversation_history)
+    chat_history_str = construct_chat_history(chat_history)
 
     simplified_online_results = {}
 
@@ -1021,7 +1022,7 @@ async def generate_better_mermaidjs_diagram_description(
 
     improve_diagram_description_prompt = prompts.improve_mermaid_js_diagram_description_prompt.format(
         query=q,
-        chat_history=chat_history,
+        chat_history=chat_history_str,
         location=location,
         current_date=today_date,
         references=user_references,
@@ -1160,7 +1161,7 @@ async def send_message_to_model_wrapper(
     query_images: List[str] = None,
     context: str = "",
     query_files: str = None,
-    conversation_log: dict = {},
+    chat_history: list[ChatMessageModel] = [],
     agent_chat_model: ChatModel = None,
     tracer: dict = {},
 ):
@@ -1193,7 +1194,7 @@ async def send_message_to_model_wrapper(
         user_message=query,
         context_message=context,
         system_message=system_message,
-        conversation_log=conversation_log,
+        chat_history=chat_history,
         model_name=chat_model_name,
         loaded_model=loaded_model,
         tokenizer_name=tokenizer,
@@ -1260,7 +1261,7 @@ def send_message_to_model_wrapper_sync(
     user: KhojUser = None,
     query_images: List[str] = None,
     query_files: str = "",
-    conversation_log: dict = {},
+    chat_history: List[ChatMessageModel] = [],
     tracer: dict = {},
 ):
     chat_model: ChatModel = ConversationAdapters.get_default_chat_model(user)
@@ -1284,7 +1285,7 @@ def send_message_to_model_wrapper_sync(
     truncated_messages = generate_chatml_messages_with_context(
         user_message=message,
         system_message=system_message,
-        conversation_log=conversation_log,
+        chat_history=chat_history,
         model_name=chat_model_name,
         loaded_model=loaded_model,
         max_prompt_size=max_tokens,
@@ -1342,7 +1343,7 @@ def send_message_to_model_wrapper_sync(
 
 async def agenerate_chat_response(
     q: str,
-    meta_log: dict,
+    chat_history: List[ChatMessageModel],
     conversation: Conversation,
     compiled_references: List[Dict] = [],
     online_results: Dict[str, Dict] = {},
@@ -1379,7 +1380,7 @@ async def agenerate_chat_response(
             save_to_conversation_log,
             q,
             user=user,
-            meta_log=meta_log,
+            chat_history=chat_history,
             compiled_references=compiled_references,
             online_results=online_results,
             code_results=code_results,
@@ -1424,7 +1425,7 @@ async def agenerate_chat_response(
                 references=compiled_references,
                 online_results=online_results,
                 loaded_model=loaded_model,
-                conversation_log=meta_log,
+                chat_history=chat_history,
                 completion_func=partial_completion,
                 conversation_commands=conversation_commands,
                 model_name=chat_model.name,
@@ -1450,7 +1451,7 @@ async def agenerate_chat_response(
                 online_results=online_results,
                 code_results=code_results,
                 operator_results=operator_results,
-                conversation_log=meta_log,
+                chat_history=chat_history,
                 model=chat_model_name,
                 api_key=api_key,
                 api_base_url=openai_chat_config.api_base_url,
@@ -1480,7 +1481,7 @@ async def agenerate_chat_response(
                 online_results=online_results,
                 code_results=code_results,
                 operator_results=operator_results,
-                conversation_log=meta_log,
+                chat_history=chat_history,
                 model=chat_model.name,
                 api_key=api_key,
                 api_base_url=api_base_url,
@@ -1508,7 +1509,7 @@ async def agenerate_chat_response(
                 online_results=online_results,
                 code_results=code_results,
                 operator_results=operator_results,
-                conversation_log=meta_log,
+                chat_history=chat_history,
                 model=chat_model.name,
                 api_key=api_key,
                 api_base_url=api_base_url,
@@ -2005,11 +2006,11 @@ async def create_automation(
     timezone: str,
     user: KhojUser,
     calling_url: URL,
-    meta_log: dict = {},
+    chat_history: List[ChatMessageModel] = [],
     conversation_id: str = None,
     tracer: dict = {},
 ):
-    crontime, query_to_run, subject = await aschedule_query(q, meta_log, user, tracer=tracer)
+    crontime, query_to_run, subject = await aschedule_query(q, chat_history, user, tracer=tracer)
     job = await aschedule_automation(query_to_run, subject, crontime, timezone, q, user, calling_url, conversation_id)
     return job, crontime, query_to_run, subject
 

khoj/routers/research.py

@@ -10,7 +10,7 @@ import yaml
 from pydantic import BaseModel, Field
 
 from khoj.database.adapters import AgentAdapters, EntryAdapters
-from khoj.database.models import Agent, KhojUser
+from khoj.database.models import Agent, ChatMessageModel, KhojUser
 from khoj.processor.conversation import prompts
 from khoj.processor.conversation.utils import (
     OperatorRun,
@@ -84,7 +84,7 @@ class PlanningResponse(BaseModel):
 
 async def apick_next_tool(
     query: str,
-    conversation_history: dict,
+    conversation_history: List[ChatMessageModel],
     user: KhojUser = None,
     location: LocationData = None,
     user_name: str = None,
@@ -166,18 +166,18 @@ async def apick_next_tool(
         query = f"[placeholder for user attached images]\n{query}"
 
     # Construct chat history with user and iteration history with researcher agent for context
-    previous_iterations_history = construct_iteration_history(previous_iterations, prompts.previous_iteration, query)
-    iteration_chat_log = {"chat": conversation_history.get("chat", []) + previous_iterations_history}
+    iteration_chat_history = construct_iteration_history(previous_iterations, prompts.previous_iteration, query)
+    chat_and_research_history = conversation_history + iteration_chat_history
 
     # Plan function execution for the next tool
-    query = prompts.plan_function_execution_next_tool.format(query=query) if previous_iterations_history else query
+    query = prompts.plan_function_execution_next_tool.format(query=query) if iteration_chat_history else query
 
     try:
         with timer("Chat actor: Infer information sources to refer", logger):
             response = await send_message_to_model_wrapper(
                 query=query,
                 system_message=function_planning_prompt,
-                conversation_log=iteration_chat_log,
+                chat_history=chat_and_research_history,
                 response_type="json_object",
                 response_schema=planning_response_model,
                 deepthought=True,
@@ -198,6 +198,8 @@ async def apick_next_tool(
 
     try:
         response = load_complex_json(response)
+        if not isinstance(response, dict):
+            raise ValueError(f"Expected dict response, got {type(response).__name__}: {response}")
         selected_tool = response.get("tool", None)
         generated_query = response.get("query", None)
         scratchpad = response.get("scratchpad", None)
@@ -236,7 +238,7 @@ async def research(
     user: KhojUser,
     query: str,
     conversation_id: str,
-    conversation_history: dict,
+    conversation_history: List[ChatMessageModel],
     previous_iterations: List[ResearchIteration],
     query_images: List[str],
     agent: Agent = None,
@@ -259,9 +261,7 @@ async def research(
     if current_iteration := len(previous_iterations) > 0:
         logger.info(f"Continuing research with the previous {len(previous_iterations)} iteration results.")
         previous_iterations_history = construct_iteration_history(previous_iterations, prompts.previous_iteration)
-        research_conversation_history["chat"] = (
-            research_conversation_history.get("chat", []) + previous_iterations_history
-        )
+        research_conversation_history += previous_iterations_history
 
     while current_iteration < MAX_ITERATIONS:
         # Check for cancellation at the start of each iteration

{khoj-1.42.1.dev8.dist-info → khoj-1.42.2.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: khoj
-Version: 1.42.1.dev8
+Version: 1.42.2.dev1
 Summary: Your Second Brain
 Project-URL: Homepage, https://khoj.dev
 Project-URL: Documentation, https://docs.khoj.dev