From 5f2717cc4b17dcb252ea7a39f5b50ad5290e96d3 Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Wed, 28 Jun 2023 22:07:52 -0700 Subject: [PATCH] Use logger.warning since logger.warn is deprecated --- src/khoj/configure.py | 4 ++-- src/khoj/processor/conversation/gpt.py | 2 +- src/khoj/processor/markdown/markdown_to_jsonl.py | 2 +- src/khoj/processor/org_mode/org_to_jsonl.py | 2 +- src/khoj/processor/pdf/pdf_to_jsonl.py | 4 +++- src/khoj/routers/api.py | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/khoj/configure.py b/src/khoj/configure.py index da46c78c..050cf069 100644 --- a/src/khoj/configure.py +++ b/src/khoj/configure.py @@ -37,7 +37,7 @@ def configure_server(args, required=False): logger.error(f"Exiting as Khoj is not configured.\nConfigure it via GUI or by editing {state.config_file}.") sys.exit(1) else: - logger.warn( + logger.warning( f"Khoj is not configured.\nConfigure it via khoj GUI, plugins or by editing {state.config_file}." ) return @@ -88,7 +88,7 @@ def configure_search_types(config: FullConfig): def configure_search(model: SearchModels, config: FullConfig, regenerate: bool, t: Optional[state.SearchType] = None): if config is None or config.content_type is None or config.search_type is None: - logger.warn("🚨 No Content or Search type is configured.") + logger.warning("🚨 No Content or Search type is configured.") return # Initialize Org Notes Search diff --git a/src/khoj/processor/conversation/gpt.py b/src/khoj/processor/conversation/gpt.py index 2c0a4cee..2f29b2ef 100644 --- a/src/khoj/processor/conversation/gpt.py +++ b/src/khoj/processor/conversation/gpt.py @@ -113,7 +113,7 @@ def extract_questions(text, model="text-davinci-003", conversation_log={}, api_k .replace("', '", '", "') ) except json.decoder.JSONDecodeError: - logger.warn(f"GPT returned invalid JSON. Falling back to using user message as search query.\n{response}") + logger.warning(f"GPT returned invalid JSON. Falling back to using user message as search query.\n{response}") questions = [text] logger.debug(f"Extracted Questions by GPT: {questions}") return questions diff --git a/src/khoj/processor/markdown/markdown_to_jsonl.py b/src/khoj/processor/markdown/markdown_to_jsonl.py index 6c2beb45..ae0c20df 100644 --- a/src/khoj/processor/markdown/markdown_to_jsonl.py +++ b/src/khoj/processor/markdown/markdown_to_jsonl.py @@ -92,7 +92,7 @@ class MarkdownToJsonl(TextToJsonl): } if any(files_with_non_markdown_extensions): - logger.warn( + logger.warning( f"[Warning] There maybe non markdown-mode files in the input set: {files_with_non_markdown_extensions}" ) diff --git a/src/khoj/processor/org_mode/org_to_jsonl.py b/src/khoj/processor/org_mode/org_to_jsonl.py index 5f29ddc9..664427d9 100644 --- a/src/khoj/processor/org_mode/org_to_jsonl.py +++ b/src/khoj/processor/org_mode/org_to_jsonl.py @@ -88,7 +88,7 @@ class OrgToJsonl(TextToJsonl): files_with_non_org_extensions = {org_file for org_file in all_org_files if not org_file.endswith(".org")} if any(files_with_non_org_extensions): - logger.warn(f"There maybe non org-mode files in the input set: {files_with_non_org_extensions}") + logger.warning(f"There maybe non org-mode files in the input set: {files_with_non_org_extensions}") logger.debug(f"Processing files: {all_org_files}") diff --git a/src/khoj/processor/pdf/pdf_to_jsonl.py b/src/khoj/processor/pdf/pdf_to_jsonl.py index d8092cc8..3c90fdc1 100644 --- a/src/khoj/processor/pdf/pdf_to_jsonl.py +++ b/src/khoj/processor/pdf/pdf_to_jsonl.py @@ -83,7 +83,9 @@ class PdfToJsonl(TextToJsonl): files_with_non_pdf_extensions = {pdf_file for pdf_file in all_pdf_files if not pdf_file.endswith(".pdf")} if any(files_with_non_pdf_extensions): - logger.warn(f"[Warning] There maybe non pdf-mode files in the input set: {files_with_non_pdf_extensions}") + logger.warning( + f"[Warning] There maybe non pdf-mode files in the input set: {files_with_non_pdf_extensions}" + ) logger.debug(f"Processing files: {all_pdf_files}") diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py index a9397127..9069418b 100644 --- a/src/khoj/routers/api.py +++ b/src/khoj/routers/api.py @@ -147,10 +147,10 @@ async def search( # Run validation checks results: List[SearchResponse] = [] if q is None or q == "": - logger.warn(f"No query param (q) passed in API call to initiate search") + logger.warning(f"No query param (q) passed in API call to initiate search") return results if not state.model or not any(state.model.__dict__.values()): - logger.warn(f"No search models loaded. Configure a search model before initiating search") + logger.warning(f"No search models loaded. Configure a search model before initiating search") return results # initialize variables