fix: normalize unicode escape sequences and reformat multi-line expressions across codebase

This commit is contained in:
2026-06-09 16:48:08 +00:00
parent 66dfda88bc
commit c4f2937415
175 changed files with 12660 additions and 4175 deletions
+67 -25
View File
@@ -42,8 +42,7 @@ def has_vision_blocks(content: Any) -> bool:
if not isinstance(content, list):
return False
return any(
isinstance(b, dict) and b.get("type") in ("image_url", "image")
for b in content
isinstance(b, dict) and b.get("type") in ("image_url", "image") for b in content
)
@@ -73,13 +72,27 @@ def _format_vision_block(descriptions: list) -> str:
if len(descriptions) == 1:
return f"[Image seen by vision model:\n{descriptions[0]}\n]"
parts = [f"Image {i}:\n{d}" for i, d in enumerate(descriptions, 1)]
return f"[{len(descriptions)} images seen by vision model:\n" + "\n\n".join(parts) + "\n]"
return (
f"[{len(descriptions)} images seen by vision model:\n"
+ "\n\n".join(parts)
+ "\n]"
)
class VisionAugmenter:
def __init__(self, vision_url: str, vision_model: str, vision_key: str,
cache: VisionCache, referer: str = "", title: str = "",
ledger=None, owner: tuple = ("unknown", "unknown"), pricing=None, context_map=None):
def __init__(
self,
vision_url: str,
vision_model: str,
vision_key: str,
cache: VisionCache,
referer: str = "",
title: str = "",
ledger=None,
owner: tuple = ("unknown", "unknown"),
pricing=None,
context_map=None,
):
self.vision_url = vision_url
self.vision_model = vision_model
self.vision_key = vision_key
@@ -95,27 +108,40 @@ class VisionAugmenter:
def _record(self, latency_ms, status_code, success, category, usage):
if self.ledger is None or self.pricing is None:
return
self.ledger.record({
"owner_kind": self.owner[0], "owner_id": self.owner[1], "backend": "vision",
"endpoint": "chat/completions", "model": self.vision_model,
"requested_model": self.vision_model, "temperature": 0.2,
"upstream_latency_ms": latency_ms, "total_latency_ms": latency_ms,
"status_code": status_code, "success": success, "error_category": category,
"usage": usage,
}, self.pricing, self.context_map)
self.ledger.record(
{
"owner_kind": self.owner[0],
"owner_id": self.owner[1],
"backend": "vision",
"endpoint": "chat/completions",
"model": self.vision_model,
"requested_model": self.vision_model,
"temperature": 0.2,
"upstream_latency_ms": latency_ms,
"total_latency_ms": latency_ms,
"status_code": status_code,
"success": success,
"error_category": category,
"usage": usage,
},
self.pricing,
self.context_map,
)
async def _describe_one(self, client: httpx.AsyncClient, image_block: dict) -> str:
if not self.vision_key:
return "[vision unavailable: vision API key not configured]"
payload = {
"model": self.vision_model,
"messages": [{
"role": "user",
"content": [
{"type": "text", "text": VISION_INSTRUCTION},
image_block,
],
}],
"messages": [
{
"role": "user",
"content": [
{"type": "text", "text": VISION_INSTRUCTION},
image_block,
],
}
],
"temperature": 0.2,
"stream": False,
}
@@ -132,12 +158,24 @@ class VisionAugmenter:
resp = await client.post(self.vision_url, json=payload, headers=headers)
except httpx.RequestError as e:
logger.warning("vision connection failed: %s", e)
self._record((time.monotonic() - start) * 1000, 502, False, classify_error(0, e), None)
self._record(
(time.monotonic() - start) * 1000,
502,
False,
classify_error(0, e),
None,
)
return f"[vision call failed: {e}]"
latency_ms = (time.monotonic() - start) * 1000
if resp.status_code != 200:
logger.warning("vision %s: %s", resp.status_code, resp.text[:200])
self._record(latency_ms, resp.status_code, False, classify_error(resp.status_code, None, resp.text), None)
self._record(
latency_ms,
resp.status_code,
False,
classify_error(resp.status_code, None, resp.text),
None,
)
return f"[vision failed: HTTP {resp.status_code}]"
try:
data = resp.json()
@@ -154,7 +192,9 @@ class VisionAugmenter:
miss = [i for i, d in enumerate(descriptions) if d is None]
if miss:
self.calls += len(miss)
results = await asyncio.gather(*[self._describe_one(client, images[i]) for i in miss])
results = await asyncio.gather(
*[self._describe_one(client, images[i]) for i in miss]
)
for idx, result in zip(miss, results):
descriptions[idx] = result
if not result.startswith("[vision"):
@@ -162,7 +202,9 @@ class VisionAugmenter:
return [d or "" for d in descriptions]
async def augment_messages(self, client: httpx.AsyncClient, messages: list) -> list:
if not any(has_vision_blocks(m.get("content")) for m in messages if isinstance(m, dict)):
if not any(
has_vision_blocks(m.get("content")) for m in messages if isinstance(m, dict)
):
return messages
out: list = []
for m in messages: