The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let Bedrock AI providers authenticate with a Bedrock API key (#27907)
Charles Bochetd893d3e532d0
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsxindex 0033e493e90..72d71953de0 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx@@ -177,9 +177,22 @@ export const SettingsAdminNewAiProvider = () => {}config.region = values.region.trim();+ const apiKey = values.apiKey.trim();const accessKeyId = values.accessKeyId.trim();const secretAccessKey = values.secretAccessKey.trim();+ if (+ isNonEmptyString(apiKey) &&+ (isNonEmptyString(accessKeyId) || isNonEmptyString(secretAccessKey))+ ) {+ form.setError('apiKey', {+ type: 'manual',+ message: t`Use either an API key or an access key pair, not both`,+ });++ return;+ }+// Role auth ignores both fields, so half a key pair would run under an identity nobody choseif (isNonEmptyString(accessKeyId) !== isNonEmptyString(secretAccessKey)) {form.setError(@@ -193,7 +206,9 @@ export const SettingsAdminNewAiProvider = () => {return;}- if (isNonEmptyString(accessKeyId)) {+ if (isNonEmptyString(apiKey)) {+ config.apiKey = apiKey;+ } else if (isNonEmptyString(accessKeyId)) {config.accessKeyId = accessKeyId;config.secretAccessKey = secretAccessKey;} else {@@ -448,6 +463,29 @@ export const SettingsAdminNewAiProvider = () => {/></Section.Root>+ <Section.Root>+ <Section.Header+ title={t`API Key`}+ description={t`Optional — a Bedrock API key, used instead of an access key pair or the IAM role`}+ />+ <Controller+ name="apiKey"+ control={form.control}+ render={({+ field: { onChange, value },+ fieldState: { error },+ }) => (+ <TextInput+ value={value}+ onChange={onChange}+ fullWidth+ type="password"+ error={error?.message}+ />+ )}+ />+ </Section.Root>+<Section.Root><Section.Headertitle={t`Access Key ID`}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/sdk-provider-factory.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/sdk-provider-factory.service.tsindex 67e26c76dc6..6aa87a7285d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/sdk-provider-factory.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-models/services/sdk-provider-factory.service.ts@@ -10,6 +10,7 @@ import { createOpenAICompatible } from '@ai-sdk/openai-compatible';import { createTypeSafeAi } from '@ai-sdk/typesafe-ai';import { createXai, type XaiProvider } from '@ai-sdk/xai';import { fromNodeProviderChain } from '@aws-sdk/credential-providers';+import { isNonEmptyString } from '@sniptt/guards';import {wrapLanguageModel,type LanguageModel,@@ -178,13 +179,15 @@ export class SdkProviderFactoryService {config: AiProviderConfig,): AiSdkProviderInstance {const region = config.region ?? 'us-east-1';- const useRoleCredentials = config.authType === 'role';+ const useApiKey = isNonEmptyString(config.apiKey);+ const useRoleCredentials = !useApiKey && config.authType === 'role';const awsCredentialProvider = useRoleCredentials? fromNodeProviderChain({ clientConfig: { region } }): undefined;const provider = createAmazonBedrock({region,+ ...(useApiKey && { apiKey: config.apiKey }),...(awsCredentialProvider && {credentialProvider: async () => {const credentials = await awsCredentialProvider();@@ -196,7 +199,8 @@ export class SdkProviderFactoryService {};},}),- ...(!useRoleCredentials &&+ ...(!useApiKey &&+ !useRoleCredentials &&config.accessKeyId &&config.secretAccessKey && {accessKeyId: config.accessKeyId,