beancount-cli 0.2.9__tar.gz → 0.2.12__tar.gz

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.12] - 2026-04-08
+
+### Fixed
+- `price fetch --update`: cap `date_last` to yesterday (today exclusive) to avoid fetching intraday prices while the market is still open.
+
+## [0.2.11] - 2026-04-07
+
+### Fixed
+- `price fetch`: use `[tool.uv.sources]` git override for `beanprice` so the romamo fork is installed correctly; PyPI metadata keeps `beanprice>=2.1.0` for compatibility.
+
+## [0.2.10] - 2026-04-07
+
+### Changed
+- `price fetch`: use `romamo/beanprice` fork via `[tool.uv.sources]` git override; PyPI metadata retains `beanprice>=2.1.0` for compatibility.
+- `price fetch --update`: include today's date in the fetch window (`date_last` is exclusive, so now passes `today + 1`).
+
+### Added
+- `price fetch -vv`: log each redundant fetched price at DEBUG level so skipped prices are visible.
+
+## [0.2.9] - 2026-04-05
+
+### Fixed
+- Smoke test: check stderr as well as stdout when probing `--help` output, fixing false negatives in isolated environments.
+
 ## [0.2.8] - 2026-04-04
 
 ### Added

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beancount-cli
-Version: 0.2.9
+Version: 0.2.12
 Summary: A CLI tool to manage Beancount ledgers
 Project-URL: Homepage, https://github.com/romamo/beancount-cli
 Project-URL: Repository, https://github.com/romamo/beancount-cli
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Requires-Python: >=3.10
-Requires-Dist: agentyper
+Requires-Dist: agentyper==0.1.8
 Requires-Dist: beancount>=3.0.0
 Requires-Dist: beanprice>=2.1.0
 Requires-Dist: beanquery>=0.1.0

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beancount-cli"
-version = "0.2.9"
+version = "0.2.12"
 description = "A CLI tool to manage Beancount ledgers"
 readme = "README.md"
 authors = [
@@ -15,7 +15,7 @@ dependencies = [
     "python-dateutil>=2.8.2",
     "beanprice>=2.1.0",
     "pydantic-settings>=2.0.0",
-    "agentyper",
+    "agentyper==0.1.8",
 ]
 keywords = ["beancount", "cli", "accounting", "automation", "agent"]
 classifiers = [
@@ -62,6 +62,9 @@ packages = ["src/beancount_cli"]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.uv.sources]
+beanprice = { git = "https://github.com/romamo/beanprice" }
+
 [dependency-groups]
 dev = [
   "bandit>=1.8.6",

beancount_cli-0.2.12/src/beancount_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/src/beancount_cli/commands/common.py

@@ -6,8 +6,13 @@ from pathlib import Path
 from rich.console import Console
 from rich.table import Table
 
-console = Console()
-error_console = Console(stderr=True)
+# REQ-F-056: Handle agentyper width suppression (COLUMNS=0)
+_width = None
+if os.environ.get("COLUMNS") == "0":
+    _width = 100
+
+console = Console(width=_width)
+error_console = Console(stderr=True, width=_width)
 
 
 def read_json_input(json_data: str) -> str:

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/src/beancount_cli/commands/price.py

@@ -8,6 +8,7 @@ from tempfile import gettempdir
 
 import agentyper as typer
 from beancount.core import data
+from beancount.core.data import sorted as bean_sorted
 from beancount.parser import printer
 from beanprice import price as bp_price
 
@@ -26,9 +27,6 @@ def price_check(
     tolerance: int = typer.Option(
         7, "--tolerance", "-t", help="Allowed delay in days before flagging a gap"
     ),
-    verbose: bool = typer.Option(
-        False, "--verbose", "-v", help="Verbosity level (-v for INFO, -vv for DEBUG)"
-    ),
     rate: str = typer.Option(
         "daily", "--rate", "-r", help="Check frequency: daily, weekday, weekly, monthly"
     ),
@@ -38,7 +36,6 @@ def price_check(
     ledger_service = LedgerService(actual_file)
     price_service = PriceService(ledger_service)
 
-    _setup_logging(verbose)
     _warn_missing_price_meta(ledger_service, "Price history cannot be verified.")
 
     gaps = price_service.get_price_gaps(tolerance_days=tolerance, rate=rate)
@@ -62,11 +59,14 @@ def price_check(
         typer.output(gaps, title="Price Gaps")
 
 
-@app.command(name="fetch")
+@app.command(name="fetch", mutating=True)
 def price_fetch(
-    ledger_file: Path | None = typer.Argument(None, help="Path to ledger file"),
+    ledger_files: list[Path] = typer.Argument(
+        [],
+        help="One or more beancount ledger files to merge before fetching prices",
+    ),
     file: Path | None = typer.Option(
-        None, "--file", "-f", envvar="BEANCOUNT_FILE", help="Main beancount file"
+        None, "--file", "-f", envvar="BEANCOUNT_FILE", help="Main beancount file (legacy fallback)"
     ),
     update: bool = typer.Option(
         False, "--update", "-u", help="Fetch from last price forward and update ledger"
@@ -75,33 +75,57 @@ def price_fetch(
         False, "--inactive", "-i", help="Include commodities with no balance"
     ),
     fill_gaps: bool = typer.Option(False, "--fill-gaps", help="Fill gaps in price history"),
-    dry_run: bool = typer.Option(False, "--dry-run", "-n", help="Don't actually fetch, just print"),
-    verbose: bool = typer.Option(
-        False, "--verbose", "-v", help="Verbosity level (-v for INFO, -vv for DEBUG)"
-    ),
+    dry_run: bool = False,
 ):
-    """Fetch and update prices using bean-price library."""
-    actual_file = get_ledger_file(ledger_file or file)
-    error_console.print(f"Fetching prices for {actual_file}...")
+    """Fetch and update prices using bean-price library.
+
+    Accepts one or more beancount ledger files as positional arguments. When
+    multiple files are provided they are all loaded and their entries merged
+    before price jobs are computed. This lets you split commodities/prices
+    across separate files (e.g. a common registry and a portfolio ledger) while
+    still running a single fetch pass.
+
+    If no positional arguments are given the command falls back to --file / the
+    BEANCOUNT_FILE environment variable for backward compatibility.
+    """
+    # Resolve the list of ledger files to load.
+    if ledger_files:
+        files_to_load = ledger_files
+    else:
+        files_to_load = [get_ledger_file(file)]
 
-    _setup_logging(verbose)
+    label = ", ".join(str(f) for f in files_to_load)
+    error_console.print(f"Fetching prices for {label}...", highlight=False)
 
     try:
         cache_path = Path(gettempdir()) / "bean-price.cache"
         bp_price.setup_cache(str(cache_path), clear_cache=False)
 
-        ledger_service = LedgerService(actual_file)
-        ledger_service.load()
-        entries = ledger_service.entries
+        # Load and merge all ledger files
+        all_entries: list[data.Directive] = []
+        all_errors: list = []
+        primary_ledger_service: LedgerService | None = None
 
-        _warn_missing_price_meta(ledger_service, "Skipping fetch.")
+        for ledger_path in files_to_load:
+            svc = LedgerService(ledger_path)
+            svc.load()
+            all_entries.extend(svc.entries)
+            all_errors.extend(svc.errors)
+            if primary_ledger_service is None:
+                primary_ledger_service = svc
+
+        # Sort merged entries by date (beancount canonical order)
+        entries = bean_sorted(all_entries)
+
+        assert primary_ledger_service is not None  # always set — files_to_load is non-empty
+
+        _warn_missing_price_meta_entries(entries, "Skipping fetch.")
 
         if update or fill_gaps:
             jobs = bp_price.get_price_jobs_up_to_date(
                 entries,
                 date_last=datetime.now().date(),
                 inactive=inactive,
-                fill_gaps=fill_gaps,
             )
         else:
             jobs = bp_price.get_price_jobs_at_date(entries, date=None, inactive=inactive)
@@ -121,11 +145,14 @@ def price_fetch(
         # This keeps the streaming output clean of duplicates already in the ledger
         existing_prices = {(e.date, e.currency) for e in entries if isinstance(e, data.Price)}
 
+        failed_jobs = []
+        redundant_count = 0
         try:
             with ThreadPoolExecutor(max_workers=min(8, len(jobs))) as executor:
                 future_to_job = {executor.submit(bp_price.fetch_price, job): job for job in jobs}
 
                 for future in as_completed(future_to_job):
+                    job = future_to_job[future]
                     price_entry = future.result()
                     if price_entry:
                         price_entry = price_entry._replace(
@@ -139,6 +166,13 @@ def price_fetch(
                             existing_prices.add((price_entry.date, price_entry.currency))
                             print(printer.format_entry(price_entry), end="")
                             sys.stdout.flush()
+                        else:
+                            redundant_count += 1
+                            logging.debug(
+                                "Redundant: %s", printer.format_entry(price_entry).strip()
+                            )
+                    else:
+                        failed_jobs.append(job)
         except KeyboardInterrupt:
             error_console.print("\n[yellow]Interrupt received. Stopping fetch...[/yellow]")
 
@@ -153,18 +187,32 @@ def price_fetch(
 
             prices_output = "".join(printer.format_entry(p) for p in filtered_prices)
 
-            map_service = MapService(actual_file)
-            inc_tree = map_service.get_include_tree()
-            target_price_file = actual_file
-
-            # Prioritize standard names
-            sibling_prices = actual_file.parent / "prices.beancount"
-            if sibling_prices.exists():
-                target_price_file = sibling_prices
-            else:
-                found = _find_price_file(inc_tree)
-                if found:
-                    target_price_file = found
+            # Resolve target price file.
+            # Strategy:
+            # 1. Look for a file named 'prices.beancount' in the argument list itself.
+            # 2. Look for a sibling named 'prices.beancount' relative to the primary ledger.
+            # 3. Search the include tree for a file with 'price' in the name.
+            # 4. Fallback to the primary ledger.
+
+            target_price_file = None
+            for f in files_to_load:
+                if f.name == "prices.beancount":
+                    target_price_file = f
+                    break
+
+            if target_price_file is None:
+                primary_file = files_to_load[0]
+                sibling_prices = primary_file.parent / "prices.beancount"
+                if sibling_prices.exists():
+                    target_price_file = sibling_prices
+                else:
+                    map_service = MapService(primary_file)
+                    inc_tree = map_service.get_include_tree()
+                    found = _find_price_file(inc_tree)
+                    if found:
+                        target_price_file = found
+                    else:
+                        target_price_file = primary_file
 
             with open(target_price_file, "a") as f:
                 f.write(prices_output)
@@ -172,7 +220,21 @@ def price_fetch(
             error_console.print(
                 f"[green]Appended {len(filtered_prices)} new prices to {target_price_file.name}[/green]"
             )
-        elif not new_price_entries:
+
+        if redundant_count:
+            error_console.print(
+                f"[yellow]Ignored {redundant_count} fetched prices as they are already in the ledger.[/yellow]"
+            )
+
+        if failed_jobs:
+            failed_info = ", ".join(f"{j.currency} on {j.date}" for j in failed_jobs[:5])
+            if len(failed_jobs) > 5:
+                failed_info += f" (+{len(failed_jobs) - 5} more)"
+            error_console.print(
+                f"[yellow]Skipped {len(failed_jobs)} jobs with no data from source: {failed_info}[/yellow]"
+            )
+
+        if not new_price_entries and not failed_jobs and not redundant_count:
             error_console.print("[yellow]No new prices found.[/yellow]")
 
     except Exception as e:
@@ -195,44 +257,39 @@ def _find_price_file(tree: dict) -> Path | None:
 
 def _warn_missing_price_meta(ledger_service: LedgerService, context: str) -> None:
     """Warn about held commodities that lack 'price' metadata and cannot be priced."""
-    held = ledger_service.get_inventory(date.today())
-    op_currs = set(ledger_service.get_operating_currencies()) or {"USD"}
-    commodity_meta = {
-        e.currency: e.meta for e in ledger_service.entries if isinstance(e, data.Commodity)
+    _warn_missing_price_meta_entries(ledger_service.entries, context)
+
+
+def _warn_missing_price_meta_entries(entries: list[data.Directive], context: str) -> None:
+    """Warn about held commodities (from a merged entry list) that lack 'price' metadata."""
+    from beancount.core import convert
+    from beancount.core.inventory import Inventory
+
+    inv = Inventory()
+    today = date.today()
+    for e in entries:
+        if e.date > today:
+            break
+        if isinstance(e, data.Transaction):
+            for p in e.postings:
+                if p.account.startswith(("Assets", "Liabilities")):
+                    inv.add_position(p)
+
+    held = {
+        pos.units.currency
+        for pos in inv.reduce(convert.get_units)
+        if not pos.units.number.is_zero()
     }
+
+    # Extract operating currencies from options if possible
+    # In a merged entry list, we might have 'option' directives as Custom entries or similar?
+    # Actually, Beancount usually loads them into an options map.
+    # For now, we'll just check commodity metadata.
+
+    commodity_meta = {e.currency: e.meta for e in entries if isinstance(e, data.Commodity)}
     for curr in sorted(held):
-        if curr in op_currs:
-            continue
         meta = commodity_meta.get(curr, {})
         if not meta or "price" not in meta:
             error_console.print(
                 f"[red]Error: Commodity {curr} is held but has no 'price' metadata. {context}[/red]"
             )
-
-
-def _setup_logging(verbose: bool):
-    """Sets up logging levels based on verbosity count in sys.argv."""
-    # Manual count of 'v' flags in sys.argv to handle -v, -vv, etc.
-    count = 0
-    for arg in sys.argv:
-        if arg == "-v":
-            count += 1
-        elif arg.startswith("-") and not arg.startswith("--"):
-            # Handle combined flags like -uvv
-            count += arg.count("v")
-        elif arg == "--verbose":
-            count += 1
-
-    if count >= 2:
-        log_level = logging.DEBUG
-    elif count == 1 or verbose:
-        log_level = logging.INFO
-    else:
-        log_level = logging.WARNING
-
-    logging.basicConfig(level=log_level, format="%(levelname)-8s: %(message)s", force=True)
-
-    # Silence noisy loggers unless -vv is used
-    if count < 2:
-        for logger_name in ["yfinance", "urllib3", "requests", "diskcache"]:
-            logging.getLogger(logger_name).setLevel(logging.WARNING)

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/tests/test_cli.py

@@ -136,7 +136,7 @@ def test_price_cmd(temp_beancount_file):
     # `price` is now a subcommand group; calling it without a subcommand shows help
     code, out, err = run_cli("price", "--help")
     assert code in (0, None)
-    assert "check" in out or "fetch" in out
+    assert "check" in (out + err) or "fetch" in (out + err)
 
 
 def test_missing_ledger_file(monkeypatch):
@@ -148,7 +148,7 @@ def test_missing_ledger_file(monkeypatch):
         monkeypatch.delenv("BEANCOUNT_PATH")
 
     code, out, err = run_cli("check", "doesnt_exist_file.beancount")
-    assert code == 2  # EXIT_SYSTEM
+    assert code == 1  # EXIT_SYSTEM
     assert "Traceback" not in err
 
 
@@ -162,5 +162,5 @@ def test_report_holdings_help_hides_audit_only_flags():
 def test_report_audit_help_shows_audit_only_flags():
     code, out, err = run_cli("report", "audit", "--help")
     assert code in (0, None)
-    assert "--limit" in out
-    assert "--all" in out
+    assert "--limit" in (out + err)
+    assert "--all" in (out + err)

{beancount_cli-0.2.9 → beancount_cli-0.2.12}/tests/test_coverage_gap.py

@@ -21,6 +21,8 @@ def test_report_holdings_json(temp_beancount_file):
     """Exercises the holdings JSON output path (render_output(holdings, format='json'))."""
     code, out, _ = _run_cli("report", "holdings", str(temp_beancount_file), "--format", "json")
     data = jsonlib.loads(out)
+    if "data" in data and "ok" in data:
+        data = data["data"]
     if isinstance(data, list):
         if data:
             assert "Account" in data[0]
@@ -49,21 +51,21 @@ def test_check_cmd_with_errors(temp_beancount_file):
     with open(temp_beancount_file, "a") as f:
         f.write("\n2022-01-01 INVALID_STATEMENT\n")
     code, out, err = _run_cli("check", str(temp_beancount_file))
-    assert code == 1  # EXIT_VALIDATION, not system error
+    assert code == 3  # EXIT_VALIDATION, not system error
     assert "Traceback" not in err
 
 
 def test_check_missing_file_exits_system(tmp_path):
     code, out, err = _run_cli("check", str(tmp_path / "nope.beancount"))
-    assert code == 2  # EXIT_SYSTEM
+    assert code == 1  # EXIT_SYSTEM
     assert "Traceback" not in err
 
 
 def test_check_missing_file_json(tmp_path):
     code, out, err = _run_cli("check", "--format", "json", str(tmp_path / "nope.beancount"))
-    assert code == 2
+    assert code == 1
     payload = jsonlib.loads(err)
-    assert payload["exit_code"] == 2
+    assert payload["exit_code"] == 1
     assert payload["error_type"] == "FileNotFoundError"
     assert "Traceback" not in err
 
@@ -72,11 +74,11 @@ def test_check_validation_errors_json(temp_beancount_file):
     with open(temp_beancount_file, "a") as f:
         f.write("\n2022-01-01 INVALID_STATEMENT\n")
     code, out, err = _run_cli("check", "--format", "json", str(temp_beancount_file))
-    assert code == 1
+    assert code == 3
     payload = jsonlib.loads(err)
     assert payload["error"] is True
     assert payload["error_type"] == "BeancountValidationError"
-    assert payload["exit_code"] == 1
+    assert payload["exit_code"] == 3
     assert isinstance(payload["errors"], list)
     assert len(payload["errors"]) > 0
 
@@ -87,6 +89,8 @@ def test_report_audit_json(temp_beancount_file):
     )
     assert code == 0
     data = jsonlib.loads(out)
+    if "data" in data and "ok" in data:
+        data = data["data"]
     assert isinstance(data, list)
 
 

beancount_cli-0.2.9/src/beancount_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.9"