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

Improve typing, null checks in controllers and gpt functions

Browse Source
This commit is contained in:
Debanjum Singh Solanky
2023-07-05 20:49:25 -07:00
parent 41ac1e24c9
commit 8f36572a9b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/khoj/processor/conversation/gpt.py
View File

@@ -2,6 +2,7 @@
import json import json
import logging import logging
from datetime import datetime from datetime import datetime
from typing import Optional
# Internal Packages # Internal Packages
from khoj.utils.constants import empty_escape_sequences from khoj.utils.constants import empty_escape_sequences
@@ -47,6 +48,8 @@ def summarize(text, summary_type, model, user_query=None, api_key=None, temperat
prompt = prompts.summarize_chat.format(text=text) prompt = prompts.summarize_chat.format(text=text)
elif summary_type == "notes": elif summary_type == "notes":
prompt = prompts.summarize_notes.format(text=text, user_query=user_query) prompt = prompts.summarize_notes.format(text=text, user_query=user_query)
else:
raise ValueError(f"Invalid summary type: {summary_type}")
# Get Response from GPT # Get Response from GPT
logger.debug(f"Prompt for GPT: {prompt}") logger.debug(f"Prompt for GPT: {prompt}")
@@ -64,7 +67,9 @@ def summarize(text, summary_type, model, user_query=None, api_key=None, temperat
return str(response).replace("\n\n", "") return str(response).replace("\n\n", "")
def extract_questions(text, model="text-davinci-003", conversation_log={}, api_key=None, temperature=0, max_tokens=100): def extract_questions(
text, model: Optional[str] = "text-davinci-003", conversation_log={}, api_key=None, temperature=0, max_tokens=100
):
""" """
Infer search queries to retrieve relevant notes to answer user query Infer search queries to retrieve relevant notes to answer user query
""" """
@@ -148,7 +153,7 @@ def converse(
references, references,
user_query, user_query,
conversation_log={}, conversation_log={},
model="gpt-3.5-turbo", model: Optional[str] = "gpt-3.5-turbo",
api_key=None, api_key=None,
temperature=0.2, temperature=0.2,
completion_func=None, completion_func=None,

8
src/khoj/routers/api.py
View File

@@ -324,7 +324,7 @@ async def search(
state.query_cache[query_cache_key] = results state.query_cache[query_cache_key] = results
user_state = { user_state = {
"client_host": request.client.host, "client_host": request.client.host if request.client else "unknown",
"user_agent": user_agent or "unknown", "user_agent": user_agent or "unknown",
"referer": referer or "unknown", "referer": referer or "unknown",
"host": host or "unknown", "host": host or "unknown",
@@ -380,7 +380,7 @@ def update(
logger.info("📬 Processor reconfigured via API") logger.info("📬 Processor reconfigured via API")
user_state = { user_state = {
"client_host": request.client.host, "client_host": request.client.host if request.client else None,
"user_agent": user_agent or "unknown", "user_agent": user_agent or "unknown",
"referer": referer or "unknown", "referer": referer or "unknown",
"host": host or "unknown", "host": host or "unknown",
@@ -416,7 +416,7 @@ def chat_init(
meta_log = state.processor_config.conversation.meta_log meta_log = state.processor_config.conversation.meta_log
user_state = { user_state = {
"client_host": request.client.host, "client_host": request.client.host if request.client else None,
"user_agent": user_agent or "unknown", "user_agent": user_agent or "unknown",
"referer": referer or "unknown", "referer": referer or "unknown",
"host": host or "unknown", "host": host or "unknown",
@@ -503,7 +503,7 @@ async def chat(
logger.debug(f"Conversation Type: {conversation_type}") logger.debug(f"Conversation Type: {conversation_type}")
user_state = { user_state = {
"client_host": request.client.host, "client_host": request.client.host if request.client else None,
"user_agent": user_agent or "unknown", "user_agent": user_agent or "unknown",
"referer": referer or "unknown", "referer": referer or "unknown",
"host": host or "unknown", "host": host or "unknown",