+
+
+
+
+
diff --git a/src/khoj/interface/web/agents.html b/src/khoj/interface/web/agents.html
index 21a5cda2..36bb4caf 100644
--- a/src/khoj/interface/web/agents.html
+++ b/src/khoj/interface/web/agents.html
@@ -193,9 +193,55 @@
}
}
+ .loader {
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+ display: inline-block;
+ border-top: 4px solid var(--primary-color);
+ border-right: 4px solid transparent;
+ box-sizing: border-box;
+ animation: rotation 1s linear infinite;
+ }
+ .loader::after {
+ content: '';
+ box-sizing: border-box;
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+ border-left: 4px solid var(--summer-sun);
+ border-bottom: 4px solid transparent;
+ animation: rotation 0.5s linear infinite reverse;
+ }
+ @keyframes rotation {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+
+
-
+
@@ -179,11 +178,30 @@ To get started, just start typing below. You can also type / to see a list of co
return referenceButton;
}
-
- function renderMessage(message, by, dt=null, annotations=null, raw=false, renderType="append") {
+ var khojQuery = "";
+ function renderMessage(message, by, dt=null, annotations=null, raw=false, renderType="append", userQuery=null) {
let message_time = formatDate(dt ?? new Date());
let by_name = by == "khoj" ? "🏮 Khoj" : "🤔 You";
- let formattedMessage = formatHTMLMessage(message, raw);
+ let formattedMessage = formatHTMLMessage(message, raw, true, userQuery);
+ //update userQuery or khojQuery to latest query for feedback purposes
+ if(by !== "khoj"){
+ raw = formattedMessage.innerHTML;
+ }
+
+ //find the thumbs up and thumbs down buttons from the message formatter
+ var thumbsUpButtons = formattedMessage.querySelectorAll('.thumbs-up-button');
+ var thumbsDownButtons = formattedMessage.querySelectorAll('.thumbs-down-button');
+
+ //only render the feedback options if the message is a response from khoj
+ if(by !== "khoj"){
+ thumbsUpButtons.forEach(function(element) {
+ element.parentNode.removeChild(element);
+ });
+ thumbsDownButtons.forEach(function(element) {
+ element.parentNode.removeChild(element);
+ });
+ }
+
// Create a new div for the chat message
let chatMessage = document.createElement('div');
@@ -303,7 +321,22 @@ To get started, just start typing below. You can also type / to see a list of co
return imageMarkdown;
}
- function formatHTMLMessage(message, raw=false, willReplace=true) {
+ //handler function for posting feedback data to endpoint
+ function sendFeedback(_uquery="", _kquery="", _sentiment="") {
+ const uquery = _uquery;
+ const kquery = _kquery;
+ const sentiment = _sentiment;
+ fetch('/api/chat/feedback', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({uquery: uquery, kquery: kquery, sentiment: sentiment})
+ })
+ .then(response => response.json())
+ }
+
+ function formatHTMLMessage(message, raw=false, willReplace=true, userQuery) {
var md = window.markdownit();
let newHTML = message;
@@ -347,7 +380,35 @@ To get started, just start typing below. You can also type / to see a list of co
copyIcon.classList.add("copy-icon");
copyButton.appendChild(copyIcon);
copyButton.addEventListener('click', createCopyParentText(message));
- element.append(copyButton);
+
+ //create thumbs-up button
+ let thumbsUpButton = document.createElement('button');
+ thumbsUpButton.className = 'thumbs-up-button';
+ let thumbsUpIcon = document.createElement("img");
+ thumbsUpIcon.src = "/static/assets/icons/thumbs-up-svgrepo-com.svg";
+ thumbsUpIcon.classList.add("thumbs-up-icon");
+ thumbsUpButton.appendChild(thumbsUpIcon);
+ thumbsUpButton.onclick = function() {
+ khojQuery = newHTML;
+ thumbsUpIcon.src = "/static/assets/icons/confirm-icon.svg";
+ sendFeedback(userQuery ,khojQuery, "Good Response");
+ };
+
+ // Create thumbs-down button
+ let thumbsDownButton = document.createElement('button');
+ thumbsDownButton.className = 'thumbs-down-button';
+ let thumbsDownIcon = document.createElement("img");
+ thumbsDownIcon.src = "/static/assets/icons/thumbs-down-svgrepo-com.svg";
+ thumbsDownIcon.classList.add("thumbs-down-icon");
+ thumbsDownButton.appendChild(thumbsDownIcon);
+ thumbsDownButton.onclick = function() {
+ khojQuery = newHTML;
+ thumbsDownIcon.src = "/static/assets/icons/confirm-icon.svg";
+ sendFeedback(userQuery, khojQuery, "Bad Response");
+ };
+
+ // Append buttons to parent element
+ element.append(copyButton, thumbsDownButton, thumbsUpButton);
}
renderMathInElement(element, {
@@ -355,7 +416,6 @@ To get started, just start typing below. You can also type / to see a list of co
// • auto-render specific keys, e.g.:
delimiters: [
{left: '$$', right: '$$', display: true},
- {left: '$', right: '$', display: false},
{left: '\\(', right: '\\)', display: false},
{left: '\\[', right: '\\]', display: true}
],
@@ -546,7 +606,7 @@ To get started, just start typing below. You can also type / to see a list of co
} else {
// If the chunk is not a JSON object, just display it as is
rawResponse += chunk;
- handleStreamResponse(newResponseText, rawResponse, loadingEllipsis);
+ handleStreamResponse(newResponseText, rawResponse, query, loadingEllipsis);
readStream();
}
});
@@ -582,14 +642,14 @@ To get started, just start typing below. You can also type / to see a list of co
return loadingEllipsis;
}
- function handleStreamResponse(newResponseElement, rawResponse, loadingEllipsis, replace=true) {
+ function handleStreamResponse(newResponseElement, rawResponse, rawQuery, loadingEllipsis, replace=true) {
if (newResponseElement.getElementsByClassName("lds-ellipsis").length > 0 && loadingEllipsis) {
newResponseElement.removeChild(loadingEllipsis);
}
if (replace) {
newResponseElement.innerHTML = "";
}
- newResponseElement.appendChild(formatHTMLMessage(rawResponse, false, replace));
+ newResponseElement.appendChild(formatHTMLMessage(rawResponse, false, replace, rawQuery));
document.getElementById("chat-body").scrollTop = document.getElementById("chat-body").scrollHeight;
}
@@ -889,6 +949,7 @@ To get started, just start typing below. You can also type / to see a list of co
loadingEllipsis: null,
references: {},
rawResponse: "",
+ rawQuery: "",
}
if (chatBody.dataset.conversationId) {
@@ -907,6 +968,7 @@ To get started, just start typing below. You can also type / to see a list of co
// Append any references after all the data has been streamed
finalizeChatBodyResponse(websocketState.references, websocketState.newResponseTextEl);
+ const liveQuery = websocketState.rawQuery;
// Reset variables
websocketState = {
newResponseTextEl: null,
@@ -914,6 +976,7 @@ To get started, just start typing below. You can also type / to see a list of co
loadingEllipsis: null,
references: {},
rawResponse: "",
+ rawQuery: liveQuery,
}
} else {
try {
@@ -935,9 +998,9 @@ To get started, just start typing below. You can also type / to see a list of co
websocketState.rawResponse = rawResponse;
websocketState.references = references;
} else if (chunk.type == "status") {
- handleStreamResponse(websocketState.newResponseTextEl, chunk.message, null, false);
+ handleStreamResponse(websocketState.newResponseTextEl, chunk.message, websocketState.rawQuery, null, false);
} else if (chunk.type == "rate_limit") {
- handleStreamResponse(websocketState.newResponseTextEl, chunk.message, websocketState.loadingEllipsis, true);
+ handleStreamResponse(websocketState.newResponseTextEl, chunk.message, websocketState.rawQuery, websocketState.loadingEllipsis, true);
} else {
rawResponse = chunk.response;
}
@@ -960,7 +1023,7 @@ To get started, just start typing below. You can also type / to see a list of co
// If the chunk is not a JSON object, just display it as is
websocketState.rawResponse += chunk;
if (websocketState.newResponseTextEl) {
- handleStreamResponse(websocketState.newResponseTextEl, websocketState.rawResponse, websocketState.loadingEllipsis);
+ handleStreamResponse(websocketState.newResponseTextEl, websocketState.rawResponse, websocketState.rawQuery, websocketState.loadingEllipsis);
}
}
@@ -1037,6 +1100,7 @@ To get started, just start typing below. You can also type / to see a list of co
loadingEllipsis,
references,
rawResponse,
+ rawQuery: query,
}
}
@@ -1154,7 +1218,8 @@ To get started, just start typing below. You can also type / to see a list of co
new Date(chat_log.created + "Z"),
chat_log.onlineContext,
chat_log.intent?.type,
- chat_log.intent?.["inferred-queries"]);
+ chat_log.intent?.["inferred-queries"],
+ chat_log.intent?.query);
chatBody.appendChild(messageElement);
// When the 4th oldest message is within viewing distance (~60% scroll up)
@@ -1249,7 +1314,8 @@ To get started, just start typing below. You can also type / to see a list of co
new Date(chat_log.created + "Z"),
chat_log.onlineContext,
chat_log.intent?.type,
- chat_log.intent?.["inferred-queries"]
+ chat_log.intent?.["inferred-queries"],
+ chat_log.intent?.query
);
entry.target.replaceWith(messageElement);
@@ -1512,11 +1578,79 @@ To get started, just start typing below. You can also type / to see a list of co
conversationMenu.appendChild(editTitleButton);
threeDotMenu.appendChild(conversationMenu);
+ let shareButton = document.createElement('button');
+ shareButton.innerHTML = "Share";
+ shareButton.type = "button";
+ shareButton.classList.add("share-conversation-button");
+ shareButton.classList.add("three-dot-menu-button-item");
+ shareButton.addEventListener('click', function(event) {
+ event.preventDefault();
+ let confirmation = confirm('Are you sure you want to share this chat session? This will make the conversation public.');
+ if (!confirmation) return;
+ let duplicateURL = `/api/chat/share?client=web&conversation_id=${incomingConversationId}`;
+ fetch(duplicateURL , { method: "POST" })
+ .then(response => response.ok ? response.json() : Promise.reject(response))
+ .then(data => {
+ if (data.status == "ok") {
+ flashStatusInChatInput("✅ Conversation shared successfully");
+ }
+ // Make a pop-up that shows data.url to share the conversation
+ let shareURL = data.url;
+ let shareModal = document.createElement('div');
+ shareModal.classList.add("modal");
+ shareModal.id = "share-conversation-modal";
+ let shareModalContent = document.createElement('div');
+ shareModalContent.classList.add("modal-content");
+ let shareModalHeader = document.createElement('div');
+ shareModalHeader.classList.add("modal-header");
+ let shareModalTitle = document.createElement('h2');
+ shareModalTitle.textContent = "Share Conversation";
+ let shareModalCloseButton = document.createElement('button');
+ shareModalCloseButton.classList.add("modal-close-button");
+ shareModalCloseButton.innerHTML = "×";
+ shareModalCloseButton.addEventListener('click', function() {
+ shareModal.remove();
+ });
+ shareModalHeader.appendChild(shareModalTitle);
+ shareModalHeader.appendChild(shareModalCloseButton);
+ shareModalContent.appendChild(shareModalHeader);
+ let shareModalBody = document.createElement('div');
+ shareModalBody.classList.add("modal-body");
+ let shareModalText = document.createElement('p');
+ shareModalText.textContent = "The link has been copied to your clipboard. Use it to share your conversation with others!";
+ let shareModalLink = document.createElement('input');
+ shareModalLink.setAttribute("value", shareURL);
+ shareModalLink.setAttribute("readonly", "");
+ shareModalLink.classList.add("share-link");
+ let copyButton = document.createElement('button');
+ copyButton.textContent = "Copy";
+ copyButton.addEventListener('click', function() {
+ shareModalLink.select();
+ document.execCommand('copy');
+ });
+ copyButton.id = "copy-share-url-button";
+ shareModalBody.appendChild(shareModalText);
+ shareModalBody.appendChild(shareModalLink);
+ shareModalBody.appendChild(copyButton);
+ shareModalContent.appendChild(shareModalBody);
+ shareModal.appendChild(shareModalContent);
+ document.body.appendChild(shareModal);
+ shareModalLink.select();
+ document.execCommand('copy');
+ })
+ .catch(err => {
+ return;
+ });
+ });
+ conversationMenu.appendChild(shareButton);
+
let deleteButton = document.createElement('button');
+ deleteButton.type = "button";
deleteButton.innerHTML = "Delete";
deleteButton.classList.add("delete-conversation-button");
deleteButton.classList.add("three-dot-menu-button-item");
- deleteButton.addEventListener('click', function() {
+ deleteButton.addEventListener('click', function(event) {
+ event.preventDefault();
// Ask for confirmation before deleting chat session
let confirmation = confirm('Are you sure you want to delete this chat session?');
if (!confirmation) return;
@@ -1864,9 +1998,10 @@ To get started, just start typing below. You can also type / to see a list of co
content: "▶";
margin-right: 5px;
display: inline-block;
- transition: transform 0.3s ease-in-out;
+ transition: transform 0.1s ease-in-out;
}
+ button.reference-button.expanded::before,
button.reference-button:active:before,
button.reference-button[aria-expanded="true"]::before {
transform: rotate(90deg);
@@ -2175,7 +2310,7 @@ To get started, just start typing below. You can also type / to see a list of co
}
.side-panel-button {
- background: var(--background-color);
+ background: none;
border: none;
box-shadow: none;
font-size: 14px;
@@ -2274,6 +2409,32 @@ To get started, just start typing below. You can also type / to see a list of co
float: right;
}
+ button.thumbs-up-button {
+ border-radius: 4px;
+ background-color: var(--background-color);
+ border: 1px solid var(--main-text-color);
+ text-align: center;
+ font-size: 16px;
+ transition: all 0.5s;
+ cursor: pointer;
+ padding: 4px;
+ float: right;
+ margin-right: 4px;
+ }
+
+ button.thumbs-down-button {
+ border-radius: 4px;
+ background-color: var(--background-color);
+ border: 1px solid var(--main-text-color);
+ text-align: center;
+ font-size: 16px;
+ transition: all 0.5s;
+ cursor: pointer;
+ padding: 4px;
+ float: right;
+ margin-right:4px;
+ }
+
button.copy-button span {
cursor: pointer;
display: inline-block;
@@ -2282,8 +2443,18 @@ To get started, just start typing below. You can also type / to see a list of co
}
img.copy-icon {
- width: 16px;
- height: 16px;
+ width: 18px;
+ height: 18px;
+ }
+
+ img.thumbs-up-icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ img.thumbs-down-icon {
+ width: 18px;
+ height: 18px;
}
button.copy-button:hover {
@@ -2291,6 +2462,16 @@ To get started, just start typing below. You can also type / to see a list of co
color: #f5f5f5;
}
+ button.thumbs-up-button:hover {
+ background-color: var(--primary-hover);
+ color: #f5f5f5;
+ }
+
+ button.thumbs-down-button:hover {
+ background-color: var(--primary-hover);
+ color: #f5f5f5;
+ }
+
pre {
text-wrap: unset;
}
@@ -2394,6 +2575,7 @@ To get started, just start typing below. You can also type / to see a list of co
margin-bottom: 8px;
}
+ button#copy-share-url-button,
button#new-conversation-button {
display: inline-flex;
align-items: center;
@@ -2414,14 +2596,12 @@ To get started, just start typing below. You can also type / to see a list of co
text-align: left;
display: flex;
position: relative;
+ margin-right: 8px;
}
.three-dot-menu {
display: block;
- /* background: var(--background-color); */
- /* border: 1px solid var(--main-text-color); */
border-radius: 5px;
- /* position: relative; */
position: absolute;
right: 4px;
top: 4px;
@@ -2603,13 +2783,6 @@ To get started, just start typing below. You can also type / to see a list of co
color: #333;
}
- #agent-instructions {
- font-size: 14px;
- color: #666;
- height: 50px;
- overflow: auto;
- }
-
#agent-owned-by-user {
font-size: 12px;
color: #007BFF;
@@ -2631,7 +2804,7 @@ To get started, just start typing below. You can also type / to see a list of co
margin: 15% auto; /* 15% from the top and centered */
padding: 20px;
border: 1px solid #888;
- width: 250px;
+ width: 300px;
text-align: left;
background: var(--background-color);
border-radius: 5px;
@@ -2705,6 +2878,28 @@ To get started, just start typing below. You can also type / to see a list of co
border: 1px solid var(--main-text-color);
}
+ .share-link {
+ display: block;
+ width: 100%;
+ padding: 10px;
+ margin-top: 10px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ background-color: #f9f9f9;
+ font-family: 'Courier New', monospace;
+ color: #333;
+ font-size: 16px;
+ box-sizing: border-box;
+ transition: all 0.3s ease;
+ }
+
+ .share-link:focus {
+ outline: none;
+ border-color: #007BFF;
+ box-shadow: 0 0 0 0.2rem rgba(0,123,255,.25);
+ }
+
+ button#copy-share-url-button,
button#new-conversation-submit-button {
background: var(--summer-sun);
transition: background 0.2s ease-in-out;
@@ -2715,6 +2910,7 @@ To get started, just start typing below. You can also type / to see a list of co
transition: background 0.2s ease-in-out;
}
+ button#copy-share-url-button:hover,
button#new-conversation-submit-button:hover {
background: var(--primary);
}
diff --git a/src/khoj/interface/web/config.html b/src/khoj/interface/web/config.html
index b808ef33..64841f97 100644
--- a/src/khoj/interface/web/config.html
+++ b/src/khoj/interface/web/config.html
@@ -635,85 +635,6 @@
// List user's API keys on page load
listApiKeys();
- function deleteAutomation(automationId) {
- const AutomationList = document.getElementById("automations-list");
- fetch(`/api/automation?automation_id=${automationId}`, {
- method: 'DELETE',
- })
- .then(response => {
- if (response.status == 200) {
- const AutomationItem = document.getElementById(`automation-item-${automationId}`);
- AutomationList.removeChild(AutomationItem);
- }
- });
- }
-
- function generateAutomationRow(automationObj) {
- let automationId = automationObj.id;
- let automationNextRun = `Next run at ${automationObj.next}`;
- return `
-
+
+User Feedback:
+
+
+ User Query
+{{uquery}}
+
+
+ Khoj's Response
+ {{kquery}} +
+
+ Sentiment
+{{sentiment}}
+
+
+ User Email
+{{user_email}}
+
- 
- 
Automate (Preview)
- You can automate queries to run on a schedule using Khoj's automations for smart reminders. Results will be sent straight to your inbox. This is an experimental feature, so your results may vary. Report any issues to team@khoj.dev.
+ Automations allow you to schedule smart reminders using Khoj. This is an experimental feature, so your results may vary! Send any feedback to team@khoj.dev.
+
+
+ Sending automation results to {{ username }}.
+
+
{% endblock %}
diff --git a/src/khoj/interface/web/login.html b/src/khoj/interface/web/login.html
index 91ef6007..6443e6a4 100644
--- a/src/khoj/interface/web/login.html
+++ b/src/khoj/interface/web/login.html
@@ -16,7 +16,7 @@
+
+ Suggested Automations +
+ +
- Log in to Khoj
+ Login to Khoj
-
-
-{% endblock %}
diff --git a/src/khoj/interface/web/public_conversation.html b/src/khoj/interface/web/public_conversation.html
new file mode 100644
index 00000000..afade059
--- /dev/null
+++ b/src/khoj/interface/web/public_conversation.html
@@ -0,0 +1,1916 @@
+
+
+
+
+
+
-
-
-
-
-
- 
- Chat
-
-
-
+
+
+
+
+
+
+ {% import 'utils.html' as utils %}
+ {{ utils.heading_pane(user_photo, username, is_active, has_documents) }}
+
+
+
+
+
+
+
diff --git a/src/khoj/interface/web/utils.html b/src/khoj/interface/web/utils.html
index b2d719cb..536c01d4 100644
--- a/src/khoj/interface/web/utils.html
+++ b/src/khoj/interface/web/utils.html
@@ -37,6 +37,7 @@
diff --git a/src/khoj/main.py b/src/khoj/main.py
index 40b449d7..64cfc194 100644
--- a/src/khoj/main.py
+++ b/src/khoj/main.py
@@ -96,7 +96,7 @@ from khoj.utils.initialization import initialization
def shutdown_scheduler():
logger.info("🌑 Shutting down Khoj")
- state.scheduler.shutdown()
+ # state.scheduler.shutdown()
def run(should_start_server=True):
diff --git a/src/khoj/processor/conversation/anthropic/__init__.py b/src/khoj/processor/conversation/anthropic/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/khoj/processor/conversation/anthropic/anthropic_chat.py b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
new file mode 100644
index 00000000..8c6157b8
--- /dev/null
+++ b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
@@ -0,0 +1,202 @@
+import json
+import logging
+import re
+from datetime import datetime, timedelta
+from typing import Dict, Optional
+
+from langchain.schema import ChatMessage
+
+from khoj.database.models import Agent
+from khoj.processor.conversation import prompts
+from khoj.processor.conversation.anthropic.utils import (
+ anthropic_chat_completion_with_backoff,
+ anthropic_completion_with_backoff,
+)
+from khoj.processor.conversation.utils import generate_chatml_messages_with_context
+from khoj.utils.helpers import ConversationCommand, is_none_or_empty
+from khoj.utils.rawconfig import LocationData
+
+logger = logging.getLogger(__name__)
+
+
+def extract_questions_anthropic(
+ text,
+ model: Optional[str] = "claude-instant-1.2",
+ conversation_log={},
+ api_key=None,
+ temperature=0,
+ location_data: LocationData = None,
+):
+ """
+ Infer search queries to retrieve relevant notes to answer user query
+ """
+ # Extract Past User Message and Inferred Questions from Conversation Log
+ location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+
+ # Extract Past User Message and Inferred Questions from Conversation Log
+ chat_history = "".join(
+ [
+ f'Q: {chat["intent"]["query"]}\nKhoj: {{"queries": {chat["intent"].get("inferred-queries") or list([chat["intent"]["query"]])}}}\nA: {chat["message"]}\n\n'
+ for chat in conversation_log.get("chat", [])[-4:]
+ if chat["by"] == "khoj" and "text-to-image" not in chat["intent"].get("type")
+ ]
+ )
+
+ # Get dates relative to today for prompt creation
+ today = datetime.today()
+ current_new_year = today.replace(month=1, day=1)
+ last_new_year = current_new_year.replace(year=today.year - 1)
+
+ system_prompt = prompts.extract_questions_anthropic_system_prompt.format(
+ current_date=today.strftime("%Y-%m-%d"),
+ day_of_week=today.strftime("%A"),
+ last_new_year=last_new_year.strftime("%Y"),
+ last_new_year_date=last_new_year.strftime("%Y-%m-%d"),
+ current_new_year_date=current_new_year.strftime("%Y-%m-%d"),
+ yesterday_date=(today - timedelta(days=1)).strftime("%Y-%m-%d"),
+ location=location,
+ )
+
+ prompt = prompts.extract_questions_anthropic_user_message.format(
+ chat_history=chat_history,
+ text=text,
+ )
+
+ messages = [ChatMessage(content=prompt, role="user")]
+
+ response = anthropic_completion_with_backoff(
+ messages=messages,
+ system_prompt=system_prompt,
+ model_name=model,
+ temperature=temperature,
+ api_key=api_key,
+ )
+
+ # Extract, Clean Message from Claude's Response
+ try:
+ response = response.strip()
+ match = re.search(r"\{.*?\}", response)
+ if match:
+ response = match.group()
+ response = json.loads(response)
+ response = [q.strip() for q in response["queries"] if q.strip()]
+ if not isinstance(response, list) or not response:
+ logger.error(f"Invalid response for constructing subqueries: {response}")
+ return [text]
+ return response
+ except:
+ logger.warning(f"Claude returned invalid JSON. Falling back to using user message as search query.\n{response}")
+ questions = [text]
+ logger.debug(f"Extracted Questions by Claude: {questions}")
+ return questions
+
+
+def anthropic_send_message_to_model(messages, api_key, model):
+ """
+ Send message to model
+ """
+ # Anthropic requires the first message to be a 'user' message, and the system prompt is not to be sent in the messages parameter
+ system_prompt = None
+
+ if len(messages) == 1:
+ messages[0].role = "user"
+ else:
+ system_prompt = ""
+ for message in messages.copy():
+ if message.role == "system":
+ system_prompt += message.content
+ messages.remove(message)
+
+ # Get Response from GPT. Don't use response_type because Anthropic doesn't support it.
+ return anthropic_completion_with_backoff(
+ messages=messages,
+ system_prompt=system_prompt,
+ model_name=model,
+ api_key=api_key,
+ )
+
+
+def converse_anthropic(
+ references,
+ user_query,
+ online_results: Optional[Dict[str, Dict]] = None,
+ conversation_log={},
+ model: Optional[str] = "claude-instant-1.2",
+ api_key: Optional[str] = None,
+ completion_func=None,
+ conversation_commands=[ConversationCommand.Default],
+ max_prompt_size=None,
+ tokenizer_name=None,
+ location_data: LocationData = None,
+ user_name: str = None,
+ agent: Agent = None,
+):
+ """
+ Converse with user using Anthropic's Claude
+ """
+ # Initialize Variables
+ current_date = datetime.now().strftime("%Y-%m-%d")
+ compiled_references = "\n\n".join({f"# {item}" for item in references})
+
+ conversation_primer = prompts.query_prompt.format(query=user_query)
+
+ if agent and agent.personality:
+ system_prompt = prompts.custom_personality.format(
+ name=agent.name, bio=agent.personality, current_date=current_date
+ )
+ else:
+ system_prompt = prompts.personality.format(current_date=current_date)
+
+ if location_data:
+ location = f"{location_data.city}, {location_data.region}, {location_data.country}"
+ location_prompt = prompts.user_location.format(location=location)
+ system_prompt = f"{system_prompt}\n{location_prompt}"
+
+ if user_name:
+ user_name_prompt = prompts.user_name.format(name=user_name)
+ system_prompt = f"{system_prompt}\n{user_name_prompt}"
+
+ # Get Conversation Primer appropriate to Conversation Type
+ if conversation_commands == [ConversationCommand.Notes] and is_none_or_empty(compiled_references):
+ completion_func(chat_response=prompts.no_notes_found.format())
+ return iter([prompts.no_notes_found.format()])
+ elif conversation_commands == [ConversationCommand.Online] and is_none_or_empty(online_results):
+ completion_func(chat_response=prompts.no_online_results_found.format())
+ return iter([prompts.no_online_results_found.format()])
+
+ if ConversationCommand.Online in conversation_commands or ConversationCommand.Webpage in conversation_commands:
+ conversation_primer = (
+ f"{prompts.online_search_conversation.format(online_results=str(online_results))}\n{conversation_primer}"
+ )
+ if not is_none_or_empty(compiled_references):
+ conversation_primer = f"{prompts.notes_conversation.format(query=user_query, references=compiled_references)}\n\n{conversation_primer}"
+
+ # Setup Prompt with Primer or Conversation History
+ messages = generate_chatml_messages_with_context(
+ conversation_primer,
+ conversation_log=conversation_log,
+ model_name=model,
+ max_prompt_size=max_prompt_size,
+ tokenizer_name=tokenizer_name,
+ )
+
+ for message in messages.copy():
+ if message.role == "system":
+ system_prompt += message.content
+ messages.remove(message)
+
+ truncated_messages = "\n".join({f"{message.content[:40]}..." for message in messages})
+ logger.debug(f"Conversation Context for Claude: {truncated_messages}")
+
+ # Get Response from Claude
+ return anthropic_chat_completion_with_backoff(
+ messages=messages,
+ compiled_references=references,
+ online_results=online_results,
+ model_name=model,
+ temperature=0,
+ api_key=api_key,
+ system_prompt=system_prompt,
+ completion_func=completion_func,
+ max_prompt_size=max_prompt_size,
+ )
diff --git a/src/khoj/processor/conversation/anthropic/utils.py b/src/khoj/processor/conversation/anthropic/utils.py
new file mode 100644
index 00000000..d6c8f4f2
--- /dev/null
+++ b/src/khoj/processor/conversation/anthropic/utils.py
@@ -0,0 +1,116 @@
+import logging
+from threading import Thread
+from typing import Dict, List
+
+import anthropic
+from tenacity import (
+ before_sleep_log,
+ retry,
+ stop_after_attempt,
+ wait_exponential,
+ wait_random_exponential,
+)
+
+from khoj.processor.conversation.utils import ThreadedGenerator
+
+logger = logging.getLogger(__name__)
+
+anthropic_clients: Dict[str, anthropic.Anthropic] = {}
+
+
+DEFAULT_MAX_TOKENS_ANTHROPIC = 3000
+
+
+@retry(
+ wait=wait_random_exponential(min=1, max=10),
+ stop=stop_after_attempt(2),
+ before_sleep=before_sleep_log(logger, logging.DEBUG),
+ reraise=True,
+)
+def anthropic_completion_with_backoff(
+ messages, system_prompt, model_name, temperature=0, api_key=None, model_kwargs=None, max_tokens=None
+) -> str:
+ if api_key not in anthropic_clients:
+ client: anthropic.Anthropic = anthropic.Anthropic(api_key=api_key)
+ anthropic_clients[api_key] = client
+ else:
+ client = anthropic_clients[api_key]
+
+ formatted_messages = [{"role": message.role, "content": message.content} for message in messages]
+
+ aggregated_response = ""
+ max_tokens = max_tokens or DEFAULT_MAX_TOKENS_ANTHROPIC
+
+ model_kwargs = model_kwargs or dict()
+ if system_prompt:
+ model_kwargs["system"] = system_prompt
+
+ with client.messages.stream(
+ messages=formatted_messages,
+ model=model_name, # type: ignore
+ temperature=temperature,
+ timeout=20,
+ max_tokens=max_tokens,
+ **(model_kwargs),
+ ) as stream:
+ for text in stream.text_stream:
+ aggregated_response += text
+
+ return aggregated_response
+
+
+@retry(
+ wait=wait_exponential(multiplier=1, min=4, max=10),
+ stop=stop_after_attempt(2),
+ before_sleep=before_sleep_log(logger, logging.DEBUG),
+ reraise=True,
+)
+def anthropic_chat_completion_with_backoff(
+ messages,
+ compiled_references,
+ online_results,
+ model_name,
+ temperature,
+ api_key,
+ system_prompt,
+ max_prompt_size=None,
+ completion_func=None,
+ model_kwargs=None,
+):
+ g = ThreadedGenerator(compiled_references, online_results, completion_func=completion_func)
+ t = Thread(
+ target=anthropic_llm_thread,
+ args=(g, messages, system_prompt, model_name, temperature, api_key, max_prompt_size, model_kwargs),
+ )
+ t.start()
+ return g
+
+
+def anthropic_llm_thread(
+ g, messages, system_prompt, model_name, temperature, api_key, max_prompt_size=None, model_kwargs=None
+):
+ if api_key not in anthropic_clients:
+ client: anthropic.Anthropic = anthropic.Anthropic(api_key=api_key)
+ anthropic_clients[api_key] = client
+ else:
+ client: anthropic.Anthropic = anthropic_clients[api_key]
+
+ formatted_messages: List[anthropic.types.MessageParam] = [
+ anthropic.types.MessageParam(role=message.role, content=message.content) for message in messages
+ ]
+
+ max_prompt_size = max_prompt_size or DEFAULT_MAX_TOKENS_ANTHROPIC
+
+ with client.messages.stream(
+ messages=formatted_messages,
+ model=model_name, # type: ignore
+ temperature=temperature,
+ system=system_prompt,
+ timeout=20,
+ max_tokens=max_prompt_size,
+ **(model_kwargs or dict()),
+ ) as stream:
+ for text in stream.text_stream:
+ g.send(text)
+
+ g.close()
diff --git a/src/khoj/processor/conversation/openai/gpt.py b/src/khoj/processor/conversation/openai/gpt.py
index 8360a32e..e424a5cb 100644
--- a/src/khoj/processor/conversation/openai/gpt.py
+++ b/src/khoj/processor/conversation/openai/gpt.py
@@ -67,7 +67,6 @@ def extract_questions(
messages=messages,
model=model,
temperature=temperature,
- max_tokens=max_tokens,
api_base_url=api_base_url,
model_kwargs={"response_format": {"type": "json_object"}},
openai_api_key=api_key,
diff --git a/src/khoj/processor/conversation/openai/utils.py b/src/khoj/processor/conversation/openai/utils.py
index 0c37ba53..49f1d6b6 100644
--- a/src/khoj/processor/conversation/openai/utils.py
+++ b/src/khoj/processor/conversation/openai/utils.py
@@ -34,7 +34,7 @@ openai_clients: Dict[str, openai.OpenAI] = {}
reraise=True,
)
def completion_with_backoff(
- messages, model, temperature=0, openai_api_key=None, api_base_url=None, model_kwargs=None, max_tokens=None
+ messages, model, temperature=0, openai_api_key=None, api_base_url=None, model_kwargs=None
) -> str:
client_key = f"{openai_api_key}--{api_base_url}"
client: openai.OpenAI = openai_clients.get(client_key)
@@ -53,7 +53,6 @@ def completion_with_backoff(
model=model, # type: ignore
temperature=temperature,
timeout=20,
- max_tokens=max_tokens,
**(model_kwargs or dict()),
)
aggregated_response = ""
diff --git a/src/khoj/processor/conversation/prompts.py b/src/khoj/processor/conversation/prompts.py
index f3b65e15..d0f5356d 100644
--- a/src/khoj/processor/conversation/prompts.py
+++ b/src/khoj/processor/conversation/prompts.py
@@ -261,6 +261,45 @@ Khoj:
""".strip()
)
+extract_questions_anthropic_system_prompt = PromptTemplate.from_template(
+ """
+You are Khoj, an extremely smart and helpful document search assistant with only the ability to retrieve information from the user's notes. Disregard online search requests. Construct search queries to retrieve relevant information to answer the user's question.
+- You will be provided past questions(Q) and answers(A) for context.
+- Add as much context from the previous questions and answers as required into your search queries.
+- Break messages into multiple search queries when required to retrieve the relevant information.
+- Add date filters to your search queries from questions and answers when required to retrieve the relevant information.
+
+What searches will you perform to answer the users question? Respond with a JSON object with the key "queries" mapping to a list of searches you would perform on the user's knowledge base. Just return the queries and nothing else.
+
+Current Date: {day_of_week}, {current_date}
+User's Location: {location}
+
+Here are some examples of how you can construct search queries to answer the user's question:
+
+User: How was my trip to Cambodia?
+Assistant: {{"queries": ["How was my trip to Cambodia?"]}}
+
+User: What national parks did I go to last year?
+Assistant: {{"queries": ["National park I visited in {last_new_year} dt>='{last_new_year_date}' dt<'{current_new_year_date}'"]}}
+
+User: How can you help me?
+Assistant: {{"queries": ["Social relationships", "Physical and mental health", "Education and career", "Personal life goals and habits"]}}
+
+User: Who all did I meet here yesterday?
+Assistant: {{"queries": ["Met in {location} on {yesterday_date} dt>='{yesterday_date}' dt<'{current_date}'"]}}
+""".strip()
+)
+
+extract_questions_anthropic_user_message = PromptTemplate.from_template(
+ """
+Here's our most recent chat history:
+{chat_history}
+
+User: {text}
+Assistant:
+""".strip()
+)
+
system_prompt_extract_relevant_information = """As a professional analyst, create a comprehensive report of the most relevant information from a web page in response to a user's query. The text provided is directly from within the web page. The report you create should be multiple paragraphs, and it should represent the content of the website. Tell the user exactly what the website says in response to their query, while adhering to these guidelines:
1. Answer the user's query as specifically as possible. Include many supporting details from the website.
@@ -454,7 +493,7 @@ You are Khoj, an advanced google search assistant. You are tasked with construct
- Break messages into multiple search queries when required to retrieve the relevant information.
- Use site: google search operators when appropriate
- You have access to the the whole internet to retrieve information.
-- Official, up-to-date information about you, Khoj, is available at site:khoj.dev, github or pypi.
+- Official, up-to-date information about you, Khoj, is available at site:khoj.dev
What Google searches, if any, will you need to perform to answer the user's question?
Provide search queries as a list of strings in a JSON object.
@@ -510,6 +549,7 @@ Q: How many oranges would fit in NASA's Saturn V rocket?
Khoj: {{"queries": ["volume of an orange", "volume of saturn v rocket"]}}
Now it's your turn to construct Google search queries to answer the user's question. Provide them as a list of strings in a JSON object. Do not say anything else.
+Now it's your turn to construct a search query for Google to answer the user's question.
History:
{chat_history}
diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py
index 067d18b3..0188c40a 100644
--- a/src/khoj/routers/api.py
+++ b/src/khoj/routers/api.py
@@ -3,8 +3,10 @@ import json
import logging
import math
import os
+import threading
import time
import uuid
+from random import random
from typing import Any, Callable, List, Optional, Union
import cron_descriptor
@@ -26,6 +28,9 @@ from khoj.database.adapters import (
get_user_search_model_or_default,
)
from khoj.database.models import ChatModelOptions, KhojUser, SpeechToTextModelOptions
+from khoj.processor.conversation.anthropic.anthropic_chat import (
+ extract_questions_anthropic,
+)
from khoj.processor.conversation.offline.chat_model import extract_questions_offline
from khoj.processor.conversation.offline.whisper import transcribe_audio_offline
from khoj.processor.conversation.openai.gpt import extract_questions
@@ -338,6 +343,17 @@ async def extract_references_and_questions(
api_key=api_key,
conversation_log=meta_log,
location_data=location_data,
+ max_tokens=conversation_config.max_prompt_size,
+ )
+ elif conversation_config.model_type == ChatModelOptions.ModelType.ANTHROPIC:
+ api_key = conversation_config.openai_config.api_key
+ chat_model = conversation_config.chat_model
+ inferred_queries = extract_questions_anthropic(
+ defiltered_query,
+ model=chat_model,
+ api_key=api_key,
+ conversation_log=meta_log,
+ location_data=location_data,
)
# Collate search results as context for GPT
@@ -454,14 +470,28 @@ async def post_automation(
crontime = " ".join(crontime.split(" ")[:5])
# Convert crontime to standard unix crontime
crontime = crontime.replace("?", "*")
+
+ # Disallow minute level automation recurrence
+ minute_value = crontime.split(" ")[0]
+ if not minute_value.isdigit():
+ return Response(
+ content="Recurrence of every X minutes is unsupported. Please create a less frequent schedule.",
+ status_code=400,
+ )
+
subject = await acreate_title_from_query(q)
+ # Create new Conversation Session associated with this new task
+ conversation = await ConversationAdapters.acreate_conversation_session(user, request.user.client_app)
+
+ calling_url = request.url.replace(query=f"{request.url.query}&conversation_id={conversation.id}")
+
# Schedule automation with query_to_run, timezone, subject directly provided by user
try:
# Use the query to run as the scheduling request if the scheduling request is unset
- automation = await schedule_automation(query_to_run, subject, crontime, timezone, q, user, request.url)
+ automation = await schedule_automation(query_to_run, subject, crontime, timezone, q, user, calling_url)
except Exception as e:
- logger.error(f"Error creating automation {q} for {user.email}: {e}")
+ logger.error(f"Error creating automation {q} for {user.email}: {e}", exc_info=True)
return Response(
content=f"Unable to create automation. Ensure the automation doesn't already exist.",
media_type="text/plain",
@@ -475,6 +505,31 @@ async def post_automation(
return Response(content=json.dumps(automation_info), media_type="application/json", status_code=200)
+@api.post("/trigger/automation", response_class=Response)
+@requires(["authenticated"])
+def trigger_manual_job(
+ request: Request,
+ automation_id: str,
+):
+ user: KhojUser = request.user.object
+
+ # Check, get automation to edit
+ try:
+ automation: Job = AutomationAdapters.get_automation(user, automation_id)
+ except ValueError as e:
+ logger.error(f"Error triggering automation {automation_id} for {user.email}: {e}", exc_info=True)
+ return Response(content="Invalid automation", status_code=403)
+
+ # Trigger the job without waiting for the result.
+ scheduled_chat_func = automation.func
+
+ # Run the function in a separate thread
+ thread = threading.Thread(target=scheduled_chat_func, args=automation.args, kwargs=automation.kwargs)
+ thread.start()
+
+ return Response(content="Automation triggered", status_code=200)
+
+
@api.put("/automation", response_class=Response)
@requires(["authenticated"])
def edit_job(
@@ -515,6 +570,14 @@ def edit_job(
# Convert crontime to standard unix crontime
crontime = crontime.replace("?", "*")
+ # Disallow minute level automation recurrence
+ minute_value = crontime.split(" ")[0]
+ if not minute_value.isdigit():
+ return Response(
+ content="Recurrence of every X minutes is unsupported. Please create a less frequent schedule.",
+ status_code=400,
+ )
+
# Construct updated automation metadata
automation_metadata = json.loads(automation.name)
automation_metadata["scheduling_request"] = q
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 30534b13..c428502f 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -13,7 +13,12 @@ from starlette.authentication import requires
from starlette.websockets import WebSocketDisconnect
from websockets import ConnectionClosedOK
-from khoj.database.adapters import ConversationAdapters, EntryAdapters, aget_user_name
+from khoj.database.adapters import (
+ ConversationAdapters,
+ EntryAdapters,
+ PublicConversationAdapters,
+ aget_user_name,
+)
from khoj.database.models import KhojUser
from khoj.processor.conversation.prompts import (
help_message,
@@ -38,6 +43,7 @@ from khoj.routers.helpers import (
construct_automation_created_message,
create_automation,
get_conversation_command,
+ is_query_empty,
is_ready_to_chat,
text_to_image,
update_telemetry_state,
@@ -62,6 +68,23 @@ conversation_command_rate_limiter = ConversationCommandRateLimiter(
api_chat = APIRouter()
+from pydantic import BaseModel
+
+from khoj.routers.email import send_query_feedback
+
+
+class FeedbackData(BaseModel):
+ uquery: str
+ kquery: str
+ sentiment: str
+
+
+@api_chat.post("/feedback")
+@requires(["authenticated"])
+async def sendfeedback(request: Request, data: FeedbackData):
+ user: KhojUser = request.user.object
+ await send_query_feedback(data.uquery, data.kquery, data.sentiment, user.email)
+
@api_chat.get("/starters", response_class=Response)
@requires(["authenticated"])
@@ -132,6 +155,60 @@ def chat_history(
return {"status": "ok", "response": meta_log}
+@api_chat.get("/share/history")
+def get_shared_chat(
+ request: Request,
+ common: CommonQueryParams,
+ public_conversation_slug: str,
+ n: Optional[int] = None,
+):
+ user = request.user.object if request.user.is_authenticated else None
+
+ # Load Conversation History
+ conversation = PublicConversationAdapters.get_public_conversation_by_slug(public_conversation_slug)
+
+ if conversation is None:
+ return Response(
+ content=json.dumps({"status": "error", "message": f"Conversation: {public_conversation_slug} not found"}),
+ status_code=404,
+ )
+
+ agent_metadata = None
+ if conversation.agent:
+ agent_metadata = {
+ "slug": conversation.agent.slug,
+ "name": conversation.agent.name,
+ "avatar": conversation.agent.avatar,
+ "isCreator": conversation.agent.creator == user,
+ }
+
+ meta_log = conversation.conversation_log
+ meta_log.update(
+ {
+ "conversation_id": conversation.id,
+ "slug": conversation.title if conversation.title else conversation.slug,
+ "agent": agent_metadata,
+ }
+ )
+
+ if n:
+ # Get latest N messages if N > 0
+ if n > 0 and meta_log.get("chat"):
+ meta_log["chat"] = meta_log["chat"][-n:]
+ # Else return all messages except latest N
+ elif n < 0 and meta_log.get("chat"):
+ meta_log["chat"] = meta_log["chat"][:n]
+
+ update_telemetry_state(
+ request=request,
+ telemetry_type="api",
+ api="public_conversation_history",
+ **common.__dict__,
+ )
+
+ return {"status": "ok", "response": meta_log}
+
+
@api_chat.delete("/history")
@requires(["authenticated"])
async def clear_chat_history(
@@ -154,6 +231,69 @@ async def clear_chat_history(
return {"status": "ok", "message": "Conversation history cleared"}
+@api_chat.post("/share/fork")
+@requires(["authenticated"])
+def fork_public_conversation(
+ request: Request,
+ common: CommonQueryParams,
+ public_conversation_slug: str,
+):
+ user = request.user.object
+
+ # Load Conversation History
+ public_conversation = PublicConversationAdapters.get_public_conversation_by_slug(public_conversation_slug)
+
+ # Duplicate Public Conversation to User's Private Conversation
+ ConversationAdapters.create_conversation_from_public_conversation(
+ user, public_conversation, request.user.client_app
+ )
+
+ chat_metadata = {"forked_conversation": public_conversation.slug}
+
+ update_telemetry_state(
+ request=request,
+ telemetry_type="api",
+ api="fork_public_conversation",
+ **common.__dict__,
+ metadata=chat_metadata,
+ )
+
+ redirect_uri = str(request.app.url_path_for("chat_page"))
+
+ return Response(status_code=200, content=json.dumps({"status": "ok", "next_url": redirect_uri}))
+
+
+@api_chat.post("/share")
+@requires(["authenticated"])
+def duplicate_chat_history_public_conversation(
+ request: Request,
+ common: CommonQueryParams,
+ conversation_id: int,
+):
+ user = request.user.object
+
+ # Duplicate Conversation History to Public Conversation
+ conversation = ConversationAdapters.get_conversation_by_user(user, request.user.client_app, conversation_id)
+
+ public_conversation = ConversationAdapters.make_public_conversation_copy(conversation)
+
+ public_conversation_url = PublicConversationAdapters.get_public_conversation_url(public_conversation)
+
+ domain = request.headers.get("host")
+ scheme = request.url.scheme
+
+ update_telemetry_state(
+ request=request,
+ telemetry_type="api",
+ api="post_chat_share",
+ **common.__dict__,
+ )
+
+ return Response(
+ status_code=200, content=json.dumps({"status": "ok", "url": f"{scheme}://{domain}{public_conversation_url}"})
+ )
+
+
@api_chat.get("/sessions")
@requires(["authenticated"])
def chat_sessions(
@@ -347,6 +487,10 @@ async def websocket_endpoint(
if conversation:
await sync_to_async(conversation.refresh_from_db)(fields=["conversation_log"])
q = await websocket.receive_text()
+
+ # Refresh these because the connection to the database might have been closed
+ await conversation.arefresh_from_db()
+
except WebSocketDisconnect:
logger.debug(f"User {user} disconnected web socket")
break
@@ -358,6 +502,14 @@ async def websocket_endpoint(
await send_rate_limit_message(e.detail)
break
+ if is_query_empty(q):
+ await send_message("start_llm_response")
+ await send_message(
+ "It seems like your query is incomplete. Could you please provide more details or specify what you need help with?"
+ )
+ await send_message("end_llm_response")
+ continue
+
user_message_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
conversation_commands = [get_conversation_command(query=q, any_references=True)]
@@ -465,11 +617,17 @@ async def websocket_endpoint(
if ConversationCommand.Webpage in conversation_commands:
try:
- online_results = await read_webpages(defiltered_query, meta_log, location, send_status_update)
+ direct_web_pages = await read_webpages(defiltered_query, meta_log, location, send_status_update)
webpages = []
- for query in online_results:
- for webpage in online_results[query]["webpages"]:
+ for query in direct_web_pages:
+ if online_results.get(query):
+ online_results[query]["webpages"] = direct_web_pages[query]["webpages"]
+ else:
+ online_results[query] = {"webpages": direct_web_pages[query]["webpages"]}
+
+ for webpage in direct_web_pages[query]["webpages"]:
webpages.append(webpage["link"])
+
await send_status_update(f"**📚 Read web pages**: {webpages}")
except ValueError as e:
logger.warning(
@@ -585,6 +743,12 @@ async def chat(
) -> Response:
user: KhojUser = request.user.object
q = unquote(q)
+ if is_query_empty(q):
+ return Response(
+ content="It seems like your query is incomplete. Could you please provide more details or specify what you need help with?",
+ media_type="text/plain",
+ status_code=400,
+ )
user_message_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
logger.info(f"Chat request by {user.username}: {q}")
@@ -634,7 +798,7 @@ async def chat(
q, timezone, user, request.url, meta_log
)
except Exception as e:
- logger.error(f"Error creating automation {q} for {user.email}: {e}")
+ logger.error(f"Error creating automation {q} for {user.email}: {e}", exc_info=True)
return Response(
content=f"Unable to create automation. Ensure the automation doesn't already exist.",
media_type="text/plain",
diff --git a/src/khoj/routers/email.py b/src/khoj/routers/email.py
index b1eb418e..ff5cb1ce 100644
--- a/src/khoj/routers/email.py
+++ b/src/khoj/routers/email.py
@@ -42,7 +42,7 @@ async def send_welcome_email(name, email):
r = resend.Emails.send(
{
- "from": "team@khoj.dev",
+ "sender": "team@khoj.dev",
"to": email,
"subject": f"{name}, four ways to use Khoj" if name else "Four ways to use Khoj",
"html": html_content,
@@ -50,6 +50,33 @@ async def send_welcome_email(name, email):
)
+async def send_query_feedback(uquery, kquery, sentiment, user_email):
+ if not is_resend_enabled():
+ logger.debug(f"Sentiment: {sentiment}, Query: {uquery}, Khoj Response: {kquery}")
+ return
+
+ logger.info(f"Sending feedback email for query {uquery}")
+
+ # rendering feedback email using feedback.html as template
+ template = env.get_template("feedback.html")
+ html_content = template.render(
+ uquery=uquery if not is_none_or_empty(uquery) else "N/A",
+ kquery=kquery if not is_none_or_empty(kquery) else "N/A",
+ sentiment=sentiment if not is_none_or_empty(sentiment) else "N/A",
+ user_email=user_email if not is_none_or_empty(user_email) else "N/A",
+ )
+ # send feedback from two fixed accounts
+ r = resend.Emails.send(
+ {
+ "sender": "saba@khoj.dev",
+ "to": "team@khoj.dev",
+ "subject": f"User Feedback",
+ "html": html_content,
+ }
+ )
+ return {"message": "Sent Email"}
+
+
def send_task_email(name, email, query, result, subject):
if not is_resend_enabled():
logger.debug("Email sending disabled")
@@ -64,7 +91,7 @@ def send_task_email(name, email, query, result, subject):
r = resend.Emails.send(
{
- "from": "Khoj
+
+
+
+
+
+ Agents
+
+
+
+
+
+
+
+ {% for agent in agents %}
+
+
+
+
+
+ {% endfor %}
+
+ 
+
+
+
+
+ {{ agent.name }}
+
+
+
+
+
+
+
+
+
+
+
+