klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-06 21:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix configuring search types & /config/types API when no plugin configured

Browse Source 
- Test /config/types API when no plugin configured, only plugin configured
  and no content configured scenarios
- Do not throw null reference exception while configuring search types
  when no plugin configured
- Do not throw null reference exception on calling /config/types API
  when no plugin configured

Resolves bug introduced by #173
This commit is contained in:
Debanjum Singh Solanky
2023-03-01 00:35:21 -06:00
parent 8914dbd073
commit 2bed4c3b50
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/khoj/configure.py
View File

@@ -73,7 +73,9 @@ def configure_search_types(config: FullConfig):
# Extract core search types
core_search_types = {e.name: e.value for e in SearchType}
# Extract configured plugin search types
plugin_search_types = {plugin_type: plugin_type for plugin_type in config.content_type.plugins.keys()}
plugin_search_types = {}
if config.content_type.plugins:
plugin_search_types = {plugin_type: plugin_type for plugin_type in config.content_type.plugins.keys()}
# Dynamically generate search type enum by merging core search types with configured plugin search types
return Enum("SearchType", merge_dicts(core_search_types, plugin_search_types))

5
src/khoj/routers/api.py
View File

@@ -29,11 +29,12 @@ def get_default_config_data():
@api.get("/config/types", response_model=List[str])
def get_config_types():
"""Get configured content types"""
configured_content_types = state.config.content_type.dict(exclude_none=True)
return [
search_type.value
for search_type in SearchType
if any(search_type.value == ctype[0] and ctype[1] for ctype in state.config.content_type)
or search_type.name in state.config.content_type.plugins.keys()
if search_type.value in configured_content_types
or ("plugins" in configured_content_types and search_type.name in configured_content_types["plugins"])
]