sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-30 10:53:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Make configure_content functional. Do not pass content index state to it."

Browse source 
This reverts commit 2ddee7e745 as it
broke partial updates of the content index for just the specified
content types
This commit is contained in:
Debanjum Singh Solanky 2023-07-21 13:57:16 -07:00
parent 82c725817e
commit f0d4a4cf9a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/khoj/configure.py
View file

@ -85,7 +85,7 @@ def configure_server(config: FullConfig, regenerate: bool, search_type: Optional
try:
state.config_lock.acquire()
state.content_index = configure_content(
state.config.content_type, state.search_models, regenerate, search_type
state.content_index, state.config.content_type, state.search_models, regenerate, search_type
)
except Exception as e:
logger.error(f"🚨 Failed to index content")
@ -112,7 +112,9 @@ if not state.demo:
def update_search_index():
try:
state.config_lock.acquire()
state.content_index = configure_content(state.config.content_type, state.search_models, regenerate=False)
state.content_index = configure_content(
state.content_index, state.config.content_type, state.search_models, regenerate=False
)
logger.info("📬 Content index updated via Scheduler")
except Exception as e:
logger.error(f"🚨 Error updating content index via Scheduler: {e}")
@ -153,6 +155,7 @@ def configure_search(search_models: SearchModels, search_config: Optional[Search
def configure_content(
content_index: Optional[ContentIndex],
content_config: Optional[ContentConfig],
search_models: SearchModels,
regenerate: bool,
@ -162,9 +165,8 @@ def configure_content(
if content_config is None:
logger.warning("🚨 No Content configuration available.")
return None
# Initialize Variables
content_index = ContentIndex()
if content_index is None:
content_index = ContentIndex()
try:
# Initialize Org Notes Search