khoj 1.35.4.dev1__py3-none-any.whl → 1.35.4.dev53__py3-none-any.whl

khoj/routers/api_chat.py

@@ -226,10 +226,11 @@ def chat_history(
             agent_metadata = {
                 "slug": conversation.agent.slug,
                 "name": conversation.agent.name,
-                "isCreator": conversation.agent.creator == user,
+                "is_creator": conversation.agent.creator == user,
                 "color": conversation.agent.style_color,
                 "icon": conversation.agent.style_icon,
                 "persona": conversation.agent.personality,
+                "is_hidden": conversation.agent.is_hidden,
             }
 
     meta_log = conversation.conversation_log
@@ -279,16 +280,29 @@ def get_shared_chat(
 
     agent_metadata = None
     if conversation.agent:
-        if conversation.agent.privacy_level == Agent.PrivacyLevel.PRIVATE:
-            conversation.agent = None
+        if conversation.agent.privacy_level == Agent.PrivacyLevel.PRIVATE and conversation.agent.creator != user:
+            if conversation.agent.is_hidden:
+                default_agent = AgentAdapters.get_default_agent()
+                agent_metadata = {
+                    "slug": default_agent.slug,
+                    "name": default_agent.name,
+                    "is_creator": False,
+                    "color": default_agent.style_color,
+                    "icon": default_agent.style_icon,
+                    "persona": default_agent.personality,
+                    "is_hidden": default_agent.is_hidden,
+                }
+            else:
+                conversation.agent = None
         else:
             agent_metadata = {
                 "slug": conversation.agent.slug,
                 "name": conversation.agent.name,
-                "isCreator": conversation.agent.creator == user,
+                "is_creator": conversation.agent.creator == user,
                 "color": conversation.agent.style_color,
                 "icon": conversation.agent.style_icon,
                 "persona": conversation.agent.personality,
+                "is_hidden": conversation.agent.is_hidden,
             }
 
     meta_log = conversation.conversation_log
@@ -443,6 +457,7 @@ def chat_sessions(
         "updated_at",
         "agent__style_icon",
         "agent__style_color",
+        "agent__is_hidden",
     )
 
     session_values = [
@@ -454,6 +469,7 @@ def chat_sessions(
             "updated": session[6].strftime("%Y-%m-%d %H:%M:%S"),
             "agent_icon": session[7],
             "agent_color": session[8],
+            "agent_is_hidden": session[9],
         }
         for session in sessions
     ]
@@ -474,6 +490,7 @@ async def create_chat_session(
     request: Request,
     common: CommonQueryParams,
     agent_slug: Optional[str] = None,
+    # Add parameters here to create a custom hidden agent on the fly
 ):
     user = request.user.object
 
@@ -865,7 +882,7 @@ async def chat(
             # and not triggered via slash command
             and not used_slash_summarize
             # but we can't actually summarize
-            and len(file_filters) != 1
+            and len(file_filters) == 0
         ):
             conversation_commands.remove(ConversationCommand.Summarize)
         elif ConversationCommand.Summarize in conversation_commands:

khoj/routers/api_model.py

@@ -20,13 +20,20 @@ def get_chat_model_options(
     request: Request,
     client: Optional[str] = None,
 ):
-    conversation_options = ConversationAdapters.get_conversation_processor_options().all()
-
-    all_conversation_options = list()
-    for conversation_option in conversation_options:
-        all_conversation_options.append({"chat_model": conversation_option.name, "id": conversation_option.id})
-
-    return Response(content=json.dumps(all_conversation_options), media_type="application/json", status_code=200)
+    chat_models = ConversationAdapters.get_conversation_processor_options().all()
+
+    chat_model_options = list()
+    for chat_model in chat_models:
+        chat_model_options.append(
+            {
+                "name": chat_model.name,
+                "id": chat_model.id,
+                "strengths": chat_model.strengths,
+                "description": chat_model.description,
+            }
+        )
+
+    return Response(content=json.dumps(chat_model_options), media_type="application/json", status_code=200)
 
 
 @api_model.get("/chat")

khoj/routers/helpers.py

@@ -393,12 +393,15 @@ async def aget_data_sources_and_output_format(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Infer information sources to refer", logger):
         response = await send_message_to_model_wrapper(
             relevant_tools_prompt,
             response_type="json_object",
             user=user,
             query_files=query_files,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
 
@@ -472,6 +475,8 @@ async def infer_webpage_urls(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Infer webpage urls to read", logger):
         response = await send_message_to_model_wrapper(
             online_queries_prompt,
@@ -479,6 +484,7 @@ async def infer_webpage_urls(
             response_type="json_object",
             user=user,
             query_files=query_files,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
 
@@ -528,6 +534,8 @@ async def generate_online_subqueries(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate online search subqueries", logger):
         response = await send_message_to_model_wrapper(
             online_queries_prompt,
@@ -535,6 +543,7 @@ async def generate_online_subqueries(
             response_type="json_object",
             user=user,
             query_files=query_files,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
 
@@ -628,10 +637,13 @@ async def extract_relevant_info(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     response = await send_message_to_model_wrapper(
         extract_relevant_information,
         prompts.system_prompt_extract_relevant_information,
         user=user,
+        agent_chat_model=agent_chat_model,
         tracer=tracer,
     )
     return response.strip()
@@ -666,12 +678,15 @@ async def extract_relevant_summary(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Extract relevant information from data", logger):
         response = await send_message_to_model_wrapper(
             extract_relevant_information,
             prompts.system_prompt_extract_relevant_summary,
             user=user,
             query_images=query_images,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
     return response.strip()
@@ -834,12 +849,15 @@ async def generate_better_diagram_description(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate better diagram description", logger):
         response = await send_message_to_model_wrapper(
             improve_diagram_description_prompt,
             query_images=query_images,
             user=user,
             query_files=query_files,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
         response = response.strip()
@@ -864,9 +882,11 @@ async def generate_excalidraw_diagram_from_description(
         query=q,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate excalidraw diagram", logger):
         raw_response = await send_message_to_model_wrapper(
-            query=excalidraw_diagram_generation, user=user, tracer=tracer
+            query=excalidraw_diagram_generation, user=user, agent_chat_model=agent_chat_model, tracer=tracer
         )
         raw_response = clean_json(raw_response)
         try:
@@ -980,12 +1000,15 @@ async def generate_better_mermaidjs_diagram_description(
         personality_context=personality_context,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate better Mermaid.js diagram description", logger):
         response = await send_message_to_model_wrapper(
             improve_diagram_description_prompt,
             query_images=query_images,
             user=user,
             query_files=query_files,
+            agent_chat_model=agent_chat_model,
             tracer=tracer,
         )
         response = response.strip()
@@ -1010,8 +1033,12 @@ async def generate_mermaidjs_diagram_from_description(
         query=q,
     )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate Mermaid.js diagram", logger):
-        raw_response = await send_message_to_model_wrapper(query=mermaidjs_diagram_generation, user=user, tracer=tracer)
+        raw_response = await send_message_to_model_wrapper(
+            query=mermaidjs_diagram_generation, user=user, agent_chat_model=agent_chat_model, tracer=tracer
+        )
         return clean_mermaidjs(raw_response.strip())
 
 
@@ -1072,9 +1099,16 @@ async def generate_better_image_prompt(
             personality_context=personality_context,
         )
 
+    agent_chat_model = agent.chat_model if agent else None
+
     with timer("Chat actor: Generate contextual image prompt", logger):
         response = await send_message_to_model_wrapper(
-            image_prompt, query_images=query_images, user=user, query_files=query_files, tracer=tracer
+            image_prompt,
+            query_images=query_images,
+            user=user,
+            query_files=query_files,
+            agent_chat_model=agent_chat_model,
+            tracer=tracer,
         )
         response = response.strip()
         if response.startswith(('"', "'")) and response.endswith(('"', "'")):
@@ -1091,9 +1125,10 @@ async def send_message_to_model_wrapper(
     query_images: List[str] = None,
     context: str = "",
     query_files: str = None,
+    agent_chat_model: ChatModel = None,
     tracer: dict = {},
 ):
-    chat_model: ChatModel = await ConversationAdapters.aget_default_chat_model(user)
+    chat_model: ChatModel = await ConversationAdapters.aget_default_chat_model(user, agent_chat_model)
     vision_available = chat_model.vision_enabled
     if not vision_available and query_images:
         logger.warning(f"Vision is not enabled for default model: {chat_model.name}.")
@@ -1977,7 +2012,13 @@ def schedule_automation(
         # Run automation at some random minute (to distribute request load) instead of running every X minutes
         crontime = " ".join([str(math.floor(random() * 60))] + crontime.split(" ")[1:])
 
-    user_timezone = pytz.timezone(timezone)
+    # Convert timezone string to timezone object
+    try:
+        user_timezone = pytz.timezone(timezone)
+    except pytz.UnknownTimeZoneError:
+        logger.error(f"Invalid timezone: {timezone}. Fallback to use UTC to schedule automation.")
+        user_timezone = pytz.utc
+
     trigger = CronTrigger.from_crontab(crontime, user_timezone)
     trigger.jitter = 60
     # Generate id and metadata used by task scheduler and process locks for the task runs
@@ -2231,7 +2272,14 @@ def get_user_config(user: KhojUser, request: Request, is_detailed: bool = False)
     chat_models = ConversationAdapters.get_conversation_processor_options().all()
     chat_model_options = list()
     for chat_model in chat_models:
-        chat_model_options.append({"name": chat_model.name, "id": chat_model.id})
+        chat_model_options.append(
+            {
+                "name": chat_model.name,
+                "id": chat_model.id,
+                "strengths": chat_model.strengths,
+                "description": chat_model.description,
+            }
+        )
 
     selected_paint_model_config = ConversationAdapters.get_user_text_to_image_model_config(user)
     paint_model_options = ConversationAdapters.get_text_to_image_model_options().all()

khoj/utils/helpers.py

@@ -354,12 +354,12 @@ command_descriptions = {
 }
 
 command_descriptions_for_agent = {
-    ConversationCommand.General: "Agent can use the agents knowledge base and general knowledge.",
+    ConversationCommand.General: "Agent can use its own knowledge base and general knowledge.",
     ConversationCommand.Notes: "Agent can search the personal knowledge base for information, as well as its own.",
     ConversationCommand.Online: "Agent can search the internet for information.",
     ConversationCommand.Webpage: "Agent can read suggested web pages for information.",
-    ConversationCommand.Summarize: "Agent can read an entire document. Agents knowledge base must be a single document.",
     ConversationCommand.Research: "Agent can do deep research on a topic.",
+    ConversationCommand.Code: "Agent can run Python code to parse information, run complex calculations, create documents and charts.",
 }
 
 tool_descriptions_for_llm = {
@@ -369,7 +369,6 @@ tool_descriptions_for_llm = {
     ConversationCommand.Online: "To search for the latest, up-to-date information from the internet. Note: **Questions about Khoj should always use this data source**",
     ConversationCommand.Webpage: "To use if the user has directly provided the webpage urls or you are certain of the webpage urls to read.",
     ConversationCommand.Code: "To run Python code in a Pyodide sandbox with no network access. Helpful when need to parse complex information, run complex calculations, create plaintext documents, and create charts with quantitative data. Only matplotlib, panda, numpy, scipy, bs4 and sympy external packages are available.",
-    ConversationCommand.Summarize: "To retrieve an answer that depends on the entire document or a large text.",
 }
 
 function_calling_description_for_llm = {
@@ -387,8 +386,6 @@ mode_descriptions_for_llm = {
 
 mode_descriptions_for_agent = {
     ConversationCommand.Image: "Agent can generate images in response. It cannot not use this to generate charts and graphs.",
-    ConversationCommand.Automation: "Agent can schedule a task to run at a scheduled date, time and frequency in response.",
-    ConversationCommand.Text: "Agent can generate text in response.",
     ConversationCommand.Diagram: "Agent can generate a visual representation that requires primitives like lines, rectangles, and text.",
 }
 
@@ -433,6 +430,18 @@ def generate_random_name():
     return name
 
 
+def generate_random_internal_agent_name():
+    random_name = generate_random_name()
+
+    random_name = random_name.replace(" ", "_")
+
+    random_number = random.randint(1000, 9999)
+
+    name = f"{random_name}{random_number}"
+
+    return name
+
+
 def batcher(iterable, max_n):
     "Split an iterable into chunks of size max_n"
     it = iter(iterable)

{khoj-1.35.4.dev1.dist-info → khoj-1.35.4.dev53.dist-info}/METADATA

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