Deploy CellQuant

cellquant/gemini_summary.py

@@ -96,8 +96,26 @@ def _generate(prompt: str, overlay: Image.Image | None, model: str | None) -> st
             resp = client.models.generate_content(model=mid, contents=contents)
             text = (resp.text or "").strip()
             return text if text else "Gemini returned an empty response."
-        except Exception as e:  # noqa: BLE001 - try the next model id, then surface the error to the UI
+        except Exception as e:  # noqa: BLE001 - try the next model id on a missing model or an exhausted quota
             last = f"{type(e).__name__}: {e}"
-            if "NOT_FOUND" not in str(e) and "not found" not in str(e).lower():
+            if not _retryable(e):
                 break
-    return f"Gemini summary failed ({last})"
+    return f"Gemini summary unavailable right now ({_short_error(last)}). The counts above do not depend on it."
+
+
+def _retryable(e: Exception) -> bool:
+    """Move on to the next model when this one is unknown or its quota / rate limit is used up."""
+    msg = str(e)
+    return ("NOT_FOUND" in msg or "not found" in msg.lower()
+            or "RESOURCE_EXHAUSTED" in msg or "429" in msg[:40] or "quota" in msg.lower() or "rate limit" in msg.lower())
+
+
+def _short_error(text: str, limit: int = 220) -> str:
+    """Status line of an API error plus the API's own message (not the JSON payload), trimmed."""
+    import re
+    head = text.split("{", 1)[0].strip().rstrip(".") or text
+    m = re.search(r"'message':\s*'([^']*)'", text) or re.search(r'"message":\s*"([^"]*)"', text)
+    if m:
+        msg = m.group(1).split(" Learn more")[0].strip()
+        head = f"{head}: {msg}"
+    return head[:limit]

tests/test_validation.py

@@ -178,3 +178,9 @@ def test_gemini_prompts_and_disabled_paths(monkeypatch):
     assert "do not round" in txt and "training set" in txt
     assert g.summarize_comparison("C100", rows, COMPARISON_HEADERS).startswith("Gemini summary disabled")
     assert g.summarize([{"image": "a", "counts": {"Cell, Antibody +": 1}}]).startswith("Gemini summary disabled")
+    assert g._retryable(Exception("404 NOT_FOUND. model x")) and g._retryable(Exception("429 RESOURCE_EXHAUSTED. {'error': {}}"))
+    assert not g._retryable(Exception("400 INVALID_ARGUMENT. bad key"))
+    assert g._short_error("ClientError: 429 RESOURCE_EXHAUSTED. {'error': {'code': 429}}") == "ClientError: 429 RESOURCE_EXHAUSTED"
+    cap = ("ClientError: 429 RESOURCE_EXHAUSTED. {'error': {'code': 429, 'message': 'Your billing account has exceeded its "
+           "monthly spending cap. Please go to AI Studio. Learn more at https://x', 'status': 'RESOURCE_EXHAUSTED'}}")
+    assert g._short_error(cap) == "ClientError: 429 RESOURCE_EXHAUSTED: Your billing account has exceeded its monthly spending cap. Please go to AI Studio."