Resolve merge conflicts in dependency imports

src/khoj/routers/api.py

@@ -31,6 +31,7 @@ from khoj.utils import state, constants
 from khoj.utils.helpers import AsyncIteratorWrapper, get_device
 from fastapi.responses import StreamingResponse, Response
 from khoj.routers.helpers import (
+    CommonQueryParams,
     get_conversation_command,
     validate_conversation_config,
     agenerate_chat_response,
@@ -55,6 +56,7 @@ from database.models import (
     Entry as DbEntry,
     GithubConfig,
     NotionConfig,
+    ChatModelOptions,
 )
 
 
@@ -122,7 +124,7 @@ async def map_config_to_db(config: FullConfig, user: KhojUser):
 def _initialize_config():
     if state.config is None:
         state.config = FullConfig()
-        state.config.search_type = SearchConfig.parse_obj(constants.default_config["search-type"])
+        state.config.search_type = SearchConfig.model_validate(constants.default_config["search-type"])
 
 
 @api.get("/config/data", response_model=FullConfig)
@@ -355,15 +357,12 @@ def get_config_types(
 async def search(
     q: str,
     request: Request,
+    common: CommonQueryParams,
     n: Optional[int] = 5,
     t: Optional[SearchType] = SearchType.All,
     r: Optional[bool] = False,
     max_distance: Optional[Union[float, None]] = None,
     dedupe: Optional[bool] = True,
-    client: Optional[str] = None,
-    user_agent: Optional[str] = Header(None),
-    referer: Optional[str] = Header(None),
-    host: Optional[str] = Header(None),
 ):
     user = request.user.object
     start_time = time.time()
@@ -467,10 +466,7 @@ async def search(
         request=request,
         telemetry_type="api",
         api="search",
-        client=client,
-        user_agent=user_agent,
-        referer=referer,
-        host=host,
+        **common.__dict__,
     )
 
     end_time = time.time()
@@ -483,12 +479,9 @@ async def search(
 @requires(["authenticated"])
 def update(
     request: Request,
+    common: CommonQueryParams,
     t: Optional[SearchType] = None,
     force: Optional[bool] = False,
-    client: Optional[str] = None,
-    user_agent: Optional[str] = Header(None),
-    referer: Optional[str] = Header(None),
-    host: Optional[str] = Header(None),
 ):
     user = request.user.object
     if not state.config:
@@ -514,10 +507,7 @@ def update(
         request=request,
         telemetry_type="api",
         api="update",
-        client=client,
-        user_agent=user_agent,
-        referer=referer,
-        host=host,
+        **common.__dict__,
     )
 
     return {"status": "ok", "message": "khoj reloaded"}
@@ -527,10 +517,7 @@ def update(
 @requires(["authenticated"])
 def chat_history(
     request: Request,
-    client: Optional[str] = None,
-    user_agent: Optional[str] = Header(None),
-    referer: Optional[str] = Header(None),
-    host: Optional[str] = Header(None),
+    common: CommonQueryParams,
 ):
     user = request.user.object
     validate_conversation_config()
@@ -542,10 +529,7 @@ def chat_history(
         request=request,
         telemetry_type="api",
         api="chat",
-        client=client,
-        user_agent=user_agent,
-        referer=referer,
-        host=host,
+        **common.__dict__,
     )
 
     return {"status": "ok", "response": meta_log.get("chat", [])}
@@ -555,10 +539,7 @@ def chat_history(
 @requires(["authenticated"])
 async def chat_options(
     request: Request,
-    client: Optional[str] = None,
-    user_agent: Optional[str] = Header(None),
-    referer: Optional[str] = Header(None),
-    host: Optional[str] = Header(None),
+    common: CommonQueryParams,
 ) -> Response:
     cmd_options = {}
     for cmd in ConversationCommand:
@@ -568,10 +549,7 @@ async def chat_options(
         request=request,
         telemetry_type="api",
         api="chat_options",
-        client=client,
-        user_agent=user_agent,
-        referer=referer,
-        host=host,
+        **common.__dict__,
     )
     return Response(content=json.dumps(cmd_options), media_type="application/json", status_code=200)
 
@@ -580,14 +558,11 @@ async def chat_options(
 @requires(["authenticated"])
 async def chat(
     request: Request,
+    common: CommonQueryParams,
     q: str,
     n: Optional[int] = 5,
     d: Optional[float] = 0.18,
-    client: Optional[str] = None,
     stream: Optional[bool] = False,
-    user_agent: Optional[str] = Header(None),
-    referer: Optional[str] = Header(None),
-    host: Optional[str] = Header(None),
     rate_limiter_per_minute=Depends(ApiUserRateLimiter(requests=30, window=60)),
     rate_limiter_per_day=Depends(ApiUserRateLimiter(requests=500, window=60 * 60 * 24)),
 ) -> Response:
@@ -601,7 +576,7 @@ async def chat(
     meta_log = (await ConversationAdapters.aget_conversation_by_user(user)).conversation_log
 
     compiled_references, inferred_queries, defiltered_query = await extract_references_and_questions(
-        request, meta_log, q, (n or 5), (d or math.inf), conversation_command
+        request, common, meta_log, q, (n or 5), (d or math.inf), conversation_command
     )
     online_results: Dict = dict()
 
@@ -647,11 +622,8 @@ async def chat(
         request=request,
         telemetry_type="api",
         api="chat",
-        client=client,
-        user_agent=user_agent,
-        referer=referer,
-        host=host,
         metadata=chat_metadata,
+        **common.__dict__,
     )
 
     if llm_response is None:
@@ -678,6 +650,7 @@ async def chat(
 
 async def extract_references_and_questions(
     request: Request,
+    common: CommonQueryParams,
     meta_log: dict,
     q: str,
     n: int,
@@ -710,7 +683,16 @@ async def extract_references_and_questions(
     # Infer search queries from user message
     with timer("Extracting search queries took", logger):
         # If we've reached here, either the user has enabled offline chat or the openai model is enabled.
-        if await ConversationAdapters.ahas_offline_chat():
+        offline_chat_config = await ConversationAdapters.aget_offline_chat_conversation_config()
+        conversation_config = await ConversationAdapters.aget_conversation_config(user)
+        if conversation_config is None:
+            conversation_config = await ConversationAdapters.aget_default_conversation_config()
+        openai_chat_config = await ConversationAdapters.aget_openai_conversation_config()
+        if (
+            offline_chat_config
+            and offline_chat_config.enabled
+            and conversation_config.model_type == ChatModelOptions.ModelType.OFFLINE
+        ):
             using_offline_chat = True
             offline_chat = await ConversationAdapters.get_offline_chat()
             chat_model = offline_chat.chat_model
@@ -722,7 +704,7 @@ async def extract_references_and_questions(
             inferred_queries = extract_questions_offline(
                 defiltered_query, loaded_model=loaded_model, conversation_log=meta_log, should_extract_questions=False
             )
-        elif await ConversationAdapters.has_openai_chat():
+        elif openai_chat_config and conversation_config.model_type == ChatModelOptions.ModelType.OPENAI:
             openai_chat_config = await ConversationAdapters.get_openai_chat_config()
             openai_chat = await ConversationAdapters.get_openai_chat()
             api_key = openai_chat_config.api_key
@@ -744,9 +726,9 @@ async def extract_references_and_questions(
                     r=True,
                     max_distance=d,
                     dedupe=False,
+                    common=common,
                 )
             )
-        # Dedupe the results again, as duplicates may be returned across queries.
         result_list = text_search.deduplicated_search_responses(result_list)
         compiled_references = [item.additional["compiled"] for item in result_list]