beanhub-cli 3.0.0b1__tar.gz → 3.0.0b2__tar.gz

{beanhub_cli-3.0.0b1 → beanhub_cli-3.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beanhub-cli
-Version: 3.0.0b1
+Version: 3.0.0b2
 Summary: Command line tools for BeanHub and Beancount users
 Project-URL: Documentation, https://beanhub-cli-docs.beanhub.io
 Author-email: Fang-Pen Lin <fangpen@launchplatform.com>

{beanhub_cli-3.0.0b1 → beanhub_cli-3.0.0b2}/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"
 )
@@ -150,7 +178,7 @@ def compute_missing_emails(
     "-c",
     "--config",
     type=click.Path(dir_okay=False),
-    default=".beanhub/inbox.yaml",
+    default=DEFAULT_INBOX_CONFIG_FILE,
     help="The path to inbox config file",
 )
 @click.option(
@@ -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=DEFAULT_INBOX_CONFIG_FILE,
     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(

{beanhub_cli-3.0.0b1 → beanhub_cli-3.0.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beanhub-cli"
-version = "3.0.0b1"
+version = "3.0.0b2"
 description = "Command line tools for BeanHub and Beancount users"
 authors = [{ name = "Fang-Pen Lin", email = "fangpen@launchplatform.com" }]
 requires-python = "~=3.10"

{beanhub_cli-3.0.0b1 → beanhub_cli-3.0.0b2}/uv.lock

@@ -104,7 +104,7 @@ wheels = [
 
 [[package]]
 name = "beanhub-cli"
-version = "3.0.0b1"
+version = "3.0.0b2"
 source = { editable = "." }
 dependencies = [
     { name = "attrs" },
@@ -635,7 +635,7 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8c/de/8eb6fffecd9c5f129461edcdd7e1ac944f9de15783e3d89c84ed6e0374bc/lxml-5.3.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:aa837e6ee9534de8d63bc4c1249e83882a7ac22bd24523f83fad68e6ffdf41ae", size = 5652903 },
     { url = "https://files.pythonhosted.org/packages/95/79/80f4102a08495c100014593680f3f0f7bd7c1333b13520aed855fc993326/lxml-5.3.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:da4c9223319400b97a2acdfb10926b807e51b69eb7eb80aad4942c0516934858", size = 5491813 },
     { url = "https://files.pythonhosted.org/packages/15/f5/9b1f7edf6565ee31e4300edb1bcc61eaebe50a3cff4053c0206d8dc772f2/lxml-5.3.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:dc0e9bdb3aa4d1de703a437576007d366b54f52c9897cae1a3716bb44fc1fc85", size = 5227837 },
-    { url = "https://files.pythonhosted.org/packages/5c/17/c31d94364c02e3492215658917f5590c00edce8074aeb06d05b7771465d9/lxml-5.3.2-cp310-cp310-win32.whl", hash = "sha256:5f94909a1022c8ea12711db7e08752ca7cf83e5b57a87b59e8a583c5f35016ad", size = 3477533 },
+    { url = "https://files.pythonhosted.org/packages/dd/53/a187c4ccfcd5fbfca01e6c96da39499d8b801ab5dcf57717db95d7a968a8/lxml-5.3.2-cp310-cp310-win32.win32.whl", hash = "sha256:dd755a0a78dd0b2c43f972e7b51a43be518ebc130c9f1a7c4480cf08b4385486", size = 3477533 },
     { url = "https://files.pythonhosted.org/packages/f2/2c/397c5a9d76a7a0faf9e5b13143ae1a7e223e71d2197a45da71c21aacb3d4/lxml-5.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:d64ea1686474074b38da13ae218d9fde0d1dc6525266976808f41ac98d9d7980", size = 3805160 },
     { url = "https://files.pythonhosted.org/packages/84/b8/2b727f5a90902f7cc5548349f563b60911ca05f3b92e35dfa751349f265f/lxml-5.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9d61a7d0d208ace43986a92b111e035881c4ed45b1f5b7a270070acae8b0bfb4", size = 8163457 },
     { url = "https://files.pythonhosted.org/packages/91/84/23135b2dc72b3440d68c8f39ace2bb00fe78e3a2255f7c74f7e76f22498e/lxml-5.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:856dfd7eda0b75c29ac80a31a6411ca12209183e866c33faf46e77ace3ce8a79", size = 4433445 },