Skip to content

Move remaining provider settings into separate components #3208

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
May 6, 2025
Merged

Move remaining provider settings into separate components #3208

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91fac11
Move remaining provider settings into separate components
cte May 6, 2025
d5044dd
Add missing translations
cte May 6, 2025
1851b44
More progress
cte May 6, 2025
74fe2ae
Fix error messages in BedrockCustomArn
cte May 6, 2025
0329e35
PR feedback
cte May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions evals/packages/types/src/roo-code.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ export const providerSettingsSchema = z.object({
awsRegion: z.string().optional(),
awsUseCrossRegionInference: z.boolean().optional(),
awsUsePromptCache: z.boolean().optional(),
awspromptCacheId: z.string().optional(),
awsProfile: z.string().optional(),
awsUseProfile: z.boolean().optional(),
awsCustomArn: z.string().optional(),
Expand Down Expand Up @@ -455,7 +454,6 @@ const providerSettingsRecord: ProviderSettingsRecord = {
awsRegion: undefined,
awsUseCrossRegionInference: undefined,
awsUsePromptCache: undefined,
awspromptCacheId: undefined,
awsProfile: undefined,
awsUseProfile: undefined,
awsCustomArn: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/core/webview/ClineProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { GlobalState, ProviderSettings, RooCodeSettings } from "../../schemas"
import { t } from "../../i18n"
import { setPanel } from "../../activate/registerCommands"
import {
ProviderName,
ApiConfiguration,
ApiProvider,
requestyDefaultModelId,
openRouterDefaultModelId,
glamaDefaultModelId,
Expand Down Expand Up @@ -1297,7 +1297,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
const customModes = await this.customModesManager.getCustomModes()

// Determine apiProvider with the same logic as before.
const apiProvider: ApiProvider = stateValues.apiProvider ? stateValues.apiProvider : "anthropic"
const apiProvider: ProviderName = stateValues.apiProvider ? stateValues.apiProvider : "anthropic"

// Build the apiConfiguration object combining state values and secrets.
const providerSettings = this.contextProxy.getProviderSettings()
Expand Down
1 change: 0 additions & 1 deletion src/exports/roo-code.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ type ProviderSettings = {
awsRegion?: string | undefined
awsUseCrossRegionInference?: boolean | undefined
awsUsePromptCache?: boolean | undefined
awspromptCacheId?: string | undefined
awsProfile?: string | undefined
awsUseProfile?: boolean | undefined
awsCustomArn?: string | undefined
Expand Down
1 change: 0 additions & 1 deletion src/exports/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ type ProviderSettings = {
awsRegion?: string | undefined
awsUseCrossRegionInference?: boolean | undefined
awsUsePromptCache?: boolean | undefined
awspromptCacheId?: string | undefined
awsProfile?: string | undefined
awsUseProfile?: boolean | undefined
awsCustomArn?: string | undefined
Expand Down
2 changes: 0 additions & 2 deletions src/schemas/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ export const providerSettingsSchema = z.object({
awsRegion: z.string().optional(),
awsUseCrossRegionInference: z.boolean().optional(),
awsUsePromptCache: z.boolean().optional(),
awspromptCacheId: z.string().optional(),
awsProfile: z.string().optional(),
awsUseProfile: z.boolean().optional(),
awsCustomArn: z.string().optional(),
Expand Down Expand Up @@ -471,7 +470,6 @@ const providerSettingsRecord: ProviderSettingsRecord = {
awsRegion: undefined,
awsUseCrossRegionInference: undefined,
awsUsePromptCache: undefined,
awspromptCacheId: undefined,
awsProfile: undefined,
awsUseProfile: undefined,
awsCustomArn: undefined,
Expand Down
2 changes: 1 addition & 1 deletion src/shared/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ModelInfo, ProviderName, ProviderSettings } from "../schemas"

export type { ModelInfo, ProviderName as ApiProvider }
export type { ModelInfo, ProviderName }

export type ApiHandlerOptions = Omit<ProviderSettings, "apiProvider" | "id">

Expand Down
Loading