mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +03:00
Rebased onto the current release/v3.8.51 tip as part of a combined provider-retirement/provenance merge batch (Designer Web, Felo Web, Runtime, GPL-derived removal, Qwen Web already landed). Large conflict set (this is the biggest PR in the batch — the common ChatGPT Web provider touches chat, images, count-tokens, session leases, and combos). Conflicts resolved: - `open-sse/config/providers/registry/chatgpt-web/*`, `open-sse/executors/chatgpt-web*`, `open-sse/handlers/imageGeneration/providers/chatgptWeb.ts`, and their tests: kept deleted, matching the PR's stated scope. - `open-sse/config/providers/registry/minimax/web/index.ts`, `open-sse/handlers/imageGeneration/providers/geminiWeb.ts`, `open-sse/executors/gemini-web.ts`'s stale image-mode branch: base-drift collisions against already-merged sibling retirements (#11691, #11708) — kept deleted / dropped the dead code, since this PR's own branch forked before those merged. - `src/shared/constants/reservedProviderPrefixes.ts`, `open-sse/executors/index.ts`, `executorProxy.ts`, `virtualFactory.ts`, `autoStrategy.ts`, `src/lib/db/providers.ts`, `src/sse/handlers/chat.ts`: combined the Designer + Runtime (Felo/Qwen) + common-ChatGPT-Web retirement guard calls at each shared chokepoint — compute-once-then-OR pattern, consistent with prior combinations in this batch. - `src/sse/services/model.ts` / `src/sse/handlers/chatHelpers.ts`: adopted this PR's new `getModelInfoOrRetirementResponse()` central wrapper (a real improvement over ad-hoc try/catch), and extended it to also catch the Designer + Runtime retirement errors it didn't originally cover, so the consolidation doesn't regress the other two mechanisms. - `src/app/api/v1/images/edits/route.ts`: this PR moved the retirement check earlier (before `enforceApiKeyPolicy`) but left the old later call+catch block in place from base drift — removed the now-redundant duplicate `resolveImageRouteModel()` call and merged the Designer catch into the earlier one. - `open-sse/config/imageRegistry.ts`, `tests/snapshots/executors/executor-map.json` (`keyCount` recomputed to 133), `tests/snapshots/provider/translate-path.json`: same "both sides inserted a different retired provider at the same slot" pattern — resolved by dropping both. - `tests/unit/chatcore-executor-proxy.test.ts`, `provider-node-reserved-prefix.test.ts`, `combo-auto-candidate-expansion.test.ts`, `messages-count-tokens-route.test.ts`, `virtual-auto-combo.test.ts`: split into independent per-mechanism test blocks (established pattern); `virtual-auto-combo.test.ts`'s old "includes cookie web-session providers" positive-inclusion test (which used chatgpt-web as its example) was retired along with the provider and replaced by this PR's negative-exclusion test for the same slot. - `docs/architecture/ARCHITECTURE.md`, `CODEBASE_DOCUMENTATION.md` (+ 4 i18n mirrors), `README.md`, `FREE-TIERS-GUIDE.md`, `docs/diagrams/free-tier-budget.svg`, `docs/screenshots/free-tier-budget-card.svg`, `docs/reference/PROVIDER_REFERENCE.md`: recomputed every stale count from the real merged state — 104 executors (`countFiles` gate logic), 351 providers (regenerated via `gen:provider-reference`), 152/351 `hasFree` entries, 445/438/7 free-tier catalog rows, 13 ToS-avoid providers, budget-card regenerated via its real generator script. One doc conflict (`oauth/` module list) needed picking HEAD's side specifically — theirs still listed the already-removed `raycast` module instead of the real `openference`. - `config/quality/test-masking-allowlist.json`: additive merge of the PR's 17 `_deletedWithReplacement` entries alongside the batch's existing ones (one real duplicate-key mistake in my first pass, caught and fixed via a `object_pairs_hook` duplicate-key check before finalizing). Also fixed two real, unrelated-to-my-merge issues surfaced by the focused suite: - `tests/unit/resolve-web-provider-host.test.ts`: the PR's own test had a typo — it asserted `perplexity-web`'s resolved host as `"perplexity.ai"`, but the provider's registered `website` is `"https://www.perplexity.ai"` and the resolver returns the URL's `host` verbatim (no www-stripping), so the correct value is `"www.perplexity.ai"` (consistent with the same test's own `url` assertion). - `tests/unit/hard-session-lease-bypass-inventory.test.ts`: this golden call-site inventory was already stale on the pristine post-#11713 tip (confirmed via a throwaway probe worktree) — `src/lib/db/providers.ts`'s 3 connection-fallback sites and a third `src/app/api/providers/route.ts` site were never added to the golden list by the earlier-merged #11698/#11720 PRs. Updated it to the real current inventory (dated inline comments explain each delta and which PR introduced it), plus this PR's own legitimate deltas (image-edits duplicate-call removal, `ChatGptWebExecutor.execute()` site removed). Focused suite green (433/433 across executor-proxy, reserved-prefix, hard-session-lease-bypass-inventory, resolve-web-provider-host, retirement/runtime-block/source-retirement/management-retirement/image-handler-retirement, migration-168, combo-auto-candidate-expansion, virtual-auto-combo, executor-map-golden and siblings), plus `typecheck:core`, `check-file-size`, and `check-changelog-integrity` clean. Thanks for the thorough provenance-hold retirement work — appreciated.
128 lines
4.4 KiB
TypeScript
128 lines
4.4 KiB
TypeScript
// Tool-call emulation helpers for web-cookie executors (#5240, #5927).
|
|
//
|
|
// Web-cookie providers (Perplexity Web, Gemini Web, etc.) may have no native
|
|
// function calling. When the OpenAI request carries `tools`, the prompt-side
|
|
// shim (`prepareToolMessages` in ../translator/webTools.ts) injects a `<tool>`
|
|
// contract; on the response side we parse `<tool>{...}</tool>` blocks back
|
|
// into OpenAI `tool_calls`.
|
|
//
|
|
// The whole tool-mode orchestration lives here — provider-agnostic — so each
|
|
// (frozen) executor only gains an import + a single delegating call. Despite
|
|
// the filename (kept for git-blame continuity from #5240, the first caller),
|
|
// this module is shared: `buildToolModeResponse()` accepts an `idSeed` so
|
|
// every provider gets its own `tool_calls[].id` prefix.
|
|
|
|
import { buildToolAwareResult } from "../translator/webTools.ts";
|
|
|
|
const SSE_HEADERS: Record<string, string> = {
|
|
"Content-Type": "text/event-stream",
|
|
"Cache-Control": "no-cache",
|
|
"X-Accel-Buffering": "no",
|
|
};
|
|
|
|
function sseChunk(data: unknown): string {
|
|
return `data: ${JSON.stringify(data)}\n\n`;
|
|
}
|
|
|
|
/**
|
|
* Parse any `<tool>` blocks in a buffered JSON completion's assistant content
|
|
* into OpenAI tool_calls and rewrite the choice. On parse failure the original
|
|
* body passes through untouched.
|
|
*/
|
|
async function applyToolCallsToJsonResponse(
|
|
response: Response,
|
|
requestedTools: unknown,
|
|
idSeed: string
|
|
): Promise<Response> {
|
|
const bodyText = await response.text();
|
|
try {
|
|
const json = JSON.parse(bodyText);
|
|
const rawContent = json?.choices?.[0]?.message?.content || "";
|
|
const { content, toolCalls, finishReason } = buildToolAwareResult(
|
|
rawContent,
|
|
requestedTools,
|
|
idSeed
|
|
);
|
|
if (toolCalls) {
|
|
json.choices[0].message = { role: "assistant", content: null, tool_calls: toolCalls };
|
|
json.choices[0].finish_reason = finishReason;
|
|
} else {
|
|
json.choices[0].message.content = content;
|
|
}
|
|
return new Response(JSON.stringify(json), {
|
|
status: response.status,
|
|
headers: { "Content-Type": "application/json" },
|
|
});
|
|
} catch {
|
|
return new Response(bodyText, {
|
|
status: response.status,
|
|
headers: { "Content-Type": "application/json" },
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Replay an already-built OpenAI `chat.completion` object as a buffered SSE
|
|
* stream: a role chunk, then a single terminal chunk carrying either
|
|
* `delta.tool_calls` + `finish_reason: "tool_calls"` or plain content +
|
|
* `finish_reason: "stop"`. No token-by-token streaming while tools are active.
|
|
*/
|
|
function toolCompletionToSseStream(
|
|
completion: Record<string, unknown>,
|
|
cid: string,
|
|
created: number,
|
|
model: string
|
|
): ReadableStream<Uint8Array> {
|
|
const encoder = new TextEncoder();
|
|
const choice = (completion?.choices as Array<Record<string, unknown>> | undefined)?.[0] ?? {};
|
|
const message = (choice.message as Record<string, unknown>) ?? {};
|
|
const finishReason = (choice.finish_reason as string) ?? "stop";
|
|
const chunk = (delta: Record<string, unknown>, fr: string | null): Uint8Array =>
|
|
encoder.encode(
|
|
sseChunk({
|
|
id: cid,
|
|
object: "chat.completion.chunk",
|
|
created,
|
|
model,
|
|
system_fingerprint: null,
|
|
choices: [{ index: 0, delta, finish_reason: fr, logprobs: null }],
|
|
})
|
|
);
|
|
|
|
return new ReadableStream<Uint8Array>({
|
|
start(controller) {
|
|
controller.enqueue(chunk({ role: "assistant" }, null));
|
|
const delta = message.tool_calls
|
|
? { tool_calls: message.tool_calls }
|
|
: { content: (message.content as string) ?? "" };
|
|
controller.enqueue(chunk(delta, finishReason));
|
|
controller.enqueue(encoder.encode("data: [DONE]\n\n"));
|
|
controller.close();
|
|
},
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Tool mode: parse `<tool>` blocks in an already-buffered JSON completion into
|
|
* tool_calls, then return either the JSON completion (non-streaming) or a
|
|
* terminal SSE replay of it (streaming).
|
|
*/
|
|
export async function buildToolModeResponse(
|
|
bufferedJson: Response,
|
|
requestedTools: unknown,
|
|
stream: boolean,
|
|
meta: { cid: string; created: number; model: string; idSeed?: string }
|
|
): Promise<Response> {
|
|
const jsonResponse = await applyToolCallsToJsonResponse(
|
|
bufferedJson,
|
|
requestedTools,
|
|
meta.idSeed ?? "cgpt"
|
|
);
|
|
if (!stream) return jsonResponse;
|
|
const completion = await jsonResponse.json();
|
|
return new Response(toolCompletionToSseStream(completion, meta.cid, meta.created, meta.model), {
|
|
status: 200,
|
|
headers: SSE_HEADERS,
|
|
});
|
|
}
|