Merge branch 'develop' v0.2.1

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1] - 2022-04-20
+### Fixed
+- supports audio files placed in subfolders under IngestBucket path. Replaces '/' with '-' when constructing job name. 
+
 ## [0.2.0] - 2022-03-22
 ### Added
 - add support for Transcribe Call Analytics call summarization (ActionItems, Outcomes)
@@ -37,7 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/compare/v0.2.0...develop
+[Unreleased]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/compare/v0.2.1...develop
+[0.2.1]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.2.1
 [0.2.0]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.2.0
 [0.1.4]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.1.4
 [0.1.3]: https://github.com/aws-samples/amazon-transcribe-post-call-analytics/releases/tag/v0.1.3

VERSION

@@ -1 +1 @@
-0.2
+0.2.1

pca-main-nokendra.template

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 
-Description: Amazon Transcribe Post Call Analytics - PCA (v0.2) (uksb-1sn29lk73)
+Description: Amazon Transcribe Post Call Analytics - PCA (v0.2.1) (uksb-1sn29lk73)
 
 Parameters:
 

pca-main.template

@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 
-Description: Amazon Transcribe Post Call Analytics - PCA (v0.2) (uksb-1sn29lk73)
+Description: Amazon Transcribe Post Call Analytics - PCA (v0.2.1) (uksb-1sn29lk73)
 
 Parameters:
 

pca-server/src/pca/pcaconfiguration.py

@@ -74,10 +74,11 @@ def generateJobName(key):
     characters and returns that as the job-name to use
     """
 
-    # Get rid of leading path, and replace [SPACE] with "-"
+    # Get rid of leading path, and replace [SPACE] with "-", replace "/" with "-"
     response = key
     if "/" in key:
-        response = response[1 + key.find('/'):]
+        response = response[1 + key.find("/") :]
+    response = response.replace("/", "-")
     response = response.replace(" ", "-")
 
     return response
@@ -110,22 +111,52 @@ def loadConfiguration():
     """
 
     # Load the the core ones in from Parameter Store in batches of up to 10
-    ssm = boto3.client('ssm')
-    fullParamList1 = ssm.get_parameters(Names=[CONF_COMP_LANGS, CONF_REDACTION_LANGS, CONF_ENTITYENDPOINT,
-                                               CONF_ENTITY_FILE, CONF_ENTITYCONF, CONF_PREFIX_MP3_PLAYBACK,
-                                               CONF_S3BUCKET_INPUT, CONF_PREFIX_RAW_AUDIO, CONF_PREFIX_FAILED_AUDIO,
-                                               CONF_MAX_SPEAKERS])
-    fullParamList2 = ssm.get_parameters(Names=[CONF_MINNEGATIVE, CONF_MINPOSITIVE, CONF_S3BUCKET_OUTPUT,
-                                               CONF_PREFIX_PARSED_RESULTS, CONF_SPEAKER_NAMES, CONF_SPEAKER_MODE,
-                                               COMP_SFN_NAME, CONF_SUPPORT_BUCKET, CONF_TRANSCRIBE_LANG,
-                                               CONF_PREFIX_TRANSCRIBE_RESULTS])
-    fullParamList3 = ssm.get_parameters(Names=[CONF_VOCABNAME, CONF_CONVO_LOCATION, CONF_ENTITY_TYPES, 
-                                               CONF_FILTER_MODE, CONF_FILTER_NAME, 
-                                               CONF_FILENAME_DATETIME_REGEX, CONF_FILENAME_DATETIME_FIELDMAP,
-                                               CONF_FILENAME_GUID_REGEX, CONF_FILENAME_AGENT_REGEX,
-                                               CONF_FILENAME_CUST_REGEX])
-    fullParamList4 = ssm.get_parameters(Names=[CONF_KENDRA_INDEX_ID, CONF_WEB_URI, CONF_TRANSCRIBE_API, CONF_REDACTION_TRANSCRIPT,
-                                               CONF_REDACTION_AUDIO])
+    ssm = boto3.client("ssm")
+    fullParamList1 = ssm.get_parameters(
+        Names=[
+            CONF_COMP_LANGS,
+            CONF_REDACTION_LANGS,
+            CONF_ENTITYENDPOINT,
+            CONF_ENTITY_FILE,
+            CONF_ENTITYCONF,
+            CONF_PREFIX_MP3_PLAYBACK,
+            CONF_S3BUCKET_INPUT,
+            CONF_PREFIX_RAW_AUDIO,
+            CONF_PREFIX_FAILED_AUDIO,
+            CONF_MAX_SPEAKERS,
+        ]
+    )
+    fullParamList2 = ssm.get_parameters(
+        Names=[
+            CONF_MINNEGATIVE,
+            CONF_MINPOSITIVE,
+            CONF_S3BUCKET_OUTPUT,
+            CONF_PREFIX_PARSED_RESULTS,
+            CONF_SPEAKER_NAMES,
+            CONF_SPEAKER_MODE,
+            COMP_SFN_NAME,
+            CONF_SUPPORT_BUCKET,
+            CONF_TRANSCRIBE_LANG,
+            CONF_PREFIX_TRANSCRIBE_RESULTS,
+        ]
+    )
+    fullParamList3 = ssm.get_parameters(
+        Names=[
+            CONF_VOCABNAME,
+            CONF_CONVO_LOCATION,
+            CONF_ENTITY_TYPES,
+            CONF_FILTER_MODE,
+            CONF_FILTER_NAME,
+            CONF_FILENAME_DATETIME_REGEX,
+            CONF_FILENAME_DATETIME_FIELDMAP,
+            CONF_FILENAME_GUID_REGEX,
+            CONF_FILENAME_AGENT_REGEX,
+            CONF_FILENAME_CUST_REGEX,
+        ]
+    )
+    fullParamList4 = ssm.get_parameters(
+        Names=[CONF_KENDRA_INDEX_ID, CONF_WEB_URI, CONF_TRANSCRIBE_API, CONF_REDACTION_TRANSCRIPT, CONF_REDACTION_AUDIO]
+    )
 
     # Extract our parameters into our config
     extractParameters(fullParamList1, False)