devin-cli-usage 0.1.0__tar.gz → 0.1.1__tar.gz

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: devin-cli-usage
-Version: 0.1.0
+Version: 0.1.1
 Summary: Devin CLI account quota monitor using local Devin authentication
 Project-URL: Homepage, https://github.com/wakamex/devin-cli-usage
 Project-URL: Source, https://github.com/wakamex/devin-cli-usage
@@ -59,10 +59,10 @@ uv tool install .
 ## Authentication and data
 
 The tool reads `windsurf_api_key` and `api_server_url` from Devin's local
-`~/.local/share/devin/credentials.toml`, then calls the read-only
-`GetUserStatus` service used by the installed client. It rereads credentials
-for every live request. It never refreshes credentials or modifies
-Devin-owned files.
+`~/.local/share/devin/credentials.toml`, or the corresponding path below
+`XDG_DATA_HOME` when it is set, then calls the read-only `GetUserStatus`
+service used by the installed client. It rereads credentials for every live
+request. It never refreshes credentials or modifies Devin-owned files.
 
 The normalized JSON includes:
 
@@ -77,8 +77,9 @@ vendor sentinel for an unlimited or non-credit-based allowance and is
 preserved verbatim.
 
 The tool writes only its own non-secret cache at
-`~/.local/share/devin/usage-limits.json`. JSON results report whether they are
-`live`, `cached`, `stale`, or `unavailable`.
+`~/.local/share/devin/usage-limits.json`, also following `XDG_DATA_HOME` when
+set. JSON results report whether they are `live`, `cached`, `stale`, or
+`unavailable`.
 
 Environment overrides:
 

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/README.md

@@ -50,10 +50,10 @@ uv tool install .
 ## Authentication and data
 
 The tool reads `windsurf_api_key` and `api_server_url` from Devin's local
-`~/.local/share/devin/credentials.toml`, then calls the read-only
-`GetUserStatus` service used by the installed client. It rereads credentials
-for every live request. It never refreshes credentials or modifies
-Devin-owned files.
+`~/.local/share/devin/credentials.toml`, or the corresponding path below
+`XDG_DATA_HOME` when it is set, then calls the read-only `GetUserStatus`
+service used by the installed client. It rereads credentials for every live
+request. It never refreshes credentials or modifies Devin-owned files.
 
 The normalized JSON includes:
 
@@ -68,8 +68,9 @@ vendor sentinel for an unlimited or non-credit-based allowance and is
 preserved verbatim.
 
 The tool writes only its own non-secret cache at
-`~/.local/share/devin/usage-limits.json`. JSON results report whether they are
-`live`, `cached`, `stale`, or `unavailable`.
+`~/.local/share/devin/usage-limits.json`, also following `XDG_DATA_HOME` when
+set. JSON results report whether they are `live`, `cached`, `stale`, or
+`unavailable`.
 
 Environment overrides:
 

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devin-cli-usage"
-version = "0.1.0"
+version = "0.1.1"
 description = "Devin CLI account quota monitor using local Devin authentication"
 readme = "README.md"
 requires-python = ">=3.12"

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/src/devin_cli_usage/__init__.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 import argparse
 import json
+import math
 import os
 import re
 import shutil
@@ -46,17 +47,31 @@ def _parse_iso(value: object) -> datetime | None:
 def _number(value: object) -> int | float | None:
     if isinstance(value, bool):
         return None
-    if isinstance(value, int | float):
+    if isinstance(value, int):
         return value
+    if isinstance(value, float):
+        return value if math.isfinite(value) else None
     if isinstance(value, str):
         try:
             parsed = float(value)
         except ValueError:
             return None
+        if not math.isfinite(parsed):
+            return None
         return int(parsed) if parsed.is_integer() else parsed
     return None
 
 
+def _optional_number(data: dict, key: str) -> int | float | None:
+    raw = data.get(key)
+    if raw is None:
+        return None
+    value = _number(raw)
+    if value is None:
+        raise RuntimeError(f"Devin user-status response contained invalid {key}")
+    return value
+
+
 def _format_reset(value: object) -> str:
     seconds = _number(value)
     if seconds is None:
@@ -75,12 +90,26 @@ def _format_reset(value: object) -> str:
 
 def get_credentials_file() -> Path:
     override = os.environ.get("DEVIN_USAGE_CREDENTIALS_FILE")
-    return Path(override).expanduser() if override else DEFAULT_CREDENTIALS_FILE
+    if override:
+        return Path(override).expanduser()
+    data_home = os.environ.get("XDG_DATA_HOME")
+    return (
+        Path(data_home).expanduser() / "devin" / "credentials.toml"
+        if data_home
+        else DEFAULT_CREDENTIALS_FILE
+    )
 
 
 def get_usage_file() -> Path:
     override = os.environ.get("DEVIN_USAGE_FILE")
-    return Path(override).expanduser() if override else DEFAULT_USAGE_FILE
+    if override:
+        return Path(override).expanduser()
+    data_home = os.environ.get("XDG_DATA_HOME")
+    return (
+        Path(data_home).expanduser() / "devin" / "usage-limits.json"
+        if data_home
+        else DEFAULT_USAGE_FILE
+    )
 
 
 def get_credentials() -> tuple[str, str]:
@@ -168,17 +197,22 @@ def _normalized_plan_info(payload: dict, plan_status: dict) -> dict:
         info = plan_status.get("planInfo")
     if not isinstance(info, dict):
         info = {}
-    return {
+    normalized = {
         key: value
         for key, source in (
             ("name", "planName"),
             ("billing_strategy", "billingStrategy"),
-            ("monthly_prompt_credits", "monthlyPromptCredits"),
-            ("monthly_flow_credits", "monthlyFlowCredits"),
-            ("monthly_flex_credits", "monthlyFlexCreditPurchaseAmount"),
         )
         if (value := info.get(source)) is not None
     }
+    for key, source in (
+        ("monthly_prompt_credits", "monthlyPromptCredits"),
+        ("monthly_flow_credits", "monthlyFlowCredits"),
+        ("monthly_flex_credits", "monthlyFlexCreditPurchaseAmount"),
+    ):
+        if (value := _optional_number(info, source)) is not None:
+            normalized[key] = value
+    return normalized
 
 
 def _normalize(payload: dict) -> dict:
@@ -187,15 +221,19 @@ def _normalize(payload: dict) -> dict:
         raise RuntimeError("Devin user-status response did not contain userStatus")
     plan_status = user_status.get("planStatus")
     if not isinstance(plan_status, dict):
-        plan_status = {}
+        raise RuntimeError("Devin user-status response did not contain planStatus")
     quotas = {
         "daily": {
-            "remaining_pct": _number(plan_status.get("dailyQuotaRemainingPercent")),
-            "reset_at": _number(plan_status.get("dailyQuotaResetAtUnix")),
+            "remaining_pct": _optional_number(
+                plan_status, "dailyQuotaRemainingPercent"
+            ),
+            "reset_at": _optional_number(plan_status, "dailyQuotaResetAtUnix"),
         },
         "weekly": {
-            "remaining_pct": _number(plan_status.get("weeklyQuotaRemainingPercent")),
-            "reset_at": _number(plan_status.get("weeklyQuotaResetAtUnix")),
+            "remaining_pct": _optional_number(
+                plan_status, "weeklyQuotaRemainingPercent"
+            ),
+            "reset_at": _optional_number(plan_status, "weeklyQuotaResetAtUnix"),
         },
     }
     credits = {
@@ -211,8 +249,12 @@ def _normalize(payload: dict) -> dict:
             ("acu_consumed", "acuConsumed"),
             ("acu_limit", "acuLimit"),
         )
-        if (value := _number(plan_status.get(source))) is not None
+        if (value := _optional_number(plan_status, source)) is not None
     }
+    if not credits and not any(
+        quota["remaining_pct"] is not None for quota in quotas.values()
+    ):
+        raise RuntimeError("Devin user-status response did not contain usage data")
     return {
         "plan": _normalized_plan_info(payload, plan_status),
         "plan_period": {

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/tests/test_devin_cli_usage.py

@@ -25,6 +25,23 @@ class FakeResponse:
 
 
 class DevinUsageTests(unittest.TestCase):
+    def test_default_files_follow_xdg_data_home(self):
+        with (
+            tempfile.TemporaryDirectory() as temporary,
+            mock.patch.dict(
+                devin_usage.os.environ,
+                {"XDG_DATA_HOME": temporary},
+                clear=True,
+            ),
+        ):
+            data_dir = Path(temporary) / "devin"
+            self.assertEqual(
+                devin_usage.get_credentials_file(), data_dir / "credentials.toml"
+            )
+            self.assertEqual(
+                devin_usage.get_usage_file(), data_dir / "usage-limits.json"
+            )
+
     def test_credentials_are_reread_without_writes(self):
         with tempfile.TemporaryDirectory() as temporary:
             credentials = Path(temporary) / "credentials.toml"
@@ -88,6 +105,39 @@ class DevinUsageTests(unittest.TestCase):
         self.assertEqual(data["quotas"]["weekly"]["remaining_pct"], 50)
         self.assertEqual(data["credits"]["available_prompt"], 900)
 
+    def test_incomplete_plan_status_is_unavailable(self):
+        for plan_status in (None, [], {}):
+            with self.subTest(plan_status=plan_status):
+                payload = {"userStatus": {"planStatus": plan_status}}
+                with mock.patch.object(
+                    devin_usage, "fetch_usage", return_value=payload
+                ):
+                    data = devin_usage.build_usage_json()
+                self.assertEqual(data["status"], "unavailable")
+
+    def test_nonfinite_usage_is_unavailable(self):
+        payloads = (
+            {
+                "userStatus": {
+                    "planStatus": {"dailyQuotaRemainingPercent": float("inf")}
+                }
+            },
+            {
+                "planInfo": {"monthlyPromptCredits": "NaN"},
+                "userStatus": {
+                    "planStatus": {"dailyQuotaRemainingPercent": 75}
+                },
+            },
+        )
+        for payload in payloads:
+            with self.subTest(payload=payload):
+                with mock.patch.object(
+                    devin_usage, "fetch_usage", return_value=payload
+                ):
+                    data = devin_usage.build_usage_json()
+                self.assertEqual(data["status"], "unavailable")
+                json.dumps(data, allow_nan=False)
+
     def test_non_https_server_is_rejected(self):
         with tempfile.TemporaryDirectory() as temporary:
             credentials = Path(temporary) / "credentials.toml"

{devin_cli_usage-0.1.0 → devin_cli_usage-0.1.1}/uv.lock

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