mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-07-04 10:15:10 +08:00
fix: add safe dictionary access for bedrock credentials (#11860)
This commit is contained in:
parent
463fbe2680
commit
bb2f46d7cc
@ -1,11 +1,19 @@
|
|||||||
|
from collections.abc import Mapping
|
||||||
|
|
||||||
import boto3
|
import boto3
|
||||||
from botocore.config import Config
|
from botocore.config import Config
|
||||||
|
|
||||||
|
from core.model_runtime.errors.invoke import InvokeBadRequestError
|
||||||
|
|
||||||
|
|
||||||
|
def get_bedrock_client(service_name: str, credentials: Mapping[str, str]):
|
||||||
|
region_name = credentials.get("aws_region")
|
||||||
|
if not region_name:
|
||||||
|
raise InvokeBadRequestError("aws_region is required")
|
||||||
|
client_config = Config(region_name=region_name)
|
||||||
|
aws_access_key_id = credentials.get("aws_access_key_id")
|
||||||
|
aws_secret_access_key = credentials.get("aws_secret_access_key")
|
||||||
|
|
||||||
def get_bedrock_client(service_name, credentials=None):
|
|
||||||
client_config = Config(region_name=credentials["aws_region"])
|
|
||||||
aws_access_key_id = credentials["aws_access_key_id"]
|
|
||||||
aws_secret_access_key = credentials["aws_secret_access_key"]
|
|
||||||
if aws_access_key_id and aws_secret_access_key:
|
if aws_access_key_id and aws_secret_access_key:
|
||||||
# use aksk to call bedrock
|
# use aksk to call bedrock
|
||||||
client = boto3.client(
|
client = boto3.client(
|
||||||
|
@ -62,7 +62,10 @@ class BedrockRerankModel(RerankModel):
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
modelId = model
|
modelId = model
|
||||||
region = credentials["aws_region"]
|
region = credentials.get("aws_region")
|
||||||
|
# region is a required field
|
||||||
|
if not region:
|
||||||
|
raise InvokeBadRequestError("aws_region is required in credentials")
|
||||||
model_package_arn = f"arn:aws:bedrock:{region}::foundation-model/{modelId}"
|
model_package_arn = f"arn:aws:bedrock:{region}::foundation-model/{modelId}"
|
||||||
rerankingConfiguration = {
|
rerankingConfiguration = {
|
||||||
"type": "BEDROCK_RERANKING_MODEL",
|
"type": "BEDROCK_RERANKING_MODEL",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user