merging main and fix scripts

dantelmomsft · dantelmomsft · commit 20ffbeccabba · 2024-01-19T16:07:30.000+01:00
diff --git a/.github/workflows/app-ci.yaml b/.github/workflows/app-ci.yaml
@@ -7,7 +7,7 @@ on:
     paths:
       - "app/**"
     tags:        
-      - v.*.*.*
+      - v*.*.*
   workflow_dispatch:
 
 jobs:
diff --git a/README.md b/README.md
diff --git a/app/backend/pom.xml b/app/backend/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.microsoft.openai.samples.rag</groupId>
 	<artifactId>search-demo-java</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>openai-search-demo-java</name>
 	<description>This sample demonstrates a few approaches for creating ChatGPT-like experiences over your own data using the Retrieval Augmented Generation pattern</description>
 	<properties>
diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -14,24 +14,24 @@
   "dependencies": {
     "@azure/msal-react": "^2.0.4",
     "@azure/msal-browser": "^3.1.0",
-    "@fluentui/react": "^8.112.3",
-    "@fluentui/react-components": "^9.35.0",
-    "@fluentui/react-icons": "^2.0.220",
+    "@fluentui/react": "^8.112.5",
+    "@fluentui/react-components": "^9.37.3",
+    "@fluentui/react-icons": "^2.0.221",
     "@react-spring/web": "^9.7.3",
     "dompurify": "^3.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.18.0",
     "ndjson-readablestream": "^1.0.7",
     "scheduler": "^0.20.2"
   },
   "devDependencies": {
     "@types/dompurify": "^3.0.3",
-    "@types/react": "^18.2.28",
-    "@types/react-dom": "^18.2.13",
-    "@vitejs/plugin-react": "^4.1.0",
+    "@types/react": "^18.2.34",
+    "@types/react-dom": "^18.2.14",
+    "@vitejs/plugin-react": "^4.1.1",
     "prettier": "^3.0.3",
     "typescript": "^5.2.2",
-    "vite": "^4.4.11"
+    "vite": "^4.5.0"
   }
 }
diff --git a/app/indexer/cli/dependency-reduced-pom.xml b/app/indexer/cli/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>indexer-parent</artifactId>
     <groupId>com.microsoft.openai.samples</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>indexer-cli</artifactId>
diff --git a/app/indexer/cli/pom.xml b/app/indexer/cli/pom.xml
@@ -7,7 +7,7 @@
      <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
   
@@ -22,7 +22,7 @@
 <dependency>
   <groupId>com.microsoft.openai.samples</groupId>
   <artifactId>indexer-core</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   </dependency>
 </dependencies>
 
diff --git a/app/indexer/core/pom.xml b/app/indexer/core/pom.xml
@@ -7,7 +7,7 @@
      <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
    
diff --git a/app/indexer/functions/pom.xml b/app/indexer/functions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.microsoft.openai.samples</groupId>
         <artifactId>indexer-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
   
diff --git a/app/indexer/microservice/pom.xml b/app/indexer/microservice/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.microsoft.openai.samples</groupId>
     <artifactId>indexer-microservice</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
 
     <properties>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.microsoft.openai.samples</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/app/indexer/pom.xml b/app/indexer/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.openai.samples</groupId>
     <artifactId>indexer-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/deploy/app-service/azure.yaml b/deploy/app-service/azure.yaml
@@ -2,6 +2,7 @@
 
 name: azure-search-openai-demo
 metadata:
+
   template: azure-search-openai-demo-java@1.2.0-alpha
 services:
   backend:
@@ -12,12 +13,12 @@ services:
       prepackage:
         windows:
           shell: pwsh
-          run:  cd ../frontend;npm install;npm run build
+          run:  cd ../frontend;npm install;npm run build; cp -r ./build/* ../backend/src/main/resources/static
           interactive: true
           continueOnError: false
         posix:
           shell: sh
-          run:  cd ../frontend;npm install;npm run build
+          run:  cd ../frontend;npm install;npm run build; cp -r ./build/* ../backend/src/main/resources/static
           interactive: true
           continueOnError: false
 
diff --git a/deploy/app-service/infra/main.bicep b/deploy/app-service/infra/main.bicep
@@ -61,11 +61,11 @@ param formRecognizerResourceGroupLocation string = location
 param formRecognizerSkuName string = 'S0'
 
 param chatGptDeploymentName string // Set in main.parameters.json
-param chatGptDeploymentCapacity int = 30
+param chatGptDeploymentCapacity int = 60
 param chatGptModelName string = 'gpt-35-turbo'
 param chatGptModelVersion string = '0613'
 param embeddingDeploymentName string // Set in main.parameters.json
-param embeddingDeploymentCapacity int = 30
+param embeddingDeploymentCapacity int = 80
 param embeddingModelName string = 'text-embedding-ada-002'
 
 // Used for the optional login and document level access control system
diff --git a/deploy/app-service/scripts/prepdocs.sh b/deploy/app-service/scripts/prepdocs.sh
@@ -6,15 +6,14 @@ echo ""
 
 while IFS='=' read -r key value; do
     value=$(echo "$value" | sed 's/^"//' | sed 's/"$//')
-    echo "$key=$value"
     export "$key=$value"
 done <<EOF
 $(azd env get-values)
 EOF
 
 
 echo 'Building java indexer'
-mvn package -f ./app/indexer/pom.xml
+mvn package -f ../../app/indexer/pom.xml
 
 echo 'Running the java indexer cli.jar'
-java -jar ./app/indexer/cli/target/cli.jar './data' --verbose --storageaccount "$AZURE_STORAGE_ACCOUNT" --container "$AZURE_STORAGE_CONTAINER" --searchservice "$AZURE_SEARCH_SERVICE"  --openai-service-name "$AZURE_OPENAI_SERVICE"  --openai-emb-deployment "$AZURE_OPENAI_EMB_DEPLOYMENT"  --index "$AZURE_SEARCH_INDEX" --formrecognizerservice "$AZURE_FORMRECOGNIZER_SERVICE"  add
+java -jar ../../app/indexer/cli/target/cli.jar '../../data' --verbose --storageaccount "$AZURE_STORAGE_ACCOUNT" --container "$AZURE_STORAGE_CONTAINER" --searchservice "$AZURE_SEARCH_SERVICE"  --openai-service-name "$AZURE_OPENAI_SERVICE"  --openai-emb-deployment "$AZURE_OPENAI_EMB_DEPLOYMENT"  --index "$AZURE_SEARCH_INDEX" --formrecognizerservice "$AZURE_FORMRECOGNIZER_SERVICE"  add
diff --git a/docs/prepdocs-success.png b/docs/prepdocs-success.png
