jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: AWS Bedrock components (#4503)

Browse source 
* AWS Bedrock components update

* update in imports
This commit is contained in:
Edwin Jose 2024-11-11 16:55:34 -05:00 • committed by GitHub
commit aea9804527
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 183 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/backend/base/langflow/components/embeddings/amazon_bedrock.py
View file

@ -1,5 +1,3 @@
from langchain_community.embeddings import BedrockEmbeddings
from langflow.base.models.model import LCModelComponent
from langflow.field_typing import Embeddings
from langflow.inputs import SecretStrInput
@ -9,7 +7,6 @@ from langflow.io import DropdownInput, MessageTextInput, Output
class AmazonBedrockEmbeddingsComponent(LCModelComponent):
display_name: str = "Amazon Bedrock Embeddings"
description: str = "Generate embeddings using Amazon Bedrock models."
documentation = "https://python.langchain.com/docs/modules/data_connection/text_embedding/integrations/bedrock"
icon = "Amazon"
name = "AmazonBedrockEmbeddings"
@ -20,15 +17,82 @@ class AmazonBedrockEmbeddingsComponent(LCModelComponent):
options=["amazon.titan-embed-text-v1"],
value="amazon.titan-embed-text-v1",
),
SecretStrInput(name="aws_access_key", display_name="Access Key"),
SecretStrInput(name="aws_secret_key", display_name="Secret Key"),
MessageTextInput(
SecretStrInput(
name="aws_access_key_id",
display_name="AWS Access Key ID",
info="The access key for your AWS account."
"Usually set in Python code as the environment variable 'AWS_ACCESS_KEY_ID'.",
),
SecretStrInput(
name="aws_secret_access_key",
display_name="AWS Secret Access Key",
info="The secret key for your AWS account. "
"Usually set in Python code as the environment variable 'AWS_SECRET_ACCESS_KEY'.",
),
SecretStrInput(
name="aws_session_token",
display_name="AWS Session Token",
advanced=True,
info="The session key for your AWS account. "
"Only needed for temporary credentials. "
"Usually set in Python code as the environment variable 'AWS_SESSION_TOKEN'.",
),
SecretStrInput(
name="credentials_profile_name",
display_name="Credentials Profile Name",
advanced=True,
info="The name of the profile to use from your "
"~/.aws/credentials file. "
"If not provided, the default profile will be used.",
),
DropdownInput(
name="region_name",
display_name="Region Name",
value="us-east-1",
options=[
"us-west-2",
"us-west-1",
"us-gov-west-1",
"us-gov-east-1",
"us-east-2",
"us-east-1",
"sa-east-1",
"me-south-1",
"me-central-1",
"il-central-1",
"eu-west-3",
"eu-west-2",
"eu-west-1",
"eu-south-2",
"eu-south-1",
"eu-north-1",
"eu-central-2",
"eu-central-1",
"cn-northwest-1",
"cn-north-1",
"ca-west-1",
"ca-central-1",
"ap-southeast-5",
"ap-southeast-4",
"ap-southeast-3",
"ap-southeast-2",
"ap-southeast-1",
"ap-south-2",
"ap-south-1",
"ap-northeast-3",
"ap-northeast-2",
"ap-northeast-1",
"ap-east-1",
"af-south-1",
],
info="The AWS region where your Bedrock resources are located.",
),
MessageTextInput(
name="endpoint_url",
display_name="Endpoint URL",
advanced=True,
info="The URL of the AWS Bedrock endpoint to use.",
),
MessageTextInput(name="region_name", display_name="Region Name", value="us-east-1"),
MessageTextInput(name="endpoint_url", display_name=" Endpoint URL", advanced=True),
]
outputs = [
@ -36,20 +100,25 @@ class AmazonBedrockEmbeddingsComponent(LCModelComponent):
]
def build_embeddings(self) -> Embeddings:
if self.aws_access_key:
try:
from langchain_aws import BedrockEmbeddings
except ImportError as e:
msg = "langchain_aws is not installed. Please install it with `pip install langchain_aws`."
raise ImportError(msg) from e
try:
import boto3
except ImportError as e:
msg = "boto3 is not installed. Please install it with `pip install boto3`."
raise ImportError(msg) from e
if self.aws_access_key_id or self.aws_secret_access_key:
session = boto3.Session(
aws_access_key_id=self.aws_access_key,
aws_secret_access_key=self.aws_secret_key,
aws_access_key_id=self.aws_access_key_id,
aws_secret_access_key=self.aws_secret_access_key,
aws_session_token=self.aws_session_token,
)
elif self.credentials_profile_name:
import boto3
session = boto3.Session(profile_name=self.credentials_profile_name)
else:
import boto3
session = boto3.Session()
client_params = {}

114
src/backend/base/langflow/components/models/amazon_bedrock.py
View file

@ -50,13 +50,91 @@ class AmazonBedrockComponent(LCModelComponent):
"stability.stable-diffusion-xl-v1",
],
value="anthropic.claude-3-haiku-20240307-v1:0",
info="List of available model IDs to choose from.",
),
SecretStrInput(
name="aws_access_key_id",
display_name="AWS Access Key ID",
info="The access key for your AWS account."
"Usually set in Python code as the environment variable 'AWS_ACCESS_KEY_ID'.",
),
SecretStrInput(
name="aws_secret_access_key",
display_name="AWS Secret Access Key",
info="The secret key for your AWS account. "
"Usually set in Python code as the environment variable 'AWS_SECRET_ACCESS_KEY'.",
),
SecretStrInput(
name="aws_session_token",
display_name="AWS Session Token",
advanced=True,
info="The session key for your AWS account. "
"Only needed for temporary credentials. "
"Usually set in Python code as the environment variable 'AWS_SESSION_TOKEN'.",
),
SecretStrInput(
name="credentials_profile_name",
display_name="Credentials Profile Name",
advanced=True,
info="The name of the profile to use from your "
"~/.aws/credentials file. "
"If not provided, the default profile will be used.",
),
DropdownInput(
name="region_name",
display_name="Region Name",
value="us-east-1",
options=[
"us-west-2",
"us-west-1",
"us-gov-west-1",
"us-gov-east-1",
"us-east-2",
"us-east-1",
"sa-east-1",
"me-south-1",
"me-central-1",
"il-central-1",
"eu-west-3",
"eu-west-2",
"eu-west-1",
"eu-south-2",
"eu-south-1",
"eu-north-1",
"eu-central-2",
"eu-central-1",
"cn-northwest-1",
"cn-north-1",
"ca-west-1",
"ca-central-1",
"ap-southeast-5",
"ap-southeast-4",
"ap-southeast-3",
"ap-southeast-2",
"ap-southeast-1",
"ap-south-2",
"ap-south-1",
"ap-northeast-3",
"ap-northeast-2",
"ap-northeast-1",
"ap-east-1",
"af-south-1",
],
info="The AWS region where your Bedrock resources are located.",
),
DictInput(
name="model_kwargs",
display_name="Model Kwargs",
advanced=True,
is_list=True,
info="Additional keyword arguments to pass to the model.",
),
MessageTextInput(
name="endpoint_url",
display_name="Endpoint URL",
advanced=True,
info="The URL of the Bedrock endpoint to use.",
),
SecretStrInput(name="aws_access_key", display_name="Access Key"),
SecretStrInput(name="aws_secret_key", display_name="Secret Key"),
MessageTextInput(name="credentials_profile_name", display_name="Credentials Profile Name", advanced=True),
MessageTextInput(name="region_name", display_name="Region Name", value="us-east-1"),
DictInput(name="model_kwargs", display_name="Model Kwargs", advanced=True, is_list=True),
MessageTextInput(name="endpoint_url", display_name="Endpoint URL", advanced=True),
HandleInput(
name="output_parser",
display_name="Output Parser",
@ -72,20 +150,24 @@ class AmazonBedrockComponent(LCModelComponent):
except ImportError as e:
msg = "langchain_aws is not installed. Please install it with `pip install langchain_aws`."
raise ImportError(msg) from e
if self.aws_access_key:
try:
import boto3
session = boto3.Session(
aws_access_key_id=self.aws_access_key,
aws_secret_access_key=self.aws_secret_key,
)
except ImportError as e:
msg = "boto3 is not installed. Please install it with `pip install boto3`."
raise ImportError(msg) from e
if self.aws_access_key_id or self.aws_secret_access_key:
try:
session = boto3.Session(
aws_access_key_id=self.aws_access_key_id,
aws_secret_access_key=self.aws_secret_access_key,
aws_session_token=self.aws_session_token,
)
except Exception as e:
msg = "Could not create a boto3 session."
raise ValueError(msg) from e
elif self.credentials_profile_name:
import boto3
session = boto3.Session(profile_name=self.credentials_profile_name)
else:
import boto3
session = boto3.Session()
client_params = {}