Skip to content
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

aws[patch]: use explicit tool name in with_structured_output tool_choice #92

Merged
merged 1 commit into from
Jul 1, 2024
Merged

aws[patch]: use explicit tool name in with_structured_output tool_choice #92

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion libs/aws/langchain_aws/chat_models/bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,9 @@ class AnswerWithJustification(BaseModel):
ValueError(
f"Structured output is not supported for model {self._get_model()}"
)
llm = self.bind_tools([schema], tool_choice="any")

tool_name = convert_to_anthropic_tool(schema)["name"]
llm = self.bind_tools([schema], tool_choice=tool_name)
if isinstance(schema, type) and issubclass(schema, BaseModel):
output_parser = ToolsOutputParser(
first_tool_only=True, pydantic_schemas=[schema]
Expand Down
14 changes: 10 additions & 4 deletions libs/aws/langchain_aws/chat_models/bedrock_converse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@

@beta()
class ChatBedrockConverse(BaseChatModel):
"""Bedrock chat model integration built on the ``converse`` api.
"""Bedrock chat model integration built on the Bedrock converse API.

This implementation will eventually replace the existing ChatBedrock implementation
once the Bedrock converse API has feature parity with older Bedrock API.
Specifically the converse API does not yet support custom Bedrock models.

For now it is being released as its own class in **beta** to give users who aren't
using custom models access to the latest API.

Setup:
To use Amazon Bedrock make sure you've gone through all the steps described
Expand All @@ -67,7 +74,6 @@ class ChatBedrockConverse(BaseChatModel):
max_tokens: Optional[int]
Max number of tokens to generate.


Key init args — client params:
region_name: Optional[str]
AWS region to use, e.g. 'us-west-2'.
Expand All @@ -79,7 +85,6 @@ class ChatBedrockConverse(BaseChatModel):

See full list of supported init args and their descriptions in the params section.

# TODO: Replace with relevant init params.
Instantiate:
.. code-block:: python

Expand Down Expand Up @@ -422,7 +427,8 @@ def with_structured_output(
include_raw: bool = False,
**kwargs: Any,
) -> Runnable[LanguageModelInput, Union[Dict, BaseModel]]:
llm = self.bind_tools([schema], tool_choice="any")
tool_name = convert_to_openai_function(schema)["name"]
llm = self.bind_tools([schema], tool_choice=tool_name)
if isinstance(schema, type) and issubclass(schema, BaseModel):
output_parser = ToolsOutputParser(
first_tool_only=True, pydantic_schemas=[schema]
Expand Down
Loading