PyPI - khoj - Versions diffs - 1.24.1.dev7__py3-none-any.whl → 1.24.2.dev3__py3-none-any.whl - Mend

khoj 1.24.1.dev7py3-none-any.whl → 1.24.2.dev3py3-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 (49) hide show

khoj/interface/web/login.html CHANGED Viewed

@@ -1,219 +1,321 @@
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
-        <title>Khoj - Login</title>
-        <link rel="icon" type="image/png" sizes="128x128" href="https://assets.khoj.dev/khoj_lantern_128x128.png">
-        <link rel="manifest" href="/static/khoj.webmanifest">
-        <link rel="stylesheet" href="/static/assets/khoj.css">
-        <meta property="og:image" content="https://assets.khoj.dev/khoj_hero.png">
-    </head>
-    <body>
-        <div class="khoj-header"></div>
-            <!-- Login Modal -->
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>Khoj - Login</title>
+    <link rel="icon" type="image/png" sizes="128x128" href="https://assets.khoj.dev/khoj_lantern_128x128.png">
+    <link rel="manifest" href="/static/khoj.webmanifest">
+    <link rel="stylesheet" href="/static/assets/khoj.css">
+    <meta property="og:image" content="https://assets.khoj.dev/khoj_hero.png">
+</head>
+<body>
+    <div class="split-container">
+        <!-- Left side with login -->
+        <div class="split left">
             <div id="login-modal">
-                <img class="khoj-logo" src="https://assets.khoj.dev/khoj_lantern_128x128.png" alt="Khoj"></img>
+                <img class="khoj-logo" src="https://assets.khoj.dev/khoj_lantern_128x128.png" alt="Khoj">
                 <div class="login-modal-title">Login to Khoj</div>
+                <!-- Sign Up/Login with Google OAuth -->
+                <div class="g_id_signin" data-shape="circle" data-text="continue_with" data-logo_alignment="center"
+                    data-size="large" data-type="standard"></div>
+                <div id="g_id_onload" data-client_id="{{ google_client_id }}" data-ux_mode="popup"
+                    data-use_fedcm_for_prompt="true" data-login_uri="{{ redirect_uri }}" data-auto-select="true"></div>
+                <!-- Divider -->
+                <div class="divider">OR</div>
                 <!-- Sign in with Magic Link -->
                 <div class="khoj-magic-link">
                     <input type="email" id="email" placeholder="Email" autofocus required>
-                    <button id="magic-link-button">Send Magic Link</button>
+                    <button id="magic-link-button">Get Login Link</button>
                 </div>
-                <!-- Divider -->
-                <div style="text-align: center; font-size: 16px; font-weight: 500; border-top: 1px solid black;">OR</div>
-                <!-- Sign Up/Login with Google OAuth -->
-                <div
-                    class="g_id_signin"
-                    data-shape="circle"
-                    data-text="continue_with"
-                    data-logo_alignment="center"
-                    data-size="large"
-                    data-type="standard">
-                </div>
-                <div id="g_id_onload"
-                    data-client_id="{{ google_client_id }}"
-                    data-ux_mode="popup"
-                    data-use_fedcm_for_prompt="true"
-                    data-login_uri="{{ redirect_uri }}"
-                    data-auto-select="true">
+            </div>
+            <!-- Footer links -->
+            <div class="footer-links">
+                <a href="https://khoj.dev/terms-of-service" target="_blank">Terms of Service</a>
+                <span class="divider-vertical"></span>
+                <a href="https://khoj.dev/privacy-policy" target="_blank">Privacy Policy</a>
+            </div>
+        </div>
+        <!-- Right side with content -->
+        <div class="split right">
+            <div class="right-content">
+                <h1>Unlock Your Second Brain</h1>
+                <p>Transform the way you think, create, and remember</p>
+                <div class="features">
+                    <div class="feature">
+                        <svg viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-width="2"
+                            fill="none">
+                            <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
+                            <path d="M14 2v6h6" />
+                            <path d="M16 13H8" />
+                            <path d="M16 17H8" />
+                            <path d="M10 9H8" />
+                        </svg>
+                        <span>Get answers across your documents and the internet</span>
+                    </div>
+                    <div class="feature">
+                        <svg viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-width="2"
+                            fill="none">
+                            <path
+                                d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z" />
+                            <path d="M3.3 7l8.7 5 8.7-5" />
+                        </svg>
+                        <span>Go deeper in the topics personal to you</span>
+                    </div>
+                    <div class="feature">
+                        <svg viewBox="0 0 24 24" width="24" height="24" stroke="currentColor" stroke-width="2"
+                            fill="none">
+                            <path d="M12 2L2 7l10 5 10-5-10-5z" />
+                            <path d="M2 17l10 5 10-5" />
+                            <path d="M2 12l10 5 10-5" />
+                        </svg>
+                        <span>Use specialized agents</span>
+                    </div>
                 </div>
             </div>
-            <div class="khoj-footer"></div>
         </div>
-    </body>
+    </div>
-    <script>
-        const magicLinkButton = document.getElementById('magic-link-button');
-        const emailInput = document.getElementById('email');
-        magicLinkButton.addEventListener('click', async () => {
-            const email = emailInput.value;
-            if (!email) {
-                alert('Please enter a valid email address');
-                return;
-            }
-            if (!email.includes('@')) {
-                alert('Please enter a valid email address');
-                return;
-            }
-            magicLinkButton.disabled = true;
-            magicLinkButton.innerText = 'Check your email for a sign-in link!';
+    <style>
+        body {
+            margin: 0;
+            height: 100vh;
+            font-family: 'Arial', sans-serif;
+            color: #333;
+            overflow: hidden;
+        }
-            const response = await fetch('/auth/magic', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ "email": email }),
-            })
+        .split-container {
+            display: flex;
+            height: 100vh;
+        }
-            if (response.status === 200) {
-                console.log('Magic link sent to your email');
-            } else {
-                alert('Failed to send magic link');
-            }
-        });
-    </script>
+        .split {
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: column;
+        }
-    <style>
-        @media only screen and (max-width: 700px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr;
-                grid-template-rows: 1fr auto 1fr;
-                font-size: small!important;
-            }
-            body > * {
-                grid-column: 1;
-            }
+        .left {
+            background-color: #fff;
         }
-        @media only screen and (min-width: 700px) {
-            body {
-                display: grid;
-                grid-template-columns: 1fr min(50vw, 100%) 1fr;
-                grid-template-rows: 1fr auto 1fr;
-            }
-            body > * {
-                grid-column: 2;
-            }
+        .right {
+            background: linear-gradient(135deg, #FFA07A 0%, #c4e4c6 100%);
+            color: white;
+            position: relative;
+            overflow: hidden;
         }
-        body {
-            padding: 0px;
-            margin: 0px;
-            height: 100%;
-            background: url('/static/assets/samples/desktop-plain-chat-sample.png') no-repeat center center fixed;
-            background-size: contain;
-            color: var(--main-text-color);
-            font-family: var(--font-family);
-            font-size: 20px;
-            font-weight: 300;
-            line-height: 1.5em;
-        }
-        body::before {
-            content: "";
+        .right::before {
+            content: '';
             position: absolute;
             top: 0;
             left: 0;
-            width: 100%;
-            height: 100%;
-            background: var(--frosted-background-color);
-            backdrop-filter: blur(10px);
+            right: 0;
+            bottom: 0;
+            opacity: 0.1;
         }
-        body > * {
-            padding: 10px;
-            margin: 10px;
+        .right-content {
+            text-align: center;
+            padding: 2rem;
+            position: relative;
+            z-index: 1;
         }
-        @keyframes gradient {
-            0% {
-                background-position: 0% 50%;
-            }
-            50% {
-                background-position: 100% 50%;
-            }
-            100% {
-                background-position: 0% 50%;
-            }
+        .right-content h1 {
+            font-size: 3rem;
+            margin-bottom: 1rem;
+            font-weight: 700;
         }
-        a.khoj-logo {
-            text-align: center;
-            justify-self: center;
+        .right-content p {
+            font-size: 1.2rem;
+            margin-bottom: 3rem;
+            opacity: 0.9;
         }
-        div#login-modal {
-            display: grid;
-            grid-template-columns: 1fr;
-            gap: 32px;
-            min-height: 300px;
-            margin-left: 25%;
-            margin-right: 25%;
-            z-index: 1;
+        .features {
+            display: flex;
+            flex-direction: column;
+            gap: 1.5rem;
+            align-items: center;
         }
-        .khoj-magic-link {
+        .feature {
+            display: flex;
+            align-items: center;
+            gap: 1rem;
+            font-size: 1.1rem;
+        }
+        .feature svg {
+            width: 24px;
+            height: 24px;
+            stroke: white;
+        }
+        #login-modal {
             display: grid;
-            grid-template-columns: 1fr;
-            gap: 16px;
+            background: white;
+            border-radius: 10px;
+            padding: 40px;
+            box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
             text-align: center;
+            width: max-content;
+        }
+        .khoj-logo {
+            width: 80px;
+            margin-bottom: 20px;
+        }
+        .login-modal-title {
+            font-size: 24px;
+            font-weight: 600;
+            margin-bottom: 20px;
+        }
+        .khoj-magic-link {
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
         }
         #email {
             padding: 10px;
-            font-size: 16px;
-            border: 1px solid var(--main-text-color);
+            border: 1px solid #ccc;
             border-radius: 5px;
             width: 100%;
-        }
-        #email:focus {
-            box-shadow: 0 0 10px var(--main-text-color);
+            font-size: 16px;
         }
         #magic-link-button {
             padding: 10px;
-            font-size: 16px;
-            border: 1px solid var(--main-text-color);
+            border: none;
             border-radius: 5px;
-            width: 100%;
-            background: var(--main-text-color);
-            color: var(--frosted-background-color);
+            background-color: #FFA07A;
+            color: white;
             cursor: pointer;
+            font-size: 16px;
+            transition: background-color 0.3s;
         }
         #magic-link-button:hover {
-            box-shadow: 0 0 10px var(--main-text-color);
+            background-color: #FFA07A
+        }
+        #magic-link-button:disabled {
+            background-color: #cccccc;
+            cursor: not-allowed;
         }
-        div.g_id_signin {
+        .divider {
+            display: flex;
+            align-items: center;
+            text-align: center;
+            color: #000;
+            /* Adjust the text color as needed */
+            margin: 20px 0;
+            /* Adjust the margin as needed */
+        }
+        .divider::before,
+        .divider::after {
+            content: '';
+            flex: 1;
+            border-bottom: 1px solid #000;
+            /* Adjust the line color as needed */
+            margin: 0 10px;
+            /* Adjust the spacing as needed */
+        }
+        .g_id_signin {
             margin: 0 auto;
             display: block;
         }
-        div.login-modal-title {
+        .footer-links {
+            width: 100%;
             text-align: center;
-            line-height: 28px;
-            font-size: 24px;
-            font-weight: 500;
+            font-size: 0.9em;
+            color: #666;
+            margin-top: 20px;
+        }
+        .footer-links a {
+            color: #666;
+            text-decoration: none;
+            margin: 0 10px;
+        }
+        .footer-links a:hover {
+            text-decoration: underline;
+        }
+        .divider-vertical {
+            display: inline-block;
+            width: 1px;
+            height: 12px;
+            background-color: #666;
+            margin: 0 10px;
+            vertical-align: middle;
         }
-        @media only screen and (max-width: 700px) {
-            body{
-                background: url('/static/assets/samples/phone-plain-chat-sample.png') no-repeat center center fixed;
-                background-size: contain;
+        @media (max-width: 768px) {
+            .split-container {
+                flex-direction: column;
             }
-            div#login-modal {
-                margin-left: 10%;
-                margin-right: 10%;
-                z-index: 1;
+            .right {
+                display: none;
             }
-        }
+            .left {
+                padding: 2rem;
+            }
+        }
     </style>
+    <script>
+        const magicLinkButton = document.getElementById('magic-link-button');
+        const emailInput = document.getElementById('email');
+        magicLinkButton.addEventListener('click', async () => {
+            const email = emailInput.value;
+            if (!email) {
+                alert('Please enter a valid email address');
+                return;
+            }
+            if (!email.includes('@')) {
+                alert('Please enter a valid email address');
+                return;
+            }
+            magicLinkButton.disabled = true;
+            magicLinkButton.innerText = 'Check your email for a sign-in link!';
+            const response = await fetch('/auth/magic', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ "email": email }),
+            });
+            if (response.status === 200) {
+                console.log('Magic link sent to your email');
+            } else {
+                alert('Failed to send magic link');
+                magicLinkButton.disabled = false;
+                magicLinkButton.innerText = 'Get Login Link';
+            }
+        });
+    </script>
     <script src="https://accounts.google.com/gsi/client" async defer></script>
+</body>
 </html>

khoj/processor/conversation/anthropic/anthropic_chat.py CHANGED Viewed

@@ -32,7 +32,7 @@ def extract_questions_anthropic(
     Infer search queries to retrieve relevant notes to answer user query
     """
     # Extract Past User Message and Inferred Questions from Conversation Log
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -158,8 +158,7 @@ def converse_anthropic(
         )
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
     if user_name:

khoj/processor/conversation/google/gemini_chat.py CHANGED Viewed

@@ -33,7 +33,7 @@ def extract_questions_gemini(
     Infer search queries to retrieve relevant notes to answer user query
     """
     # Extract Past User Message and Inferred Questions from Conversation Log
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -163,8 +163,7 @@ def converse_gemini(
         )
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
     if user_name:

khoj/processor/conversation/offline/chat_model.py CHANGED Viewed

@@ -46,7 +46,7 @@ def extract_questions_offline(
     assert loaded_model is None or isinstance(loaded_model, Llama), "loaded_model must be of type Llama, if configured"
     offline_chat_model = loaded_model or download_model(model, max_tokens=max_prompt_size)
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -171,8 +171,7 @@ def converse_offline(
     conversation_primer = prompts.query_prompt.format(query=user_query)
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
     if user_name:

khoj/processor/conversation/openai/gpt.py CHANGED Viewed

@@ -36,7 +36,7 @@ def extract_questions(
     """
     Infer search queries to retrieve relevant notes to answer user query
     """
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -159,8 +159,7 @@ def converse(
         )
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
     if user_name:

khoj/processor/tools/online_search.py CHANGED Viewed

@@ -7,7 +7,6 @@ from collections import defaultdict
 from typing import Callable, Dict, List, Optional, Tuple, Union
 import aiohttp
-import requests
 from bs4 import BeautifulSoup
 from markdownify import markdownify
@@ -80,7 +79,7 @@ async def search_online(
     with timer(f"Internet searches for {list(subqueries)} took", logger):
         search_func = search_with_google if SERPER_DEV_API_KEY else search_with_jina
-        search_tasks = [search_func(subquery) for subquery in subqueries]
+        search_tasks = [search_func(subquery, location) for subquery in subqueries]
         search_results = await asyncio.gather(*search_tasks)
         response_dict = {subquery: search_result for subquery, search_result in search_results}
@@ -115,8 +114,9 @@ async def search_online(
     yield response_dict
-async def search_with_google(query: str) -> Tuple[str, Dict[str, List[Dict]]]:
-    payload = json.dumps({"q": query})
+async def search_with_google(query: str, location: LocationData) -> Tuple[str, Dict[str, List[Dict]]]:
+    country_code = location.country_code.lower() if location and location.country_code else "us"
+    payload = json.dumps({"q": query, "gl": country_code})
     headers = {"X-API-KEY": SERPER_DEV_API_KEY, "Content-Type": "application/json"}
     async with aiohttp.ClientSession() as session:
@@ -220,7 +220,7 @@ async def read_webpage_with_jina(web_url: str) -> str:
             return response_json["data"]["content"]
-async def search_with_jina(query: str) -> Tuple[str, Dict[str, List[Dict]]]:
+async def search_with_jina(query: str, location: LocationData) -> Tuple[str, Dict[str, List[Dict]]]:
     encoded_query = urllib.parse.quote(query)
     jina_search_api_url = f"{JINA_SEARCH_API_URL}/{encoded_query}"
     headers = {"Accept": "application/json"}

khoj/routers/api_chat.py CHANGED Viewed

@@ -55,6 +55,8 @@ from khoj.utils.helpers import (
     ConversationCommand,
     command_descriptions,
     convert_image_to_webp,
+    get_country_code_from_timezone,
+    get_country_name_from_timezone,
     get_device,
     is_none_or_empty,
 )
@@ -529,8 +531,10 @@ class ChatRequestBody(BaseModel):
     city: Optional[str] = None
     region: Optional[str] = None
     country: Optional[str] = None
+    country_code: Optional[str] = None
     timezone: Optional[str] = None
     image: Optional[str] = None
+    create_new: Optional[bool] = False
 @api_chat.post("")
@@ -540,10 +544,10 @@ async def chat(
     common: CommonQueryParams,
     body: ChatRequestBody,
     rate_limiter_per_minute=Depends(
-        ApiUserRateLimiter(requests=60, subscribed_requests=60, window=60, slug="chat_minute")
+        ApiUserRateLimiter(requests=60, subscribed_requests=200, window=60, slug="chat_minute")
     ),
     rate_limiter_per_day=Depends(
-        ApiUserRateLimiter(requests=600, subscribed_requests=600, window=60 * 60 * 24, slug="chat_day")
+        ApiUserRateLimiter(requests=600, subscribed_requests=6000, window=60 * 60 * 24, slug="chat_day")
     ),
 ):
     # Access the parameters from the body
@@ -555,7 +559,8 @@ async def chat(
     conversation_id = body.conversation_id
     city = body.city
     region = body.region
-    country = body.country
+    country = body.country or get_country_name_from_timezone(body.timezone)
+    country_code = body.country_code or get_country_code_from_timezone(body.timezone)
     timezone = body.timezone
     image = body.image
@@ -641,7 +646,11 @@ async def chat(
         conversation_commands = [get_conversation_command(query=q, any_references=True)]
         conversation = await ConversationAdapters.aget_conversation_by_user(
-            user, client_application=request.user.client_app, conversation_id=conversation_id, title=title
+            user,
+            client_application=request.user.client_app,
+            conversation_id=conversation_id,
+            title=title,
+            create_new=body.create_new,
         )
         if not conversation:
             async for result in send_llm_response(f"Conversation {conversation_id} not found"):
@@ -653,8 +662,8 @@ async def chat(
         user_name = await aget_user_name(user)
         location = None
-        if city or region or country:
-            location = LocationData(city=city, region=region, country=country)
+        if city or region or country or country_code:
+            location = LocationData(city=city, region=region, country=country, country_code=country_code)
         if is_query_empty(q):
             async for result in send_llm_response("Please ask your query to get started."):

khoj 1.24.1.dev7__py3-none-any.whl → 1.24.2.dev3__py3-none-any.whl

khoj 1.24.1.dev7py3-none-any.whl → 1.24.2.dev3py3-none-any.whl