Updated to 2.3.6

Author: ChrisMaunder

.gitignore

@@ -292,35 +292,24 @@ ASALocalRun/
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
 
-# Heat Generated Wix files.
-**/*Files.wxs
-
 *.DS_Store
 
 /demos/Python/detected
 /demos/Python/Vision/detected
 
 /Installers/downloads
 
-/Installers/Windows/Python37.Installer/Python37Files.wxs
-/Installers/Windows/Python37.Installer/PythonSdkFiles.wxs
-/Installers/Windows/BackgroundRemover.Installer/BackgroundRemoverFiles.wxs
-/Installers/Windows/CodeProjectAI.Server.Installer/FrontendInstallFiles.wxs
-/Installers/Windows/DeepStack.Installer/DeepStackFiles.wxs
-/Installers/Windows/ObjectDetectionYolo.Installer/ObjectDetectionYoloFiles.wxs
-/Installers/Windows/ObjectDetectionYolo.Installer/ObjectDetectionYoloFiles.wxs
-/Installers/Windows/PortraitFilter.Installer/PortraitFilterInstallFiles.wxs
-/Installers/Windows/Python37.Installer/Python37Files.wxs
-/Installers/Windows/PortraitFilter.Installer/PortraitFilterInstallFiles.wxs
-/Installers/Windows/CodeProjectAI.Server.Installer/DemoImangesFiles.wxs
-/Installers/Windows/Python39.Installer/Python39Files.wxs
-/Installers/Windows/YoloNet.Installer/YoloNetInstallFiles.wxs
-
-/Installers/zlib123dllx64.zip
-/Installers/cudnn-windows-x86_64-8.5.0.96_cuda11-archive.zip
-
-/src/API/Server/FrontEnd/installconfig.json
-/src/API/Server/FrontEnd/modules.json
+/Installers/macOS/application
+/Installers/macOS/target
+/Installers/macOS/*.pkg
+/Installers/macOS/CodeProject.AI-Server_*_macOS_*.zip
+/Installers/Ubuntu/*.deb
+/Installers/Ubuntu/codeproject.ai-server_*_Ubuntu_*.zip
+/Installers/Windows/Inno Setup/Output
+/Installers/Windows/Inno Setup/assets/dotnet-hosting-*.exe
+/Installers/Windows/WIX Toolset/CodeProjectAI.Server.Installer/ServerInstallFiles.wxs
+
+/src/server/installconfig.json
 
 # keep the folder structure but don't git commit the cached downloads
 !/src/downloads
@@ -332,10 +321,13 @@ MigrationBackup/
 # Downloaded assets for modules
 /src/modules/ALPR/paddleocr
 /src/modules/ALPR/plate.png
+/src/modules/ALPR-RKNN/paddleocr
+/src/modules/ALPR-RKNN/plate.png
 /src/modules/BackgroundRemover/models
 /src/modules/Cartooniser/weights
 /src/modules/FaceProcessing/assets
 /src/modules/FaceProcessing/datastore/
+/src/modules/LlamaChat/models/
 /src/modules/ObjectDetectionCoral/assets
 src/modules/ObjectDetectionCoral/edgetpu_runtime
 src/modules/ObjectDetectionCoral/libedgetpu.*
@@ -344,7 +336,6 @@ src/modules/ObjectDetectionCoral/libedgetpu.*
 /src/modules/ObjectDetectionNet/LocalNugets
 src/modules/ObjectDetectionYoloRKNN/assets
 src/modules/ObjectDetectionYoloRKNN/custom-models
-/src/modules/ObjectDetectionTFLite/assets
 /src/modules/ObjectDetectionYolo/assets
 /src/modules/ObjectDetectionYolo/custom-models
 /src/modules/OCR/paddleocr
@@ -361,23 +352,16 @@ src/modules/ObjectDetectionYoloRKNN/custom-models
 /src/modules/YOLOv5-3.1/windows_packages_cpu
 /src/modules/YOLOv5-3.1/windows_packages_gpu
 
-# Generated module packages
-/src/modules/ALPR/ALPR-[0-9].[0-9].zip
-/src/modules/BackgroundRemover/BackgroundRemover-[0-9].[0-9].zip
-/src/modules/Cartooniser/Cartooniser-[0-9].[0-9].zip
-/src/modules/FaceProcessing/FaceProcessing-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-CPU-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-OpenVINO-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-DirectML-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-CUDA-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-CPU-[0-9].[0-9].zip
-/src/modules/ObjectDetectionTFLite/ObjectDetectionTFLite-1.0.zip
+# Generated exe packages
+/src/modules/ObjectDetectionNet/ObjectDetectionNet-*-[0-9].[0-9].zip
+/src/modules/ObjectDetectionNet/ObjectDetectionNet-*-[0-9].[0-9].[0-9].zip
 /src/modules/ObjectDetectionYolo/ObjectDetectionYolo-[0-9].[0-9].zip
-/src/modules/OCR/OCR-[0-9].[0-9].zip
-/src/modules/PortraitFilter/PortraitFilter-[0-9].[0-9].zip
-/src/modules/SceneClassifier/SceneClassifier-[0-9].[0-9].zip
-/src/modules/SentimentAnalysis/SentimentAnalysis-[0-9].[0-9].zip
-/src/modules/SuperResolution/SuperResolution-[0-9].[0-9].zip
-/src/modules/TextSummary/TextSummary-[0-9].[0-9].zip
-/src/modules/YOLOv5-3.1/YOLOv5-3.1-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-1.1.zip
+/src/modules/ObjectDetectionYolo/ObjectDetectionYolo-[0-9].[0-9].[0-9].zip
+
+# The compiled form of the ParseJSON utility. We move it for convenience
+/src/SDK/Utilities/ParseJSON/ParseJSON
+/src/SDK/Utilities/ParseJSON/ParseJSON.exe
+src/SDK/Utilities/ParseJSON/ParseJSON.deps.json
+src/SDK/Utilities/ParseJSON/ParseJSON.dll
+src/SDK/Utilities/ParseJSON/ParseJSON.runtimeconfig.json
+src/SDK/Utilities/ParseJSON/ParseJSON.xml

.vscode/launch.docker.json

@@ -89,7 +89,7 @@
             },
             "name": "ALPR",
             "type": "python",
-            "python": "python3.8",
+            "python": "/app/modules/ALPR/bin/linux/python38/venv/bin/python",
             "request": "launch",
             "program": "ALPR_adapter.py",
             "console": "integratedTerminal",
@@ -109,7 +109,7 @@
             },
             "name": "Cartooniser",
             "type": "python",
-            "python": "python3.9",
+            "python": "/app/modules/Cartooniser/bin/linux/python38/venv/bin/python",
             "request": "launch",
             "program": "cartooniser_adapter.py",
             "console": "integratedTerminal",
@@ -166,27 +166,6 @@
             }
         },
 
-        {
-            "presentation": {
-                "group": "5 Launch Individual",
-                "hidden": false
-            },
-            "name": "Object Detect TFLite",
-            "type": "python",
-            "request": "launch",
-            "python": "python3.9",
-            "program": "objectdetection_tflite_adapter.py",
-            "cwd": "/app/modules/ObjectDetectionTFLite",
-            "console": "integratedTerminal",
-            "justMyCode": false,
-            "env": {
-                "DEBUG_IN_VSCODE": "True",
-                "RUNNING_IN_VSCODE": "True",
-                "CPAI_PORT": "32168",
-                "CPAI_MODULE_QUEUENAME": "objectdetection_queue"
-            }
-        },
-
         {
             "presentation": {
                 "group": "5 Launch Individual",
@@ -248,14 +227,36 @@
             }
         },
 
+{
+            "presentation": {
+                "group": "5 Launch Individual",
+                "hidden": false
+            },
+            "name": "Portrait Filter",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "/app/modules/PortraitFilter/PortraitFilter",
+            "args": [],
+            "cwd": "/app/modules/PortraitFilter",
+            "stopAtEntry": false,
+            "console": "internalConsole",
+            "requireExactSource": false,
+            "justMyCode": false,
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development",
+                "RUNNING_IN_VSCODE": "true",
+                "DOTNET_NOLOGO": "true"
+            }
+        },
+
         {
             "presentation": {
                 "group": "5 Launch Individual",
                 "hidden": false
             },
             "name": "Scene Classifier",
             "type": "python",
-            "python": "/app/modules/SceneClassifier/bin/linux/python38/venv/bin/python",
+            "python": "python3.8",
             "request": "launch",
             "program": "scene_adapter.py",
             "console": "integratedTerminal",
@@ -328,7 +329,9 @@
             "env": {
                 "DEBUG_IN_VSCODE": "True",
                 "RUNNING_IN_VSCODE": "True",
-                "CPAI_PORT": "32168"
+                "CPAI_PORT": "32168",
+                
+                "NLTK_DATA": "/app/modules/TextSummary/nltk_data"
             }
         }
     ]