DRY inbox doc loading

Author: fangpenlin

beanhub_cli/inbox/main.py

@@ -143,6 +143,34 @@ def compute_missing_emails(
             raise ValueError(f"Unexpected action type {type(action)}")
 
 
+def load_inbox_doc(config: str) -> InboxDoc:
+    config_path = pathlib.Path(config)
+    if config_path.exists():
+        doc_payload = yaml.safe_load(config_path.read_bytes())
+        inbox_doc = InboxDoc.model_validate(doc_payload)
+        if inbox_doc.inbox is None:
+            inbox_doc.inbox = DEFAULT_INBOX_RULES
+            logger.info("Use default inbox rules")
+        logger.info(
+            "Loaded inbox doc from [green]%s[/]",
+            config,
+            extra={"markup": True, "highlighter": None},
+        )
+    else:
+        inbox_doc = DEFAULT_INBOX_DOC
+        logger.info(
+            "The inbox doc at [green]%s[/] does not exist, use default config",
+            config,
+            extra={"markup": True, "highlighter": None},
+        )
+    logger.debug(
+        f"Inbox doc: %s",
+        inbox_doc.model_dump_json(indent=2),
+        extra={"markup": True, "highlighter": JSONHighlighter()},
+    )
+    return inbox_doc
+
+
 @cli.command(
     help="Extract data from archived email files based on rules defined inbox config file"
 )
@@ -188,31 +216,8 @@ def extract(
     keep_thinking_log: bool,
     debug_output_folder: str,
 ):
-    config_path = pathlib.Path(config)
     workdir_path = pathlib.Path(workdir)
-    if config_path.exists():
-        doc_payload = yaml.safe_load(config_path.read_bytes())
-        inbox_doc = InboxDoc.model_validate(doc_payload)
-        if inbox_doc.inbox is None:
-            inbox_doc.inbox = DEFAULT_INBOX_RULES
-            logger.info("Use default inbox rules")
-        logger.info(
-            "Loaded inbox doc from [green]%s[/]",
-            config,
-            extra={"markup": True, "highlighter": None},
-        )
-    else:
-        inbox_doc = DEFAULT_INBOX_DOC
-        logger.info(
-            "The inbox doc at [green]%s[/] does not exist, use default config",
-            config,
-            extra={"markup": True, "highlighter": None},
-        )
-    logger.debug(
-        f"Inbox doc: %s",
-        inbox_doc.model_dump_json(indent=2),
-        extra={"markup": True, "highlighter": JSONHighlighter()},
-    )
+    inbox_doc = load_inbox_doc(config)
 
     logger.info(
         "Extracting data with Ollama model [green]%s[/]",
@@ -354,6 +359,7 @@ def extract(
     "-c",
     "--config",
     type=click.Path(dir_okay=False),
+    default=".beanhub/inbox.yaml",
     help="The path to inbox config file",
 )
 @click.option(
@@ -378,32 +384,8 @@ def dump(
     workdir: str,
     unsafe_tar_extract: bool,
 ):
-    default_config_path = pathlib.Path(DEFAULT_INBOX_CONFIG_FILE)
-    if config is not None or default_config_path.exists():
-        if config is not None:
-            config_path = pathlib.Path(config)
-            if not config_path.exists():
-                logger.error("Inbox config file does not exist at %s", config_path)
-                sys.exit(-1)
-        else:
-            config_path = default_config_path
-        with config_path.open("rt") as fo:
-            doc_payload = yaml.safe_load(fo)
-        inbox_doc = InboxDoc.model_validate(doc_payload)
-        env.logger.info(
-            "Loaded inbox doc from [green]%s[/]",
-            config,
-            extra={"markup": True, "highlighter": None},
-        )
-    else:
-        env.logger.info(
-            "Loaded default inbox doc as config file is not provided by argument and does exists at the default location %s",
-            default_config_path,
-        )
-        # TODO: load default
-        inbox_doc = None
-
     workdir_path = pathlib.Path(workdir)
+    inbox_doc = load_inbox_doc(config)
 
     if not hasattr(tarfile, "data_filter") and not unsafe_tar_extract:
         logger.error(