khoj 2.0.0b12.dev5__py3-none-any.whl → 2.0.0b13__py3-none-any.whl

khoj/routers/api.py

@@ -7,7 +7,6 @@ from typing import List, Optional, Union
 
 import openai
 from fastapi import APIRouter, Depends, File, HTTPException, Request, UploadFile
-from fastapi.requests import Request
 from fastapi.responses import Response
 from starlette.authentication import has_required_scope, requires
 
@@ -15,7 +14,6 @@ from khoj.configure import initialize_content
 from khoj.database import adapters
 from khoj.database.adapters import ConversationAdapters, EntryAdapters, get_user_photo
 from khoj.database.models import KhojUser, SpeechToTextModelOptions
-from khoj.processor.conversation.offline.whisper import transcribe_audio_offline
 from khoj.processor.conversation.openai.whisper import transcribe_audio
 from khoj.routers.helpers import (
     ApiUserRateLimiter,
@@ -88,22 +86,14 @@ def update(
     force: Optional[bool] = False,
 ):
     user = request.user.object
-    if not state.config:
-        error_msg = f"🚨 Khoj is not configured.\nConfigure it via http://localhost:42110/settings, plugins or by editing {state.config_file}."
-        logger.warning(error_msg)
-        raise HTTPException(status_code=500, detail=error_msg)
     try:
         initialize_content(user=user, regenerate=force, search_type=t)
     except Exception as e:
-        error_msg = f"🚨 Failed to update server via API: {e}"
+        error_msg = f"🚨 Failed to update server indexed content via API: {e}"
         logger.error(error_msg, exc_info=True)
         raise HTTPException(status_code=500, detail=error_msg)
     else:
-        components = []
-        if state.search_models:
-            components.append("Search models")
-        components_msg = ", ".join(components)
-        logger.info(f"📪 {components_msg} updated via API")
+        logger.info("📪 Server indexed content updated via API")
 
     update_telemetry_state(
         request=request,
@@ -150,9 +140,6 @@ async def transcribe(
         if not speech_to_text_config:
             # If the user has not configured a speech to text model, return an unsupported on server error
             status_code = 501
-        elif speech_to_text_config.model_type == SpeechToTextModelOptions.ModelType.OFFLINE:
-            speech2text_model = speech_to_text_config.model_name
-            user_message = await transcribe_audio_offline(audio_filename, speech2text_model)
         elif speech_to_text_config.model_type == SpeechToTextModelOptions.ModelType.OPENAI:
             speech2text_model = speech_to_text_config.model_name
             if speech_to_text_config.ai_model_api:

khoj/routers/api_agents.py

@@ -6,12 +6,11 @@ from typing import Dict, List, Optional
 
 from asgiref.sync import sync_to_async
 from fastapi import APIRouter, Request
-from fastapi.requests import Request
 from fastapi.responses import Response
 from pydantic import BaseModel
 from starlette.authentication import has_required_scope, requires
 
-from khoj.database.adapters import AgentAdapters, ConversationAdapters, EntryAdapters
+from khoj.database.adapters import AgentAdapters, ConversationAdapters
 from khoj.database.models import Agent, Conversation, KhojUser, PriceTier
 from khoj.routers.helpers import CommonQueryParams, acheck_if_safe_prompt
 from khoj.utils.helpers import (

khoj/routers/api_automation.py

@@ -109,7 +109,7 @@ def post_automation(
     except Exception as 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.",
+            content="Unable to create automation. Ensure the automation doesn't already exist.",
             media_type="text/plain",
             status_code=500,
         )

khoj/routers/api_chat.py

@@ -10,7 +10,6 @@ from functools import partial
 from typing import Any, Dict, List, Optional
 from urllib.parse import unquote
 
-from asgiref.sync import sync_to_async
 from fastapi import (
     APIRouter,
     Depends,
@@ -32,10 +31,10 @@ from khoj.database.adapters import (
     PublicConversationAdapters,
     aget_user_name,
 )
-from khoj.database.models import Agent, ChatMessageModel, KhojUser
+from khoj.database.models import Agent, KhojUser
 from khoj.processor.conversation import prompts
 from khoj.processor.conversation.openai.utils import is_local_api
-from khoj.processor.conversation.prompts import help_message, no_entries_found
+from khoj.processor.conversation.prompts import no_entries_found
 from khoj.processor.conversation.utils import (
     OperatorRun,
     ResponseWithThought,
@@ -65,11 +64,8 @@ from khoj.routers.helpers import (
     acreate_title_from_history,
     agenerate_chat_response,
     aget_data_sources_and_output_format,
-    construct_automation_created_message,
-    create_automation,
     gather_raw_query_files,
     generate_mermaidjs_diagram,
-    generate_summary_from_files,
     get_conversation_command,
     get_message_from_queue,
     is_query_empty,
@@ -89,13 +85,11 @@ from khoj.utils.helpers import (
     convert_image_to_webp,
     get_country_code_from_timezone,
     get_country_name_from_timezone,
-    get_device,
     is_env_var_true,
     is_none_or_empty,
     is_operator_enabled,
 )
 from khoj.utils.rawconfig import (
-    ChatRequestBody,
     FileAttachment,
     FileFilterRequest,
     FilesFilterRequest,
@@ -689,7 +683,6 @@ async def event_generator(
     region = body.region
     country = body.country or get_country_name_from_timezone(body.timezone)
     country_code = body.country_code or get_country_code_from_timezone(body.timezone)
-    timezone = body.timezone
     raw_images = body.images
     raw_query_files = body.files
 
@@ -853,7 +846,8 @@ async def event_generator(
                 if (
                     len(train_of_thought) > 0
                     and train_of_thought[-1]["type"] == ChatEvent.THOUGHT.value
-                    and type(train_of_thought[-1]["data"]) == type(data) == str
+                    and isinstance(train_of_thought[-1]["data"], str)
+                    and isinstance(data, str)
                 ):
                     train_of_thought[-1]["data"] += data
                 else:
@@ -1075,11 +1069,11 @@ async def event_generator(
 
         # researched_results = await extract_relevant_info(q, researched_results, agent)
         if state.verbose > 1:
-            logger.debug(f'Researched Results: {"".join(r.summarizedResult or "" for r in research_results)}')
+            logger.debug(f"Researched Results: {''.join(r.summarizedResult or '' for r in research_results)}")
 
     # Gather Context
     ## Extract Document References
-    if not ConversationCommand.Research in conversation_commands:
+    if ConversationCommand.Research not in conversation_commands:
         try:
             async for result in search_documents(
                 q,
@@ -1218,7 +1212,7 @@ async def event_generator(
                 else:
                     code_results = result
         except ValueError as e:
-            program_execution_context.append(f"Failed to run code")
+            program_execution_context.append("Failed to run code")
             logger.warning(
                 f"Failed to use code tool: {e}. Attempting to respond without code results",
                 exc_info=True,
@@ -1297,7 +1291,7 @@ async def event_generator(
         inferred_queries.append(improved_image_prompt)
         if generated_image is None or status_code != 200:
             program_execution_context.append(f"Failed to generate image with {improved_image_prompt}")
-            async for result in send_event(ChatEvent.STATUS, f"Failed to generate image"):
+            async for result in send_event(ChatEvent.STATUS, "Failed to generate image"):
                 yield result
         else:
             generated_images.append(generated_image)
@@ -1315,7 +1309,7 @@ async def event_generator(
                 yield result
 
     if ConversationCommand.Diagram in conversation_commands:
-        async for result in send_event(ChatEvent.STATUS, f"Creating diagram"):
+        async for result in send_event(ChatEvent.STATUS, "Creating diagram"):
             yield result
 
         inferred_queries = []
@@ -1372,7 +1366,7 @@ async def event_generator(
         return
 
     ## Generate Text Output
-    async for result in send_event(ChatEvent.STATUS, f"**Generating a well-informed response**"):
+    async for result in send_event(ChatEvent.STATUS, "**Generating a well-informed response**"):
         yield result
 
     llm_response, chat_metadata = await agenerate_chat_response(

khoj/routers/api_content.py

@@ -27,16 +27,7 @@ from khoj.database.adapters import (
     get_user_notion_config,
 )
 from khoj.database.models import Entry as DbEntry
-from khoj.database.models import (
-    GithubConfig,
-    GithubRepoConfig,
-    KhojUser,
-    LocalMarkdownConfig,
-    LocalOrgConfig,
-    LocalPdfConfig,
-    LocalPlaintextConfig,
-    NotionConfig,
-)
+from khoj.database.models import GithubConfig, GithubRepoConfig, NotionConfig
 from khoj.processor.content.docx.docx_to_entries import DocxToEntries
 from khoj.processor.content.pdf.pdf_to_entries import PdfToEntries
 from khoj.routers.helpers import (
@@ -47,17 +38,9 @@ from khoj.routers.helpers import (
     get_user_config,
     update_telemetry_state,
 )
-from khoj.utils import constants, state
-from khoj.utils.config import SearchModels
-from khoj.utils.rawconfig import (
-    ContentConfig,
-    FullConfig,
-    GithubContentConfig,
-    NotionContentConfig,
-    SearchConfig,
-)
+from khoj.utils import state
+from khoj.utils.rawconfig import GithubContentConfig, NotionContentConfig
 from khoj.utils.state import SearchType
-from khoj.utils.yaml import save_config_to_file_updated_state
 
 logger = logging.getLogger(__name__)
 
@@ -192,8 +175,6 @@ async def set_content_github(
     updated_config: Union[GithubContentConfig, None],
     client: Optional[str] = None,
 ):
-    _initialize_config()
-
     user = request.user.object
 
     try:
@@ -225,8 +206,6 @@ async def set_content_notion(
     updated_config: Union[NotionContentConfig, None],
     client: Optional[str] = None,
 ):
-    _initialize_config()
-
     user = request.user.object
 
     try:
@@ -323,10 +302,6 @@ def get_content_types(request: Request, client: Optional[str] = None):
     configured_content_types = set(EntryAdapters.get_unique_file_types(user))
     configured_content_types |= {"all"}
 
-    if state.config and state.config.content_type:
-        for ctype in state.config.content_type.model_dump(exclude_none=True):
-            configured_content_types.add(ctype)
-
     return list(configured_content_types & all_content_types)
 
 
@@ -606,28 +581,6 @@ async def indexer(
             docx=index_files["docx"],
         )
 
-        if state.config == None:
-            logger.info("📬 Initializing content index on first run.")
-            default_full_config = FullConfig(
-                content_type=None,
-                search_type=SearchConfig.model_validate(constants.default_config["search-type"]),
-                processor=None,
-            )
-            state.config = default_full_config
-            default_content_config = ContentConfig(
-                org=None,
-                markdown=None,
-                pdf=None,
-                docx=None,
-                image=None,
-                github=None,
-                notion=None,
-                plaintext=None,
-            )
-            state.config.content_type = default_content_config
-            save_config_to_file_updated_state()
-            configure_search(state.search_models, state.config.search_type)
-
         loop = asyncio.get_event_loop()
         success = await loop.run_in_executor(
             None,
@@ -674,14 +627,6 @@ async def indexer(
     return Response(content=indexed_filenames, status_code=200)
 
 
-def configure_search(search_models: SearchModels, search_config: Optional[SearchConfig]) -> Optional[SearchModels]:
-    # Run Validation Checks
-    if search_models is None:
-        search_models = SearchModels()
-
-    return search_models
-
-
 def map_config_to_object(content_source: str):
     if content_source == DbEntry.EntrySource.GITHUB:
         return GithubConfig
@@ -689,56 +634,3 @@ def map_config_to_object(content_source: str):
         return NotionConfig
     if content_source == DbEntry.EntrySource.COMPUTER:
         return "Computer"
-
-
-async def map_config_to_db(config: FullConfig, user: KhojUser):
-    if config.content_type:
-        if config.content_type.org:
-            await LocalOrgConfig.objects.filter(user=user).adelete()
-            await LocalOrgConfig.objects.acreate(
-                input_files=config.content_type.org.input_files,
-                input_filter=config.content_type.org.input_filter,
-                index_heading_entries=config.content_type.org.index_heading_entries,
-                user=user,
-            )
-        if config.content_type.markdown:
-            await LocalMarkdownConfig.objects.filter(user=user).adelete()
-            await LocalMarkdownConfig.objects.acreate(
-                input_files=config.content_type.markdown.input_files,
-                input_filter=config.content_type.markdown.input_filter,
-                index_heading_entries=config.content_type.markdown.index_heading_entries,
-                user=user,
-            )
-        if config.content_type.pdf:
-            await LocalPdfConfig.objects.filter(user=user).adelete()
-            await LocalPdfConfig.objects.acreate(
-                input_files=config.content_type.pdf.input_files,
-                input_filter=config.content_type.pdf.input_filter,
-                index_heading_entries=config.content_type.pdf.index_heading_entries,
-                user=user,
-            )
-        if config.content_type.plaintext:
-            await LocalPlaintextConfig.objects.filter(user=user).adelete()
-            await LocalPlaintextConfig.objects.acreate(
-                input_files=config.content_type.plaintext.input_files,
-                input_filter=config.content_type.plaintext.input_filter,
-                index_heading_entries=config.content_type.plaintext.index_heading_entries,
-                user=user,
-            )
-        if config.content_type.github:
-            await adapters.set_user_github_config(
-                user=user,
-                pat_token=config.content_type.github.pat_token,
-                repos=config.content_type.github.repos,
-            )
-        if config.content_type.notion:
-            await adapters.set_notion_config(
-                user=user,
-                token=config.content_type.notion.token,
-            )
-
-
-def _initialize_config():
-    if state.config is None:
-        state.config = FullConfig()
-        state.config.search_type = SearchConfig.model_validate(constants.default_config["search-type"])

khoj/routers/api_model.py

@@ -3,7 +3,6 @@ import logging
 from typing import Dict, Optional, Union
 
 from fastapi import APIRouter, Request
-from fastapi.requests import Request
 from fastapi.responses import Response
 from starlette.authentication import has_required_scope, requires
 

khoj/routers/api_subscription.py

@@ -117,7 +117,7 @@ async def subscribe(request: Request):
         )
         logger.log(logging.INFO, f"🥳 New User Created: {user.user.uuid}")
 
-    logger.info(f'Stripe subscription {event["type"]} for {customer_email}')
+    logger.info(f"Stripe subscription {event['type']} for {customer_email}")
     return {"success": success}
 
 

khoj/routers/email.py

@@ -44,7 +44,7 @@ async def send_magic_link_email(email, unique_id, host):
         {
             "sender": os.environ.get("RESEND_EMAIL", "noreply@khoj.dev"),
             "to": email,
-            "subject": f"Your login code to Khoj",
+            "subject": "Your login code to Khoj",
             "html": html_content,
         }
     )
@@ -98,11 +98,11 @@ async def send_query_feedback(uquery, kquery, sentiment, user_email):
         user_email=user_email if not is_none_or_empty(user_email) else "N/A",
     )
     # send feedback to fixed account
-    r = resend.Emails.send(
+    resend.Emails.send(
         {
             "sender": os.environ.get("RESEND_EMAIL", "noreply@khoj.dev"),
             "to": "team@khoj.dev",
-            "subject": f"User Feedback",
+            "subject": "User Feedback",
             "html": html_content,
         }
     )
@@ -127,7 +127,7 @@ def send_task_email(name, email, query, result, subject, is_image=False):
 
     r = resend.Emails.send(
         {
-            "sender": f'Khoj <{os.environ.get("RESEND_EMAIL", "khoj@khoj.dev")}>',
+            "sender": f"Khoj <{os.environ.get('RESEND_EMAIL', 'khoj@khoj.dev')}>",
             "to": email,
             "subject": f"✨ {subject}",
             "html": html_content,