Updated to 1.6.5

Author: ChrisMaunder

.gitignore

@@ -375,3 +375,4 @@ FodyWeavers.xsd
 
 *.DS_Store
 
+/demos/Python/Vision/detected

.vscode/launch.json

@@ -144,7 +144,7 @@
         {
             "name": "Python 3.7/3.8: Current File",
             "type": "python",
-            "python": "${workspaceFolder}/src/AnalysisLayer/bin/windows/python37/venv/bin/python",
+            "python": "${workspaceFolder}/src/AnalysisLayer/bin/windows/python37/venv/Scripts/python",
             "request": "launch",
             "program": "${file}",
             "console": "integratedTerminal",

CodeProject.AI.sln

@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D982BD8C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demos", "demos", "{7F18EB64-C857-49C4-9380-70D3CCE6242B}"
 EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Python", "demos\Python\Python.pyproj", "{25750BF1-1502-4F65-8D69-CEA8C87D6446}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "API", "API", "{2379A486-0D28-4CAD-BB13-E77FBA538E0D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnalysisLayer", "AnalysisLayer", "{156BFEDA-D477-43B2-92DA-FCC9BAF1F893}"
@@ -198,6 +196,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.AI.API.Server.B
 EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ObjectDetectionYolo", "src\AnalysisLayer\ObjectDetectionYolo\ObjectDetectionYolo.pyproj", "{B6A1D372-264E-4F66-B7FB-7FF19587476F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{37533562-EC4C-4FB4-8C42-FE327D1D79BD}"
+EndProject
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Python", "demos\Python\Vision\Python.pyproj", "{25750BF1-1502-4F65-8D69-CEA8C87D6446}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -206,10 +208,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|x86.ActiveCfg = Release|Any CPU
 		{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -310,12 +308,15 @@ Global
 		{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|x86.ActiveCfg = Release|Any CPU
+		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{25750BF1-1502-4F65-8D69-CEA8C87D6446} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
 		{2379A486-0D28-4CAD-BB13-E77FBA538E0D} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
 		{156BFEDA-D477-43B2-92DA-FCC9BAF1F893} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
 		{3A860CDD-94B9-4002-BA08-87E8822DDE50} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
@@ -350,6 +351,8 @@ Global
 		{25D75AFE-BEC9-43BF-BE44-B9068FF8E395} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
 		{031F17E0-BE84-42AF-B9FE-4F928CB03D1B} = {D982BD8C-2257-413B-8513-8043AB3035F3}
 		{B6A1D372-264E-4F66-B7FB-7FF19587476F} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
+		{37533562-EC4C-4FB4-8C42-FE327D1D79BD} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
+		{25750BF1-1502-4F65-8D69-CEA8C87D6446} = {37533562-EC4C-4FB4-8C42-FE327D1D79BD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}

Installers/Dev/clean.bat

@@ -167,19 +167,19 @@ goto:eof
         if /i "!dirMatched!" == "true" (
 
             if /i "!doDebug!" == "true" (
-                call %pwd%\utils.bat WriteLine "Marked for removal: !dirName!" !color_error!
+                call %pwd%\utils.bat WriteLine "Marked for removal: !dirName!" "!color_error!"
             ) else (
                 rmdir /s /q "!dirName!";
 
                 if exist "!dirName!" (
-                    call %pwd%\utils.bat WriteLine "Unable to remove !dirName!"  !color_error!
+                    call %pwd%\utils.bat WriteLine "Unable to remove !dirName!"  "!color_error!"
                 ) else (
-                    call %pwd%\utils.bat WriteLine "Removed !dirName!" !color_success!
+                    call %pwd%\utils.bat WriteLine "Removed !dirName!" "!color_success!"
                 )
             )
         ) else (
             if /i "!doDebug!" == "true" (
-                call %pwd%\utils.bat WriteLine "Not deleting !dirName!" !color_success!
+                call %pwd%\utils.bat WriteLine "Not deleting !dirName!" "!color_success!"
             )
         )
     )
@@ -194,7 +194,7 @@ goto:eof
 
     pushd "!BasePath!"  >nul 2>nul
     if not "%errorlevel%" == "0" (
-        call %pwd%\utils.bat WriteLine "Can't navigate to %cd%!BasePath!" "Red"
+        call %pwd%\utils.bat WriteLine "Can't navigate to %cd%!BasePath! (but that's probably OK)" "!color_warn!"
         cd %pwd%
         exit /b %errorlevel%
     )

Installers/Dev/clean.sh

@@ -77,7 +77,7 @@ function cleanFiles() {
     pushd "${basePath}"  >/dev/null
 
     if [ $? -ne 0 ]; then
-        writeLine "Can't navigate to $(pwd)/${basePath}" $color_error
+        writeLine "Can't navigate to $(pwd)/${basePath} (but that's probably OK)" $color_warn
         popd  >/dev/null
         return
     fi

demos/Python/Python.pyproj demos/Python/Vision/Python.pyprojdemos/Python/Python.pyproj renamed to demos/Python/Vision/Python.pyproj

@@ -5,7 +5,7 @@
     <ProjectGuid>25750bf1-1502-4f65-8d69-cea8c87d6446</ProjectGuid>
     <ProjectHome>
     </ProjectHome>
-    <StartupFile>registeration.py</StartupFile>
+    <StartupFile>facevideo.py</StartupFile>
     <SearchPath>
     </SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
@@ -22,15 +22,9 @@
     <DebugSymbols>true</DebugSymbols>
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="detected\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="requirements.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="benchmark.py" />
-    <Compile Include="demoConfig.py" />
+    <Compile Include="options.py" />
     <Compile Include="detect.py" />
     <Compile Include="face.py" />
     <Compile Include="facevideo.py" />
@@ -40,7 +34,7 @@
     <Compile Include="scene.py" />
   </ItemGroup>
   <ItemGroup>
-    <Interpreter Include="..\..\src\AnalysisLayer\bin\windows\python37\venv\">
+    <Interpreter Include="..\..\..\src\AnalysisLayer\bin\windows\python37\venv\">
       <Id>env</Id>
       <Version>3.7</Version>
       <Description>env (Python 3.7 (64-bit))</Description>

demos/Python/benchmark.py demos/Python/Vision/benchmark.pydemos/Python/benchmark.py renamed to demos/Python/Vision/benchmark.py

@@ -8,18 +8,19 @@
 import argparse
 import time
 from pathlib import Path
-
 import requests
-import demoConfig as cfg
 
-# deepstack credentials
-DEFAULT_IP_ADDRESS    = cfg.serverHost
-DEFAULT_PORT          = cfg.serverPort
-DEFAULT_IMAGES_FOLDER = cfg.imageDir
+from options import Options
 
+opts = Options()
 
 def main():
-    parser = argparse.ArgumentParser(description="Perform benchmarking of DeepStack modules in CodeProject.AI")
+
+    DEFAULT_IP_ADDRESS    = opts.serverHost
+    DEFAULT_PORT          = opts.serverPort
+    DEFAULT_IMAGES_FOLDER = opts.imageDir + "/Objects"
+
+    parser = argparse.ArgumentParser(description="Perform benchmarking of CodeProject.AI Server")
     parser.add_argument(
         "--ip",
         default=DEFAULT_IP_ADDRESS,
@@ -32,9 +33,9 @@ def main():
         type=int,
         help="CodeProject.AI Server Port",
     )
-    parser.add_argument(
-        "--api_key", default=DEFAULT_API_KEY, type=str, help="Deepstack API key"
-    )
+    # parser.add_argument(
+    #    "--api_key", default=DEFAULT_API_KEY, type=str, help="Deepstack API key"
+    #)
     parser.add_argument(
         "--images_folder",
         default=DEFAULT_IMAGES_FOLDER,
@@ -51,26 +52,20 @@ def main():
 
     for i, img_path in enumerate(images):
         with open(img_path, "rb") as image_bytes:
-            response = requests.post(
-                cfg.serverUrl + "vision/detection",
-                files={"image": image_bytes},
-                data={"api_key": args.api_key},
-            )
+            response = requests.post(opts.endpoint("vision/detection"),
+                                     files={"image": image_bytes}).json()
 
-        predictions = response.json()["predictions"]
-        if (predictions == None):
-            predictions = []
+            predictions = response["predictions"]
+            if (predictions == None):
+                predictions = []
 
         total_predictions = total_predictions + len(predictions)
-        print(
-            f"Processed image number {i} : {str(img_path)}, {len(predictions)} predictions"
-        )
+        print(f"Processed image {i} : {img_path}, {len(predictions)} predictions")
 
     end_time = time.time()
     duration = end_time - start_time
-    print(
-        f"Processing completes in {round(duration, 5)} seconds, total of {total_predictions} predictions"
-    )
+
+    print(f"Completes in {round(duration, 2)} seconds, {total_predictions} predictions, {round(total_predictions/duration,1)} ops/sec")
 
 
 if __name__ == "__main__":

demos/Python/Vision/detect.py

@@ -0,0 +1,57 @@
+import os
+import requests
+from PIL import Image, ImageDraw
+
+from options import Options
+
+def main():
+
+    minConfidence = 0.4
+
+    opts = Options() 
+    opts.cleanDetectedDir()
+
+    imagedir = opts.imageDir + "/Objects"
+
+    # process all the files in the input directory and store the results in the 
+    # output directory
+    filelist = os.listdir(imagedir)
+
+    for filename in filelist:
+        if not filename.endswith(".jpg") and not filename.endswith(".png"):
+            continue
+
+        filepath = os.path.join(imagedir, filename)
+        image_data = open(filepath, "rb").read()
+        image      = Image.open(filepath).convert("RGB")
+
+        response = requests.post(opts.endpoint("vision/detection"),
+                                 files={"image": image_data},
+                                 data={"min_confidence": minConfidence}).json()
+
+        predictions = response["predictions"]
+        if (predictions is None):
+            predictions = []
+
+        print(f"Processed {filename}: {len(predictions)} predictions")
+
+        draw = ImageDraw.Draw(image)
+        for object in predictions:
+            label = object["label"]
+            conf  = object["confidence"]
+            y_max = int(object["y_max"])
+            y_min = int(object["y_min"])
+            x_max = int(object["x_max"])
+            x_min = int(object["x_min"])
+
+            draw.rectangle([(x_min, y_min), (x_max, y_max)], outline="red", width=5)
+            draw.text((x_min, y_min), f"{label}")
+            draw.text((x_min, y_min - 10), f"{round(conf*100.0,0)}")
+
+        (root, _) = os.path.splitext(filename)
+        savedName = f"{root}.jpg"
+        image.save(os.path.join(opts.detectedDir, savedName))
+
+
+if __name__ == "__main__":
+    main()

demos/Python/Vision/face.py

@@ -0,0 +1,41 @@
+import os
+import requests
+from PIL import Image
+from options import Options
+
+def main():
+
+    opts = Options()
+
+    filepath   = os.path.join(opts.imageDir + "/People and actions/",
+                              "pexels-polina-tankilevitch-5848781.jpg")
+    image_data = open(filepath, "rb").read()
+    image      = Image.open(filepath).convert("RGB")
+
+    opts.cleanDetectedDir()
+
+    response = requests.post(opts.endpoint("vision/face"),
+                             files = {"image": image_data}).json()
+
+    predictions = response["predictions"]
+    if (predictions is None):
+        predictions = []
+
+    print(f"Processed {filepath}: {len(predictions)} predictions")
+
+    i = 0
+    for face in predictions:
+
+        y_max = int(face["y_max"])
+        y_min = int(face["y_min"])
+        x_max = int(face["x_max"])
+        x_min = int(face["x_min"])
+        cropped = image.crop((x_min, y_min, x_max, y_max))
+
+        filepath = os.path.join(opts.detectedDir, "image{}.jpg".format(i))
+        cropped.save(filepath)
+
+        i += 1
+
+if __name__ == "__main__":
+    main()

demos/Python/Vision/facevideo.py

@@ -0,0 +1,55 @@
+# from https://github.com/DeepQuestAI/DeepStackExamples
+
+import cv2
+import requests
+from options import Options
+
+def main():
+
+    opts = Options()
+    cap = cv2.VideoCapture(0)
+
+    frame_index = 0
+    predictions = {}
+    skip_frame  = 5
+
+    while cap.isOpened():
+
+        if cv2.waitKey(1) & 0xFF == ord('q'):
+            break
+
+        valid, frame = cap.read()            
+        if not valid:
+            break;
+
+        frame_index += 1
+        
+        if skip_frame > 1:
+            if frame_index % skip_frame != 0:
+               continue;
+
+        retval, new_frame = cv2.imencode('.jpg', frame)
+
+        response = requests.post(opts.endpoint("vision/face"),
+                                 files={"image":new_frame}).json()
+
+        predictions = response['predictions']
+
+        print(f"Frame {frame_index}: {len(predictions)} predictions")
+
+        num_prediction_json = len(predictions)
+
+        for i in range(num_prediction_json):
+            red, green, blue = 200, 100, 200
+            frame = cv2.rectangle(frame, 
+                                  (predictions[i]['x_min'], predictions[i]['y_min']),
+                                  (predictions[i]['x_max'], predictions[i]['y_max']), 
+                                  (red, green, blue), 1)
+        
+        cv2.imshow('Image Viewer', frame)
+        
+    cap.release()
+    cv2.destroyAllWindows()
+
+if __name__ == "__main__":
+    main()