From 38aede68f20adc7aff4ea95683593bb895ba37ae Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Sun, 31 Jul 2022 22:02:03 +0300 Subject: [PATCH] Only configure org via config file for consistency across search types - Previously org-files were configurable via cmdline args. Where as none of the other search types are - This is an artifact of how the application grew - It can be removed for better consistency and equal preference given all search types --- src/utils/cli.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/utils/cli.py b/src/utils/cli.py index a426ba8c..7d8b3328 100644 --- a/src/utils/cli.py +++ b/src/utils/cli.py @@ -16,8 +16,6 @@ def cli(args=None): # Setup Argument Parser for the Commandline Interface parser = argparse.ArgumentParser(description="Expose API for Khoj") - parser.add_argument('--org-files', '-i', nargs='*', help="List of org-mode files to process") - parser.add_argument('--org-filter', type=str, default=None, help="Regex filter for org-mode files to process") parser.add_argument('--config-file', '-c', type=pathlib.Path, help="YAML file with user configuration") parser.add_argument('--regenerate', action='store_true', default=False, help="Regenerate model embeddings from source files. Default: false") parser.add_argument('--verbose', '-v', action='count', default=0, help="Show verbose conversion logs. Default: 0") @@ -27,25 +25,18 @@ def cli(args=None): args = parser.parse_args(args) - if not (args.config_file or args.org_files): - print(f"Require at least 1 of --org-file, --org-filter or --config-file flags to be passed from commandline") + if not (args.config_file): + print(f"Need --config-file flag to be passed from commandline") exit(1) - # Config Priority: Cmd Args > Config File > Default Config + # Config Priority: Config File > Default Config args.config = default_config if args.config_file and resolve_absolute_path(args.config_file).exists(): with open(get_absolute_path(args.config_file), 'r', encoding='utf-8') as config_file: config_from_file = yaml.safe_load(config_file) args.config = merge_dicts(priority_dict=config_from_file, default_dict=args.config) - args.config = FullConfig.parse_obj(args.config) - else: - args.config = FullConfig.parse_obj(args.config) - if args.org_files: - args.config.content_type.org.input_files = args.org_files - - if args.org_filter: - args.config.content_type.org.input_filter = args.org_filter + args.config = FullConfig.parse_obj(args.config) return args