Merge branch 'develop' v0.7.13

Author: Bob Strahan

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.13] - 2025-02-21
+
+### Fixed
+- Remove Boto3 layer from all Lambda functions as Bedrock features are available in the base Boto package deployed in Lambda
+- Updated all Lambda functions to Python 3.13 runtime
+
 ## [0.7.12] - 2025-02-21
 
 ### Added
@@ -290,6 +296,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release
 
 [Unreleased]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/compare/main...develop
+[0.7.13]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.7.13
 [0.7.12]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.7.12
 [0.7.11]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.7.11
 [0.7.10]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.7.10

VERSION

@@ -1 +1 @@
-0.7.12
+0.7.13

pca-boto3-bedrock/template.yaml

@@ -286,7 +286,7 @@ Resources:
 
             MemorySize: 128
             Role: !GetAtt FirehoseTransformationLambdaRoleForPca.Arn
-            Runtime: "python3.11"
+            Runtime: "python3.13"
             Timeout: 600
             TracingConfig:
                 Mode: "PassThrough"

pca-dashboards/pca-dashboards.yaml

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 
-Description: Amazon Transcribe Post Call Analytics - PCA (v0.7.12) (uksb-1sn29lk73, SO9071)
+Description: Amazon Transcribe Post Call Analytics - PCA (v0.7.13) (uksb-1sn29lk73, SO9071)
 
 Parameters:
 
@@ -585,12 +585,6 @@ Conditions:
   ShouldCreateKendraIndexDeveloperEdition: !Equals [!Ref EnableTranscriptKendraSearch, 'Yes, create new Kendra Index (Developer Edition)']
   ShouldDeployPcaDashboards: !Equals [!Ref EnablePcaDashboards, 'Yes']
   ShouldLoadSampleFiles: !Equals [!Ref loadSampleAudioFiles, 'true']
-  ShouldDeployBedrockBoto3Layer: !Or [
-    !Equals [!Ref CallSummarization, 'BEDROCK'], 
-    !Equals [!Ref CallSummarization, 'BEDROCK+TCA'], 
-    !Equals [!Ref CallSummarization, 'TCA-ONLY'], 
-    !Equals [!Ref GenAIQuery, 'BEDROCK'],
-  ]
   ShouldDeployLLMThirdPartyApiKey: !And [!Not [!Equals [!Ref SummarizationLLMThirdPartyApiKey, '']], !Not [!Equals [!Ref SummarizationLLMThirdPartyApiKey, undefined]]]
   ShouldTestBedrockModelId: !And [
     !Or [
@@ -734,7 +728,7 @@ Resources:
     Properties:
       Handler: index.lambda_handler
       Role: !GetAtt 'TestBedrockModelFunctionRole.Arn'
-      Runtime: python3.11
+      Runtime: python3.13
       Timeout: 60
       MemorySize: 128
       Code: 
@@ -744,9 +738,6 @@ Resources:
           import subprocess
           import os
           import sys
-          print("install latest boto3 to get bedrock service support")
-          subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--target', '/tmp', 'boto3'])
-          sys.path.insert(0,'/tmp')
           import boto3
           from botocore.config import Config
 
@@ -905,12 +896,6 @@ Resources:
       Parameters:
         ParentStackName: !Ref 'AWS::StackName'
 
-  BedrockBoto3Layer:
-    Type: AWS::CloudFormation::Stack
-    Condition: ShouldDeployBedrockBoto3Layer
-    Properties:
-      TemplateURL: pca-boto3-bedrock/template.yaml
-
   LLMThirdPartyApiKeySecret:
     Condition: ShouldDeployLLMThirdPartyApiKey
     Type: AWS::SecretsManager::Secret
@@ -942,10 +927,6 @@ Resources:
           - ''
         SummarizationLambdaFunctionArn: !Ref SummarizationLambdaFunctionArn
         PyUtilsLayerArn: !GetAtt PythonUtilsLayer.Outputs.PyUtilsLayer
-        Boto3LayerArn: !If
-          - ShouldDeployBedrockBoto3Layer
-          - !GetAtt BedrockBoto3Layer.Outputs.Boto3Layer
-          - ''
         LLMTableName: !GetAtt LLMPromptConfigure.Outputs.LLMTableName
 
   PCAUI:
@@ -981,10 +962,6 @@ Resources:
           - !Ref LLMThirdPartyApiKeySecret
           - ''
         PyUtilsLayerArn: !GetAtt PythonUtilsLayer.Outputs.PyUtilsLayer
-        Boto3LayerArn: !If
-          - ShouldDeployBedrockBoto3Layer
-          - !GetAtt BedrockBoto3Layer.Outputs.Boto3Layer
-          - ''
         LLMTableName: !GetAtt LLMPromptConfigure.Outputs.LLMTableName
 
   PcaDashboards:
@@ -1049,7 +1026,7 @@ Resources:
     Condition: ShouldDeployPcaDashboards
     Properties:
       Handler: index.handler
-      Runtime: python3.11
+      Runtime: python3.13
       Role: !GetAtt QuickSightEnabledCheckFunctionRole.Arn
       Code: 
         ZipFile: !Sub |

pca-main-nokendra.template

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 
-Description: Amazon Transcribe Post Call Analytics - PCA (v0.7.12) (uksb-1sn29lk73, SO9071)
+Description: Amazon Transcribe Post Call Analytics - PCA (v0.7.13) (uksb-1sn29lk73, SO9071)
 
 Parameters:
 
@@ -626,12 +626,6 @@ Conditions:
   ShouldCreateKendraIndexDeveloperEdition: !Equals [!Ref EnableTranscriptKendraSearch, 'Yes, create new Kendra Index (Developer Edition)']
   ShouldDeployPcaDashboards: !Equals [!Ref EnablePcaDashboards, 'Yes']
   ShouldLoadSampleFiles: !Equals [!Ref loadSampleAudioFiles, 'true']
-  ShouldDeployBedrockBoto3Layer: !Or [
-    !Equals [!Ref CallSummarization, 'BEDROCK'], 
-    !Equals [!Ref CallSummarization, 'BEDROCK+TCA'], 
-    !Equals [!Ref CallSummarization, 'TCA-ONLY'], 
-    !Equals [!Ref GenAIQuery, 'BEDROCK'],
-  ]
   ShouldDeployLLMThirdPartyApiKey: !And [!Not [!Equals [!Ref SummarizationLLMThirdPartyApiKey, '']], !Not [!Equals [!Ref SummarizationLLMThirdPartyApiKey, undefined]]]
   ShouldTestBedrockModelId: !And [
     !Or [
@@ -917,7 +911,7 @@ Resources:
     Properties:
       Handler: index.lambda_handler
       Role: !GetAtt 'TestBedrockModelFunctionRole.Arn'
-      Runtime: python3.11
+      Runtime: python3.13
       Timeout: 60
       MemorySize: 128
       Code: 
@@ -927,9 +921,6 @@ Resources:
           import subprocess
           import os
           import sys
-          print("install latest boto3 to get bedrock service support")
-          subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--target', '/tmp', 'boto3'])
-          sys.path.insert(0,'/tmp')
           import boto3
           from botocore.config import Config
 
@@ -1090,12 +1081,6 @@ Resources:
       Parameters:
         ParentStackName: !Ref 'AWS::StackName'
 
-  BedrockBoto3Layer:
-    Type: AWS::CloudFormation::Stack
-    # Condition: ShouldDeployBedrockBoto3Layer
-    Properties:
-      TemplateURL: pca-boto3-bedrock/template.yaml
-
   LLMThirdPartyApiKeySecret:
     Condition: ShouldDeployLLMThirdPartyApiKey
     Type: AWS::SecretsManager::Secret
@@ -1127,10 +1112,6 @@ Resources:
           - ''
         SummarizationLambdaFunctionArn: !Ref SummarizationLambdaFunctionArn
         PyUtilsLayerArn: !GetAtt PythonUtilsLayer.Outputs.PyUtilsLayer
-        Boto3LayerArn: !If
-          - ShouldDeployBedrockBoto3Layer
-          - !GetAtt BedrockBoto3Layer.Outputs.Boto3Layer
-          - ''
         LLMTableName: !GetAtt LLMPromptConfigure.Outputs.LLMTableName
 
   PCAUI:
@@ -1167,10 +1148,6 @@ Resources:
           - !Ref LLMThirdPartyApiKeySecret
           - ''
         PyUtilsLayerArn: !GetAtt PythonUtilsLayer.Outputs.PyUtilsLayer
-        Boto3LayerArn: !If
-          - ShouldDeployBedrockBoto3Layer
-          - !GetAtt BedrockBoto3Layer.Outputs.Boto3Layer
-          - ''
         LLMTableName: !GetAtt LLMPromptConfigure.Outputs.LLMTableName
 
   MediaSearchKendraFinder:
@@ -1249,7 +1226,7 @@ Resources:
     Condition: ShouldDeployPcaDashboards
     Properties:
       Handler: index.handler
-      Runtime: python3.11
+      Runtime: python3.13
       Role: !GetAtt QuickSightEnabledCheckFunctionRole.Arn
       Code: 
         ZipFile: !Sub |

pca-main.template

@@ -22,7 +22,7 @@ Parameters:
 
 Globals:
   Function:
-    Runtime: python3.11
+    Runtime: python3.13
     MemorySize: 1024
     Timeout: 60
 
@@ -61,7 +61,7 @@ Resources:
     Properties:
       Code:  ./src
       Handler: copy-samples.lambda_handler
-      Runtime: python3.11
+      Runtime: python3.13
       Timeout: 300
       Role: !GetAtt CopySamplesRole.Arn
       Environment: