Skip to content

Commit

Permalink
Merge branch 'develop' v0.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rstrahan committed Oct 11, 2024
2 parents 3bb5e28 + a01c65f commit 4f177e5
Show file tree
Hide file tree
Showing 29 changed files with 1,179 additions and 86 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.3] - 2024-10-11

### Added

- Allow meeting assistant to perform custom actions using a Bedrock Agent #128

### Fixed

- Fixes for differences between Zoom and Zoom Enterprise - PR #132

## [0.2.2] - 2024-10-03

### Added
Expand Down Expand Up @@ -172,6 +182,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-live-meeting-assistant/compare/main...develop
[0.2.3]: https://github.com/aws-samples/amazon-transcribe-live-meeting-assistant/releases/tag/v0.2.3
[0.2.2]: https://github.com/aws-samples/amazon-transcribe-live-meeting-assistant/releases/tag/v0.2.2
[0.2.1]: https://github.com/aws-samples/amazon-transcribe-live-meeting-assistant/releases/tag/v0.2.1
[0.2.0]: https://github.com/aws-samples/amazon-transcribe-live-meeting-assistant/releases/tag/v0.2.0
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.2
0.2.3
Binary file added images/meetingassist-agent-example-email.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/meetingassist-agent-query-action.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/meetingassist-agent-query-action2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/qnabot-prompt-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lma-ai-stack/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.2
0.2.3
2 changes: 1 addition & 1 deletion lma-ai-stack/deployment/lma-ai-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Parameters:
BootstrapVersion:
Type: String
Default: 0.2.2
Default: 0.2.3
Description: >
Artifacts version (semver). Used to point to a specific release in the S3
bootstrap bucket
Expand Down
4 changes: 2 additions & 2 deletions lma-ai-stack/source/ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lma-ai-stack/source/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lma-ui",
"version": "0.2.2",
"version": "0.2.3",
"private": true,
"dependencies": {
"@aws-amplify/ui-components": "^1.9.6",
Expand Down
2 changes: 1 addition & 1 deletion lma-ai-stack/source/ui/src/components/common/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// eslint-disable import/prefer-default-export

export const LMA_VERSION = 'v0.2.2';
export const LMA_VERSION = 'v0.2.3';
export const DEFAULT_OTHER_SPEAKER_NAME = 'Other Participant';
export const DEFAULT_LOCAL_SPEAKER_NAME = 'Me';
export const SYSTEM = 'System';
Expand Down
94 changes: 94 additions & 0 deletions lma-bedrockagent-stack/publish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#!/bin/bash

##############################################################################################
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
##############################################################################################

##############################################################################################
# Create new Cfn artifacts bucket if not already existing, and publish template and artifacts
# usage: ./publish.sh <cfn_bucket> <cfn_prefix> <region> [public]
##############################################################################################
# Stop the publish process on failures
set -e

# use current directory name as template name
NAME=$(basename `pwd`)

USAGE="$0 <cfn_bucket> <cfn_prefix> <region> [public]"

BUCKET=$1
[ -z "$BUCKET" ] && echo "Cfn bucket name is required parameter. Usage $USAGE" && exit 1

PREFIX=$2
[ -z "$PREFIX" ] && echo "Prefix is required parameter. Usage $USAGE" && exit 1

# Remove trailing slash from prefix if needed
[[ "${PREFIX}" == */ ]] && PREFIX="${PREFIX%?}"

REGION=$3
[ -z "$REGION" ] && echo "Region is a required parameter. Usage $USAGE" && exit 1
export AWS_DEFAULT_REGION=$REGION

ACL=$4
if [ "$ACL" == "public" ]; then
echo "Published S3 artifacts will be acessible by public (read-only)"
PUBLIC=true
else
echo "Published S3 artifacts will NOT be acessible by public."
PUBLIC=false
fi

# Create bucket if it doesn't already exist
if [ -x $(aws s3api list-buckets --query 'Buckets[].Name' | grep "\"$BUCKET\"") ]; then
echo "Creating s3 bucket: $BUCKET"
aws s3 mb s3://${BUCKET} || exit 1
aws s3api put-bucket-versioning --bucket ${BUCKET} --versioning-configuration Status=Enabled || exit 1
else
echo "Using existing bucket: $BUCKET"
fi

echo -n "Make temp dir: "
timestamp=$(date "+%Y%m%d_%H%M")
tmpdir=/tmp/$NAME
[ -d $tmpdir ] && rm -fr $tmpdir
mkdir -p $tmpdir

template=template.yaml
s3_template="s3://${BUCKET}/${PREFIX}/${NAME}/template.yaml"
https_template="https://s3.${REGION}.amazonaws.com/${BUCKET}/${PREFIX}/${NAME}/template.yaml"

echo "PACKAGING $NAME"
aws cloudformation package \
--template-file ${template} \
--output-template-file ${tmpdir}/tmp.template.yaml \
--s3-bucket $BUCKET --s3-prefix ${PREFIX}/${NAME} \
--region ${REGION} || exit 1

echo "Inline edit ${tmpdir}/tmp.template.yaml to replace "
echo " <ARTIFACT_BUCKET_TOKEN> with bucket name: $BUCKET"
echo " <ARTIFACT_PREFIX_TOKEN> with prefix: $PREFIX"
echo " <REGION_TOKEN> with region: $REGION"
cat ${tmpdir}/tmp.template.yaml |
sed -e "s%<ARTIFACT_BUCKET_TOKEN>%$BUCKET%g" |
sed -e "s%<ARTIFACT_PREFIX_TOKEN>%$PREFIX%g" |
sed -e "s%<REGION_TOKEN>%$REGION%g" > ${tmpdir}/${template}

echo "Uploading template file to: ${s3_template}"
aws s3 cp ${tmpdir}/${template} ${s3_template}
echo "Validating template"
aws cloudformation validate-template --template-url ${https_template} > /dev/null || exit 1
echo "Validated: ${https_template}"

if $PUBLIC; then
echo "Setting public read ACLs on published artifacts"
files=$(aws s3api list-objects --bucket ${BUCKET} --prefix ${PREFIX} --query "(Contents)[].[Key]" --output text)
for file in $files
do
aws s3api put-object-acl --acl public-read --bucket ${BUCKET} --key $file
done
fi

echo Published $NAME - Template URL: $https_template
exit 0

Loading

0 comments on commit 4f177e5

Please sign in to comment.