Skip to content

Commit 5018f8f

Browse files
dingmeng-xueLGDoorasaikaliSneezrymarkpollack
authored
Include acme-assist AI app (#139)
* Add AI backend and sample data. (#1) - Added a ChatGPT-like REST API which can chat with the user and answer the questions about the products. - Added brand new bikes and accessories with detailed specs and images. * Add 25 sample data and images for accessories. (#2) Co-authored-by: Raphael Yu <[email protected]> * Add frontend for AI (#5) Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> * Add pre-processing. (#6) * Add code for preprocessing. * Update the doc for preprocessing. * add license for the images. * Fix the data location. --------- Co-authored-by: Raphael Yu <[email protected]> * Update readme.md * add ai into home and cart * Tune the prompts. * update api * Rename the module and refactor code and API. (#8) * merge: refactor code and API update scripts update greeting message Update FAQ and images. * Reformat and add comments. --------- Co-authored-by: Dingmeng Xue <[email protected]> Co-authored-by: Raphael Yu <[email protected]> * update ui * update ui * bug fix * bugfix * update frontend * Add logging for execution time. * wording fix * move ai chat to nav bar * fix marked lib * fix marked lib * fix marked lib * fix marked lib * scroll top * Change to gpt-35-turbo-16k and provide more context. (#15) * Change to gpt-35-turbo-16k and provide more context. * fix README. --------- Co-authored-by: Raphael Yu <[email protected]> * update faq and fix minor issue * adding spring ai project, updates (#17) * -Initial Directory Setup. * -Added Initial README.md * Incremental Commit, separate TAP. * -Adjusted Image Reference. * -Incremental commit, folder adjusts. * -Incremental commit, fix Architecture Image. * -Incremental Commit. Refactored README.md files * -Incremental Commit. Updated Doc. * -Yanked depend-a-bot section from child pages. * -Yanked depend-a-bot section from child pages. * -Scripts folder take1 * updated stack to use jammy/base * removed extra scripts/builder.json file * updated az spring extension version and install steps * updated ignored files and paths * added output of env vars that are set * updateded sections * updated scripts and README.md * updated README.md * updated README.md * updated README.md * -Fix Unit1 anchor. * -Fix Unit1 anchor. * -Fix anchors. * -Fixed main page. * -Incremental commit. * Delete .vscode directory * -Yanked .vscode folder. * -Added eme script. * -Updated Doc * -Updated Doc. * -Yank X from template.sh files * -Updated SCGW commands. * -Updated SCGW commands. * -Updated deploy commands * -Updating SSO Steps. * -Updated setup-sso-variables-ad.sh. * -Yanked personal scriptfile. * -Updated script permissons. * -Updated README.md * -Updated README.md * -Updated README.md * -Updated README.md * -Updated README.md * -Updated templates. * -Updated README.md * -Updated README.md * -Updated README.md * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for PostGresDB. * -Updated doc for PostGresDB. * -Updated script templates. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated doc for RedisConnector. * -Updated doc for RedisConnector. * -Updated doc for Connectors. * -Updated doc for Connectors. * -Added Cumulative setup script. Doc Updates * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated GithubActions Workflows. * -Updated cleanup.yaml * Some minor fixes. * Remove lombok * update indentation * Update indentation * fix: the duplicated data bug. * Add actuator * update * Move acme-assist to apps folder (#20) * Move python file to subfolder (#21) * Fix floating issue when price is greater than 1000 (#22) * Move python file to subfolder * Fix floating issue when it is greater than 1000 * -Updated GithubActionsDoc. * -Added storage script template, instructions. * -Updated ALL script. * -Updated storage template script. * -Updated GithubActions doc * -Added storage script template, instructions. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Corrected WF name. * -Fix provision.yml * -Corrected pathing. * updated provision.yml * fixed path in provision.yml for gateway.sh * update cart python env for GHA * -Updated payment added BP_JVM flag * updated python setup for GHA * fix python setup for GHA * added BP_JVM_VERSION to catalog.yml * added BP_JVM_VERSION to identity.yml * -Refactored apps to root. * added BP_JVM_VERSION to order.yml * removed BP_JP_VERSION order.yml * removed env vars from order.yml * -Updating deploy scripts * -Updating deploy scripts * Polish readme.md * Polish Readme.md * Polish readme.md * Polish * Polish readme.md * Polish readme.md * remove out of date diagarm * Cleanup the docs for TAP * Polish TAP install docs * changed to use spring-ai 0.1.0-snapshot * Rebase SpringOne to Azure (#26) * -Initial Directory Setup. * -Added Initial README.md * Incremental Commit, separate TAP. * -Adjusted Image Reference. * -Incremental commit, folder adjusts. * -Incremental commit, fix Architecture Image. * -Incremental Commit. Refactored README.md files * -Incremental Commit. Updated Doc. * -Yanked depend-a-bot section from child pages. * -Yanked depend-a-bot section from child pages. * -Scripts folder take1 * updated stack to use jammy/base * removed extra scripts/builder.json file * updated az spring extension version and install steps * updated ignored files and paths * added output of env vars that are set * updateded sections * updated scripts and README.md * updated README.md * updated README.md * updated README.md * -Fix Unit1 anchor. * -Fix Unit1 anchor. * -Fix anchors. * -Fixed main page. * -Incremental commit. * Delete .vscode directory * -Yanked .vscode folder. * -Added eme script. * -Updated Doc * -Updated Doc. * -Yank X from template.sh files * -Updated SCGW commands. * -Updated SCGW commands. * -Updated deploy commands * -Updating SSO Steps. * -Updated setup-sso-variables-ad.sh. * -Yanked personal scriptfile. * -Updated script permissons. * -Updated README.md * -Updated README.md * -Updated README.md * -Updated README.md * -Updated README.md * -Updated templates. * -Updated README.md * -Updated README.md * -Updated README.md * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for IdentityService. * -Updated doc for PostGresDB. * -Updated doc for PostGresDB. * -Updated script templates. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated PG setup doc. * -Updated doc for RedisConnector. * -Updated doc for RedisConnector. * -Updated doc for Connectors. * -Updated doc for Connectors. * -Added Cumulative setup script. Doc Updates * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated Doc. * -Updated GithubActions Workflows. * -Updated cleanup.yaml * -Updated GithubActionsDoc. * -Added storage script template, instructions. * -Updated ALL script. * -Updated storage template script. * -Updated GithubActions doc * -Added storage script template, instructions. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Updated GitHubActions doc. * -Corrected WF name. * -Fix provision.yml * -Corrected pathing. * updated provision.yml * fixed path in provision.yml for gateway.sh * update cart python env for GHA * -Updated payment added BP_JVM flag * updated python setup for GHA * fix python setup for GHA * added BP_JVM_VERSION to catalog.yml * added BP_JVM_VERSION to identity.yml * -Refactored apps to root. * added BP_JVM_VERSION to order.yml * removed BP_JP_VERSION order.yml * removed env vars from order.yml * -Updating deploy scripts * -Updating deploy scripts * Polish readme.md * Polish Readme.md * Polish readme.md * Polish * Polish readme.md * Polish readme.md * remove out of date diagarm * Cleanup the docs for TAP * Polish TAP install docs * Add AI backend and sample data. (#1) - Added a ChatGPT-like REST API which can chat with the user and answer the questions about the products. - Added brand new bikes and accessories with detailed specs and images. * Add 25 sample data and images for accessories. (#2) Co-authored-by: Raphael Yu <[email protected]> * Add frontend for AI (#5) Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> * Add pre-processing. (#6) * Add code for preprocessing. * Update the doc for preprocessing. * add license for the images. * Fix the data location. --------- Co-authored-by: Raphael Yu <[email protected]> * Update readme.md * add ai into home and cart * Tune the prompts. * Rename the module and refactor code and API. (#8) * merge: refactor code and API update scripts update greeting message Update FAQ and images. * Reformat and add comments. --------- Co-authored-by: Dingmeng Xue <[email protected]> Co-authored-by: Raphael Yu <[email protected]> * update api * update ui * update ui * bug fix * bugfix * update frontend * Add logging for execution time. * wording fix * move ai chat to nav bar * fix marked lib * fix marked lib * fix marked lib * fix marked lib * scroll top * Change to gpt-35-turbo-16k and provide more context. (#15) * Change to gpt-35-turbo-16k and provide more context. * fix README. --------- Co-authored-by: Raphael Yu <[email protected]> * update faq and fix minor issue * Remove lombok * adding spring ai project, updates (#17) * Some minor fixes. * update indentation * Update indentation * fix: the duplicated data bug. * Add actuator * update * Move acme-assist to apps folder (#20) * Move python file to subfolder (#21) * Fix floating issue when price is greater than 1000 (#22) * Move python file to subfolder * Fix floating issue when it is greater than 1000 * changed to use spring-ai 0.1.0-snapshot * Fix path and do minor change after rebase --------- Co-authored-by: ericm48 <[email protected]> Co-authored-by: Anish Patel <anishs dot online dot bills at gmail.com> Co-authored-by: asaikali <[email protected]> Co-authored-by: Raphael Yu <[email protected]> Co-authored-by: Raphael Yu <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Mark Pollack <[email protected]> * Remove duplicated files (#28) * Remove duplicated files * Remove duplicated file * Refactor package name to com.example * make the maven project id match the directory name * refactor package name to com.example * refactor package name to com.example * refactor package name to com.example * Add pyenv file * add tap catalog info * Add instructions on how to run the shopping cart service locally * update workload yaml * Correct path of apps (#31) --------- Co-authored-by: Raphael Yu <[email protected]> Co-authored-by: Adib Saikali <[email protected]> Co-authored-by: Raphael Yu <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Zhe Li <[email protected]> Co-authored-by: Mark Pollack <[email protected]> Co-authored-by: ericm48 <[email protected]> Co-authored-by: Anish Patel <anishs dot online dot bills at gmail.com> Co-authored-by: asaikali <[email protected]>
1 parent cf24bd1 commit 5018f8f

File tree

337 files changed

+298157
-3450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+298157
-3450
lines changed

‎.github/workflows/cart.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ env:
1717
jobs:
1818
build:
1919
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
python-version: ["3.7"]
2023
defaults:
2124
run:
2225
working-directory: apps/acme-cart
2326
steps:
2427
- uses: actions/checkout@v3
2528
- name: Set up Python
26-
uses: actions/setup-python@v3
29+
uses: actions/setup-python@v4
30+
with:
31+
python-version: ${{ matrix.python-version }}
2732
- name: Install dependencies
2833
run: |
2934
python -m pip install --upgrade pip

‎.github/workflows/catalog.yml

+1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ jobs:
5151
--service "$SPRING_APPS_SERVICE" \
5252
--env "SPRING_CLOUD_AZURE_KEYVAULT_SECRET_PROPERTY_SOURCES_0_ENDPOINT=${keyvault_uri}" "SPRING_CLOUD_AZURE_KEYVAULT_SECRET_PROPERTY_SOURCES_0_NAME='acme-fitness-store-vault'" "SPRING_PROFILES_ACTIVE=default,key-vault" \
5353
--config-file-pattern catalog/default,catalog/key-vault \
54+
--build-env BP_JVM_VERSION=17 \
5455
--source-path ./

‎.github/workflows/cleanup.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
inputs: { }
55

66
jobs:
7-
destory:
7+
destroy:
88
runs-on: ubuntu-latest
99
defaults:
1010
run:
11-
working-directory: terraform
11+
working-directory: azure-spring-apps-enterprise/terraform
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Set up Credentials and Terraform Backend
15-
run: ../.github/scripts/prepare-configs.sh
15+
run: ../../.github/scripts/prepare-configs.sh
1616
env:
1717
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
1818
BACKEND_CONFIG: ${{ secrets.TF_BACKEND_CONFIG }}

‎.github/workflows/identity.yml

+1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ jobs:
5151
--service "$SPRING_APPS_SERVICE" \
5252
--env "SPRING_CLOUD_AZURE_KEYVAULT_SECRET_PROPERTY_SOURCES_0_ENDPOINT=${keyvault_uri}" "SPRING_CLOUD_AZURE_KEYVAULT_SECRET_PROPERTY_SOURCES_0_NAME='acme-fitness-store-vault'" "SPRING_PROFILES_ACTIVE=default,key-vault" \
5353
--config-file-pattern identity/default,identity/key-vault \
54+
--build-env BP_JVM_VERSION=17 \
5455
--source-path ./

‎.github/workflows/order.yml

-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ jobs:
5151
--resource-group "$RESOURCE_GROUP" \
5252
--service "$SPRING_APPS_SERVICE" \
5353
--builder ${CUSTOM_BUILDER} \
54-
--env "DatabaseProvider=Postgres" "AcmeServiceSettings__AuthUrl=https://${gateway_url}" "ConnectionStrings__KeyVaultUri=$keyvault_uri" \
5554
--source-path ./

‎.github/workflows/payment.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ jobs:
4545
--resource-group "$RESOURCE_GROUP" \
4646
--service "$SPRING_APPS_SERVICE" \
4747
--config-file-pattern payment/default \
48+
--build-env BP_JVM_VERSION=17 \
4849
--source-path ./

‎.github/workflows/provision.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ on:
66
branches:
77
- Azure
88
paths:
9-
- 'terraform/**'
10-
- 'azure/builder.json'
11-
- 'azure/routes/**'
9+
- 'azure-spring-apps-enterprise/terraform/**'
10+
- 'azure-spring-apps-enterprise/resources/json/tbs/builder.json'
11+
- 'azure-spring-apps-enterprise/resources/json/routes/**'
1212
env:
1313
SPRING_APPS_SERVICE: ${{ secrets.TF_PROJECT_NAME }}-asa
1414
RESOURCE_GROUP: ${{ secrets.TF_PROJECT_NAME }}-grp
@@ -24,11 +24,11 @@ jobs:
2424
runs-on: ubuntu-latest
2525
defaults:
2626
run:
27-
working-directory: terraform
27+
working-directory: azure-spring-apps-enterprise/terraform
2828
steps:
2929
- uses: actions/checkout@v3
3030
- name: Set up Credentials and Terraform Backend
31-
run: ../.github/scripts/prepare-configs.sh
31+
run: ../../.github/scripts/prepare-configs.sh
3232
env:
3333
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
3434
BACKEND_CONFIG: ${{ secrets.TF_BACKEND_CONFIG }}
@@ -68,8 +68,8 @@ jobs:
6868
- name: Set up Azure Spring Extension
6969
run: az extension add --name spring
7070
- name: Configure Spring Cloud Gateway
71-
working-directory: azure/routes
72-
run: ../../.github/scripts/gateway.sh
71+
working-directory: azure-spring-apps-enterprise/resources/json/routes
72+
run: ../../../../.github/scripts/gateway.sh
7373
env:
7474
RESOURCE_GROUP: ${{ env.RESOURCE_GROUP }}
7575
SPRING_APPS_SERVICE: ${{ env.SPRING_APPS_SERVICE }}
@@ -79,7 +79,7 @@ jobs:
7979
CATALOG_SERVICE_APP: ${{ env.CATALOG_SERVICE_APP }}
8080
FRONTEND_APP: ${{ env.FRONTEND_APP }}
8181
- name: Configure Identity Provider
82-
run: ../.github/scripts/identity-provider.sh
82+
run: ../../.github/scripts/identity-provider.sh
8383
env:
8484
RESOURCE_GROUP: ${{ env.RESOURCE_GROUP }}
8585
SPRING_APPS_SERVICE: ${{ env.SPRING_APPS_SERVICE }}

‎.gitignore

+8-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ __pycache__
55
custom-filters
66

77

8-
azure/setup-env-variables.sh
9-
azure/setup-db-env-variables.sh
10-
azure/setup-sso-variables.sh
11-
azure/setup-env-variables-keyvault.sh
8+
azure-spring-apps-enterprise/scripts/setup-env-variables.sh
9+
azure-spring-apps-enterprise/scripts/setup-db-env-variables.sh
10+
azure-spring-apps-enterprise/scripts/setup-sso-variables.sh
11+
azure-spring-apps-enterprise/scripts/setup-env-variables-keyvault.sh
12+
azure-spring-apps-enterprise/scripts/setup-ai-env-variables.sh
1213
redis.json
1314
ad.json
1415
sso.json
@@ -53,3 +54,6 @@ workshops/azure-spring-apps-enterprise/scripts/setup-keyvault-env-variables.sh
5354
scripts/setup-db-env-variables.sh
5455

5556
hello-world/
57+
58+
# vsCode
59+
.vscode

‎.vscode/settings.json

-4
This file was deleted.

0 commit comments

Comments
 (0)