Move acme-assist to apps folder (#20)

.gitignore

@@ -9,7 +9,7 @@ azure/setup-env-variables.sh
 azure/setup-db-env-variables.sh
 azure/setup-sso-variables.sh
 azure/setup-env-variables-keyvault.sh
-ai/setup-ai-env-variables.sh
+azure/setup-ai-env-variables.sh
 redis.json
 ad.json
 sso.json

ai/acme-assist/.gitignore → apps/acme-assist/.gitignore

@@ -1,5 +1,6 @@
 HELP.md
 target/
+*.sql
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

ai/README.md → apps/acme-assist/README.md

@@ -9,8 +9,9 @@
 
 
 ## Prepare the Environment Variables
+1. Please navigate to the root folder of this project.
 1. Run `cp azure/setup-env-variables-template.sh azure/setup-env-variables.sh` and update the values in `setup-env-variables.sh` with your own values.
-1. Run `cp ai/setup-ai-env-variables-template.sh ai/setup-ai-env-variables.sh` and update the values in `setup-ai-env-variables.sh` with your own values.
+1. Run `cp azure/setup-ai-env-variables-template.sh azure/setup-ai-env-variables.sh` and update the values in `setup-ai-env-variables.sh` with your own values.
 
 
 ## Prepare Azure OpenAI Service
@@ -29,7 +30,7 @@
       --custom-domain ${OPENAI_RESOURCE_NAME}   
    ```
 
-1. Create the model deployments for `text-embedding-ada-002` and `gpt-35-turbo` in your Azure OpenAI service.
+1. Create the model deployments for `text-embedding-ada-002` and `gpt-35-turbo-16k` in your Azure OpenAI service.
    ```bash
    az cognitiveservices account deployment create \
       -g ${RESOURCE_GROUP} \
@@ -53,18 +54,17 @@
 
 Before building the `assist-service` service, we need to preprocess the data into the vector store. The vector store is a file that contains the vector representation of each product description. There's already a pre-built file `vector_store.json` in the repo so you can skip this step. If you want to build the vector store yourself, please run the following commands:
 ```bash
-cd ai && source ./setup-ai-env-variables.sh
-cd acme-assist
-./preprocess.sh ../data/bikes.json,../data/accessories.json src/main/resources/vector_store.json
+source ./azure/setup-ai-env-variables.sh
+cd apps\acme-assist
+./preprocess.sh data/bikes.json,data/accessories.json src/main/resources/vector_store.json
 ```
 
 
 ## Build and deploy to Azure Spring Apps
 
 1. Prepare the new sample data and images:
    ```bash
-   cd ai && ./prepare_data.sh
-   cd ..
+   ./apps/acme-assist/prepare_data.sh
    ```.
 1. Redeploy `catalog-service` with the new resources:
     ```bash
@@ -76,15 +76,14 @@ cd acme-assist
     ```
 1. Deploy the new ai service `assist-service` :
     ```bash
-    cd ai
-    source ./setup-ai-env-variables.sh
+    source ./azure/setup-ai-env-variables.sh
     az spring app create --name ${AI_APP} --instance-count 1 --memory 1Gi
     az spring gateway route-config create \
         --name ${AI_APP} \
         --app-name ${AI_APP} \
-        --routes-file assist-service.json
+        --routes-file azure/routes/assist-service.json
     az spring app deploy --name ${AI_APP} \
-        --source-path acme-assist \
+        --source-path apps/acme-assist \
         --build-env BP_JVM_VERSION=17 \
         --env AZURE_OPENAI_ENDPOINT=${AZURE_OPENAI_ENDPOINT} AZURE_OPENAI_APIKEY=${AZURE_OPENAI_APIKEY} AZURE_OPENAI_CHATDEPLOYMENTID=${AZURE_OPENAI_CHATDEPLOYMENTID} AZURE_OPENAI_EMBEDDINGDEPLOYMENTID=${AZURE_OPENAI_EMBEDDINGDEPLOYMENTID}
     ```

ai/generate_db_migration.py → apps/acme-assist/generate_db_migration.py

@@ -8,7 +8,7 @@ def single_quote(raw):
     return "'" + raw.replace("'", "''") + "'"
 
 def generate_sql(category):
-    data=json.load(open('data/' + category + '.json','r+'))
+    data=json.load(open(category,'r+'))
 
     sql = 'INSERT INTO CATALOG (id,  description,  image_url1,  image_url2,  image_url3,  name,  price,  short_description,  tags)\nVALUES'
 
@@ -34,5 +34,5 @@ def generate_sql(category):
     print(sql)
 
 if __name__ == '__main__':
-    generate_sql('bikes')
-    generate_sql('accessories')
+    generate_sql('data/bikes.json')
+    generate_sql('data/accessories.json')

apps/acme-assist/prepare_data.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+INITIAL_WORKING_DIRECTORY=$(pwd)
+cd "$(dirname "$0")"
+python ./generate_db_migration.py > ./V1_1__insert_products.sql
+mv ./*.sql ../acme-catalog/src/main/resources/db/migration
+cp ./data/images/* ../acme-catalog/src/main/resources/static/
+cd $INITIAL_WORKING_DIRECTORY