AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-06-30 10:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow to use IAM Role for Bedrock (#5188)

Browse Source
This commit is contained in:
Masashi Tomooka 2024-06-14 16:18:42 +09:00 committed by GitHub
parent f87f11e92c
commit 0633aae7dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/core/model_runtime/model_providers/bedrock/bedrock.yaml
View File

@ -21,16 +21,16 @@ configurate_methods:
provider_credential_schema: provider_credential_schema:
credential_form_schemas: credential_form_schemas:
- variable: aws_access_key_id - variable: aws_access_key_id
required: true required: false
label: label:
en_US: Access Key en_US: Access Key (If not provided, credentials are obtained from your running environment. e.g. IAM role)
zh_Hans: Access Key zh_Hans: Access Key
type: secret-input type: secret-input
placeholder: placeholder:
en_US: Enter your Access Key en_US: Enter your Access Key
zh_Hans: 在此输入您的 Access Key zh_Hans: 在此输入您的 Access Key
- variable: aws_secret_access_key - variable: aws_secret_access_key
required: true required: false
label: label:
en_US: Secret Access Key en_US: Secret Access Key
zh_Hans: Secret Access Key zh_Hans: Secret Access Key

10
api/core/model_runtime/model_providers/bedrock/llm/llm.py
View File

@ -95,8 +95,8 @@ class BedrockLargeLanguageModel(LargeLanguageModel):
# - https://docs.anthropic.com/claude/reference/claude-on-amazon-bedrock # - https://docs.anthropic.com/claude/reference/claude-on-amazon-bedrock
# - https://github.com/anthropics/anthropic-sdk-python # - https://github.com/anthropics/anthropic-sdk-python
client = AnthropicBedrock( client = AnthropicBedrock(
aws_access_key=credentials["aws_access_key_id"], aws_access_key=credentials.get("aws_access_key_id", None),
aws_secret_key=credentials["aws_secret_access_key"], aws_secret_key=credentials.get("aws_secret_access_key", None),
aws_region=credentials["aws_region"], aws_region=credentials["aws_region"],
) )
@ -568,8 +568,8 @@ class BedrockLargeLanguageModel(LargeLanguageModel):
runtime_client = boto3.client( runtime_client = boto3.client(
service_name='bedrock-runtime', service_name='bedrock-runtime',
config=client_config, config=client_config,
aws_access_key_id=credentials["aws_access_key_id"], aws_access_key_id=credentials.get("aws_access_key_id", None),
aws_secret_access_key=credentials["aws_secret_access_key"] aws_secret_access_key=credentials.get("aws_secret_access_key", None)
) )
model_prefix = model.split('.')[0] model_prefix = model.split('.')[0]
@ -826,4 +826,4 @@ class BedrockLargeLanguageModel(LargeLanguageModel):
elif error_code == "ModelStreamErrorException": elif error_code == "ModelStreamErrorException":
return InvokeConnectionError(error_msg) return InvokeConnectionError(error_msg)
return InvokeError(error_msg) return InvokeError(error_msg)

2
web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx
View File

@ -205,7 +205,7 @@ const ModelModal: FC<ModelModalProps> = ({
const encodeSecretValues = useCallback((v: FormValue) => { const encodeSecretValues = useCallback((v: FormValue) => {
const result = { ...v } const result = { ...v }
extendedSecretFormSchemas.forEach(({ variable }) => { extendedSecretFormSchemas.forEach(({ variable }) => {
if (result[variable] === formSchemasValue?.[variable]) if (result[variable] === formSchemasValue?.[variable] && result[variable] !== undefined)
result[variable] = '[__HIDDEN__]' result[variable] = '[__HIDDEN__]'
}) })
return result return result