PyPI - khoj - Versions diffs - 1.23.3.dev4__py3-none-any.whl → 1.23.4.dev4__py3-none-any.whl - Mend

khoj 1.23.3.dev4py3-none-any.whl → 1.23.4.dev4py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

khoj/interface/email/welcome.html CHANGED Viewed

@@ -1,61 +1,90 @@
 <!DOCTYPE html>
-<html>
-    <head>
-        <title>Welcome to Khoj</title>
-    </head>
-<body>
-<body style="font-family: 'Verdana', sans-serif; font-weight: 400; font-style: normal; padding: 0; text-align: left; width: 600px; margin: 20px auto;">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<a class="logo" href="https://khoj.dev" target="_blank" style="text-decoration: none; text-decoration: underline dotted;">
-    <img src="https://assets.khoj.dev/khoj_logo.png" alt="Khoj Logo" style="width: 100px;">
-</a>
-<div class="calls-to-action" style="margin-top: 20px;">
-    <div>
-        <h1 style="color: #333; font-size: large; font-weight: bold; margin: 0; line-height: 1.5; background-color: #fee285; padding: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.5);">Merge AI with your brain</h1>
-        <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">Hi {{name}}! We are psyched to be part of your journey with personal AI. To better help you, we're committed to staying transparent, accessible, and completely open-source.</p>
-        <a class="button" href="https://app.khoj.dev" target="_blank" style="display: block; width: 200px; text-align: center; padding: 10px; margin-top: 20px; color: #333; background-color: #fee285; text-decoration: none; border-radius: 5px; font-weight: bold; transition: background-color 0.3s ease; box-shadow: 6px 6px rgba(0, 0, 0, 1.0); padding: 4px; font-size: large; text-transform: uppercase;">Get Started</a>
-        <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">You're about to get a whole lot more productive.</p>
-        <div style="display: grid; grid-template-columns: 1fr 1fr; grid-gap: 12px; margin-top: 20px;">
-            <div style="border: 1px solid black; border-radius: 8px; padding: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0); margin-top: 20px;">
-                <a href="https://docs.khoj.dev/features/online_search" style="text-decoration: none; text-decoration: underline dotted;">
-                    <h3 style="color: #333; font-size: large; margin: 0; padding: 0; line-height: 2.0; background-color: #b8f1c7; padding: 8px; ">Ditch the search bar</h3>
-                </a>
-                <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">You don't need to click around Google results and sift through information yourself, because Khoj is connected to the internet.</p>
-            </div>
-            <div style="border: 1px solid black; border-radius: 8px; padding: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0); margin-top: 20px;">
-                <a href="https://app.khoj.dev/agents" style="text-decoration: none; text-decoration: underline dotted;">
-                    <h3 style="color: #333; font-size: large; margin: 0; padding: 0; line-height: 2.0; background-color: #b8f1c7; padding: 8px;">Get a village, not just an agent</h3>
-                </a>
-                <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">Khoj can fill the need for more specialized assistance, <a href="https://blog.khoj.dev/posts/using-khoj-for-studying/">such as tutoring</a>, with its curated agents. You get a whole team, always available.</p>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Welcome to Khoj</title>
+</head>
+<body
+    style="font-family: 'Arial', sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px; background-color: #f5f5f5;">
+    <div
+        style="background-color: #ffffff; border-radius: 10px; box-shadow: 0 0 20px rgba(0, 0, 0, 0.1); padding: 30px;">
+        <a href="https://khoj.dev" target="_blank"
+            style="display: block; text-align: center; margin-bottom: 20px; text-decoration: none;">
+            <img src="https://assets.khoj.dev/khoj_logo.png" alt="Khoj Logo" style="width: 120px;">
+        </a>
+        <h1
+            style="font-size: 24px; color: #2c3e50; margin-bottom: 20px; text-align: center; border-bottom: 2px solid #FFA07A; padding-bottom: 10px;">
+            Merge AI with your brain</h1>
+        <p style="font-size: 16px; color: #333; margin-bottom: 20px;">Hi {{name}}! We are psyched to be part of your
+            journey with personal AI. To better help you, we're committed to staying transparent, accessible, and
+            completely open-source.</p>
+        <a href="https://app.khoj.dev" target="_blank"
+            style="display: block; width: 200px; text-align: center; padding: 10px; margin: 20px auto; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px; font-weight: bold; font-size: 16px; text-transform: uppercase;">Get
+            Started</a>
+        <p style="font-size: 16px; color: #333; margin-bottom: 20px;">You're about to get a whole lot more productive.
+        </p>
+        <a href="https://docs.khoj.dev/features/online_search"
+            style="color: #FFA07A; text-decoration: none; font-weight: bold; font-size: 14px;">
+            <div style="display: grid; grid-template-columns: 1fr 1fr; grid-gap: 20px; margin-bottom: 20px;">
+                <div style="background-color: #f8f9fa; border-left: 4px solid #FFA07A; padding: 15px;">
+                    <h3 style="color: #2c3e50; margin-top: 0; font-size: 18px;">Ditch the search bar</h3>
+                    <p style="font-size: 14px; color: #666; margin-bottom: 0;">You don't need to click around Google
+                        results
+                        and sift through information yourself, because Khoj is connected to the internet.</p>
+                </div>
+        </a>
+        <a href="https://app.khoj.dev/agents"
+            style="color: #FFA07A; text-decoration: none; font-weight: bold; font-size: 14px;">
+            <div style="background-color: #f8f9fa; border-left: 4px solid #FFA07A; padding: 15px;">
+                <h3 style="color: #2c3e50; margin-top: 0; font-size: 18px;">Get a village, not just an agent</h3>
+                <p style="font-size: 14px; color: #666; margin-bottom: 0;">Khoj can fill the need for more specialized
+                    assistance, such as tutoring, with its curated agents. You get a whole team, always available.</p>
             </div>
-            <div style="border: 1px solid black; border-radius: 8px; padding: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0); margin-top: 20px;">
-                <a href="https://docs.khoj.dev/category/clients" style="text-decoration: none; text-decoration: underline dotted;">
-                    <h3 style="color: #333; font-size: large; margin: 0; padding: 0; line-height: 2.0; background-color: #b8f1c7; padding: 8px;">Available where you are</h3>
-                </a>
-                <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">Build on top of your digital brain. Khoj stores whatever data you share with it, so you can get answers from your personal notes and documents in your native language. You can engage from your desktop, Obsidian, WhatsApp, or the web.</p>
+        </a>
+        <a href="https://docs.khoj.dev/category/clients"
+            style="color: #FFA07A; text-decoration: none; font-weight: bold; font-size: 14px;">
+            <div style="background-color: #f8f9fa; border-left: 4px solid #FFA07A; padding: 15px;">
+                <h3 style="color: #2c3e50; margin-top: 0; font-size: 18px;">Activate your data</h3>
+                <p style="font-size: 14px; color: #666; margin-bottom: 0;">Build on top of your digital brain. Khoj
+                    stores whatever data you share with it, so you can get answers from your personal notes and
+                    documents in your native language.</p>
             </div>
-            <div style="border: 1px solid black; border-radius: 8px; padding: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0); margin-top: 20px;">
-                <a href="https://blog.khoj.dev/posts/how-khoj-generates-images/" style="text-decoration: none; text-decoration: underline dotted;">
-                    <h3 style="color: #333; font-size: large; margin: 0; padding: 0; line-height: 2.0; background-color: #b8f1c7; padding: 8px;">Create rich, contextual images</h3>
-                </a>
-                <p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">With your shared data, Khoj can help you create astoundingly personal images depicting scenes of what's important to you.</p>
+        </a>
+        <a href="https://blog.khoj.dev/posts/how-khoj-generates-images/"
+            style="color: #FFA07A; text-decoration: none; font-weight: bold; font-size: 14px;">
+            <div style="background-color: #f8f9fa; border-left: 4px solid #FFA07A; padding: 15px;">
+                <h3 style="color: #2c3e50; margin-top: 0; font-size: 18px;">Create rich, contextual images</h3>
+                <p style="font-size: 14px; color: #666; margin-bottom: 0;">With your shared data, Khoj can help you
+                    create astoundingly personal images depicting scenes of what's important to you.</p>
             </div>
-        </div>
+        </a>
     </div>
-</div>
-<p style="color: #333; font-size: medium; margin-top: 20px; padding: 0; line-height: 1.5;">Like something? Dislike something? Searching for some other magical feature? Our inbox is always open for feedback! Reply to this email and say hi to introduce yourself 👋🏽.</p>
-<p style="color: #333; font-size: large; margin-top: 20px; padding: 0; line-height: 1.5;">- The Khoj Team</p>
-<table style="width: 100%; margin-top: 20px;">
-    <tr>
-        <td style="text-align: center;"><a href="https://docs.khoj.dev" target="_blank" style="padding: 8px; color: #333; background-color: #fee285; border-radius: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0);">Docs</a></td>
-        <td style="text-align: center;"><a href="https://github.com/khoj-ai/khoj" target="_blank" style="padding: 8px; color: #333; background-color: #fee285; border-radius: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0);">GitHub</a></td>
-        <td style="text-align: center;"><a href="https://twitter.com/khoj_ai" target="_blank" style="padding: 8px; color: #333; background-color: #fee285; border-radius: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0);">Twitter</a></td>
-        <td style="text-align: center;"><a href="https://www.linkedin.com/company/khoj-ai" target="_blank" style="padding: 8px; color: #333; background-color: #fee285; border-radius: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0);">LinkedIn</a></td>
-        <td style="text-align: center;"><a href="https://discord.gg/BDgyabRM6e" target="_blank" style="padding: 8px; color: #333; background-color: #fee285; border-radius: 8px; box-shadow: 6px 6px rgba(0, 0, 0, 1.0);">Discord</a></td>
-    </tr>
-</table>
+    <p style="font-size: 16px; color: #333; margin-bottom: 20px;">Like something? Dislike something? Searching for
+        some other magical feature? Our inbox is always open for feedback! Reply to this email and say hi to
+        introduce yourself 👋🏽.</p>
+    <div style="font-size: 18px; font-weight: bold; margin-top: 30px; text-align: right;">- The Khoj Team</div>
+    <div style="margin-top: 30px; text-align: center;">
+        <a href="https://docs.khoj.dev" target="_blank"
+            style="display: inline-block; margin: 0 10px; padding: 8px 15px; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px;">Docs</a>
+        <a href="https://github.com/khoj-ai/khoj" target="_blank"
+            style="display: inline-block; margin: 0 10px; padding: 8px 15px; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px;">GitHub</a>
+        <a href="https://twitter.com/khoj_ai" target="_blank"
+            style="display: inline-block; margin: 0 10px; padding: 8px 15px; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px;">Twitter</a>
+        <a href="https://www.linkedin.com/company/khoj-ai" target="_blank"
+            style="display: inline-block; margin: 0 10px; padding: 8px 15px; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px;">LinkedIn</a>
+        <a href="https://discord.gg/BDgyabRM6e" target="_blank"
+            style="display: inline-block; margin: 0 10px; padding: 8px 15px; background-color: #FFA07A; color: #ffffff; text-decoration: none; border-radius: 5px;">Discord</a>
+    </div>
+    </div>
 </body>
 </html>

khoj/main.py CHANGED Viewed

@@ -131,7 +131,7 @@ def run(should_start_server=True):
     logger.info(f"📦 Initializing DB:\n{db_migrate_output.getvalue().strip()}")
     logger.debug(f"🌍 Initializing Web Client:\n{collectstatic_output.getvalue().strip()}")
-    initialization()
+    initialization(not args.non_interactive)
     # Create app directory, if it doesn't exist
     state.config_file.parent.mkdir(parents=True, exist_ok=True)

khoj/processor/content/images/image_to_entries.py CHANGED Viewed

@@ -4,8 +4,6 @@ import os
 from datetime import datetime
 from typing import Dict, List, Tuple
-from rapidocr_onnxruntime import RapidOCR
 from khoj.database.models import Entry as DbEntry
 from khoj.database.models import KhojUser
 from khoj.processor.content.text_to_entries import TextToEntries
@@ -58,7 +56,6 @@ class ImageToEntries(TextToEntries):
         entry_to_location_map: List[Tuple[str, str]] = []
         for image_file in image_files:
             try:
-                loader = RapidOCR()
                 bytes = image_files[image_file]
                 # write the image to a temporary file
                 timestamp_now = datetime.utcnow().timestamp()
@@ -71,13 +68,18 @@ class ImageToEntries(TextToEntries):
                     bytes = image_files[image_file]
                     f.write(bytes)
                 try:
+                    from rapidocr_onnxruntime import RapidOCR
+                    loader = RapidOCR()
                     image_entries_per_file = ""
                     result, _ = loader(tmp_file)
                     if result:
                         expanded_entries = [text[1] for text in result]
                         image_entries_per_file = " ".join(expanded_entries)
                 except ImportError:
-                    logger.warning(f"Unable to process file: {image_file}. This file will not be indexed.")
+                    logger.warning(
+                        f"Unable to process image or scanned file for text: {image_file}. This file will not be indexed."
+                    )
                     continue
                 entry_to_location_map.append((image_entries_per_file, image_file))
                 entries.extend([image_entries_per_file])

khoj/processor/conversation/utils.py CHANGED Viewed

@@ -18,13 +18,20 @@ from khoj.utils.helpers import is_none_or_empty, merge_dicts
 logger = logging.getLogger(__name__)
 model_to_prompt_size = {
+    # OpenAI Models
     "gpt-3.5-turbo": 12000,
-    "gpt-3.5-turbo-0125": 12000,
-    "gpt-4-0125-preview": 20000,
     "gpt-4-turbo-preview": 20000,
+    "gpt-4o": 20000,
     "gpt-4o-mini": 20000,
     "o1-preview": 20000,
     "o1-mini": 20000,
+    # Google Models
+    "gemini-1.5-flash": 20000,
+    "gemini-1.5-pro": 20000,
+    # Anthropic Models
+    "claude-3-5-sonnet-20240620": 20000,
+    "claude-3-opus-20240229": 20000,
+    # Offline Models
     "TheBloke/Mistral-7B-Instruct-v0.2-GGUF": 3500,
     "NousResearch/Hermes-2-Pro-Mistral-7B-GGUF": 3500,
     "bartowski/Meta-Llama-3.1-8B-Instruct-GGUF": 20000,
@@ -100,7 +107,7 @@ def save_to_conversation_log(
     inferred_queries: List[str] = [],
     intent_type: str = "remember",
     client_application: ClientApplication = None,
-    conversation_id: int = None,
+    conversation_id: str = None,
     automation_id: str = None,
     uploaded_image_url: str = None,
 ):
@@ -163,7 +170,7 @@ def generate_chatml_messages_with_context(
         if loaded_model:
             max_prompt_size = infer_max_tokens(loaded_model.n_ctx(), model_to_prompt_size.get(model_name, math.inf))
         else:
-            max_prompt_size = model_to_prompt_size.get(model_name, 2000)
+            max_prompt_size = model_to_prompt_size.get(model_name, 10000)
     # Scale lookback turns proportional to max prompt size supported by model
     lookback_turns = max_prompt_size // 750
@@ -291,8 +298,6 @@ def reciprocal_conversation_to_chatml(message_pair):
     return [ChatMessage(content=message, role=role) for message, role in zip(message_pair, ["user", "assistant"])]
-def remove_json_codeblock(response):
+def remove_json_codeblock(response: str):
     """Remove any markdown json codeblock formatting if present. Useful for non schema enforceable models"""
-    if response.startswith("```json") and response.endswith("```"):
-        response = response[7:-3]
-    return response
+    return response.removeprefix("```json").removesuffix("```")

khoj/routers/api.py CHANGED Viewed

@@ -328,7 +328,7 @@ async def extract_references_and_questions(
     q: str,
     n: int,
     d: float,
-    conversation_id: int,
+    conversation_id: str,
     conversation_commands: List[ConversationCommand] = [ConversationCommand.Default],
     location_data: LocationData = None,
     send_status_func: Optional[Callable] = None,

khoj/routers/api_chat.py CHANGED Viewed

@@ -77,9 +77,7 @@ from khoj.routers.email import send_query_feedback
 @api_chat.get("/conversation/file-filters/{conversation_id}", response_class=Response)
 @requires(["authenticated"])
 def get_file_filter(request: Request, conversation_id: str) -> Response:
-    conversation = ConversationAdapters.get_conversation_by_user(
-        request.user.object, conversation_id=int(conversation_id)
-    )
+    conversation = ConversationAdapters.get_conversation_by_user(request.user.object, conversation_id=conversation_id)
     if not conversation:
         return Response(content=json.dumps({"status": "error", "message": "Conversation not found"}), status_code=404)
@@ -95,7 +93,7 @@ def get_file_filter(request: Request, conversation_id: str) -> Response:
 @api_chat.delete("/conversation/file-filters/bulk", response_class=Response)
 @requires(["authenticated"])
 def remove_files_filter(request: Request, filter: FilesFilterRequest) -> Response:
-    conversation_id = int(filter.conversation_id)
+    conversation_id = filter.conversation_id
     files_filter = filter.filenames
     file_filters = ConversationAdapters.remove_files_from_filter(request.user.object, conversation_id, files_filter)
     return Response(content=json.dumps(file_filters), media_type="application/json", status_code=200)
@@ -105,7 +103,7 @@ def remove_files_filter(request: Request, filter: FilesFilterRequest) -> Respons
 @requires(["authenticated"])
 def add_files_filter(request: Request, filter: FilesFilterRequest):
     try:
-        conversation_id = int(filter.conversation_id)
+        conversation_id = filter.conversation_id
         files_filter = filter.filenames
         file_filters = ConversationAdapters.add_files_to_filter(request.user.object, conversation_id, files_filter)
         return Response(content=json.dumps(file_filters), media_type="application/json", status_code=200)
@@ -118,7 +116,7 @@ def add_files_filter(request: Request, filter: FilesFilterRequest):
 @requires(["authenticated"])
 def add_file_filter(request: Request, filter: FileFilterRequest):
     try:
-        conversation_id = int(filter.conversation_id)
+        conversation_id = filter.conversation_id
         files_filter = [filter.filename]
         file_filters = ConversationAdapters.add_files_to_filter(request.user.object, conversation_id, files_filter)
         return Response(content=json.dumps(file_filters), media_type="application/json", status_code=200)
@@ -130,7 +128,7 @@ def add_file_filter(request: Request, filter: FileFilterRequest):
 @api_chat.delete("/conversation/file-filters", response_class=Response)
 @requires(["authenticated"])
 def remove_file_filter(request: Request, filter: FileFilterRequest) -> Response:
-    conversation_id = int(filter.conversation_id)
+    conversation_id = filter.conversation_id
     files_filter = [filter.filename]
     file_filters = ConversationAdapters.remove_files_from_filter(request.user.object, conversation_id, files_filter)
     return Response(content=json.dumps(file_filters), media_type="application/json", status_code=200)
@@ -189,7 +187,7 @@ async def chat_starters(
 def chat_history(
     request: Request,
     common: CommonQueryParams,
-    conversation_id: Optional[int] = None,
+    conversation_id: Optional[str] = None,
     n: Optional[int] = None,
 ):
     user = request.user.object
@@ -224,7 +222,6 @@ def chat_history(
             "conversation_id": conversation.id,
             "slug": conversation.title if conversation.title else conversation.slug,
             "agent": agent_metadata,
-            "unique_id": conversation.unique_id,
         }
     )
@@ -246,33 +243,6 @@ def chat_history(
     return {"status": "ok", "response": meta_log}
-@api_chat.get("/metadata")
-def get_chat_metadata(
-    request: Request,
-    common: CommonQueryParams,
-    conversation_unique_id: str,
-):
-    user = request.user.object
-    # Load Conversation Metadata
-    conversation = ConversationAdapters.get_conversation_by_unique_id(user, conversation_unique_id)
-    if conversation is None:
-        return Response(
-            content=json.dumps({"status": "error", "message": f"Conversation: {conversation_unique_id} not found"}),
-            status_code=404,
-        )
-    update_telemetry_state(
-        request=request,
-        telemetry_type="api",
-        api="chat_metadata",
-        **common.__dict__,
-    )
-    return {"status": "ok", "conversationId": conversation.id}
 @api_chat.get("/share/history")
 def get_shared_chat(
     request: Request,
@@ -340,7 +310,7 @@ def get_shared_chat(
 async def clear_chat_history(
     request: Request,
     common: CommonQueryParams,
-    conversation_id: Optional[int] = None,
+    conversation_id: Optional[str] = None,
 ):
     user = request.user.object
@@ -403,7 +373,7 @@ def fork_public_conversation(
 def duplicate_chat_history_public_conversation(
     request: Request,
     common: CommonQueryParams,
-    conversation_id: int,
+    conversation_id: str,
 ):
     user = request.user.object
     domain = request.headers.get("host")
@@ -446,18 +416,17 @@ def chat_sessions(
         conversations = conversations[:8]
     sessions = conversations.values_list(
-        "id", "slug", "title", "agent__slug", "agent__name", "agent__avatar", "created_at", "updated_at", "unique_id"
+        "id", "slug", "title", "agent__slug", "agent__name", "agent__avatar", "created_at", "updated_at"
     )
     session_values = [
         {
-            "conversation_id": session[0],
+            "conversation_id": str(session[0]),
             "slug": session[2] or session[1],
             "agent_name": session[4],
             "agent_avatar": session[5],
             "created": session[6].strftime("%Y-%m-%d %H:%M:%S"),
             "updated": session[7].strftime("%Y-%m-%d %H:%M:%S"),
-            "unique_id": str(session[8]),
         }
         for session in sessions
     ]
@@ -484,7 +453,7 @@ async def create_chat_session(
     # Create new Conversation Session
     conversation = await ConversationAdapters.acreate_conversation_session(user, request.user.client_app, agent_slug)
-    response = {"conversation_id": conversation.id, "unique_id": str(conversation.unique_id)}
+    response = {"conversation_id": str(conversation.id)}
     conversation_metadata = {
         "agent": agent_slug,
@@ -526,7 +495,7 @@ async def set_conversation_title(
     request: Request,
     common: CommonQueryParams,
     title: str,
-    conversation_id: Optional[int] = None,
+    conversation_id: Optional[str] = None,
 ) -> Response:
     user = request.user.object
     title = title.strip()[:200]
@@ -556,7 +525,7 @@ class ChatRequestBody(BaseModel):
     d: Optional[float] = None
     stream: Optional[bool] = False
     title: Optional[str] = None
-    conversation_id: Optional[int] = None
+    conversation_id: Optional[str] = None
     city: Optional[str] = None
     region: Optional[str] = None
     country: Optional[str] = None
@@ -1045,7 +1014,7 @@ async def get_chat(
     d: float = None,
     stream: Optional[bool] = False,
     title: Optional[str] = None,
-    conversation_id: Optional[int] = None,
+    conversation_id: Optional[str] = None,
     city: Optional[str] = None,
     region: Optional[str] = None,
     country: Optional[str] = None,

khoj/routers/helpers.py CHANGED Viewed

@@ -21,7 +21,7 @@ from typing import (
     Tuple,
     Union,
 )
-from urllib.parse import parse_qs, urljoin, urlparse
+from urllib.parse import parse_qs, quote, urljoin, urlparse
 import cron_descriptor
 import pytz
@@ -632,6 +632,7 @@ async def send_message_to_model_wrapper(
             messages=truncated_messages,
             loaded_model=loaded_model,
             model=chat_model,
+            max_prompt_size=max_tokens,
             streaming=False,
             response_type=response_type,
         )
@@ -721,6 +722,7 @@ def send_message_to_model_wrapper_sync(
             system_message=system_message,
             model_name=chat_model,
             loaded_model=loaded_model,
+            max_prompt_size=max_tokens,
             vision_enabled=vision_available,
             model_type=conversation_config.model_type,
         )
@@ -729,6 +731,7 @@ def send_message_to_model_wrapper_sync(
             messages=truncated_messages,
             loaded_model=loaded_model,
             model=chat_model,
+            max_prompt_size=max_tokens,
             streaming=False,
             response_type=response_type,
         )
@@ -739,6 +742,7 @@ def send_message_to_model_wrapper_sync(
             user_message=message,
             system_message=system_message,
             model_name=chat_model,
+            max_prompt_size=max_tokens,
             vision_enabled=vision_available,
             model_type=conversation_config.model_type,
         )
@@ -795,7 +799,7 @@ def generate_chat_response(
     conversation_commands: List[ConversationCommand] = [ConversationCommand.Default],
     user: KhojUser = None,
     client_application: ClientApplication = None,
-    conversation_id: int = None,
+    conversation_id: str = None,
     location_data: LocationData = None,
     user_name: Optional[str] = None,
     uploaded_image_url: Optional[str] = None,
@@ -1098,7 +1102,7 @@ def scheduled_chat(
     user: KhojUser,
     calling_url: URL,
     job_id: str = None,
-    conversation_id: int = None,
+    conversation_id: str = None,
 ):
     logger.info(f"Processing scheduled_chat: {query_to_run}")
     if job_id:
@@ -1127,7 +1131,8 @@ def scheduled_chat(
     # Replace the original conversation_id with the conversation_id
     if conversation_id:
-        query_dict["conversation_id"] = [conversation_id]
+        # encode the conversation_id to avoid any issues with special characters
+        query_dict["conversation_id"] = [quote(conversation_id)]
     # Restructure the original query_dict into a valid JSON payload for the chat API
     json_payload = {key: values[0] for key, values in query_dict.items()}
@@ -1181,7 +1186,7 @@ def scheduled_chat(
 async def create_automation(
-    q: str, timezone: str, user: KhojUser, calling_url: URL, meta_log: dict = {}, conversation_id: int = None
+    q: str, timezone: str, user: KhojUser, calling_url: URL, meta_log: dict = {}, conversation_id: str = None
 ):
     crontime, query_to_run, subject = await schedule_query(q, meta_log)
     job = await schedule_automation(query_to_run, subject, crontime, timezone, q, user, calling_url, conversation_id)
@@ -1196,7 +1201,7 @@ async def schedule_automation(
     scheduling_request: str,
     user: KhojUser,
     calling_url: URL,
-    conversation_id: int,
+    conversation_id: str,
 ):
     # Disable minute level automation recurrence
     minute_value = crontime.split(" ")[0]
@@ -1214,7 +1219,7 @@ async def schedule_automation(
             "scheduling_request": scheduling_request,
             "subject": subject,
             "crontime": crontime,
-            "conversation_id": conversation_id,
+            "conversation_id": str(conversation_id),
         }
     )
     query_id = hashlib.md5(f"{query_to_run}_{crontime}".encode("utf-8")).hexdigest()

khoj/utils/cli.py CHANGED Viewed

@@ -50,6 +50,12 @@ def cli(args=None):
         default=False,
         help="Run Khoj in anonymous mode. This does not require any login for connecting users.",
     )
+    parser.add_argument(
+        "--non-interactive",
+        action="store_true",
+        default=False,
+        help="Start Khoj in non-interactive mode. Assumes interactive shell unavailable for config. E.g when run via Docker.",
+    )
     args, remaining_args = parser.parse_known_args(args)

khoj/utils/constants.py CHANGED Viewed

@@ -8,8 +8,15 @@ empty_escape_sequences = "\n|\r|\t| "
 app_env_filepath = "~/.khoj/env"
 telemetry_server = "https://khoj.beta.haletic.com/v1/telemetry"
 content_directory = "~/.khoj/content/"
-default_offline_chat_model = "bartowski/Meta-Llama-3.1-8B-Instruct-GGUF"
-default_online_chat_model = "gpt-4o-mini"
+default_offline_chat_models = [
+    "bartowski/Meta-Llama-3.1-8B-Instruct-GGUF",
+    "bartowski/gemma-2-9b-it-GGUF",
+    "bartowski/gemma-2-2b-it-GGUF",
+    "bartowski/Phi-3.5-mini-instruct-GGUF",
+]
+default_openai_chat_models = ["gpt-4o-mini", "gpt-4o"]
+default_gemini_chat_models = ["gemini-1.5-flash", "gemini-1.5-pro"]
+default_anthropic_chat_models = ["claude-3-5-sonnet-20240620", "claude-3-opus-20240229"]
 empty_config = {
     "search-type": {

khoj 1.23.3.dev4__py3-none-any.whl → 1.23.4.dev4__py3-none-any.whl

khoj 1.23.3.dev4py3-none-any.whl → 1.23.4.dev4py3-none-any.whl