Skip to content

Commit 04b2114

Browse files
dingmeng-xueLGDoorasaikaliSneezrymarkpollack
authored
Updated architecture diagram and static content (#141)
* 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) * fix package names * fix package names and typos * SpringOne (#32) * Updated catalog app with new images. * Added Azure OpenAI integration. --------- 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]> Co-authored-by: Neven C <[email protected]>
1 parent 5018f8f commit 04b2114

Some content is hidden

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

63 files changed

+3593
-104
lines changed

README.md

+6-5

apps/acme-assist/preprocess.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
mvn spring-boot:run -Dstart-class=com.azure.acme.assist.tools.BuildVectorStoreApplication -Dspring-boot.run.arguments="--from=$1 --to=$2"
2+
mvn spring-boot:run -Dstart-class=com.example.acme.assist.tools.BuildVectorStoreApplication -Dspring-boot.run.arguments="--from=$1 --to=$2"

apps/acme-assist/src/main/java/com/example/acme/assist/FitAssistApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.context.annotation.FilterType;
88

99
@SpringBootApplication
10-
@ComponentScan(excludeFilters = @Filter(type = FilterType.REGEX, pattern = "com.azure.acme.assist.tools.*"))
10+
@ComponentScan(excludeFilters = @Filter(type = FilterType.REGEX, pattern = "com.example.acme.assist.tools.*"))
1111
public class FitAssistApplication {
1212

1313
public static void main(String[] args) {

apps/acme-assist/src/main/java/com/example/acme/assist/SuggestedPromptRepository.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public class SuggestedPromptRepository {
3030

3131
@PostConstruct
3232
private void loadSuggestedPrompts() {
33-
Resource resource = context.getResource("classpath:com/azure/acme/assist/suggested-prompts.json");
33+
Resource resource = context.getResource("classpath:com/example/acme/assist/suggested-prompts.json");
3434
List<SuggestedPrompts> list = null;
3535
try {
3636
ObjectMapper mapper = new ObjectMapper();
3737
list = mapper.readValue(resource.getInputStream(),
3838
mapper.getTypeFactory().constructCollectionType(List.class, SuggestedPrompts.class));
3939
} catch (Exception e) {
40-
log.warn("Cannot load suggested-prompots.json", e);
40+
log.warn("Cannot load suggested-prompts.json", e);
4141
}
4242

4343
if (list != null && list.size() > 0) {

apps/acme-assist/src/main/resources/prompts/product-detail.st

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
You are an AI assistant of this website named 'Acme Fitness Store', which sells bikes and accessories online.
2-
You helps people find information.
2+
You help people find information.
33
Please answer the questions based the following product details:
44
==================================
55
Name: {name}
@@ -10,4 +10,4 @@ Full description:
1010
{fullDescription}
1111
==================================
1212
Then try to improve your answer the following additional information:
13-
{additionalContext}
13+
{additionalContext}

apps/acme-catalog/src/main/resources/db/migration/V1_1__insert_products.sql

+3,369-81
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
The images in this folder are licensed by Adobe Stock with the following IDs:
2+
100585998
3+
106834048
4+
111499705
5+
114019337
6+
13339188
7+
135064792
8+
165912889
9+
168968951
10+
183460774
11+
19110860
12+
213608170
13+
217032642
14+
219803129
15+
222853589
16+
223518386
17+
224230716
18+
234956425
19+
243706736
20+
252033807
21+
265005019
22+
271761521
23+
272826797
24+
298948511
25+
314936263
26+
316404117
27+
316588306
28+
320558000
29+
33802539
30+
362479231
31+
373145010
32+
375466479
33+
386249288
34+
410023579
35+
415963107
36+
424844898
37+
433125047
38+
438151980
39+
44335020
40+
453913452
41+
48613584
42+
492536975
43+
51225145
44+
531544517
45+
564926658
46+
579346930
47+
585583092
48+
67798782
49+
76460186
50+
78740892
51+
89257290
52+
99053872

azure-spring-apps-enterprise/README.md

+148-10
-2.37 MB

azure-spring-apps-enterprise/scripts/setup-env-variables-ALL.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44

55
#set -x
66

7-
scriptz_array='[{"scriptName":"./setup-env-variables.sh"},{"scriptName":"./setup-sso-variables-ad.sh"},{"scriptName":"./setup-sso-variables.sh"},{"scriptName":"./setup-db-env-variables.sh"},{"scriptName":"./setup-storage-env-variables.sh"}]'
7+
scriptz_array='[
8+
{"scriptName":"./setup-env-variables.sh"},
9+
{"scriptName":"./setup-sso-variables-ad.sh"},
10+
{"scriptName":"./setup-sso-variables.sh"},
11+
{"scriptName":"./setup-db-env-variables.sh"},
12+
{"scriptName":"./setup-ai-env-variables.sh"},
13+
{"scriptName":"./setup-storage-env-variables.sh"}
14+
]'
815

916
usage(){
1017
echo " "

0 commit comments

Comments
 (0)