aiuse 3.3.2__tar.gz → 3.3.3__tar.gz

{aiuse-3.3.2/src/aiuse.egg-info → aiuse-3.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiuse
-Version: 3.3.2
+Version: 3.3.3
 Summary: Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments
 Author: djbclark
 License-Expression: MIT

{aiuse-3.3.2 → aiuse-3.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aiuse"
-version = "3.3.2"
+version = "3.3.3"
 description = "Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments"
 readme = "README.md"
 requires-python = ">=3.11"

{aiuse-3.3.2 → aiuse-3.3.3}/src/aiuse/__init__.py

@@ -1,3 +1,3 @@
 """Aggregate provider quotas and flag use-it-or-lose-it allotments."""
 
-__version__ = "3.3.2"
+__version__ = "3.3.3"

{aiuse-3.3.2 → aiuse-3.3.3}/src/aiuse/collectors/codexbar.py

@@ -12,6 +12,7 @@ from aiuse.models import (
     BillingKind,
     QuotaWindow,
     UsageCredits,
+    canonical_provider,
     classify_window_minutes,
     keep_copilot_report_window,
     parse_dt,
@@ -109,6 +110,7 @@ def collect_codexbar(
     timeout: float = 45.0,
     discovery_timeout: float | None = None,
     min_intervals: dict[str, float] | None = None,
+    skip_providers: frozenset[str] | None = None,
 ) -> list[AccountUsage]:
     if not which("codexbar"):
         raise CollectorError("codexbar not found on PATH")
@@ -124,6 +126,14 @@ def collect_codexbar(
         if discovered:
             provider_list = discovered
 
+    if skip_providers:
+        # [disabled_services]: never spawn a query (or surface its timeout) for a
+        # provider the operator turned off, even if CodexBar still has it enabled.
+        kept = [p for p in provider_list if p is None or canonical_provider(p) not in skip_providers]
+        if not kept:
+            return []
+        provider_list = kept
+
     accounts: list[AccountUsage] = []
     errors: list[str] = []
     reuse_notes: dict[str, str] = {}

{aiuse-3.3.2 → aiuse-3.3.3}/src/aiuse/collectors/runner.py

@@ -156,6 +156,7 @@ def _run_collectors(config: dict[str, Any] | None = None) -> Snapshot:
                     timeout=codexbar_timeout,
                     discovery_timeout=discovery_timeout,
                     min_intervals=intervals,
+                    skip_providers=frozenset(disabled_providers),
                 ),
             )
         )

{aiuse-3.3.2 → aiuse-3.3.3/src/aiuse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiuse
-Version: 3.3.2
+Version: 3.3.3
 Summary: Aggregate AI subscription/API usage and flag use-it-or-lose-it allotments
 Author: djbclark
 License-Expression: MIT

{aiuse-3.3.2 → aiuse-3.3.3}/tests/test_codexbar_parse.py

@@ -788,3 +788,28 @@ def test_slot_label_names_a_window_by_its_reset_when_duration_is_missing():
     in_five_days = (utcnow() + timedelta(days=5)).isoformat()
     assert _slot_label("somevendor", 1, {"resetsAt": in_three_hours}) == "Somevendor 5-hour quota (1)"
     assert _slot_label("somevendor", 1, {"resetsAt": in_five_days}) == "Somevendor weekly quota (1)"
+
+
+def test_collect_codexbar_never_queries_disabled_services(monkeypatch):
+    queried = []
+
+    def fake_run_json(argv, *, timeout=90.0, allow_empty=False):
+        if "config" in argv:
+            return [
+                {"provider": "codex", "enabled": True},
+                {"provider": "alibaba", "enabled": True},
+                {"provider": "alibabatokenplan", "enabled": True},
+            ]
+        provider = argv[argv.index("--provider") + 1]
+        queried.append(provider)
+        return [{"provider": provider, "usage": {"primary": {"usedPercent": 1}}}]
+
+    monkeypatch.setattr("aiuse.collectors.codexbar.which", lambda _cmd: "/usr/bin/codexbar")
+    monkeypatch.setattr("aiuse.collectors.codexbar.run_json", fake_run_json)
+
+    from aiuse.collectors.codexbar import collect_codexbar
+
+    accounts = collect_codexbar(skip_providers=frozenset({"alibaba", "alibabatokenplan"}))
+
+    assert queried == ["codex"]
+    assert {account.provider for account in accounts} == {"codex"}