gemini-cli-usage 0.1.7__tar.gz → 0.1.9__tar.gz

gemini_cli_usage-0.1.9/.github/workflows/publish.yml

@@ -0,0 +1,29 @@
+name: Publish to PyPI
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7.0.1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v9.0.0
+        with:
+          enable-cache: false
+      - name: Verify version tag
+        run: test "$GITHUB_REF_NAME" = "v$(uv --no-config version --short)"
+      - name: Test
+        run: uv --no-config run --locked python -m unittest discover -s tests
+      - name: Build
+        run: uv --no-config build --no-sources
+      - name: Publish
+        run: uv publish --trusted-publishing always

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: gemini-cli-usage
-Version: 0.1.7
+Version: 0.1.9
 Summary: Gemini CLI quota monitor — fetches Code Assist quota data from Google's backend
 Project-URL: Homepage, https://github.com/wakamex/gemini-cli-usage
 Project-URL: Source, https://github.com/wakamex/gemini-cli-usage
@@ -83,7 +83,8 @@ Google's internal Code Assist API:
 - `retrieveUserQuota`
 
 This tool mirrors that flow using the OAuth credentials in
-`~/.gemini/oauth_creds.json`.
+`~/.gemini/oauth_creds.json`. When `GEMINI_CLI_HOME` is set, it follows Gemini
+CLI and uses `$GEMINI_CLI_HOME/.gemini` instead.
 
 ## Notes
 
@@ -102,7 +103,8 @@ This tool mirrors that flow using the OAuth credentials in
   `remainingAmount` and a usable fraction. Otherwise the tool reports `% used`
   plus reset time.
 - Auth detection follows Gemini CLI precedence: environment variables first,
-  then workspace `.gemini/settings.json`, then global `~/.gemini/settings.json`.
+  then workspace `.gemini/settings.json`, then the global settings file under
+  the effective Gemini CLI home.
 
 ## Options
 

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/README.md

@@ -74,7 +74,8 @@ Google's internal Code Assist API:
 - `retrieveUserQuota`
 
 This tool mirrors that flow using the OAuth credentials in
-`~/.gemini/oauth_creds.json`.
+`~/.gemini/oauth_creds.json`. When `GEMINI_CLI_HOME` is set, it follows Gemini
+CLI and uses `$GEMINI_CLI_HOME/.gemini` instead.
 
 ## Notes
 
@@ -93,7 +94,8 @@ This tool mirrors that flow using the OAuth credentials in
   `remainingAmount` and a usable fraction. Otherwise the tool reports `% used`
   plus reset time.
 - Auth detection follows Gemini CLI precedence: environment variables first,
-  then workspace `.gemini/settings.json`, then global `~/.gemini/settings.json`.
+  then workspace `.gemini/settings.json`, then the global settings file under
+  the effective Gemini CLI home.
 
 ## Options
 

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gemini-cli-usage"
-version = "0.1.7"
+version = "0.1.9"
 description = "Gemini CLI quota monitor — fetches Code Assist quota data from Google's backend"
 readme = "README.md"
 requires-python = ">=3.12"

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/src/gemini_cli_usage/__init__.py

@@ -18,6 +18,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import math
 import os
 import re
 import signal
@@ -31,7 +32,12 @@ import urllib.request
 from datetime import UTC, datetime
 from pathlib import Path
 
-_NATIVE_GEMINI_DIR = Path.home() / ".gemini"
+def _gemini_dir() -> Path:
+    home = os.environ.get("GEMINI_CLI_HOME")
+    return (Path(home) if home else Path.home()) / ".gemini"
+
+
+_NATIVE_GEMINI_DIR = _gemini_dir()
 
 
 def _wsl_gemini_dirs() -> list[Path]:
@@ -68,7 +74,7 @@ def _wsl_gemini_dirs() -> list[Path]:
 def _find_gemini_file(filename: str) -> Path:
     """Return the first existing .gemini/<filename> from native + WSL paths."""
     native = _NATIVE_GEMINI_DIR / filename
-    if native.exists():
+    if native.exists() or os.environ.get("GEMINI_CLI_HOME"):
         return native
     for wsl_dir in _wsl_gemini_dirs():
         candidate = wsl_dir / filename
@@ -121,12 +127,13 @@ def _iso_now() -> str:
 
 
 def _parse_iso(timestamp: str | None) -> datetime | None:
-    if not timestamp:
+    if not isinstance(timestamp, str) or not timestamp:
         return None
     try:
-        return datetime.fromisoformat(timestamp.replace("Z", "+00:00"))
+        parsed = datetime.fromisoformat(timestamp.replace("Z", "+00:00"))
     except ValueError:
         return None
+    return parsed if parsed.tzinfo is not None else None
 
 
 def _read_auth_type_from_settings(path: Path) -> str | None:
@@ -311,7 +318,7 @@ def _get_oauth_client_credentials(creds: dict | None = None) -> tuple[str, str]:
 def refresh_access_token(creds: dict) -> dict:
     refresh_token = creds.get("refresh_token")
     if not refresh_token:
-        raise RuntimeError("No refresh token in ~/.gemini/oauth_creds.json")
+        raise RuntimeError(f"No refresh token in {OAUTH_FILE}")
 
     client_id, client_secret = _get_oauth_client_credentials(creds)
     payload = urllib.parse.urlencode(
@@ -356,7 +363,7 @@ def get_access_token(
 ) -> str:
     creds = get_oauth_credentials()
     if not creds:
-        raise RuntimeError("No OAuth credentials at ~/.gemini/oauth_creds.json")
+        raise RuntimeError(f"No OAuth credentials at {OAUTH_FILE}")
 
     token = creds.get("access_token")
     token_was_replaced = (
@@ -373,7 +380,7 @@ def get_access_token(
 
     token = creds.get("access_token")
     if not token:
-        raise RuntimeError("No access token in ~/.gemini/oauth_creds.json")
+        raise RuntimeError(f"No access token in {OAUTH_FILE}")
     return token
 
 
@@ -415,13 +422,37 @@ def _load_code_assist(access_token: str) -> dict:
     )
 
 
-def _parse_quota_buckets(buckets: list[dict]) -> list[dict]:
+def _parse_quota_buckets(buckets: object) -> list[dict]:
+    if not isinstance(buckets, list):
+        raise RuntimeError("Invalid quota response")
+
     parsed = []
     for bucket in buckets:
+        if not isinstance(bucket, dict):
+            raise RuntimeError("Invalid quota response")
+
         remaining = None
         limit = None
-        used_pct = None
+        model = bucket.get("modelId")
         remaining_fraction = bucket.get("remainingFraction")
+        reset_time = bucket.get("resetTime")
+
+        if model is None or model == "" or remaining_fraction is None:
+            continue
+
+        if (
+            not isinstance(model, str)
+            or not model.strip()
+            or not isinstance(remaining_fraction, int | float)
+            or isinstance(remaining_fraction, bool)
+            or (
+                isinstance(remaining_fraction, float)
+                and not math.isfinite(remaining_fraction)
+            )
+            or not 0 <= remaining_fraction <= 1
+            or (reset_time is not None and _parse_iso(reset_time) is None)
+        ):
+            raise RuntimeError("Invalid quota response")
 
         try:
             if bucket.get("remainingAmount") is not None:
@@ -429,20 +460,18 @@ def _parse_quota_buckets(buckets: list[dict]) -> list[dict]:
         except (TypeError, ValueError):
             remaining = None
 
-        if isinstance(remaining_fraction, int | float):
-            used_pct = (1 - float(remaining_fraction)) * 100
-        if remaining is not None and isinstance(remaining_fraction, int | float):
-            if remaining_fraction > 0:
-                limit = round(remaining / float(remaining_fraction))
+        used_pct = (1 - float(remaining_fraction)) * 100
+        if remaining is not None and remaining_fraction > 0:
+            limit = round(remaining / float(remaining_fraction))
 
         parsed.append(
             {
-                "model": bucket.get("modelId"),
+                "model": model,
                 "remaining": remaining,
                 "limit": limit,
                 "used_pct": used_pct,
                 "remaining_fraction": remaining_fraction,
-                "reset_time": bucket.get("resetTime"),
+                "reset_time": reset_time,
                 "token_type": bucket.get("tokenType"),
             }
         )
@@ -485,13 +514,17 @@ def fetch_quota(project_root: Path | None = None) -> dict:
             quota_res = _code_assist_post(
                 "retrieveUserQuota", {"project": project_id}, access_token
             )
+            if not isinstance(quota_res, dict) or not isinstance(
+                quota_res.get("buckets"), list
+            ):
+                raise RuntimeError("Invalid quota response")
             current_tier = load_res.get("currentTier") or {}
             paid_tier = load_res.get("paidTier") or {}
             result = {
                 "project_id": project_id,
                 "user_tier": paid_tier.get("id") or current_tier.get("id"),
                 "user_tier_name": paid_tier.get("name") or current_tier.get("name"),
-                "buckets": _parse_quota_buckets(quota_res.get("buckets") or []),
+                "buckets": _parse_quota_buckets(quota_res["buckets"]),
             }
             result["summary_bucket"] = _select_summary_bucket(result)
             return result

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/tests/test_gemini_cli_usage.py

@@ -37,6 +37,12 @@ def _usage_payload(project_root: Path, updated_at: str) -> dict:
 
 
 class GeminiUsageTests(unittest.TestCase):
+    def test_gemini_cli_home_sets_global_gemini_directory(self):
+        with tempfile.TemporaryDirectory() as tmp, mock.patch.dict(
+            os.environ, {"GEMINI_CLI_HOME": tmp}, clear=True
+        ):
+            self.assertEqual(gemini_cli_usage._gemini_dir(), Path(tmp) / ".gemini")
+
     def test_env_auth_overrides_workspace_and_global_settings(self):
         with tempfile.TemporaryDirectory() as tmp:
             tmp_path = Path(tmp)
@@ -117,6 +123,53 @@ class GeminiUsageTests(unittest.TestCase):
         self.assertIn("q:3.5%", statusline)
         self.assertNotIn("q:0.07%", statusline)
 
+    def test_fetch_quota_rejects_missing_buckets(self):
+        with (
+            mock.patch.object(
+                gemini_cli_usage, "get_auth_type", return_value="oauth-personal"
+            ),
+            mock.patch.object(
+                gemini_cli_usage, "get_access_token", return_value="token"
+            ),
+            mock.patch.object(
+                gemini_cli_usage,
+                "_load_code_assist",
+                return_value={"cloudaicompanionProject": "project"},
+            ),
+            mock.patch.object(gemini_cli_usage, "_code_assist_post", return_value={}),
+        ):
+            with self.assertRaisesRegex(RuntimeError, "Invalid quota response"):
+                gemini_cli_usage.fetch_quota()
+
+    def test_quota_buckets_require_finite_fraction_and_valid_reset(self):
+        invalid_buckets = (
+            {"modelId": "model", "remainingFraction": float("nan")},
+            {"modelId": "model", "remainingFraction": float("inf")},
+            {"modelId": "model", "remainingFraction": 1.1},
+            {
+                "modelId": "model",
+                "remainingFraction": 0.5,
+                "resetTime": "not-a-timestamp",
+            },
+        )
+
+        for bucket in invalid_buckets:
+            with self.subTest(bucket=bucket), self.assertRaisesRegex(
+                RuntimeError, "Invalid quota response"
+            ):
+                gemini_cli_usage._parse_quota_buckets([bucket])
+
+    def test_quota_buckets_skip_incomplete_entries(self):
+        buckets = gemini_cli_usage._parse_quota_buckets(
+            [
+                {"remainingFraction": 0.5},
+                {"modelId": "missing-fraction"},
+                {"modelId": "valid-model", "remainingFraction": 0.25},
+            ]
+        )
+
+        self.assertEqual([bucket["model"] for bucket in buckets], ["valid-model"])
+
     def test_force_refresh_bypasses_cache(self):
         with tempfile.TemporaryDirectory() as tmp:
             tmp_path = Path(tmp)

{gemini_cli_usage-0.1.7 → gemini_cli_usage-0.1.9}/uv.lock

@@ -4,5 +4,5 @@ requires-python = ">=3.12"
 
 [[package]]
 name = "gemini-cli-usage"
-version = "0.1.7"
+version = "0.1.9"
 source = { editable = "." }

gemini_cli_usage-0.1.7/.github/workflows/publish.yml

@@ -1,20 +0,0 @@
-name: Publish to PyPI
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  id-token: write
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    environment: pypi
-    steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v4
-      - run: uv build
-      - uses: pypa/gh-action-pypi-publish@release/v1