Naming / Comments

Author: ChrisMaunder

.vscode/settings.json

@@ -41,6 +41,7 @@
         "deserialising",
         "deskew",
         "Dgram",
+        "distutils",
         "downloadables",
         "downsampling",
         "dtype",

src/demos/modules/DotNetSimple/install.bat

@@ -1,6 +1,6 @@
 :: Installation script :::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-::                           .NET YOLO Object Detection
+::                           .NET Simple Demo
 ::
 :: This script is only called from ..\..\..\setup.bat 
 ::
@@ -13,7 +13,10 @@
     @goto:eof
 ) 
 if /i "!executionEnvironment!" == "Production" (
-    call "!utilsScript!" WriteLine "No custom setup steps for this module." "!color_info!"
+    REM Often we just pull down the pre-compiled binaries from the CDN when in
+    REM production. This saves having to install the .NET SDK. This is a demo so
+    REM do nothing here.
+    call "!utilsScript!" WriteLine "Production install not supported" "!color_info!"
 ) else (
     :: If we're in dev-setup mode we'll build the module now so the self-test will work
     pushd "!moduleDirPath!"

src/demos/modules/DotNetSimple/install.sh

@@ -2,9 +2,9 @@
 
 # Development mode setup script ::::::::::::::::::::::::::::::::::::::::::::::
 #
-#                            .NET YOLO Object Detection
+#                            .NET Simple Demo
 #
-# This script is called from the ObjectDetectionYOLOv5Net directory using: 
+# This script is called from the DotNetSimple directory using: 
 #
 #    bash ../../../setup.sh
 #
@@ -20,13 +20,23 @@ if [ "$1" != "install" ]; then
 fi
 
 # Pull down the correct .NET executable for this module
-if [ "${executionEnvironment}" = "Production" ] || [ "${launchedBy}" = "server" ]; then
-    imageName="${moduleId}-${moduleVersion}.zip"
-    getFromServer "binaries/" "${imageName}" "bin" "Downloading ${imageName}..."
+if [ "${executionEnvironment}" = "Production" ]; then
+    # Often we just pull down the pre-compiled binaries from the CDN when in
+    # production. This saves having to install the .NET SDK. This is a demo so
+    # do nothing here.
+
+    # imageName="${moduleId}-${moduleVersion}.zip"
+    # getFromServer "binaries/" "${imageName}" "bin" "Downloading ${imageName}..."
+
+    writeLine "Production install not supported." "$color_info"
 else
     pushd "$moduleDirPath" >/dev/null
     writeLine "Building project..." "$color_info"
-    dotnet build -c Debug -o "${moduleDirPath}/bin/Debug/${dotNetTarget}" >/dev/null
+    if [ $verbosity = "quiet" ]; then
+        dotnet build -c Debug -o "${moduleDirPath}/bin/Debug/${dotNetTarget}" >/dev/null
+    else
+        dotnet build -c Debug -o "${moduleDirPath}/bin/Debug/${dotNetTarget}"
+    fi
     popd >/dev/null
 fi
 

src/demos/modules/PythonSimple/install.bat

@@ -1,6 +1,6 @@
 :: Installation script :::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-::                           Object Detection (YOLOv8)
+::                           Python Simple Demo
 ::
 :: This script is only called from ..\..\..\setup.bat 
 ::

src/demos/modules/PythonSimple/install.sh

@@ -2,9 +2,9 @@
 
 # Development mode setup script ::::::::::::::::::::::::::::::::::::::::::::::
 #
-#                            Object Detection (YOLOv8)
+#                            Python Simple Demo
 #
-# This script is called from the ObjectDetectionYOLOv8 directory using: 
+# This script is called from the /demos/modules/PythonSimple directory using: 
 #
 #    bash ../../../setup.sh
 #

src/demos/modules/PythonSimple/modulesettings.json

@@ -141,7 +141,7 @@
           "Method": "POST",
           "Command": "custom",
           "MeshEnabled": false,
-          "Description": "Detects objects based on YOLO PyTorch models. Models are stored as .pt files in the /ObjectDetectionYOLOv8/assets directory, and to make a call to a specific model use /vision/custom/model-name, where 'model-name' is the name of the model's .pt file",
+          "Description": "Detects objects based on YOLO PyTorch models. Models are stored as .pt files in the /PythonSimple/assets directory, and to make a call to a specific model use /vision/custom/model-name, where 'model-name' is the name of the model's .pt file",
           "Inputs": [
             {
               "Name": "image",

src/demos/modules/PythonSimple/post_install.bat

@@ -1,6 +1,6 @@
 :: Post-Installation script ::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-::                       Object Detection (YOLOv8)
+::                       Python Simple
 ::
 :: The setup.bat file will find this post_install.bat file and execute it.
 ::