Skip to content

feat: permit bedrockoptions in aws bedrock config #1564

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: permit bedrockoptions in aws bedrock config #1564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 5 additions & 11 deletions app/lib/modules/llm/providers/amazon-bedrock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@ import { BaseProvider } from '~/lib/modules/llm/base-provider';
import type { ModelInfo } from '~/lib/modules/llm/types';
import type { LanguageModelV1 } from 'ai';
import type { IProviderSetting } from '~/types/model';
import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock';

interface AWSBedRockConfig {
region: string;
accessKeyId: string;
secretAccessKey: string;
sessionToken?: string;
}
import { createAmazonBedrock, type AmazonBedrockProviderSettings } from '@ai-sdk/amazon-bedrock';

export default class AmazonBedrockProvider extends BaseProvider {
name = 'AmazonBedrock';
Expand Down Expand Up @@ -64,8 +57,8 @@ export default class AmazonBedrockProvider extends BaseProvider {
},
];

private _parseAndValidateConfig(apiKey: string): AWSBedRockConfig {
let parsedConfig: AWSBedRockConfig;
private _parseAndValidateConfig(apiKey: string): AmazonBedrockProviderSettings {
let parsedConfig: AmazonBedrockProviderSettings;

try {
parsedConfig = JSON.parse(apiKey);
Expand All @@ -75,7 +68,7 @@ export default class AmazonBedrockProvider extends BaseProvider {
);
}

const { region, accessKeyId, secretAccessKey, sessionToken } = parsedConfig;
const { region, accessKeyId, secretAccessKey, sessionToken, bedrockOptions } = parsedConfig;

if (!region || !accessKeyId || !secretAccessKey) {
throw new Error(
Expand All @@ -88,6 +81,7 @@ export default class AmazonBedrockProvider extends BaseProvider {
accessKeyId,
secretAccessKey,
...(sessionToken && { sessionToken }),
...(bedrockOptions && { bedrockOptions }),
};
}

Expand Down
Loading