-
Notifications
You must be signed in to change notification settings - Fork 3
feat(openrouter): support multiple named keys in usage command #16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
IgorWarzocha
wants to merge
2
commits into
master
Choose a base branch
from
multi-openrouter-keys
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+157
−20
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /** | ||
| * Resolves OpenRouter auth entries from config and auth records. | ||
| * Deduplicates by key and ensures unique display names. | ||
| */ | ||
|
|
||
| import type { UsageConfig } from "../../types" | ||
| import type { AuthRecord } from "../../usage/registry" | ||
| import type { OpenRouterAuth } from "./types" | ||
|
|
||
| export type OpenRouterResolvedAuthEntry = { | ||
| providerID: "openrouter" | ||
| entryID: string | ||
| auth: OpenRouterAuth | ||
| } | ||
|
|
||
| export function resolveOpenRouterAuths( | ||
| auths: AuthRecord, | ||
| config: UsageConfig | null, | ||
| ): OpenRouterResolvedAuthEntry[] { | ||
| const entries: OpenRouterResolvedAuthEntry[] = [] | ||
| const seenKeys = new Set<string>() | ||
| const seenNames = new Set<string>() | ||
|
|
||
| const configuredKeys = Array.isArray(config?.openrouterKeys) ? config.openrouterKeys : [] | ||
| for (const configured of configuredKeys) { | ||
| const key = configured?.key?.trim() | ||
| if (!key || seenKeys.has(key)) continue | ||
| const rawName = configured?.name?.trim() | ||
| if (configured.enabled === false) continue | ||
| const name = getUniqueOpenRouterName(rawName || `key-${entries.length + 1}`, seenNames) | ||
| seenKeys.add(key) | ||
| seenNames.add(name.toLowerCase()) | ||
| entries.push({ | ||
| providerID: "openrouter", | ||
| entryID: `openrouter:${name}`, | ||
| auth: { key, keyName: name }, | ||
| }) | ||
| } | ||
|
|
||
| for (const authKey of ["openrouter", "or"]) { | ||
| const auth = auths[authKey] | ||
| const key = (auth?.key || auth?.access || "").trim() | ||
| if (!key || seenKeys.has(key)) continue | ||
| const name = getUniqueOpenRouterName("default", seenNames) | ||
| seenKeys.add(key) | ||
| seenNames.add(name.toLowerCase()) | ||
| entries.push({ | ||
| providerID: "openrouter", | ||
| entryID: `openrouter:${name}`, | ||
| auth: { key, keyName: name }, | ||
| }) | ||
| break | ||
| } | ||
|
|
||
| return entries | ||
| } | ||
|
|
||
| function getUniqueOpenRouterName(candidate: string, seenNames: Set<string>): string { | ||
| const normalized = candidate.toLowerCase() | ||
| if (!seenNames.has(normalized)) return candidate | ||
|
|
||
| let suffix = 2 | ||
| while (seenNames.has(`${normalized}-${suffix}`)) suffix += 1 | ||
| return `${candidate}-${suffix}` | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When multiple OpenRouter keys are configured, the fetch loop records success in
fetchedby provider ID only. If one key succeeds and another key fails (bad key, rate limit, etc.),appendMissingStateswill think OpenRouter is fully fetched and won’t emit any missing snapshot for the failed key, so that key silently disappears from/usageoutput. This regression shows up only when multiple keys are configured and at least one fails; consider tracking fetched byentryID(or emitting per-key missing snapshots) so users see failures for individual keys.Useful? React with 👍 / 👎.