generated from obsidianmd/obsidian-sample-plugin
-
-
Notifications
You must be signed in to change notification settings - Fork 503
Refactor model API key handling and improve model filtering. #2003
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
Emt-lin
wants to merge
3
commits into
master
Choose a base branch
from
refactor-model-dispaly
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.
Open
Changes from all commits
Commits
Show all changes
3 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| import { | ||
| ChatModelProviders, | ||
| ChatModels, | ||
| ProviderSettingsKeyMap, | ||
| SettingKeyProviders, | ||
| } from "@/constants"; | ||
| import { getSettings } from "@/settings/model"; | ||
| import { CustomModel } from "@/aiParams"; | ||
|
|
||
| /** | ||
| * Check if a provider requires an API key. | ||
| * Local providers (OLLAMA, LM_STUDIO, OPENAI_FORMAT) don't require API keys. | ||
| * | ||
| * @param provider - The provider to check | ||
| * @returns true if the provider requires an API key, false for local providers | ||
| * | ||
| * @example | ||
| * if (providerRequiresApiKey(model.provider)) { | ||
| * // This is a cloud provider, check for API key | ||
| * } else { | ||
| * // This is a local provider, no API key needed | ||
| * } | ||
| */ | ||
| export function providerRequiresApiKey(provider: string): provider is SettingKeyProviders { | ||
| return provider in ProviderSettingsKeyMap; | ||
| } | ||
|
|
||
| /** | ||
| * Get API key for a provider, with model-specific key taking precedence over global settings. | ||
| * | ||
| * @param provider - The provider to get the API key for | ||
| * @param model - Optional model instance; if provided and has apiKey, it will be used instead of global key | ||
| * @returns The API key (model-specific if available, otherwise global provider key, or empty string) | ||
| * | ||
| * @example | ||
| * // Get global API key for OpenAI | ||
| * const globalKey = getApiKeyForProvider(ChatModelProviders.OPENAI); | ||
| * | ||
| * // Get model-specific key (falls back to global if model.apiKey is empty) | ||
| * const modelKey = getApiKeyForProvider(ChatModelProviders.OPENAI, customModel); | ||
| */ | ||
| export function getApiKeyForProvider(provider: SettingKeyProviders, model?: CustomModel): string { | ||
| const settings = getSettings(); | ||
| return model?.apiKey || (settings[ProviderSettingsKeyMap[provider]] as string | undefined) || ""; | ||
| } | ||
|
|
||
| /** | ||
| * Get the list of models that are always required and cannot be disabled. | ||
| * These models provide essential functionality for the plugin. | ||
| * Uses a getter function to avoid circular dependency issues. | ||
| */ | ||
| function getRequiredModels(): ReadonlyArray<{ name: string; provider: string }> { | ||
| return [ | ||
| { name: ChatModels.COPILOT_PLUS_FLASH, provider: ChatModelProviders.COPILOT_PLUS }, | ||
| { name: ChatModels.OPENROUTER_GEMINI_2_5_FLASH, provider: ChatModelProviders.OPENROUTERAI }, | ||
| ]; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if a model is required and should always be enabled. | ||
| * Required models cannot be disabled by users as they provide core plugin functionality. | ||
| * | ||
| * @param model - The model to check | ||
| * @returns true if the model is required and must remain enabled, false otherwise | ||
| * | ||
| * @example | ||
| * if (isRequiredChatModel(model)) { | ||
| * // This model cannot be disabled | ||
| * } | ||
| */ | ||
| export function isRequiredChatModel(model: CustomModel): boolean { | ||
| return getRequiredModels().some( | ||
| (required) => required.name === model.name && required.provider === model.provider | ||
| ); | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.