Merge branch 'develop' of ssh.gitlab.aws.dev:genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator into develop

Author: Bob Strahan

lib/idp_common_pkg/idp_common/bedrock/client.py

@@ -17,6 +17,7 @@
 import random
 import socket
 from typing import Dict, Any, List, Optional, Union, Tuple
+from botocore.config import Config
 from botocore.exceptions import ClientError, ReadTimeoutError, ConnectTimeoutError, EndpointConnectionError
 from urllib3.exceptions import ReadTimeoutError as Urllib3ReadTimeoutError
 try:
@@ -73,8 +74,12 @@ def __init__(
     @property
     def client(self):
         """Lazy-loaded Bedrock client."""
+        config = Config(
+            connect_timeout=10,
+            read_timeout=120
+            )
         if self._client is None:
-            self._client = boto3.client('bedrock-runtime', region_name=self.region)
+            self._client = boto3.client('bedrock-runtime', region_name=self.region, config=config)
         return self._client
 
     def __call__(
@@ -445,7 +450,7 @@ def _invoke_with_retry(
 
             return response_with_metering
 
-        except ClientError as e:
+        except Exception as e:
             error_code = e.response['Error']['Code']
             error_message = e.response['Error']['Message']
 
@@ -495,12 +500,7 @@ def _invoke_with_retry(
                 self._put_metric('BedrockRequestsFailed', 1)
                 self._put_metric('BedrockNonRetryableErrors', 1)
                 raise
-        
-        except Exception as e:
-            logger.error(f"Unexpected error invoking Bedrock: {str(e)}", exc_info=True)
-            self._put_metric('BedrockRequestsFailed', 1)
-            self._put_metric('BedrockUnexpectedErrors', 1)
-            raise
+
 
     def get_guardrail_config(self) -> Optional[Dict[str, str]]:
         """

patterns/pattern-2/template.yaml

@@ -246,7 +246,7 @@ Resources:
                         description: Confidence threshold for this specific attribute (0.0 to 1.0). If not set, the default confidence threshold from assessment section will be used.
                         minimum: 0
                         maximum: 1
-                        order: 5
+                        order: 6
                     # This controls the layout of the form fields inside each attribute item
                     columns: 2
           classification:

scripts/sdlc/idp-cli/src/idp_cli/cli/main.py

@@ -74,7 +74,7 @@ def uninstall(
 def smoketest(
     stack_name: str = typer.Option("idp-Stack", "--stack-name", help="Name of the deployed stack to test"),
     file_path: str = typer.Option("../../../samples/lending_package.pdf", "--file-path", help="Path to the test file"),
-    verify_string: str = typer.Option("475 ANY AVENUE ANYTOWN, USA", "--verify-string", help="String to verify in the processed output")
+    verify_string: str = typer.Option("BIGTOWN, MA, 02801", "--verify-string", help="String to verify in the processed output")
 ):
     """
     Run a smoke test on the deployed IDP Accelerator