klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-07 21:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix khoj server config update in khoj.el by unquoting list to cl-push to

Browse Source 
- cl-push expects a generatlized variable. Else throws (setf quote)
  undefined warning
- This results in the config call failing on calling khoj entrypoint
This commit is contained in:
Debanjum Singh Solanky
2023-05-03 15:01:58 +08:00
parent 948a4274e4
commit 3386cc92b5
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/interface/emacs/khoj.el
View File

@@ -391,7 +391,7 @@ CONFIG is json obtained from Khoj config API."
(compressed-jsonl . ,(format "%s/org.jsonl.gz" default-index-dir)) (compressed-jsonl . ,(format "%s/org.jsonl.gz" default-index-dir))
(embeddings-file . ,(format "%s/org.pt" default-index-dir)) (embeddings-file . ,(format "%s/org.pt" default-index-dir))
(index-heading-entries . ,json-false))))) (index-heading-entries . ,json-false)))))
'config)) config))
;; Else if khoj config has no org content config ;; Else if khoj config has no org content config
((not (alist-get 'org (alist-get 'content-type config))) ((not (alist-get 'org (alist-get 'content-type config)))
@@ -403,9 +403,9 @@ CONFIG is json obtained from Khoj config API."
(compressed-jsonl . ,(format "%s/org.jsonl.gz" default-index-dir)) (compressed-jsonl . ,(format "%s/org.jsonl.gz" default-index-dir))
(embeddings-file . ,(format "%s/org.pt" default-index-dir)) (embeddings-file . ,(format "%s/org.pt" default-index-dir))
(index-heading-entries . ,json-false))) (index-heading-entries . ,json-false)))
'new-content-type) new-content-type)
(setq config (delq (assoc 'content-type config) config)) (setq config (delq (assoc 'content-type config) config))
(cl-pushnew `(content-type . ,new-content-type) 'config))) (cl-pushnew `(content-type . ,new-content-type) config)))
;; Else if khoj is not configured to index specified org files ;; Else if khoj is not configured to index specified org files
((not (and (equal (alist-get 'input-files (alist-get 'org (alist-get 'content-type config))) khoj-org-files) ((not (and (equal (alist-get 'input-files (alist-get 'org (alist-get 'content-type config))) khoj-org-files)
@@ -419,9 +419,9 @@ CONFIG is json obtained from Khoj config API."
(compressed-jsonl . ,(format "%s/org.jsonl.gz" index-directory)) (compressed-jsonl . ,(format "%s/org.jsonl.gz" index-directory))
(embeddings-file . ,(format "%s/org.pt" index-directory)) (embeddings-file . ,(format "%s/org.pt" index-directory))
(index-heading-entries . ,json-false))) (index-heading-entries . ,json-false)))
'new-content-type) new-content-type)
(setq config (delq (assoc 'content-type config) config)) (setq config (delq (assoc 'content-type config) config))
(cl-pushnew `(content-type . ,new-content-type) 'config)))) (cl-pushnew `(content-type . ,new-content-type) config))))
;; Configure processors ;; Configure processors
(cond (cond
@@ -434,7 +434,7 @@ CONFIG is json obtained from Khoj config API."
(cl-pushnew `(processor . ((conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir)) (cl-pushnew `(processor . ((conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir))
(model . ,default-model) (model . ,default-model)
(openai-api-key . ,khoj-openai-api-key))))) (openai-api-key . ,khoj-openai-api-key)))))
'config)) config))
((not (alist-get 'conversation (alist-get 'processor config))) ((not (alist-get 'conversation (alist-get 'processor config)))
(message "khoj.el: Chat not configured yet.") (message "khoj.el: Chat not configured yet.")
@@ -443,9 +443,9 @@ CONFIG is json obtained from Khoj config API."
(cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir)) (cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" default-chat-dir))
(model . ,default-model) (model . ,default-model)
(openai-api-key . ,khoj-openai-api-key))) (openai-api-key . ,khoj-openai-api-key)))
'new-processor-type) new-processor-type)
(setq config (delq (assoc 'processor config) config)) (setq config (delq (assoc 'processor config) config))
(cl-pushnew `(processor . ,new-processor-type) 'config))) (cl-pushnew `(processor . ,new-processor-type) config)))
;; Else if khoj is not configured with specified openai api key ;; Else if khoj is not configured with specified openai api key
((not (equal (alist-get 'openai-api-key (alist-get 'conversation (alist-get 'processor config))) khoj-openai-api-key)) ((not (equal (alist-get 'openai-api-key (alist-get 'conversation (alist-get 'processor config))) khoj-openai-api-key))
@@ -457,9 +457,9 @@ CONFIG is json obtained from Khoj config API."
(cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" chat-directory)) (cl-pushnew `(conversation . ((conversation-logfile . ,(format "%s/conversation.json" chat-directory))
(model . ,model-name) (model . ,model-name)
(openai-api-key . ,khoj-openai-api-key))) (openai-api-key . ,khoj-openai-api-key)))
'new-processor-type) new-processor-type)
(setq config (delq (assoc 'processor config) config)) (setq config (delq (assoc 'processor config) config))
(cl-pushnew `(processor . ,new-processor-type) 'config)))) (cl-pushnew `(processor . ,new-processor-type) config))))
;; Update server with latest configuration, if required ;; Update server with latest configuration, if required
(cond ((not current-config) (cond ((not current-config)