diff --git a/src/khoj/configure.py b/src/khoj/configure.py index ab992fb6..061444db 100644 --- a/src/khoj/configure.py +++ b/src/khoj/configure.py @@ -117,7 +117,7 @@ def configure_server( state.cross_encoder_model = CrossEncoderModel(get_or_create_search_model().cross_encoder) state.config_lock.acquire() - state.SearchType = configure_search_types(state.config) + state.SearchType = configure_search_types() state.search_models = configure_search(state.search_models, state.config.search_type) initialize_content(regenerate, search_type, init, user) except Exception as e: @@ -195,7 +195,7 @@ def update_search_index(): logger.error(f"🚨 Error updating content index via Scheduler: {e}", exc_info=True) -def configure_search_types(config: FullConfig): +def configure_search_types(): # Extract core search types core_search_types = {e.name: e.value for e in SearchType} diff --git a/src/khoj/search_type/text_search.py b/src/khoj/search_type/text_search.py index 2b99ed66..f07eb580 100644 --- a/src/khoj/search_type/text_search.py +++ b/src/khoj/search_type/text_search.py @@ -2,7 +2,7 @@ import logging import math from pathlib import Path -from typing import List, Tuple, Type, Union, Dict +from typing import List, Tuple, Type, Union # External Packages import torch diff --git a/tests/conftest.py b/tests/conftest.py index a169722e..d90bae95 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -227,7 +227,7 @@ def md_content_config(): def chat_client(search_config: SearchConfig, default_user2: KhojUser): # Initialize app state state.config.search_type = search_config - state.SearchType = configure_search_types(state.config) + state.SearchType = configure_search_types() LocalMarkdownConfig.objects.create( input_files=None, @@ -261,7 +261,7 @@ def chat_client(search_config: SearchConfig, default_user2: KhojUser): def chat_client_no_background(search_config: SearchConfig, default_user2: KhojUser): # Initialize app state state.config.search_type = search_config - state.SearchType = configure_search_types(state.config) + state.SearchType = configure_search_types() # Initialize Processor from Config if os.getenv("OPENAI_API_KEY"): @@ -296,7 +296,7 @@ def client( ): state.config.content_type = content_config state.config.search_type = search_config - state.SearchType = configure_search_types(state.config) + state.SearchType = configure_search_types() state.embeddings_model = EmbeddingsModel() state.cross_encoder_model = CrossEncoderModel() @@ -330,7 +330,7 @@ def client( def client_offline_chat(search_config: SearchConfig, default_user2: KhojUser): # Initialize app state state.config.search_type = search_config - state.SearchType = configure_search_types(state.config) + state.SearchType = configure_search_types() LocalMarkdownConfig.objects.create( input_files=None, diff --git a/tests/test_client.py b/tests/test_client.py index 1894577c..8e909c54 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -203,9 +203,6 @@ def test_get_api_config_types(client, sample_org_data, default_user: KhojUser): @pytest.mark.django_db(transaction=True) def test_get_configured_types_with_no_content_config(fastapi_app: FastAPI): # Arrange - state.SearchType = configure_search_types(config) - original_config = state.config.content_type - state.config.content_type = None state.anonymous_mode = True configure_routes(fastapi_app) @@ -218,9 +215,6 @@ def test_get_configured_types_with_no_content_config(fastapi_app: FastAPI): assert response.status_code == 200 assert response.json() == ["all"] - # Restore - state.config.content_type = original_config - # ---------------------------------------------------------------------------------------------------- @pytest.mark.django_db(transaction=True)