community[patch]: Add explicit error message to Bedrock error output. (…

…#17328) - **Description:** Propagate Bedrock errors into Langchain explicitly. Use-case: unset region error is hidden behind 'Could not load credentials...' message - **Issue:** [17654](#17654) - **Dependencies:** None --------- Co-authored-by: Bagatur <[email protected]>
langchain-ai · Mar 29, 2024 · 540ebf3 · 540ebf3
1 parent 69bb96c
commit 540ebf3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/libs/community/langchain_community/document_loaders/pdf.py b/libs/community/langchain_community/document_loaders/pdf.py
@@ -670,7 +670,7 @@ def __init__(
                 raise ValueError(
                     "Could not load credentials to authenticate with AWS client. "
                     "Please check that credentials in the specified "
-                    "profile name are valid."
+                    f"profile name are valid. {e}"
                 ) from e
         self.parser = AmazonTextractPDFParser(
             textract_features=features,

diff --git a/libs/community/langchain_community/embeddings/bedrock.py b/libs/community/langchain_community/embeddings/bedrock.py
@@ -107,7 +107,7 @@ def validate_environment(cls, values: Dict) -> Dict:
             raise ValueError(
                 "Could not load credentials to authenticate with AWS client. "
                 "Please check that credentials in the specified "
-                "profile name are valid."
+                f"profile name are valid. Bedrock error: {e}"
             ) from e
 
         return values

diff --git a/libs/community/langchain_community/embeddings/sagemaker_endpoint.py b/libs/community/langchain_community/embeddings/sagemaker_endpoint.py
@@ -142,7 +142,7 @@ def validate_environment(cls, values: Dict) -> Dict:
                 raise ValueError(
                     "Could not load credentials to authenticate with AWS client. "
                     "Please check that credentials in the specified "
-                    "profile name are valid."
+                    f"profile name are valid. {e}"
                 ) from e
 
         except ImportError:

diff --git a/libs/community/langchain_community/llms/bedrock.py b/libs/community/langchain_community/llms/bedrock.py
@@ -427,11 +427,13 @@ def validate_environment(cls, values: Dict) -> Dict:
                 "Could not import boto3 python package. "
                 "Please install it with `pip install boto3`."
             )
+        except ValueError as e:
+            raise ValueError(f"Error raised by bedrock service: {e}")
         except Exception as e:
             raise ValueError(
                 "Could not load credentials to authenticate with AWS client. "
                 "Please check that credentials in the specified "
-                "profile name are valid."
+                f"profile name are valid. Bedrock error: {e}"
             ) from e
 
         return values

diff --git a/...experimental/langchain_experimental/comprehend_moderation/amazon_comprehend_moderation.py b/...experimental/langchain_experimental/comprehend_moderation/amazon_comprehend_moderation.py
@@ -109,7 +109,7 @@ def create_client(cls, values: Dict[str, Any]) -> Dict[str, Any]:
             raise ValueError(
                 "Could not load credentials to authenticate with AWS client. "
                 "Please check that credentials in the specified "
-                "profile name are valid."
+                f"profile name are valid. {e}"
             ) from e
 
     @property