beanhub-cli 1.2.3__tar.gz → 1.4.0__tar.gz

{beanhub_cli-1.2.3 → beanhub_cli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: beanhub-cli
-Version: 1.2.3
+Version: 1.4.0
 Summary: Command line tools for BeanHub
 License: MIT
 Author: Fang-Pen Lin
@@ -15,7 +15,7 @@ Requires-Dist: beancount-black (>=1.0.1,<2.0.0)
 Requires-Dist: beancount-parser (>=1.2.3,<1.3.0)
 Requires-Dist: beanhub-extract (>=0.1.0,<1.0.0)
 Requires-Dist: beanhub-forms (>=0.1.3,<0.2.0)
-Requires-Dist: beanhub-import (>=0.3.4,<1.0.0)
+Requires-Dist: beanhub-import (>=1.0.0,<2.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: fastapi (>=0.98.0,<1.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)

{beanhub_cli-1.2.3 → beanhub_cli-1.4.0}/beanhub_cli/import_cli.py

@@ -6,12 +6,11 @@ import rich
 import yaml
 from beancount_black.formatter import Formatter
 from beancount_parser.parser import make_parser
-from beanhub_extract.data_types import Transaction
 from beanhub_extract.utils import strip_base_path
-from beanhub_import.data_types import BeancountTransaction
 from beanhub_import.data_types import DeletedTransaction
 from beanhub_import.data_types import GeneratedTransaction
 from beanhub_import.data_types import ImportDoc
+from beanhub_import.data_types import UnprocessedTransaction
 from beanhub_import.post_processor import apply_change_set
 from beanhub_import.post_processor import compute_changes
 from beanhub_import.post_processor import extract_existing_transactions
@@ -78,7 +77,7 @@ def main(
 
     generated_txns: list[GeneratedTransaction] = []
     deleted_txns: list[DeletedTransaction] = []
-    unprocessed_txns: list[Transaction] = []
+    unprocessed_txns: list[UnprocessedTransaction] = []
     for txn in process_imports(import_doc=import_doc, input_dir=workdir_path):
         if isinstance(txn, GeneratedTransaction):
             generated_file_path = (workdir_path / txn.file).resolve()
@@ -96,11 +95,12 @@ def main(
                 extra={"markup": True, "highlighter": None},
             )
             deleted_txns.append(txn)
-        elif isinstance(txn, Transaction):
+        elif isinstance(txn, UnprocessedTransaction):
             env.logger.info(
-                "Skipped input transaction at [green]%s[/]:[blue]%s[/]",
-                txn.file,
-                txn.lineno,
+                "Skipped input transaction %s at [green]%s[/]:[blue]%s[/]",
+                txn.import_id,
+                txn.txn.file,
+                txn.txn.lineno,
                 extra={"markup": True, "highlighter": None},
             )
             unprocessed_txns.append(txn)
@@ -130,8 +130,13 @@ def main(
             root_dir=workdir_path,
         )
     )
+    imported_txns_with_override = frozenset(
+        txn.id for txn in existing_txns if txn.override is not None
+    )
     env.logger.info(
-        "Found %s existing imported transactions in Beancount books", len(existing_txns)
+        "Found %s existing imported transactions in Beancount books, %s with override",
+        len(existing_txns),
+        len(imported_txns_with_override),
     )
 
     change_sets = compute_changes(
@@ -230,13 +235,14 @@ def main(
     rich.print(Padding(table, (1, 0, 0, 4)))
 
     table = Table(
-        title="Unprocessed transactions",
+        title="Open transactions",
         box=box.SIMPLE,
         header_style=TABLE_HEADER_STYLE,
         expand=True,
     )
     table.add_column("File", style=TABLE_COLUMN_STYLE)
     table.add_column("Line", style=TABLE_COLUMN_STYLE)
+    table.add_column("Id", style=TABLE_COLUMN_STYLE)
     table.add_column("Extractor", style=TABLE_COLUMN_STYLE)
     table.add_column("Date", style=TABLE_COLUMN_STYLE)
     table.add_column("Desc", style=TABLE_COLUMN_STYLE)
@@ -244,15 +250,18 @@ def main(
     table.add_column("Amount", style=TABLE_COLUMN_STYLE, justify="right")
     table.add_column("Currency", style=TABLE_COLUMN_STYLE)
     for txn in unprocessed_txns:
+        if txn.import_id in imported_txns_with_override:
+            continue
         table.add_row(
-            escape(txn.file),
-            str(txn.lineno),
-            escape(str(txn.extractor)),
-            escape(str(txn.date)) if txn.date is not None else "",
-            escape(txn.desc) if txn.desc is not None else "",
-            escape(txn.bank_desc) if txn.bank_desc is not None else "",
-            escape(str(txn.amount)) if txn.amount is not None else "",
-            escape(txn.currency) if txn.currency is not None else "",
+            escape(txn.txn.file),
+            str(txn.txn.lineno),
+            txn.import_id,
+            escape(str(txn.txn.extractor)),
+            escape(str(txn.txn.date)) if txn.txn.date is not None else "",
+            escape(txn.txn.desc) if txn.txn.desc is not None else "",
+            escape(txn.txn.bank_desc) if txn.txn.bank_desc is not None else "",
+            escape(str(txn.txn.amount)) if txn.txn.amount is not None else "",
+            escape(txn.txn.currency) if txn.txn.currency is not None else "",
         )
     rich.print(Padding(table, (1, 0, 0, 4)))
 

{beanhub_cli-1.2.3 → beanhub_cli-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanhub-cli"
-version = "1.2.3"
+version = "1.4.0"
 description = "Command line tools for BeanHub"
 authors = ["Fang-Pen Lin <fangpen@launchplatform.com>"]
 license = "MIT"
@@ -22,7 +22,7 @@ uvicorn = ">=0.23.2, <1.0.0"
 beanhub-forms = "^0.1.3"
 pydantic-settings = "^2.0.3"
 rich = "^13.6.0"
-beanhub-import = ">= 0.3.4, <1.0.0"
+beanhub-import = ">= 1.0.0, <2.0.0"
 beanhub-extract = ">= 0.1.0, <1.0.0"
 beancount-parser = ">= 1.2.3, <1.3.0"