Merge branch 'client-helper' of https://github.com/michaelnchin/langc…

…hain-aws into client-helper
langchain-ai · Feb 14, 2025 · bf43806 · bf43806
2 parents ab2a3f4 + a0290e9
commit bf43806
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/libs/aws/langchain_aws/chat_models/bedrock.py b/libs/aws/langchain_aws/chat_models/bedrock.py
@@ -641,11 +641,11 @@ def get_token_ids(self, text: str) -> List[int]:
                 return get_token_ids_anthropic(text)
             else:
                 warnings.warn(
-                    "Falling back to default token method due to missing or incompatible `anthropic` installation "
-                    "(needs <=0.38.0).\n\nIf using `anthropic>0.38.0`, it is recommended to provide the model "
-                    "class with a custom_get_token_ids method implementing a more accurate tokenizer for Anthropic. "
-                    "For get_num_tokens, as another alternative, you can implement your own token counter method "
-                    "using the ChatAnthropic or AnthropicLLM classes."
+                    f"Falling back to default token method due to missing or incompatible `anthropic` installation "
+                    f"(needs <=0.38.0).\n\nIf using `anthropic>0.38.0`, it is recommended to provide the model "
+                    f"class with a custom_get_token_ids method implementing a more accurate tokenizer for Anthropic. "
+                    f"For get_num_tokens, as another alternative, you can implement your own token counter method "
+                    f"using the ChatAnthropic or AnthropicLLM classes."
                 )
         return super().get_token_ids(text)
 
@@ -873,6 +873,7 @@ def _as_converse(self) -> ChatBedrockConverse:
         if self.temperature is not None:
             kwargs["temperature"] = self.temperature
         return ChatBedrockConverse(
+            client=self.client,
             model=self.model_id,
             region_name=self.region_name,
             credentials_profile_name=self.credentials_profile_name,

diff --git a/libs/aws/tests/unit_tests/chat_models/test_bedrock_converse.py b/libs/aws/tests/unit_tests/chat_models/test_bedrock_converse.py
@@ -36,6 +36,7 @@ def chat_model_class(self) -> Type[BaseChatModel]:
     @property
     def chat_model_params(self) -> dict:
         return {
+            "client": None,
             "model": "anthropic.claude-3-sonnet-20240229-v1:0",
             "region_name": "us-west-1",
         }