Skip to content

Commit

Permalink
Merge branch 'aws-solutions:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@myHerbDev
myHerbDev authored Nov 25, 2024
2 parents 222e613 + c8d4654 commit 2ae6a99
Show file tree
Hide file tree
Showing 405 changed files with 28,812 additions and 18,446 deletions.
26 changes: 23 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@ 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).

## [2.1.0] - 2024-11-20

### Added

- Support for using Amazon Bedrock Agents ([#49](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues/49)).
- Support for new LLMs available through Amazon Bedrock.
- Support for [Bedrock cross-region inference profiles](https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html).
- Support for using existing Amazon Cognito user pool configuration when deploying the application and its use cases ([#129](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/pull/129)).

### Changed

- Use [LCEL](https://python.langchain.com/docs/how_to/#langchain-expression-language-lcel) to replace LangChain `Chains` in the solution's implementation

### Fixed

- Fixed issue when removing a score threshold on an existing use case ([#154](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues/154)).

### Security

- Updated library versions to address security vulnerabilities

## [2.0.4] - 2024-09-26

### Security
Expand All @@ -31,8 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- With the release of [AWS-Solutions-Constructs v2.65.0](https://github.com/awslabs/aws-solutions-constructs/tree/main/source/patterns/%40aws-solutions-constructs/aws-apigatewayv2websocket-sqs), the AWS ApiGateway websocket integration with Amazon SQS Queue is available in the library. Hence the
implementation has been updated to use this construct.
- With the release of [AWS-Solutions-Constructs v2.65.0](https://github.com/awslabs/aws-solutions-constructs/tree/main/source/patterns/%40aws-solutions-constructs/aws-apigatewayv2websocket-sqs), the AWS ApiGateway websocket integration with Amazon SQS Queue is available in the library. Hence the implementation has been updated to use this construct.

### Fixed

Expand Down Expand Up @@ -223,4 +243,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Initial Release
- Initial Release
81 changes: 73 additions & 8 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This software includes third party software subject to the following copyrights:
@aws-lambda-powertools/metrics MIT
@aws-lambda-powertools/tracer MIT
@aws-sdk/client-cloudformation Apache-2.0
@aws-sdk/client-cognito-identity-provider Apache-2.0
@aws-sdk/client-dynamodb Apache-2.0
@aws-sdk/client-kendra Apache-2.0
@aws-sdk/client-s3 Apache-2.0
Expand All @@ -39,18 +40,38 @@ This software includes third party software subject to the following copyrights:
@aws-solutions-constructs/aws-wafwebacl-apigateway Apache-2.0
@aws-solutions-constructs/core Apache-2.0
@babel/plugin-proposal-private-property-in-object MIT
@balena/dockerignore Apache-2.0
@cloudscape-design/code-view Apache-2.0
@cloudscape-design/components Apache-2.0
@cloudscape-design/global-styles Apache-2.0
@middy/core MIT
@rollup/rollup-android-arm-eabi MIT
@rollup/rollup-android-arm64 MIT
@rollup/rollup-darwin-arm64 MIT
@rollup/rollup-darwin-x64 MIT
@rollup/rollup-linux-arm-gnueabihf MIT
@rollup/rollup-linux-arm-musleabihf MIT
@rollup/rollup-linux-arm64-gnu MIT
@rollup/rollup-linux-arm64-musl MIT
@rollup/rollup-linux-powerpc64le-gnu MIT
@rollup/rollup-linux-riscv64-gnu MIT
@rollup/rollup-linux-s390x-gnu MIT
@rollup/rollup-linux-x64-gnu MIT
@rollup/rollup-linux-x64-musl MIT
@rollup/rollup-win32-arm64-msvc MIT
@rollup/rollup-win32-ia32-msvc MIT
@rollup/rollup-win32-x64-msvc MIT
@smithy/types Apache-2.0
@tabler/icons-react MIT
@tailwindcss/typography MIT
@tanstack/react-query-devtools MIT
@tanstack/react-query MIT
@tanstack/react-query-devtools MIT
@testing-library/jest-dom MIT
@testing-library/react MIT
@testing-library/user-event MIT
@typescript-eslint/eslint-plugin MIT
@typescript-eslint/parser BSD-2-Clause
@types/aws-lambda MIT
@types/jest MIT
@types/lodash MIT
Expand All @@ -73,44 +94,55 @@ aiohttp Apache-2.0
aiosignal Apache-2.0
annotated-types MIT
anyio MIT
aproba ISC
are-we-there-yet ISC
astral-regex MIT
async-timeout Apache-2.0
attrs MIT
awscli Apache-2.0
aws-amplify Apache-2.0
aws-cdk-lib Apache-2.0
aws-jwt-verify Apache-2.0
aws-lambda-powertools==2.20.0 MIT
aws-sdk-client-mock MIT
aws-sdk-mock Apache-2.0
aws-xray-sdk==2.12.0 Apache-2.0
awscli Apache-2.0
axios MIT
black MIT
boolean.py BSD-2-Clause
bootstrap MIT
boto3 Apache-2.0
botocore Apache-2.0
cdk Apache-2.0
case MIT
cdk-nag Apache-2.0
cdk Apache-2.0
certifi MPL 2.0
cffi MIT
charset-normalizer MIT
click BSD License (BSD-3-Clause)
color-support ISC
colorama BSD License
console-control-strings ISC
constructs Apache-2.0
coverage Apache-2.0
cryptography Apache-2.0 OR BSD-3-Clause
dataclasses Apache-2.0
dataclasses-json MIT
docutils BSD License
dataclasses Apache-2.0
deep-diff MIT
distro Apache-2.0
docutils BSD License
eslint MIT
exceptiongroup MIT
fast-uri MIT
filelock Unlicense
freezegun Apache-2.0
frozenlist Apache-2.0
fs-extra MIT
fsspec BSD
gauge ISC
greenlet MIT
h11 MIT
has-unicode ISC
httpcore BSD License (BSD)
httpx BSD License
identity-obj-proxy MIT
Expand All @@ -119,23 +151,29 @@ importlib-metadata Apache-2.0
iniconfig MIT
isort MIT
jest MIT
Jinja2 BSD-3-Clause
jmespath MIT
json-schema-traverse MIT
jsonpatch BSD License
jsonpath-ng Apache2.0
jsonpointer BSD License
langchain MIT
jsonschema MIT
langchain-aws MIT
langchain-core MIT
langchain-text-splitters MIT
langchain MIT
langsmith MIT
license-expression Apache-2.0
lodash.truncate MIT
lodash MIT
MarkupSafe BSD-3-Clause
marshmallow MIT
mock BSD
mock-fs MIT
mock BSD
moto Apache-2.0
multidict Apache-2.0
mypy-extensions MIT
nanoid MIT
npmlog ISC
numexpr MIT
numpy BSD-3-Clause
Expand All @@ -148,32 +186,42 @@ pluggy MIT
ply BSD
portfinder MIT
prettier MIT
propcache Apache-2.0
pyasn1 BSD License (BSD-2-Clause)
pycparser BSD
pydantic MIT
pydantic_core MIT
pytest MIT
pytest-cov MIT
pytest-env MIT
pytest-mock MIT
pytest MIT
python-dateutil Apache 2.0, BSD License
PyYAML MIT
react MIT
react-bootstrap MIT
react-markdown MIT
react-router-dom MIT
react-scripts MIT
react-syntax-highlighter MIT
react-test-renderer MIT
rehype-external-links MIT
remark-gfm MIT
remark-math MIT
rehype-external-links MIT
requests-toolbelt Apache-2.0
requests Apache-2.0
require-from-string MIT
responses Apache-2.0
rollup MIT
rsa Apache-2.0
s3transfer Apache-2.0
setuptools MIT
six MIT
slice-ansi MIT
sniffio MIT OR Apache-2.0
source-map-support MIT
SQLAlchemy MIT
table BSD-3-Clause
tailwindcss MIT
tenacity Apache-2.0
tokenizers Apache-2.0
Expand All @@ -187,7 +235,24 @@ typing-inspect MIT
typing_extensions Python 2.0
urllib3 MIT
uuid MIT
Werkzeug BSD-3-Clause
wide-align ISC
wrapt BSD License
xmltodict MIT
PyYAML ISC
yarl Apache-2.0
zipp MIT
zipp MIT


********************
OPEN SOURCE LICENSES
********************

Apache-2.0 - https://spdx.org/licenses/Apache-2.0.html
BSD-2-Clause - https://spdx.org/licenses/BSD-2-Clause.html
BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
ISC - https://spdx.org/licenses/ISC.html
MIT - https://spdx.org/licenses/MIT.html
MPL-2.0 - https://spdx.org/licenses/MPL-2.0.html
Python-2.0 - https://spdx.org/licenses/Python-2.0.html
Unlicense - https://spdx.org/licenses/Unlicense.html
12 changes: 9 additions & 3 deletions SECURITY.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Reporting Security Issues
----------------------------------------------------------------------------------------------------------
We take all security reports seriously. When we receive such reports, we will investigate and subsequently address any potential vulnerabilities as quickly as possible. If you discover a potential security issue in this project, please notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to [AWS Security](mailto:[email protected]). Please do not create a public GitHub issue in this project.
## Reporting Security Issues

We take all security reports seriously. When we receive such reports,
we will investigate and subsequently address any potential vulnerabilities as
quickly as possible. If you discover a potential security issue in this project,
please notify AWS/Amazon Security via our [vulnerability reporting page]
(http://aws.amazon.com/security/vulnerability-reporting/) or directly via email
to [AWS Security](mailto:[email protected]).
Please do _not_ create a public GitHub issue in this project.
2 changes: 1 addition & 1 deletion deployment/build-s3-dist.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ set -e
# Check to see if input has been provided:
if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ]; then
echo "Please provide all required parameters for the build script"
echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v2.0.4 template-bucket-name"
echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v2.1.0 template-bucket-name"
exit 1
fi

Expand Down
21 changes: 2 additions & 19 deletions deployment/run-unit-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@ install_lambda_layer() {

setup_python_env

echo "Initiating virtual environment"
source .venv-test/bin/activate

echo "------------------------------------------------------------------------------"
echo "Check for vulnerabilities"
pip install pip-audit
pip-audit
echo "------------------------------------------------------------------------------"

echo "deactivate virtual environment"
deactivate

[ "${CLEAN:-true}" = "true" ] && rm -fr .venv-test
}

Expand All @@ -86,12 +74,6 @@ run_python_lambda_test() {
echo "Initiating virtual environment"
source .venv-test/bin/activate

echo "------------------------------------------------------------------------------"
echo "Check for vulnerabilities"
pip install pip-audit
pip-audit
echo "------------------------------------------------------------------------------"

# setup coverage report path
mkdir -p $source_dir/test/coverage-reports
coverage_report_path=$source_dir/test/coverage-reports/$lambda_name.coverage.xml
Expand Down Expand Up @@ -134,7 +116,7 @@ run_python_scripts_test() {
echo "Check for vulnerabilities"
pip install pip-audit
pip-audit
echo "------------------------------------------------------------------------------"
echo "------------------------------------------------------------------------------"

# setup coverage report path
mkdir -p $source_dir/test/coverage-reports
Expand Down Expand Up @@ -309,6 +291,7 @@ echo "Running unit test for lambda functions"
echo "---------------------------------------"

run_python_lambda_test chat "Chat Use Case"
run_python_lambda_test invoke-agent "Bedrock Agent"
run_javascript_lambda_test custom-authorizer "Custom Authorizer"
run_python_lambda_test custom-resource "Custom Resource"
run_python_lambda_test ext-idp-group-mapper "IDP Group Mapper for Cognito JWT pre-token generation"
Expand Down
Loading

0 comments on commit 2ae6a99

Please sign in to comment.