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

Author: Bob Strahan

idp_cli/tests/test_batch_processor.py

@@ -9,6 +9,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+
 from idp_cli.batch_processor import BatchProcessor
 
 

idp_cli/tests/test_manifest_parser.py

@@ -9,6 +9,7 @@
 import json
 
 import pytest
+
 from idp_cli.manifest_parser import ManifestParser, parse_manifest, validate_manifest
 
 

idp_cli/tests/test_progress_monitor.py

@@ -9,6 +9,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+
 from idp_cli.progress_monitor import ProgressMonitor
 
 

idp_cli/tests/test_rerun_processor.py

@@ -37,9 +37,10 @@ def test_prepare_for_classification_rerun(
         self, mock_boto_client, mock_stack_info_class
     ):
         """Test document preparation for classification rerun"""
-        from idp_cli.rerun_processor import RerunProcessor
         from idp_common.models import Document, Page, Section, Status
 
+        from idp_cli.rerun_processor import RerunProcessor
+
         mock_stack_info = MagicMock()
         mock_stack_info.validate_stack.return_value = True
         mock_stack_info.get_resources.return_value = {
@@ -91,9 +92,10 @@ def test_prepare_for_extraction_rerun(
         self, mock_boto_client, mock_stack_info_class
     ):
         """Test document preparation for extraction rerun"""
-        from idp_cli.rerun_processor import RerunProcessor
         from idp_common.models import Document, Page, Section, Status
 
+        from idp_cli.rerun_processor import RerunProcessor
+
         mock_stack_info = MagicMock()
         mock_stack_info.validate_stack.return_value = True
         mock_stack_info.get_resources.return_value = {
@@ -145,9 +147,10 @@ def test_prepare_for_extraction_rerun(
     @patch("boto3.client")
     def test_send_to_queue(self, mock_boto_client, mock_stack_info_class):
         """Test sending document to SQS queue"""
-        from idp_cli.rerun_processor import RerunProcessor
         from idp_common.models import Document, Status
 
+        from idp_cli.rerun_processor import RerunProcessor
+
         mock_stack_info = MagicMock()
         mock_stack_info.validate_stack.return_value = True
         mock_stack_info.get_resources.return_value = {

template.yaml

@@ -929,16 +929,11 @@ Resources:
         AppSyncApiArn: !GetAtt GraphQLApi.Arn
         ConfigurationTable: !Ref ConfigurationTable
         ConfigurationDefaultS3Uri: !If
-          - HasCustomConfigPath
-          - !Ref CustomConfigPath
-          - !Sub
+          - HasPattern2CustomConfigPath
+          - !Sub "s3://${ConfigurationBucket}/${Pattern2CustomConfigPath}/config.yaml"
+          - !Sub 
             - "s3://${ConfigurationBucket}/config_library/pattern-2/${ConfigPath}/config.yaml"
-            - ConfigPath:
-                !FindInMap [
-                  Pattern2ConfigurationMap,
-                  !Ref Pattern2Configuration,
-                  ConfigPath,
-                ]
+            - ConfigPath: !FindInMap [Pattern2ConfigurationMap, !Ref Pattern2Configuration, ConfigPath]
         ConfigLibraryHash: "<CONFIG_LIBRARY_HASH_TOKEN>"
         EnableHITL: !Ref EnableHITL
         SageMakerA2IReviewPortalURL: !If