Update app.py

app.py

@@ -9,7 +9,7 @@ from io import BytesIO
 HF_TOKEN = os.environ.get("girlToken")
 
 API_BASE = "https://prithivmlmods-qwen-image-edit-2511-loras-fast.hf.space"
-INFER_URL = f"{API_BASE}/gradio/infer"  # Not used, for clarity
+INFER_URL = f"{API_BASE}/gradio/infer"
 NAMED_API_URL = f"{API_BASE}/gradio_api/call/v2/infer"
 
 LORA_STYLES = [
@@ -22,11 +22,14 @@ LORA_STYLES = [
 ]
 MAX_SEED = 2**31 - 1
 
-def encode_image_file_to_b64_json(image_path):
+def encode_image_file_to_b64_payload(image_path):
+    """
+    返回符合API要求的图片Payload对象(list，不是json字符串)。
+    """
     try:
         with open(image_path, "rb") as f:
             image_bytes = f.read()
-        # 检查格式，如果不是 jpeg/png 尝试转码
+        # 如非jpeg，转码
         try:
             img = Image.open(BytesIO(image_bytes))
             buffered = BytesIO()
@@ -35,7 +38,6 @@ def encode_image_file_to_b64_json(image_path):
         except Exception:
             pass
         im_b64 = base64.b64encode(image_bytes).decode("utf-8")
-        # 和 gradio_client 一致，图片用 json 数组包裹并带类型
         payload = [
             {
                 "data": im_b64,
@@ -43,13 +45,12 @@ def encode_image_file_to_b64_json(image_path):
                 "orig_name": os.path.basename(image_path),
             }
         ]
-        import json
-        return json.dumps(payload)
+        return payload
     except Exception as e:
         raise RuntimeError(f"图片编码失败: {e}")
 
 def call_named_infer(
-    images_b64_json,
+    images_b64_payload,
     prompt,
     lora_adapter,
     seed,
@@ -62,31 +63,35 @@ def call_named_infer(
         'Content-Type': 'application/json'
     }
     payload = {
-        "images_b64_json": images_b64_json,
+        "images_b64_json": images_b64_payload, # 注意此处改为直接传 list
         "prompt": prompt,
         "lora_adapter": lora_adapter,
         "seed": int(seed),
         "randomize_seed": bool(randomize_seed),
-        "guidance_scale": float(guidance_scale), # 注意类型
+        "guidance_scale": float(guidance_scale),
         "steps": int(steps),
     }
-    print("准备调用/infer:", payload)
-    resp = requests.post(NAMED_API_URL, json=payload, headers=headers)
+    print("准备调用/infer:", {**payload, "images_b64_json": "[payload omitted for brevity]"})
+    import json
+    # 注意: 直接以json.dumps(payload)传body
+    resp = requests.post(NAMED_API_URL, data=json.dumps(payload), headers=headers)
     resp.raise_for_status()
-    # gradio api新版返回 event_id，然后/POLL 获取最终结果
     job = resp.json()
     event_id = job.get("event_id")
     return event_id
 
 def poll_infer(event_id):
-    # 必须用 gradio_api/call/infer/{event_id}
     url = f"{API_BASE}/gradio_api/call/infer/{event_id}"
     headers = {'Authorization': f'Bearer {HF_TOKEN}'}
     import time
-    for _ in range(60):
+    for i in range(60):
         resp = requests.get(url, headers=headers)
-        resp.raise_for_status()
-        result = resp.json()
+        try:
+            result = resp.json()
+        except Exception:
+            print(f"[轮询第{i+1}次] 响应无法decode，返回内容：{resp.text[:200]}")
+            time.sleep(2)
+            continue
         if result.get("status") == "complete":
             return result.get("data"), result.get("outputs")
         elif result.get("status") == "error":
@@ -116,14 +121,14 @@ def infer(
         seed = random.randint(0, MAX_SEED)
 
     try:
-        images_b64_json = encode_image_file_to_b64_json(image)
+        images_b64_payload = encode_image_file_to_b64_payload(image)
     except Exception as e:
         print(f"[图片 base64编码失败] {e}")
         return None, seed
 
     try:
         event_id = call_named_infer(
-            images_b64_json,
+            images_b64_payload,
             prompt,
             lora_adapter,
             seed,
@@ -134,7 +139,6 @@ def infer(
         print("API返回event_id:", event_id)
         data, outputs = poll_infer(event_id)
         print("[API 完成] data:", data, "outputs:", outputs)
-        # 适配返回结构：outputs 是 dict（含 path/url/seed 等），或者直接 path
         img_out = None
         seed_used = seed
         if outputs:
@@ -153,7 +157,6 @@ def infer(
                 img_out = API_BASE + data
             else:
                 img_out = data
-        # url 补全为完整远端URL（部分 gradio 返回 path 不是http开头）
         if img_out and isinstance(img_out, str) and not img_out.startswith("http"):
             img_out = API_BASE + img_out
         return img_out, int(seed_used)