Merge pull request #336 from microsoft/vNext-Dev

0.4-Delta Release
microsoft · Nov 14, 2023 · 0cc8d71 · 0cc8d71
2 parents c3347fd + 979166a
commit 0cc8d71
Show file tree

Hide file tree

Showing 151 changed files with 5,683 additions and 2,168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,14 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Models
+
+models
+
+# Image tags
+
+image_tag.txt
+
 # Mono auto generated files
 mono_crash.*
 
@@ -374,4 +382,7 @@ app/backend/lib
 app/backend/lib64
 app/backend/shared_code
 
-packages-microsoft*
+packages-microsoft*
+
+# docker container build artifacts
+app/enrichment/shared_code
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,15 +4,9 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+
         {
-            "name": "Python: Current File",
-            "type": "python",
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "Python: Flask",
+            "name": "Python: WebApp backend",
             "type": "python",
             "request": "launch",
             "module": "flask",
@@ -33,6 +27,34 @@
             "envFile": "${workspaceFolder}/scripts/environments/infrastructure.debug.env",
             "preLaunchTask": "pip_install"
         },
+        {
+            "name": "Python: Enrichment Webapp",
+            "type": "python",
+            "request": "launch",
+            "module": "uvicorn",
+            "args": [
+                "app:app",
+                "--reload",
+                "--port",
+                "5001"
+            ],
+            "cwd": "${workspaceFolder}/app/enrichment",
+            "console": "integratedTerminal",
+            "justMyCode": true,
+            "envFile": "${workspaceFolder}/scripts/environments/infrastructure.debug.env",
+            "preLaunchTask": "pip_install_enrichment"
+        },
+        {
+            "name": "Vite: Debug",
+            "type": "msedge",
+            "request": "launch",
+            "url": "http://localhost:5000",
+            "webRoot": "${workspaceFolder}/app/backend/static",
+            "sourceMapPathOverrides": {
+              "webpack:///src/*": "${webRoot}/*"
+            },
+            "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
+        },
         {
             "name": "Frontend: watch",
             "type": "node",
@@ -65,15 +87,44 @@
             "preLaunchTask": "func host start"
         },
         {
-            "name": "Vite: Debug",
-            "type": "msedge",
+            "name": "Debug functional tests",
+            "type": "python",
             "request": "launch",
-            "url": "http://localhost:5000",
-            "webRoot": "${workspaceFolder}/app/backend/static",
-            "sourceMapPathOverrides": {
-              "webpack:///src/*": "${webRoot}/*"
+            "program": "debug_tests.py",
+            "args": [
+                "--storage_account_connection_str",
+                "${env:STORAGE_ACCOUNT_CONNECTION_STR},",
+                "--search_service_endpoint",
+                "${env:SEARCH_SERVICE_ENDPOINT}",
+                "--search_index",
+                "${env:SEARCH_INDEX}",
+                "--search_key",
+                "${env:SEARCH_KEY}",
+                "--wait_time_seconds",
+                "60"
+            ],
+            "env": {
+                "STORAGE_ACCOUNT_CONNECTION_STR": "${env:BLOB_CONNECTION_STRING}",
+                "SEARCH_SERVICE_ENDPOINT": "${env:AZURE_SEARCH_SERVICE_ENDPOINT}",
+                "SEARCH_INDEX": "${env:AZURE_SEARCH_INDEX}",
+                "SEARCH_KEY": "${env:AZURE_SEARCH_SERVICE_KEY}"
             },
-            "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
+            "cwd": "${workspaceFolder}/tests",
+            "envFile": "${workspaceFolder}/scripts/environments/infrastructure.debug.env",
+            "preLaunchTask": "pip_install_func_tests",
+            "presentation": {
+                "hidden": false,
+                "group": "",
+                "order": 1,
+                "panel": "shared"
+            }
+        },
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -19,6 +19,45 @@
         "clear": false
       }
     },
+    {
+      "label": "pip_install_enrichment",
+      "type": "shell",
+      "command": "pip",
+      "args": [
+        "install",
+        "-r",
+        "${workspaceFolder}/app/enrichment/requirements.txt"
+      ],
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      }
+    },
+    {
+      "label": "pip_install_func_tests",
+      "type": "shell",
+      "command": "pip",
+      "args": [
+        "install",
+        "-r",
+        "${workspaceFolder}/tests/requirements.txt"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/tests",
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      }
+    },
     {
       "type": "func",
       "label": "func host start",

diff --git a/Makefile b/Makefile
@@ -9,23 +9,33 @@ help: ## Show this help
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%s\033[0m|%s\n", $$1, $$2}' \
         | column -t -s '|'
 
-deploy: build infrastructure extract-env deploy-search-indexes deploy-webapp deploy-functions ## Deploy infrastructure and application code
+deploy: build infrastructure extract-env deploy-enrichments deploy-search-indexes deploy-webapp deploy-functions ## Deploy infrastructure and application code
 
+build-deploy-webapp: build extract-env deploy-webapp ##Build and Deploy the Webapp
+build-deploy-enrichments: build extract-env deploy-enrichments ##Build and Deploy the Enrichment Webapp
+build-deploy-functions: build extract-env deploy-functions ##Build and Deploy the Functions
+
 build: ## Build application code
 	@./scripts/build.sh
 
+build-containers: extract-env
+	@./app/enrichment/docker-build.sh
+
 infrastructure: check-subscription ## Deploy infrastructure
 	@./scripts/inf-create.sh
 
 extract-env: extract-env-debug-webapp extract-env-debug-functions ## Extract infrastructure.env file from BICEP output
-	@./scripts/json-to-env.sh < infra_output.json > ./scripts/environments/infrastructure.env
+	 @./scripts/json-to-env.sh < infra_output.json > ./scripts/environments/infrastructure.env
 
 deploy-webapp: extract-env ## Deploys the web app code to Azure App Service
 	@./scripts/deploy-webapp.sh
 
 deploy-functions: extract-env ## Deploys the function code to Azure Function Host
 	@./scripts/deploy-functions.sh
 
+deploy-enrichments: extract-env ## Deploys the web app code to Azure App Service
+	@./scripts/deploy-enrichment-webapp.sh
+
 deploy-search-indexes: extract-env ## Deploy search indexes
 	@./scripts/deploy-search-indexes.sh
 
@@ -45,3 +55,7 @@ take-dir-ownership:
 
 destroy-inf: check-subscription
 	@./scripts/inf-destroy.sh
+
+functional-tests: extract-env ## Run functional tests to check the processing pipeline is working
+	@./scripts/functional-tests.sh	
+