klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-09 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve khoj chat new, delete session flows

Browse Source 
When create new conversation session, automatically request query. As
that is expected next action after creating new session

Pass session-id to khoj-chat to allow reuse from
create-new-conversation func

When delete conversation session, do not call load chat session.
Unnecessary action.

Use thread-last to improve code flow in new, delete conversation funcs
This commit is contained in:
Debanjum Singh Solanky
2024-06-20 21:38:02 +05:30
parent 59032a06d5
commit 427575e958
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -751,14 +751,14 @@ Filter out first similar result if IS-FIND-SIMILAR set."
;; Khoj Chat ;; Khoj Chat
;; ---------------- ;; ----------------
(defun khoj--chat () (defun khoj--chat (&optional session-id)
"Chat with Khoj." "Chat with Khoj in session with SESSION-ID."
(interactive) (interactive)
(when (not (get-buffer khoj--chat-buffer-name)) (when (or session-id (not (get-buffer khoj--chat-buffer-name)))
(khoj--load-chat-session khoj--chat-buffer-name)) (khoj--load-chat-session khoj--chat-buffer-name session-id))
(let ((query (read-string "Query: "))) (let ((query (read-string "Query: ")))
(when (not (string-empty-p query)) (when (not (string-empty-p query))
(khoj--query-chat-api-and-render-messages query khoj--chat-buffer-name)))) (khoj--query-chat-api-and-render-messages query khoj--chat-buffer-name session-id))))
(defun khoj--open-side-pane (buffer-name) (defun khoj--open-side-pane (buffer-name)
"Open Khoj BUFFER-NAME in right side pane." "Open Khoj BUFFER-NAME in right side pane."
@@ -857,8 +857,8 @@ Filter out first similar result if IS-FIND-SIMILAR set."
;; show definition on hover on footnote reference ;; show definition on hover on footnote reference
(overlay-put overlay 'help-echo it))))))) (overlay-put overlay 'help-echo it)))))))
(defun khoj--query-chat-api-and-render-messages (query buffer-name) (defun khoj--query-chat-api-and-render-messages (query buffer-name &optional session-id)
"Send QUERY to Khoj Chat. Render the chat messages from exchange in BUFFER-NAME." "Send QUERY to Chat SESSION-ID. Render the chat messages in BUFFER-NAME."
;; render json response into formatted chat messages ;; render json response into formatted chat messages
(with-current-buffer (get-buffer buffer-name) (with-current-buffer (get-buffer buffer-name)
(let ((inhibit-read-only t) (let ((inhibit-read-only t)
@@ -867,15 +867,19 @@ Filter out first similar result if IS-FIND-SIMILAR set."
(insert (insert
(khoj--render-chat-message query "you" query-time)) (khoj--render-chat-message query "you" query-time))
(khoj--query-chat-api query (khoj--query-chat-api query
session-id
#'khoj--format-chat-response #'khoj--format-chat-response
#'khoj--render-chat-response buffer-name)))) #'khoj--render-chat-response buffer-name))))
(defun khoj--query-chat-api (query callback &rest cbargs) (defun khoj--query-chat-api (query session-id callback &rest cbargs)
"Send QUERY to Khoj Chat API and call CALLBACK with the response and CBARGS." "Send QUERY for SESSION-ID to Khoj Chat API.
Call CALLBACK func with response and CBARGS."
(let ((params `(("q" ,query) ("n" ,khoj-results-count))))
(when session-id (push `("conversation_id" ,session-id) params))
(khoj--call-api-async "/api/chat" (khoj--call-api-async "/api/chat"
"GET" "GET"
`(("q" ,query) ("n" ,khoj-results-count)) params
callback cbargs)) callback cbargs)))
(defun khoj--get-chat-sessions () (defun khoj--get-chat-sessions ()
"Get all chat sessions from Khoj server." "Get all chat sessions from Khoj server."
@@ -911,9 +915,11 @@ Filter out first similar result if IS-FIND-SIMILAR set."
(defun khoj--new-conversation-session () (defun khoj--new-conversation-session ()
"Create new Khoj conversation session." "Create new Khoj conversation session."
(let* ((session (khoj--create-chat-session)) (thread-last
(new-session-id (cdr (assoc 'conversation_id session)))) (khoj--create-chat-session)
(khoj--load-chat-session khoj--chat-buffer-name new-session-id))) (assoc 'conversation_id)
(cdr)
(khoj--chat)))
(defun khoj--delete-chat-session (session-id) (defun khoj--delete-chat-session (session-id)
"Delete chat session with SESSION-ID." "Delete chat session with SESSION-ID."
@@ -921,9 +927,9 @@ Filter out first similar result if IS-FIND-SIMILAR set."
(defun khoj--delete-conversation-session () (defun khoj--delete-conversation-session ()
"Delete new Khoj conversation session." "Delete new Khoj conversation session."
(let* ((selected-session-id (khoj--select-conversation-session "Delete")) (thread-last
(session (khoj--delete-chat-session selected-session-id))) (khoj--select-conversation-session "Delete")
(khoj--load-chat-session khoj--chat-buffer-name))) (khoj--delete-chat-session)))
(defun khoj--render-chat-message (message sender &optional receive-date) (defun khoj--render-chat-message (message sender &optional receive-date)
"Render chat messages as `org-mode' list item. "Render chat messages as `org-mode' list item.