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

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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/khoj/configure.py
View File

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