khoj-ai · sabaimran · Aug 5, 2024 · Jul 2, 2024 · Jul 2, 2024 · Jul 2, 2024
diff --git a/documentation/docs/advanced/litellm.md b/documentation/docs/advanced/litellm.md
@@ -34,4 +34,4 @@ Using LiteLLM with Khoj makes it possible to turn any LLM behind an API into you
 5. Create a new [Server Chat Setting](http://localhost:42110/server/admin/database/serverchatsettings/add/) on your Khoj admin panel
    - Default model: `<name of chat model option you created in step 4>`
    - Summarizer model: `<name of chat model option you created in step 4>`
-6. Go to [your config](http://localhost:42110/config) and select the model you just created in the chat model dropdown.
+6. Go to [your config](http://localhost:42110/settings) and select the model you just created in the chat model dropdown.
diff --git a/documentation/docs/advanced/lmstudio.md b/documentation/docs/advanced/lmstudio.md
@@ -27,4 +27,4 @@ LM Studio can expose an [OpenAI API compatible server](https://lmstudio.ai/docs/
 5. Create a new [Server Chat Setting](http://localhost:42110/server/admin/database/serverchatsettings/add/) on your Khoj admin panel
    - Default model: `<name of chat model option you created in step 4>`
    - Summarizer model: `<name of chat model option you created in step 4>`
-6. Go to [your config](http://localhost:42110/config) and select the model you just created in the chat model dropdown.
+6. Go to [your config](http://localhost:42110/settings) and select the model you just created in the chat model dropdown.
diff --git a/documentation/docs/advanced/ollama.md b/documentation/docs/advanced/ollama.md
@@ -31,6 +31,6 @@ Ollama exposes a local [OpenAI API compatible server](https://github.com/ollama/
 5. Create a new [Server Chat Setting](http://localhost:42110/server/admin/database/serverchatsettings/add/) on your Khoj admin panel
    - Default model: `<name of chat model option you created in step 4>`
    - Summarizer model: `<name of chat model option you created in step 4>`
-6. Go to [your config](http://localhost:42110/config) and select the model you just created in the chat model dropdown.
+6. Go to [your config](http://localhost:42110/settings) and select the model you just created in the chat model dropdown.
 
 That's it! You should now be able to chat with your Ollama model from Khoj. If you want to add additional models running on Ollama, repeat step 6 for each model.
diff --git a/documentation/docs/advanced/use-openai-proxy.md b/documentation/docs/advanced/use-openai-proxy.md
@@ -34,4 +34,4 @@ For specific integrations, see our [Ollama](/advanced/ollama), [LMStudio](/advan
 5. Create a new [Server Chat Setting](http://localhost:42110/server/admin/database/serverchatsettings/add/) on your Khoj admin panel
    - Default model: `<name of chat model option you created in step 4>`
    - Summarizer model: `<name of chat model option you created in step 4>`
-6. Go to [your config](http://localhost:42110/config) and select the model you just created in the chat model dropdown.
+6. Go to [your config](http://localhost:42110/settings) and select the model you just created in the chat model dropdown.
diff --git a/documentation/docs/clients/desktop.md b/documentation/docs/clients/desktop.md
@@ -23,7 +23,7 @@ Khoj will keep these files in sync to provide contextual responses when you sear
 ## Setup
 
 1. Install the [Khoj Desktop app](https://khoj.dev/downloads) for your OS
-2. Generate an API key on the [Khoj Web App](https://app.khoj.dev/config#clients)
+2. Generate an API key on the [Khoj Web App](https://app.khoj.dev/settings#clients)
 3. Set your Khoj API Key on the *Settings* page of the Khoj Desktop app
 4. [Optional] Add any files, folders you'd like Khoj to be aware of on the *Settings* page and Click *Save*
    These files and folders will be automatically kept in sync for you

diff --git a/documentation/docs/clients/emacs.md b/documentation/docs/clients/emacs.md
@@ -30,7 +30,7 @@ sidebar_position: 2
 | ![khoj search on emacs](/img/khoj_search_on_emacs.png) | ![khoj chat on emacs](/img/khoj_chat_on_emacs.png) |
 
 ## Setup
-1. Generate an API key on the [Khoj Web App](https://app.khoj.dev/config#clients)
+1. Generate an API key on the [Khoj Web App](https://app.khoj.dev/settings#clients)
 2. Add below snippet to your Emacs config file, usually at `~/.emacs.d/init.el`
 
 

diff --git a/documentation/docs/clients/obsidian.md b/documentation/docs/clients/obsidian.md
@@ -23,7 +23,7 @@ sidebar_position: 3
 
   1. Open [Khoj](https://obsidian.md/plugins?id=khoj) from the *Community plugins* tab in Obsidian settings panel
   2. Click *Install*, then *Enable* on the Khoj plugin page in Obsidian
-  3. Generate an API key on the [Khoj Web App](https://app.khoj.dev/config#clients)
+  3. Generate an API key on the [Khoj Web App](https://app.khoj.dev/settings#clients)
   4. Set your Khoj API Key in the Khoj plugin settings in Obsidian
 
 See the official [Obsidian Plugin Docs](https://help.obsidian.md/Extending+Obsidian/Community+plugins) for more details on installing Obsidian plugins.

diff --git a/documentation/docs/clients/whatsapp.md b/documentation/docs/clients/whatsapp.md
@@ -10,7 +10,7 @@ Text [+1 (848) 800 4242](https://wa.me/18488004242) or scan [this QR code](https
 
 Without any desktop clients, you can start chatting with Khoj on WhatsApp. Bear in mind you do need one of the desktop clients in order to share and sync your data with Khoj. The WhatsApp AI bot will work right away for answering generic queries and using Khoj in default mode.
 
-In order to use Khoj on WhatsApp with your own data, you need to setup a Khoj Cloud account and connect your WhatsApp account to it. This is a one time setup and you can do it from the [Khoj Cloud config page](https://app.khoj.dev/config).
+In order to use Khoj on WhatsApp with your own data, you need to setup a Khoj Cloud account and connect your WhatsApp account to it. This is a one time setup and you can do it from the [Khoj Cloud config page](https://app.khoj.dev/settings).
 
 If you hit usage limits for the WhatsApp bot, upgrade to [a paid plan](https://khoj.dev/pricing) on Khoj Cloud.
 

diff --git a/documentation/docs/data-sources/github_integration.md b/documentation/docs/data-sources/github_integration.md
@@ -4,11 +4,11 @@ The Github integration allows you to index as many repositories as you want. It'
 
 # Configure your settings
 
-1. Go to [https://app.khoj.dev/config](https://app.khoj.dev/config) and enter in settings for the data sources you want to index. You'll have to specify the file paths.
+1. Go to [https://app.khoj.dev/settings](https://app.khoj.dev/settings) and enter in settings for the data sources you want to index. You'll have to specify the file paths.
 
 ## Use the Github plugin
 
 1. Generate a [classic PAT (personal access token)](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) from [Github](https://github.com/settings/tokens) with `repo` and `admin:org` scopes at least.
-2. Navigate to [https://app.khoj.dev/config/content-source/github](https://app.khoj.dev/config/content-source/github) to configure your Github settings. Enter in your PAT, along with details for each repository you want to index.
+2. Navigate to [https://app.khoj.dev/settings#github](https://app.khoj.dev/settings#github) to configure your Github settings. Enter in your PAT, along with details for each repository you want to index.
 3. Click `Save`. Go back to the settings page and click `Configure`.
 4. Go to [https://app.khoj.dev/](https://app.khoj.dev/) and start searching!
diff --git a/documentation/docs/data-sources/notion_integration.md b/documentation/docs/data-sources/notion_integration.md
@@ -2,7 +2,7 @@
 
 The Notion integration allows you to search/chat with your Notion workspaces. [Notion](https://notion.so/) is a platform people use for taking notes, especially for collaboration.
 
-Go to https://app.khoj.dev/config to connect your Notion workspace(s) to Khoj.
+Go to https://app.khoj.dev/settings to connect your Notion workspace(s) to Khoj.
 
 ![notion_integration](https://assets.khoj.dev/notion_integration.gif)
 
@@ -13,7 +13,7 @@ Go to https://app.khoj.dev/config to connect your Notion workspace(s) to Khoj.
 ![setup_new_integration](https://github.com/khoj-ai/khoj/assets/65192171/b056e057-d4dc-47dc-aad3-57b59a22c68b)
 3. Share all the workspaces that you want to integrate with the Khoj integration you just made in the previous step
 ![enable_workspace](https://github.com/khoj-ai/khoj/assets/65192171/98290303-b5b8-4cb0-b32c-f68c6923a3d0)
-4. In the first step, you generated an API key. Use the newly generated API Key in your Khoj settings, by default at http://localhost:42110/config/content-source/notion. Click `Save`.
-5. Click `Configure` in http://localhost:42110/config to index your Notion workspace(s).
+4. In the first step, you generated an API key. Use the newly generated API Key in your Khoj settings, by default at [http://localhost:42110/settings#notion](http://localhost:42110/settings#notion). Click `Save`.
+5. Click `Configure` in http://localhost:42110/settings to index your Notion workspace(s).
 
 That's it! You should be ready to start searching and chatting. Make sure you've configured your [chat settings](/get-started/setup#2-configure).
diff --git a/documentation/docs/get-started/overview.md b/documentation/docs/get-started/overview.md
@@ -1,15 +1,15 @@
 ---
 sidebar_position: 0
 slug: /
-keywords: ["khoj", "khoj ai", "khoj docs", "khoj documentation", "khoj features", "khoj overview", "khoj quickstart", "khoj chat", "khoj search", "khoj cloud", "khoj self-host", "khoj setup", "open source ai", "local llm", "ai copilot", "second brain ai", "ai search engine"]
+keywords: ["khoj", "khoj ai", "khoj docs", "khoj documentation", "khoj features", "khoj overview", "khoj quickstart", "khoj chat", "khoj search", "khoj cloud", "khoj self-host", "khoj setup", "open source ai", "local llm", "ai copilot", "second brain", "personal ai", "ai search engine"]
 ---
 
 # Overview
 
 <p align="center"><img src="/img/khoj-logo-sideways-500.png" width="200" alt="Khoj Logo"></img></p>
 
 <div align="center">
-  <b>An AI copilot for your Second Brain</b>
+  <b>Your Second Brain</b>
 </div>
 
 <br />

diff --git a/documentation/docusaurus.config.js b/documentation/docusaurus.config.js
@@ -9,7 +9,7 @@ import {themes as prismThemes} from 'prism-react-renderer';
 /** @type {import('@docusaurus/types').Config} */
 const config = {
   title: 'Khoj AI',
-  tagline: 'An AI copilot for your Second Brain',
+  tagline: 'Your Second Brain',
 
   staticDirectories: ['assets'],
 

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
 	"name": "Khoj",
 	"version": "1.17.0",
 	"minAppVersion": "0.15.0",
-	"description": "An AI copilot for your Second Brain",
+	"description": "Your Second Brain",
 	"author": "Khoj Inc.",
 	"authorUrl": "https://github.com/khoj-ai",
 	"isDesktopOnly": false

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "khoj"
-description = "An AI copilot for your Second Brain"
+description = "Your Second Brain"
 readme = "README.md"
 license = "AGPL-3.0-or-later"
 requires-python = ">=3.10"

diff --git a/src/interface/desktop/main.js b/src/interface/desktop/main.js
@@ -233,11 +233,15 @@ function pushDataToKhoj (regenerate = false) {
 
     // Request indexing files on server. With upto 1000 files in each request
     for (let i = 0; i < filesDataToPush.length; i += 1000) {
+        const syncUrl = `${hostURL}/api/content?client=desktop`;
         const filesDataGroup = filesDataToPush.slice(i, i + 1000);
         const formData = new FormData();
         filesDataGroup.forEach(fileData => { formData.append('files', fileData.blob, fileData.path) });
-        let request = axios.post(`${hostURL}/api/v1/index/update?force=${regenerate}&client=desktop`, formData, { headers });
-        requests.push(request);
+        requests.push(
+            regenerate
+            ? axios.put(syncUrl, formData, { headers })
+            : axios.patch(syncUrl, formData, { headers })
+        );
     }
 
     // Wait for requests batch to finish
@@ -253,7 +257,7 @@ function pushDataToKhoj (regenerate = false) {
         console.error(error);
         state["completed"] = false;
         if (error?.response?.status === 429 && (BrowserWindow.getAllWindows().find(win => win.webContents.getURL().includes('config')))) {
-            state["error"] = `Looks like you're out of space to sync your files. <a href="https://app.khoj.dev/config">Upgrade your plan</a> to unlock more space.`;
+            state["error"] = `Looks like you're out of space to sync your files. <a href="https://app.khoj.dev/settings#subscription">Upgrade your plan</a> to unlock more space.`;
             const win = BrowserWindow.getAllWindows().find(win => win.webContents.getURL().includes('config'));
             if (win) win.webContents.send('needsSubscription', true);
         } else if (error?.code === 'ECONNREFUSED') {

diff --git a/src/interface/desktop/package.json b/src/interface/desktop/package.json
@@ -1,8 +1,8 @@
 {
   "name": "Khoj",
   "version": "1.17.0",
-  "description": "An AI copilot for your Second Brain",
-  "author": "Saba Imran, Debanjum Singh Solanky <team@khoj.dev>",
+  "description": "Your Second Brain",
+  "author": "Khoj Inc. <team@khoj.dev>",
   "license": "GPL-3.0-or-later",
   "homepage": "https://khoj.dev",
   "repository": "\"https://github.com/khoj-ai/khoj\"",

diff --git a/src/interface/desktop/renderer.js b/src/interface/desktop/renderer.js
@@ -182,7 +182,7 @@ window.updateStateAPI.onUpdateState((event, state) => {
 window.needsSubscriptionAPI.onNeedsSubscription((event, needsSubscription) => {
     console.log("needs subscription", needsSubscription);
     if (needsSubscription) {
-        window.alert("Looks like you're out of space to sync your files. Upgrade your plan to unlock more space here: https://app.khoj.dev/config");
+        window.alert("Looks like you're out of space to sync your files. Upgrade your plan to unlock more space here: https://app.khoj.dev/settings#subscription");
         needsSubscriptionElement.style.display = 'block';
     }
 });

diff --git a/src/interface/desktop/search.html b/src/interface/desktop/search.html
@@ -212,12 +212,12 @@
             const headers = { 'Authorization': `Bearer ${khojToken}` };
 
             // Populate type dropdown field with enabled content types only
-            fetch(`${hostURL}/api/config/types`, { headers })
+            fetch(`${hostURL}/api/content/types`, { headers })
                 .then(response => response.json())
                 .then(enabled_types => {
                     // Show warning if no content types are enabled
                     if (enabled_types.detail) {
-                        document.getElementById("results").innerHTML = "<div id='results-error'>To use Khoj search, setup your content plugins on the Khoj <a class='inline-chat-link' href='/config'>settings page</a>.</div>";
+                        document.getElementById("results").innerHTML = "<div id='results-error'>To use Khoj search, setup your content plugins on the Khoj <a class='inline-chat-link' href='/settings'>settings page</a>.</div>";
                         document.getElementById("query").setAttribute("disabled", "disabled");
                         document.getElementById("query").setAttribute("placeholder", "Configure Khoj to enable search");
                         return [];

diff --git a/src/interface/desktop/config.html → src/interface/desktop/settings.html b/src/interface/desktop/config.html → src/interface/desktop/settings.html
diff --git a/src/interface/desktop/utils.js b/src/interface/desktop/utils.js
@@ -85,7 +85,7 @@ async function populateHeaderPane() {
                     <div id="khoj-nav-menu" class="khoj-nav-dropdown-content">
                         <div class="khoj-nav-username"> ${username} </div>
                         <a id="github-nav" class="khoj-nav" href="https://github.com/khoj-ai/khoj">GitHub</a>
-                        <a id="settings-nav" class="khoj-nav" href="./config.html">⚙️ Settings</a>
+                        <a id="settings-nav" class="khoj-nav" href="./settings.html">⚙️ Settings</a>
                     </div>
                 </div>
             ` : ''}

diff --git a/src/interface/emacs/khoj.el b/src/interface/emacs/khoj.el
@@ -4,8 +4,8 @@
 
 ;; Author: Debanjum Singh Solanky <debanjum@khoj.dev>
 ;;         Saba Imran <saba@khoj.dev>
-;; Description: An AI copilot for your Second Brain
-;; Keywords: search, chat, org-mode, outlines, markdown, pdf, image
+;; Description: Your Second Brain
+;; Keywords: search, chat, ai, org-mode, outlines, markdown, pdf, image
 ;; Version: 1.17.0
 ;; Package-Requires: ((emacs "27.1") (transient "0.3.0") (dash "2.19.1"))
 ;; URL: https://github.com/khoj-ai/khoj/tree/master/src/interface/emacs
@@ -99,7 +99,7 @@
   :type 'boolean)
 
 (defcustom khoj-api-key nil
-  "API Key to your Khoj. Default at https://app.khoj.dev/config#clients."
+  "API Key to your Khoj. Default at https://app.khoj.dev/settings#clients."
   :group 'khoj
   :type 'string)
 
@@ -424,12 +424,12 @@ Auto invokes setup steps on calling main entrypoint."
   "Send multi-part form `BODY' of `CONTENT-TYPE' in request to khoj server.
 Append 'TYPE-QUERY' as query parameter in request url.
 Specify `BOUNDARY' used to separate files in request header."
-  (let ((url-request-method "POST")
+  (let ((url-request-method ((if force) "PUT" "PATCH"))
         (url-request-data body)
           (url-request-extra-headers `(("content-type" . ,(format "multipart/form-data; boundary=%s" boundary))
                                        ("Authorization" . ,(format "Bearer %s" khoj-api-key)))))
       (with-current-buffer
-          (url-retrieve (format "%s/api/v1/index/update?%s&force=%s&client=emacs" khoj-server-url type-query (or force "false"))
+          (url-retrieve (format "%s/api/content?%s&client=emacs" khoj-server-url type-query)
                         ;; render response from indexing API endpoint on server
                         (lambda (status)
                           (if (not (plist-get status :error))
@@ -697,7 +697,7 @@ Optionally apply CALLBACK with JSON parsed response and CBARGS."
 
 (defun khoj--get-enabled-content-types ()
   "Get content types enabled for search from API."
-  (khoj--call-api "/api/config/types" "GET" nil `(lambda (item) (mapcar #'intern item))))
+  (khoj--call-api "/api/content/types" "GET" nil `(lambda (item) (mapcar #'intern item))))
 
 (defun khoj--query-search-api-and-render-results (query content-type buffer-name &optional rerank is-find-similar)
   "Query Khoj Search API with QUERY, CONTENT-TYPE and RERANK as query params.

diff --git a/src/interface/obsidian/manifest.json b/src/interface/obsidian/manifest.json
@@ -3,7 +3,7 @@
 	"name": "Khoj",
 	"version": "1.17.0",
 	"minAppVersion": "0.15.0",
-	"description": "An AI copilot for your Second Brain",
+	"description": "Your Second Brain",
 	"author": "Khoj Inc.",
 	"authorUrl": "https://github.com/khoj-ai",
 	"isDesktopOnly": false

diff --git a/src/interface/obsidian/package.json b/src/interface/obsidian/package.json
@@ -1,7 +1,7 @@
 {
     "name": "Khoj",
     "version": "1.17.0",
-    "description": "An AI copilot for your Second Brain",
+    "description": "Your Second Brain",
     "author": "Debanjum Singh Solanky, Saba Imran <team@khoj.dev>",
     "license": "GPL-3.0-or-later",
     "main": "src/main.js",
@@ -14,7 +14,8 @@
         "search",
         "chat",
         "AI",
-        "assistant"
+        "assistant",
+        "second brain"
     ],
     "devDependencies": {
         "@types/dompurify": "^3.0.5",

diff --git a/src/interface/obsidian/src/utils.ts b/src/interface/obsidian/src/utils.ts
@@ -92,10 +92,11 @@ export async function updateContentIndex(vault: Vault, setting: KhojSetting, las
     for (let i = 0; i < fileData.length; i += 1000) {
         const filesGroup = fileData.slice(i, i + 1000);
         const formData = new FormData();
+        const method = regenerate ? "PUT" : "PATCH";
         filesGroup.forEach(fileItem => { formData.append('files', fileItem.blob, fileItem.path) });
         // Call Khoj backend to update index with all markdown, pdf files
-        const response = await fetch(`${setting.khojUrl}/api/v1/index/update?force=${regenerate}&client=obsidian`, {
-            method: 'POST',
+        const response = await fetch(`${setting.khojUrl}/api/content?client=obsidian`, {
+            method: method,
             headers: {
                 'Authorization': `Bearer ${setting.khojApiKey}`,
             },
@@ -204,12 +205,12 @@ export function getBackendStatusMessage(
 ): string {
     // Welcome message with default settings. Khoj cloud always expects an API key.
     if (!khojApiKey && khojUrl === 'https://app.khoj.dev')
-        return `🌈 Welcome to Khoj! Get your API key from ${khojUrl}/config#clients and set it in the Khoj plugin settings on Obsidian`;
+        return `🌈 Welcome to Khoj! Get your API key from ${khojUrl}/settings#clients and set it in the Khoj plugin settings on Obsidian`;
 
     if (!connectedToServer)
         return `❗️Could not connect to Khoj at ${khojUrl}. Ensure your can access it`;
     else if (!userEmail)
-        return `✅ Connected to Khoj. ❗️Get a valid API key from ${khojUrl}/config#clients to log in`;
+        return `✅ Connected to Khoj. ❗️Get a valid API key from ${khojUrl}/settings#clients to log in`;
     else if (userEmail === 'default@example.com')
         // Logged in as default user in anonymous mode
         return `✅ Signed in to Khoj`;

diff --git a/src/interface/web/.eslintrc.json b/src/interface/web/.eslintrc.json
@@ -1,3 +1,11 @@
 {
-  "extends": "next/core-web-vitals"
+  "extends": [
+    "next",
+    "next/core-web-vitals",
+    "plugin:prettier/recommended"
+  ],
+  "plugins": ["prettier"],
+  "rules": {
+    "prettier/prettier": "warn"
+  }
 }
diff --git a/src/interface/web/.husky/pre-commit b/src/interface/web/.husky/pre-commit
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn run lint-staged
+yarn test