aiuse 3.2.4__tar.gz → 3.2.5__tar.gz

{aiuse-3.2.4/src/aiuse.egg-info → aiuse-3.2.5}/PKG-INFO

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

{aiuse-3.2.4 → aiuse-3.2.5}/pyproject.toml

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

{aiuse-3.2.4 → aiuse-3.2.5}/src/aiuse/__init__.py

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

{aiuse-3.2.4 → aiuse-3.2.5}/src/aiuse/report.py

@@ -1398,6 +1398,25 @@ def _cell_color(s: _Style, used: float) -> Any:
     return s.green
 
 
+def _style_clock_percent(s: _Style, cell: _ClockCell, *, width: int) -> str:
+    """Right-align ``NNu/NNl`` into ``width`` and color only the left token.
+
+    The used side (``44u/``) stays the default color. The left side (``56l``
+    or ``56l+``) is one colored token, so the ``l`` does not drop out between
+    the number and the reset span. An inferred clock is dim end to end.
+    Visible width is always ``width``: a short pair is padded on the left,
+    and the color codes are not part of that width, so the next column starts
+    on the same character in every row.
+    """
+    padded = f"{_clock_percent_text(cell):>{width}}"
+    if cell.inferred:
+        return s.dim(padded)
+    slash = padded.rfind("/")
+    if slash < 0:
+        return _cell_color(s, cell.used_percent)(padded)
+    return padded[: slash + 1] + _cell_color(s, cell.used_percent)(padded[slash + 1 :])
+
+
 def render_clock_matrix(
     alerts: list[UseOrLoseAlert],
     *,
@@ -1511,33 +1530,12 @@ def render_clock_matrix(
                 continue
             any_inferred = any_inferred or cell.inferred
             any_folded = any_folded or bool(cell.folded)
-            percent = _clock_percent_text(cell)
             span = _format_reset_span(
                 cell.days_until_reset,
                 estimated=cell.reset_estimated,
                 compact=layout.compact_deadline,
             )
-            # Split percent into used part (before "/") and left part (after "/" but before "l")
-            # Format: "44u/56l" or "44u/56l+" if folded
-            # Keep used part and slash in normal text, color only the left part
-            if "/" in percent:
-                used_part, rest = percent.split("/", 1)
-                # rest is like "56l" or "56l+"
-                left_part = rest.rstrip("l+")
-                mark = "+" if "+" in rest else ""
-                if cell.inferred:
-                    colored_used = s.dim(used_part)
-                    colored_left = s.dim(left_part)
-                else:
-                    colored_used = used_part  # Normal text for used part
-                    colored_left = _cell_color(s, cell.used_percent)(left_part)
-                colored = f"{colored_used}/{colored_left}l{mark}"
-            else:
-                colored = (
-                    s.dim(f"{percent:>{w_pct}}")
-                    if cell.inferred
-                    else _cell_color(s, cell.used_percent)(f"{percent:>{w_pct}}")
-                )
+            colored = _style_clock_percent(s, cell, width=w_pct)
             if span is None:
                 tail.append(colored + (" " * (w_clock - w_pct)))
                 continue

{aiuse-3.2.4 → aiuse-3.2.5/src/aiuse.egg-info}/PKG-INFO

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

{aiuse-3.2.4 → aiuse-3.2.5}/tests/test_report.py

@@ -1916,6 +1916,88 @@ def test_clock_matrix_omits_slash_when_clock_has_no_timestamp():
     assert "0u/100l" in tokens
 
 
+def test_clock_matrix_pads_percents_and_colors_only_the_left_token():
+    """A short ``4u/96l`` must not slide the next clock left of a ``79u/21l``.
+
+    Color wraps the whole left token (``21l``), not just the digits, and the
+    used side stays plain. Stripping ANSI leaves the plain table unchanged.
+    """
+    now = utcnow()
+
+    def window(label: str, used: float, left: float, *, window_minutes: int, **when: float) -> QuotaWindow:
+        return QuotaWindow(
+            label=label,
+            used_percent=used,
+            remaining_percent=left,
+            resets_at=now + timedelta(**when),
+            window_minutes=window_minutes,
+        )
+
+    snap = Snapshot(
+        collected_at=now,
+        accounts=[
+            AccountUsage(
+                provider="claude",
+                source="cswap",
+                account="me@gmail.com",
+                billing_kind=BillingKind.SUBSCRIPTION_WINDOW,
+                windows=[
+                    window("5-hour", 79.0, 21.0, window_minutes=300, hours=1, minutes=52),
+                    window("weekly", 56.0, 44.0, window_minutes=10080, days=5, hours=8),
+                ],
+            ),
+            AccountUsage(
+                provider="cursor",
+                source="codexbar",
+                account="me@gmail.com",
+                billing_kind=BillingKind.SUBSCRIPTION_WINDOW,
+                windows=[
+                    window("5-hour", 4.0, 96.0, window_minutes=300, minutes=36),
+                    window("weekly", 29.0, 71.0, window_minutes=10080, days=3, hours=2),
+                ],
+            ),
+        ],
+    )
+    plain = render_clock_matrix([], snapshot=snap, color=False, width=160)
+    colored = render_clock_matrix([], snapshot=snap, color=True, width=160)
+    assert _strip_ansi(colored) == plain
+
+    rows = {line.split()[2]: line for line in plain.splitlines() if line[:5].strip() in _BAND_TAGS}
+    claude = rows["claude"]
+    cursor = rows["cursor"]
+    assert claude.index("56u/44l") == cursor.index("29u/71l")
+    assert claude.index("79u/21l") == cursor.index("4u/96l") - 1
+    header = plain.splitlines()[0]
+    assert header.index("5H") + 1 == claude.index("79u/21l") + len("79u/21l") - 1
+    assert header.index("WEEK") + 3 == claude.index("56u/44l") + len("56u/44l") - 1
+
+    # First data row has no zebra stripe, so the reset is a plain ``[0m``.
+    # The next row's stripe rewrites that reset; the open code is what matters.
+    assert "79u/\033[33m21l\033[0m" in colored
+    assert "\033[32m96l" in colored
+    assert "\033[33m79u" not in colored
+    assert "\033[32m4u" not in colored
+
+
+def test_style_clock_percent_pads_and_keeps_fold_mark_in_the_left_token():
+    from aiuse.report import _ClockCell, _style_clock_percent
+
+    on = _Style(True)
+    short = _style_clock_percent(on, _ClockCell(used_percent=4.0), width=8)
+    assert _strip_ansi(short) == "  4u/96l"
+    assert short == "  4u/\033[32m96l\033[0m"
+
+    folded = _style_clock_percent(on, _ClockCell(used_percent=56.0, folded=2), width=8)
+    assert _strip_ansi(folded) == "56u/44l+"
+    assert folded == "56u/\033[36m44l+\033[0m"
+
+    inferred = _style_clock_percent(on, _ClockCell(used_percent=4.0, inferred=True), width=8)
+    assert inferred == on.dim("  4u/96l")
+
+    off = _Style(False)
+    assert _style_clock_percent(off, _ClockCell(used_percent=4.0), width=8) == "  4u/96l"
+
+
 @pytest.mark.parametrize(
     ("provider", "display"),
     [