From eb3115d537713ee19a0e36d1d35277cfc30beb29 Mon Sep 17 00:00:00 2001
From: wangzhuc <wangzhuc@outlook.com>
Date: Wed, 1 Apr 2026 13:13:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20improve=20GeminiProvider=20=E2=80=94=20s?=
 =?UTF-8?q?ize=20hint,=20API=20key=20in=20header,=20error=20handling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Append size instruction to prompt (Gemini has no native size param)
- Move API key from URL query string to x-goog-api-key header
- Check status_code before parsing JSON to handle non-JSON error responses
- Remove unnecessary Session with trust_env=False
- Remove f-prefix from strings with no interpolation

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 dist/openclaw/toolkit/image_gen.py | 27 ++++++++++++++++++---------
 toolkit/image_gen.py               | 29 +++++++++++++++++++----------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/dist/openclaw/toolkit/image_gen.py b/dist/openclaw/toolkit/image_gen.py
index 5651de3..3783dfd 100644
--- a/dist/openclaw/toolkit/image_gen.py
+++ b/dist/openclaw/toolkit/image_gen.py
@@ -225,26 +225,35 @@ class GeminiProvider(ImageProvider):
         self._base_url = base_url
 
     def generate(self, prompt: str, size: str) -> bytes:
+        # Append size instruction to prompt (Gemini doesn't have a native size param)
+        if "x" in size:
+            w, h = size.split("x", 1)
+            prompt = f"{prompt}\n\nGenerate this image at {w}x{h} resolution."
+
         body = {
             "contents": [{"parts": [{"text": prompt}]}],
             "generationConfig": {"responseModalities": ["TEXT", "IMAGE"]},
         }
-        session = requests.Session()
-        session.trust_env = False
-        resp = session.post(
-            f"{self._base_url}/models/{self._model}:generateContent?key={self._api_key}",
-            headers={"Content-Type": "application/json"},
+        resp = requests.post(
+            f"{self._base_url}/models/{self._model}:generateContent",
+            headers={
+                "Content-Type": "application/json",
+                "x-goog-api-key": self._api_key,
+            },
             json=body,
             timeout=120,
         )
-        data = resp.json()
         if resp.status_code != 200:
-            error = data.get("error", {})
-            msg = error.get("message", json.dumps(data, ensure_ascii=False))
+            try:
+                error = resp.json().get("error", {})
+                msg = error.get("message", resp.text[:200])
+            except (ValueError, KeyError):
+                msg = resp.text[:200]
             raise ValueError(f"Gemini API error ({resp.status_code}): {msg}")
+        data = resp.json()
         candidates = data.get("candidates", [])
         if not candidates:
-            raise ValueError(f"No candidates in Gemini response")
+            raise ValueError("No candidates in Gemini response")
         parts = candidates[0].get("content", {}).get("parts", [])
         for part in parts:
             inline_data = part.get("inlineData")
diff --git a/toolkit/image_gen.py b/toolkit/image_gen.py
index 73647af..a59b317 100644
--- a/toolkit/image_gen.py
+++ b/toolkit/image_gen.py
@@ -225,32 +225,41 @@ class GeminiProvider(ImageProvider):
         self._base_url = base_url
 
     def generate(self, prompt: str, size: str) -> bytes:
+        # Append size instruction to prompt (Gemini doesn't have a native size param)
+        if "x" in size:
+            w, h = size.split("x", 1)
+            prompt = f"{prompt}\n\nGenerate this image at {w}x{h} resolution."
+
         body = {
             "contents": [{"parts": [{"text": prompt}]}],
             "generationConfig": {"responseModalities": ["TEXT", "IMAGE"]},
         }
-        session = requests.Session()
-        session.trust_env = False
-        resp = session.post(
-            f"{self._base_url}/models/{self._model}:generateContent?key={self._api_key}",
-            headers={"Content-Type": "application/json"},
+        resp = requests.post(
+            f"{self._base_url}/models/{self._model}:generateContent",
+            headers={
+                "Content-Type": "application/json",
+                "x-goog-api-key": self._api_key,
+            },
             json=body,
             timeout=120,
         )
-        data = resp.json()
         if resp.status_code != 200:
-            error = data.get("error", {})
-            msg = error.get("message", json.dumps(data, ensure_ascii=False))
+            try:
+                error = resp.json().get("error", {})
+                msg = error.get("message", resp.text[:200])
+            except (ValueError, KeyError):
+                msg = resp.text[:200]
             raise ValueError(f"Gemini API error ({resp.status_code}): {msg}")
+        data = resp.json()
         candidates = data.get("candidates", [])
         if not candidates:
-            raise ValueError(f"No candidates in Gemini response")
+            raise ValueError("No candidates in Gemini response")
         parts = candidates[0].get("content", {}).get("parts", [])
         for part in parts:
             inline_data = part.get("inlineData")
             if inline_data and inline_data.get("mimeType", "").startswith("image/"):
                 return base64.b64decode(inline_data["data"])
-        raise ValueError(f"No image found in Gemini response parts")
+        raise ValueError("No image found in Gemini response parts")
 
 
 # --- Provider registry ---