klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-02 21:19:12 +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

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

@@ -387,11 +387,11 @@ CONFIG is json obtained from Khoj config API."
(message "khoj.el: Server not configured yet.") (message "khoj.el: Server not configured yet.")
(setq config (delq (assoc 'content-type config) config)) (setq config (delq (assoc 'content-type config) config))
(cl-pushnew `(content-type . ((org . ((input-files . ,khoj-org-files) (cl-pushnew `(content-type . ((org . ((input-files . ,khoj-org-files)
(input-filter . ,org-directory-regexes) (input-filter . ,org-directory-regexes)
(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)))
@@ -399,13 +399,13 @@ CONFIG is json obtained from Khoj config API."
(let ((new-content-type (alist-get 'content-type config))) (let ((new-content-type (alist-get 'content-type config)))
(setq new-content-type (delq (assoc 'org new-content-type) new-content-type)) (setq new-content-type (delq (assoc 'org new-content-type) new-content-type))
(cl-pushnew `(org . ((input-files . ,khoj-org-files) (cl-pushnew `(org . ((input-files . ,khoj-org-files)
(input-filter . ,org-directory-regexes) (input-filter . ,org-directory-regexes)
(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)
@@ -415,13 +415,13 @@ CONFIG is json obtained from Khoj config API."
(new-content-type (alist-get 'content-type config))) (new-content-type (alist-get 'content-type config)))
(setq new-content-type (delq (assoc 'org new-content-type) new-content-type)) (setq new-content-type (delq (assoc 'org new-content-type) new-content-type))
(cl-pushnew `(org . ((input-files . ,khoj-org-files) (cl-pushnew `(org . ((input-files . ,khoj-org-files)
(input-filter . ,org-directory-regexes) (input-filter . ,org-directory-regexes)
(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
@@ -432,20 +432,20 @@ CONFIG is json obtained from Khoj config API."
(message "khoj.el: Chat not configured yet.") (message "khoj.el: Chat not configured yet.")
(setq config (delq (assoc 'processor config) config)) (setq config (delq (assoc 'processor config) config))
(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.")
(let ((new-processor-type (alist-get 'processor config))) (let ((new-processor-type (alist-get 'processor config)))
(setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type)) (setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type))
(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))
@@ -455,11 +455,11 @@ CONFIG is json obtained from Khoj config API."
(new-processor-type (alist-get 'processor config))) (new-processor-type (alist-get 'processor config)))
(setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type)) (setq new-processor-type (delq (assoc 'conversation new-processor-type) new-processor-type))
(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)