dh-cli 0.8.1__tar.gz → 0.8.2__tar.gz

{dh_cli-0.8.1 → dh_cli-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dh-cli
-Version: 0.8.1
+Version: 0.8.2
 Summary: Dayhoff Labs developer CLI
 Author-email: Dayhoff Labs <dev@dayhofflabs.com>
 License: # PolyForm Noncommercial License 1.0.0

{dh_cli-0.8.1 → dh_cli-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dh-cli"
-version = "0.8.1"
+version = "0.8.2"
 description = "Dayhoff Labs developer CLI"
 requires-python = ">=3.11"
 readme = "README.md"

{dh_cli-0.8.1 → dh_cli-0.8.2}/src/dh_cli/bedrock/commands.py

@@ -304,8 +304,11 @@ def bedrock_cost(
         sys.exit(1)
 
     import boto3
+    from botocore.config import Config
 
-    s3 = boto3.client("s3")
+    # Match the thread pool used by walk_logs so urllib3 doesn't block
+    # or warn when many parallel GETs are in flight.
+    s3 = boto3.client("s3", config=Config(max_pool_connections=32))
 
     my_handle: Optional[str] = None
     if me:

{dh_cli-0.8.1 → dh_cli-0.8.2}/src/dh_cli/bedrock/cost_report.py

@@ -27,6 +27,7 @@ from __future__ import annotations
 import datetime as dt
 import gzip
 import json
+from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Iterable, Iterator
@@ -443,14 +444,46 @@ def walk_logs(
     region: str,
     start: dt.date,
     end: dt.date,
+    max_workers: int = 32,
 ) -> Iterator[dict]:
+    """Yield every invocation record in `[start, end]` (inclusive, UTC days).
+
+    Object GETs are parallelised with a thread pool because each day's
+    prefix holds hundreds of tiny (~400-byte) gzipped objects and
+    per-request latency dominates wall time. Records within a single
+    object are yielded in their original NDJSON order; records *across*
+    objects may be reordered — downstream aggregation (`build_report`)
+    is order-insensitive.
+
+    `max_workers` caps in-flight S3 GETs per day. The caller's
+    `s3_client` should be configured with `max_pool_connections` >=
+    `max_workers` (see `botocore.config.Config`) to avoid urllib3
+    connection-pool contention.
+    """
     paginator = s3_client.get_paginator("list_objects_v2")
     seen_keys: set[str] = set()
+
+    def _fetch_and_parse(key: str) -> list[dict]:
+        body = s3_client.get_object(Bucket=bucket, Key=key)["Body"].read()
+        decompressed = gzip.decompress(body)
+        out: list[dict] = []
+        # Each object is one or more JSON records separated by
+        # newlines (NDJSON). Older Bedrock traffic produced
+        # one-record objects; multi-record objects appeared in
+        # our bucket on 2026-04-20. Parse line-by-line so both
+        # shapes work, and tolerate a trailing newline.
+        for line in decompressed.splitlines():
+            if not line.strip():
+                continue
+            out.append(json.loads(line))
+        return out
+
     for day in _iter_days(start, end):
         prefix = (
             f"invocation-logs/AWSLogs/{account}/BedrockModelInvocationLogs/"
             f"{region}/{day.year:04d}/{day.month:02d}/{day.day:02d}/"
         )
+        keys: list[str] = []
         for page in paginator.paginate(Bucket=bucket, Prefix=prefix):
             for obj in page.get("Contents", []) or []:
                 key = obj["Key"]
@@ -461,17 +494,18 @@ def walk_logs(
                 if key in seen_keys:
                     continue
                 seen_keys.add(key)
-                body = s3_client.get_object(Bucket=bucket, Key=key)["Body"].read()
-                decompressed = gzip.decompress(body)
-                # Each object is one or more JSON records separated by
-                # newlines (NDJSON). Older Bedrock traffic produced
-                # one-record objects; multi-record objects appeared in
-                # our bucket on 2026-04-20. Parse line-by-line so both
-                # shapes work, and tolerate a trailing newline.
-                for line in decompressed.splitlines():
-                    if not line.strip():
-                        continue
-                    yield json.loads(line)
+                keys.append(key)
+        if not keys:
+            continue
+        # One pool per day bounds concurrent in-flight GETs and caps
+        # peak memory (at most ~max_workers decompressed objects held
+        # at once). ex.map preserves submission order, so the day's
+        # records stream out in a stable — though not chronological —
+        # order.
+        with ThreadPoolExecutor(max_workers=max_workers) as ex:
+            for records in ex.map(_fetch_and_parse, keys):
+                for rec in records:
+                    yield rec
 
 
 def reconcile_with_cost_explorer(

{dh_cli-0.8.1 → dh_cli-0.8.2}/tests/batch/test_submit_merge.py

@@ -91,9 +91,7 @@ class TestCliWinsWhenExplicitlyPassed:
         "cli_flag,kwarg,cli_default,yaml_alt,_",
         MERGE_FIELDS,
     )
-    def test_cli_at_default_beats_yaml(
-        self, cli_runner, tmp_path, cli_flag, kwarg, cli_default, yaml_alt, _
-    ):
+    def test_cli_at_default_beats_yaml(self, cli_runner, tmp_path, cli_flag, kwarg, cli_default, yaml_alt, _):
         """CLI flag set to the Click default still wins over a different YAML value."""
         yaml_key = cli_flag.lstrip("-")
         config_path = tmp_path / "job.yaml"
@@ -112,9 +110,7 @@ class TestCliWinsWhenExplicitlyPassed:
         "cli_flag,kwarg,_,yaml_alt,cli_alt",
         MERGE_FIELDS,
     )
-    def test_cli_at_non_default_beats_yaml(
-        self, cli_runner, tmp_path, cli_flag, kwarg, _, yaml_alt, cli_alt
-    ):
+    def test_cli_at_non_default_beats_yaml(self, cli_runner, tmp_path, cli_flag, kwarg, _, yaml_alt, cli_alt):
         """CLI flag at a non-default value also wins over YAML (regression check)."""
         yaml_key = cli_flag.lstrip("-")
         config_path = tmp_path / "job.yaml"
@@ -137,9 +133,7 @@ class TestYamlWinsWhenCliOmitted:
         "cli_flag,kwarg,_,yaml_alt,__",
         MERGE_FIELDS,
     )
-    def test_yaml_wins_when_cli_not_passed(
-        self, cli_runner, tmp_path, cli_flag, kwarg, _, yaml_alt, __
-    ):
+    def test_yaml_wins_when_cli_not_passed(self, cli_runner, tmp_path, cli_flag, kwarg, _, yaml_alt, __):
         yaml_key = cli_flag.lstrip("-")
         config_path = tmp_path / "job.yaml"
         config_path.write_text(yaml.dump({"command": "echo hi", yaml_key: yaml_alt}))
@@ -157,9 +151,7 @@ class TestDefaultWhenNeitherSet:
         "_,kwarg,cli_default,__,___",
         MERGE_FIELDS,
     )
-    def test_click_default_applies(
-        self, cli_runner, tmp_path, _, kwarg, cli_default, __, ___
-    ):
+    def test_click_default_applies(self, cli_runner, tmp_path, _, kwarg, cli_default, __, ___):
         result, mock_client = _invoke(cli_runner, ["--command", "echo hi"], tmp_path)
         assert result.exit_code == 0, result.output
         call_kwargs = mock_client.submit_job.call_args[1]
@@ -218,9 +210,7 @@ class TestGpuRegressionFromReport:
 
     def test_explicit_gpus_one_beats_yaml_gpus_zero(self, cli_runner, tmp_path):
         config_path = tmp_path / "job.yaml"
-        config_path.write_text(
-            yaml.dump({"command": "echo hi", "queue": "t4-1x-spot", "gpus": 0})
-        )
+        config_path.write_text(yaml.dump({"command": "echo hi", "queue": "t4-1x-spot", "gpus": 0}))
         result, mock_client = _invoke(
             cli_runner,
             ["-f", str(config_path), "--gpus", "1"],