mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-14 10:52:17 +03:00
7d57d9f4a1
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.
69 lines
3.7 KiB
TypeScript
69 lines
3.7 KiB
TypeScript
/**
|
|
* Flat-rate (subscription / cookie-web) provider classification — issue #5552.
|
|
*
|
|
* Some providers are billed at a flat rate (a subscription or a coding plan),
|
|
* not per token: cookie/web sessions (ChatGPT Web (Codex), grok-web, …) are backed by a
|
|
* consumer subscription, and several "Coding Plan" providers (Codex, MiniMax
|
|
* Coding, Kimi Coding, GLM Coding, …) bill a fixed monthly fee. These providers
|
|
* still carry per-token pricing rows (used for pre-flight estimates), so cost
|
|
* analytics computed from those rows shows an inflated dollar amount that does
|
|
* not match the user's actual bill. For those providers analytics should show
|
|
* $0 instead — see {@link module:lib/usage/costCalculator}.
|
|
*
|
|
* This is intentionally a DISPLAY-only signal: it is consulted by the analytics
|
|
* surfaces (opt-in via the `flatRateAsZero` cost option), never by the budget /
|
|
* quota / routing paths, so per-request cost estimation is unchanged.
|
|
*
|
|
* @module lib/usage/flatRateProviders
|
|
*/
|
|
|
|
import { WEB_COOKIE_PROVIDERS } from "@/shared/constants/providers/web-cookie";
|
|
|
|
/**
|
|
* Dedicated subscription / coding-plan provider ids whose identity IS a
|
|
* flat-rate plan. Kept explicit (not derived) because these entries sit in the
|
|
* api-key / oauth categories alongside genuinely metered providers and carry
|
|
* real per-token pricing rows.
|
|
*
|
|
* Deliberately EXCLUDED even though token-priced and sometimes grouped with the
|
|
* above: `codex`/`cx` (OmniRoute actively tracks Codex token cost — Fast-tier
|
|
* multipliers and GPT-5.x pricing — and Codex can be a metered API account, so
|
|
* its analytics cost is intentional, not an artifact), `byteplus` (BytePlus
|
|
* ModelArk is a metered inference host, billed per token — zeroing it would hide
|
|
* real cost), `minimax-cn` (the metered Minimax China API, distinct from the
|
|
* `minimax` "Minimax Coding" plan), `glm-thinking` (metered tier, distinct
|
|
* from the `glm` Coding plan), and `anthropic` (the metered Anthropic API,
|
|
* distinct from the `claude`/`cc` Claude Code plan below).
|
|
*/
|
|
const FLAT_RATE_SUBSCRIPTION_PROVIDER_IDS: ReadonlySet<string> = new Set([
|
|
"minimax", // "Minimax Coding" plan
|
|
"kimi-coding", // Kimi Coding plan (OAuth)
|
|
"kimi-coding-apikey", // Kimi Coding plan (API-key auth, still flat-rate)
|
|
"xiaomi-mimo", // Xiaomi MiMo plan (issue: "MiMo Token Plan")
|
|
"bailian-coding-plan", // Alibaba Token Plan (legacy provider ID)
|
|
"qwen-cloud-token-plan", // Qwen Cloud Token Plan
|
|
"glm", // GLM Coding plan
|
|
"glm-cn", // GLM Coding (China) plan
|
|
"claude", // Claude Code plan (OAuth-only — a Claude Pro/Max subscription)
|
|
"cc", // Claude Code plan (alias id — same connection, shares the `cc` pricing rows)
|
|
// OpenCode Go subscription (https://opencode.ai/go) — a flat monthly fee. It is an
|
|
// aggregator reselling GLM, Kimi, Grok, DeepSeek, MiniMax, Qwen and GPT-5.x, so
|
|
// per-token rows price each call at the UNDERLYING model's metered rate and the
|
|
// analytics overstatement is large rather than marginal (#11149).
|
|
"opencode-go",
|
|
]);
|
|
|
|
/**
|
|
* Whether a provider bills at a flat rate (subscription / coding plan / cookie
|
|
* web session) rather than per token, so its per-token cost estimate should be
|
|
* surfaced as $0 in analytics. Cookie/web providers are covered dynamically
|
|
* (every web session is subscription-backed), plus the explicit plan set above.
|
|
*/
|
|
export function isFlatRateProvider(providerId: string | null | undefined): boolean {
|
|
if (!providerId || typeof providerId !== "string") return false;
|
|
const id = providerId.trim().toLowerCase();
|
|
if (!id) return false;
|
|
if (FLAT_RATE_SUBSCRIPTION_PROVIDER_IDS.has(id)) return true;
|
|
return Object.prototype.hasOwnProperty.call(WEB_COOKIE_PROVIDERS, id);
|
|
}
|