diff --git a/src/interface/desktop/main.js b/src/interface/desktop/main.js index 17ab2fb4..53d98c6c 100644 --- a/src/interface/desktop/main.js +++ b/src/interface/desktop/main.js @@ -163,7 +163,7 @@ function pushDataToKhoj (regenerate = false) { const headers = { 'x-api-key': 'secret' }; - axios.post(`${hostURL}/api/v1/indexer/batch?regenerate=${regenerate}`, formData, { headers }) + axios.post(`${hostURL}/api/v1/index/update?regenerate=${regenerate}`, formData, { headers }) .then(response => { console.log(response.data); const win = BrowserWindow.getAllWindows()[0]; diff --git a/src/interface/emacs/khoj.el b/src/interface/emacs/khoj.el index 2956c025..e3441a1d 100644 --- a/src/interface/emacs/khoj.el +++ b/src/interface/emacs/khoj.el @@ -550,7 +550,7 @@ CONFIG is json obtained from Khoj config API." (url-request-extra-headers `(("content-type" . ,(format "multipart/form-data; boundary=%s" boundary)) ("x-api-key" . ,khoj-server-api-key)))) (with-current-buffer - (url-retrieve (format "%s/api/v1/indexer/batch" khoj-server-url) + (url-retrieve (format "%s/api/v1/index/update" khoj-server-url) ;; render response from indexing API endpoint on server (lambda (status) (if (not status) diff --git a/src/interface/obsidian/src/utils.ts b/src/interface/obsidian/src/utils.ts index 7fb04d24..8f004469 100644 --- a/src/interface/obsidian/src/utils.ts +++ b/src/interface/obsidian/src/utils.ts @@ -68,7 +68,7 @@ export async function updateContentIndex(vault: Vault, setting: KhojSetting, las } // Call Khoj backend to update index with all markdown, pdf files - const response = await fetch(`${setting.khojUrl}/api/v1/indexer/batch?regenerate=${regenerate}`, { + const response = await fetch(`${setting.khojUrl}/api/v1/index/update?regenerate=${regenerate}`, { method: 'POST', headers: { 'x-api-key': 'secret', diff --git a/src/khoj/configure.py b/src/khoj/configure.py index 7b2b3ce2..a7f39775 100644 --- a/src/khoj/configure.py +++ b/src/khoj/configure.py @@ -103,7 +103,7 @@ def configure_routes(app): app.mount("/static", StaticFiles(directory=constants.web_directory), name="static") app.include_router(api, prefix="/api") app.include_router(api_beta, prefix="/api/beta") - app.include_router(indexer, prefix="/api/v1/indexer") + app.include_router(indexer, prefix="/api/v1/index") app.include_router(web_client) diff --git a/src/khoj/routers/indexer.py b/src/khoj/routers/indexer.py index 215dfe57..644712a5 100644 --- a/src/khoj/routers/indexer.py +++ b/src/khoj/routers/indexer.py @@ -56,8 +56,8 @@ class IndexerInput(BaseModel): plaintext: Optional[dict[str, str]] = None -@indexer.post("/batch") -async def index_batch( +@indexer.post("/update") +async def update( request: Request, files: list[UploadFile], x_api_key: str = Header(None), diff --git a/tests/test_client.py b/tests/test_client.py index 831668f7..d17f20fd 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -60,13 +60,13 @@ def test_regenerate_with_invalid_content_type(client): # ---------------------------------------------------------------------------------------------------- -def test_index_batch(client): +def test_index_update(client): # Arrange files = get_sample_files_data() headers = {"x-api-key": "secret"} # Act - response = client.post("/api/v1/indexer/batch", files=files, headers=headers) + response = client.post("/api/v1/index/update", files=files, headers=headers) # Assert assert response.status_code == 200 @@ -80,7 +80,7 @@ def test_regenerate_with_valid_content_type(client): headers = {"x-api-key": "secret"} # Act - response = client.post(f"/api/v1/indexer/batch?search_type={content_type}", files=files, headers=headers) + response = client.post(f"/api/v1/index/update?search_type={content_type}", files=files, headers=headers) # Assert assert response.status_code == 200, f"Returned status: {response.status_code} for content type: {content_type}" @@ -95,7 +95,7 @@ def test_regenerate_with_github_fails_without_pat(client): headers = {"x-api-key": "secret"} # Act - response = client.post(f"/api/v1/indexer/batch?search_type=github", files=files, headers=headers) + response = client.post(f"/api/v1/index/update?search_type=github", files=files, headers=headers) # Assert assert response.status_code == 200, f"Returned status: {response.status_code} for content type: github"