feat: OpenCode Go 会话 id 升级为对话级稳定(方案 A)
- models.py: ChatRequest 显式声明 conversation_id(内部字段,不透传上游) - openai_compat: chat/chat_stream/_req_headers 支持 session_id(有则用之,无则回退 UUID) - main.py: 非流式/流式主链路把 req.conversation_id 传为 session_id - Chat.vue: 对话级 convId(randomUUID),随对话持久化,清空对话时重建,注入 payload - 新增 2 个单测;157 passed / 0 failed;typecheck 通过;真实 key 冒烟稳定会话 OK
This commit is contained in:
1 parent
8bab67d31d
commit
e4065d31c3
7 files changed
+90
-9
No files matched your search
@@ -38,12 +38,17 @@ class OpenAICompatAdapter(BaseAdapter):
|
||||
# 所以在每次请求时动态生成一个 UUID 会话头。
|
||||
self._requires_session = requires_session_header
|
||||
|
||||
def _req_headers(self) -> dict[str, str]:
|
||||
"""每次请求的 headers。需要会话头的供应商动态注入 x-opencode-session。"""
|
||||
def _req_headers(self, session_id: str | None = None) -> dict[str, str]:
|
||||
"""每次请求的 headers。需要会话头的供应商动态注入 x-opencode-session。
|
||||
|
||||
session_id 由调用方传入(网关把对话的 conversation_id 透传过来):
|
||||
- 有 → 同一段对话的所有请求共用同一个 session(吃到上游提示词缓存);
|
||||
- 无 → 回退为每请求一个随机 UUID(仍能过上游的强校验,只是没有缓存收益)。
|
||||
"""
|
||||
if not self._requires_session:
|
||||
return self._headers
|
||||
headers = dict(self._headers)
|
||||
headers["x-opencode-session"] = uuid.uuid4().hex
|
||||
headers["x-opencode-session"] = session_id or uuid.uuid4().hex
|
||||
return headers
|
||||
|
||||
def _build_payload(
|
||||
@@ -94,6 +99,7 @@ class OpenAICompatAdapter(BaseAdapter):
|
||||
tools: list[dict] | None = None,
|
||||
tool_choice: str | dict | None = None,
|
||||
extra: dict[str, Any] | None = None,
|
||||
session_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
payload = self._build_payload(
|
||||
model, messages, temperature, top_p, max_tokens,
|
||||
@@ -101,7 +107,7 @@ class OpenAICompatAdapter(BaseAdapter):
|
||||
)
|
||||
# Bug 4 修复: 用 lease 占用 client,热重载 close 会等本次请求结束才真正关连接
|
||||
async with self._lease() as client:
|
||||
resp = await client.post("/chat/completions", json=payload, headers=self._req_headers())
|
||||
resp = await client.post("/chat/completions", json=payload, headers=self._req_headers(session_id))
|
||||
resp.raise_for_status()
|
||||
data = json_or_raise(resp)
|
||||
|
||||
@@ -126,6 +132,7 @@ class OpenAICompatAdapter(BaseAdapter):
|
||||
tools: list[dict] | None = None,
|
||||
tool_choice: str | dict | None = None,
|
||||
extra: dict[str, Any] | None = None,
|
||||
session_id: str | None = None,
|
||||
) -> AsyncIterator[dict]:
|
||||
payload = self._build_payload(
|
||||
model, messages, temperature, top_p, max_tokens,
|
||||
@@ -134,7 +141,7 @@ class OpenAICompatAdapter(BaseAdapter):
|
||||
# Bug 4 修复: lease 在整个流式期间持有占用,热重载/关闭不会掐断在途流
|
||||
async with self._lease() as client:
|
||||
async with client.stream(
|
||||
"POST", "/chat/completions", json=payload, headers=self._req_headers()
|
||||
"POST", "/chat/completions", json=payload, headers=self._req_headers(session_id)
|
||||
) as resp:
|
||||
resp.raise_for_status()
|
||||
async for line in resp.aiter_lines():
|
||||
|
||||
@@ -1309,6 +1309,7 @@ async def _chat_fallback(cfg, rid, caller, request, req, chain, route, messages,
|
||||
max_tokens=req.max_tokens, stop=req.stop,
|
||||
tools=tools, tool_choice=tool_choice,
|
||||
extra=req.upstream_extra() or None,
|
||||
session_id=req.conversation_id,
|
||||
)
|
||||
ok = True
|
||||
break
|
||||
@@ -1412,6 +1413,7 @@ def _stream_response(request, req, chain, route, messages, tools):
|
||||
max_tokens=req.max_tokens, stop=req.stop,
|
||||
tools=tools, tool_choice=req.tool_choice,
|
||||
extra=req.upstream_extra() or None,
|
||||
session_id=req.conversation_id,
|
||||
)
|
||||
async for chunk in stream_gen:
|
||||
if chunk.get("done"):
|
||||
|
||||
@@ -108,6 +108,10 @@ class ChatRequest(BaseModel):
|
||||
top_logprobs: int | None = None
|
||||
parallel_tool_calls: bool | None = None
|
||||
stream_options: dict[str, Any] | None = None
|
||||
# 网关内部字段(显式声明 → 不进 model_extra → 不透传上游):
|
||||
# 由前端对话页为「同一段对话」提供一个稳定 id;后端只拿它当 OpenCode Go 的
|
||||
# x-opencode-session(同一对话共享,吃到上游提示词缓存)。非 opencode 供应商忽略。
|
||||
conversation_id: str | None = None
|
||||
# 透传供应商特有参数
|
||||
extra: dict[str, Any] = Field(default_factory=dict)
|
||||
|
||||
|
||||
Reference in new issue
Block a user