Skip to content

Commit 4ccbd7f

Browse files
ChrisMaunderChrisMaunder
committed
Added backend Yolo / updated dashboard / logging
1 parent 64a0b23 commit 4ccbd7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2229
-443
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,3 +383,8 @@ FodyWeavers.xsd
383383
/CodeProject.SenseAI.config
384384
/CodeProject.SenseAI.json
385385
/src/API/Server/FrontEnd/installconfig.json
386+
/install/downloads/yoloModels
387+
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/weights
388+
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5s.onnx
389+
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5n.onnx
390+
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5m.onnx

‎CodeProject.SenseAI.sln‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "install", "install", "{D885
3333
install\Start_SenseAI_Win.bat = install\Start_SenseAI_Win.bat
3434
EndProjectSection
3535
EndProject
36-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "downloads", "downloads", "{7250A438-7B43-4FED-BB2B-9FB1FB2F69AF}"
37-
EndProject
3836
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DeepStack", "src\AnalysisLayer\DeepStack\intelligencelayer\DeepStack.pyproj", "{E5D27495-EE4F-4AAF-8749-A6BA848111E2}"
3937
EndProject
4038
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Javascript", "Javascript", "{3A860CDD-94B9-4002-BA08-87E8822DDE50}"
@@ -85,11 +83,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{B1
8583
EndProject
8684
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.SenseAI.Playground", "demos\dotNet\CodeProject.SenseAI.Playground\CodeProject.SenseAI.Playground.csproj", "{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}"
8785
EndProject
88-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common","src\API\Common\Common.csproj", "{CEECDD90-4400-436D-A369-DB216B21FD93}"
86+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "src\API\Common\Common.csproj", "{CEECDD90-4400-436D-A369-DB216B21FD93}"
8987
EndProject
9088
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{93A23681-E9E8-4381-9EB5-8D178A0EE785}"
9189
EndProject
9290
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Frontend", "src\API\Server\FrontEnd\Frontend.csproj", "{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}"
91+
ProjectSection(ProjectDependencies) = postProject
92+
{232710A8-9180-4139-8FF2-8F21F649D927} = {232710A8-9180-4139-8FF2-8F21F649D927}
93+
EndProjectSection
9394
EndProject
9495
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backend", "src\API\Server\Backend\Backend.csproj", "{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}"
9596
EndProject
@@ -116,42 +117,88 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
116117
global.json = global.json
117118
EndProjectSection
118119
EndProject
119-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.SenseAI.Analysis.Yolo", "src\AnalysisLayer\CodeProject.SenseAI.Backend.Yolo\CodeProject.SenseAI.Analysis.Yolo.csproj", "{D9FF21D8-A953-405B-84D7-41D7F1EDA96D}"
120+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.SenseAI.AnalysisLayer.Yolo", "src\AnalysisLayer\CodeProject.SenseAI.AnalysisLayer.Yolo\CodeProject.SenseAI.AnalysisLayer.Yolo.csproj", "{232710A8-9180-4139-8FF2-8F21F649D927}"
121+
EndProject
122+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{FF0C329F-41E8-4540-BCDB-97690911077D}"
123+
EndProject
124+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ModelRunners", "ModelRunners", "{55C41D48-17AC-4ED5-9440-B42AF65CCE4E}"
125+
EndProject
126+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Yolov5Net.Scorer", "Yolov5Net.Scorer", "{7E981C51-DADD-4047-AF5B-21B0E3442B99}"
127+
EndProject
128+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yolov5Net.Scorer", "src\AnalysisLayer\SDK\ModelRunners\Yolov5Net.Scorer\Yolov5Net.Scorer.csproj", "{7DC0A312-39AD-41B0-BB53-72ACACC76959}"
120129
EndProject
121130
Global
122131
GlobalSection(SolutionConfigurationPlatforms) = preSolution
123132
Debug|Any CPU = Debug|Any CPU
133+
Debug|x86 = Debug|x86
124134
Release|Any CPU = Release|Any CPU
135+
Release|x86 = Release|x86
125136
EndGlobalSection
126137
GlobalSection(ProjectConfigurationPlatforms) = postSolution
127138
{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139+
{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Debug|x86.ActiveCfg = Debug|Any CPU
128140
{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|Any CPU.ActiveCfg = Release|Any CPU
141+
{25750BF1-1502-4F65-8D69-CEA8C87D6446}.Release|x86.ActiveCfg = Release|Any CPU
129142
{E5D27495-EE4F-4AAF-8749-A6BA848111E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143+
{E5D27495-EE4F-4AAF-8749-A6BA848111E2}.Debug|x86.ActiveCfg = Debug|Any CPU
130144
{E5D27495-EE4F-4AAF-8749-A6BA848111E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{E5D27495-EE4F-4AAF-8749-A6BA848111E2}.Release|x86.ActiveCfg = Release|Any CPU
131146
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
132147
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
148+
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
149+
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Debug|x86.Build.0 = Debug|Any CPU
133150
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
134151
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Release|x86.ActiveCfg = Release|Any CPU
153+
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B}.Release|x86.Build.0 = Release|Any CPU
135154
{CEECDD90-4400-436D-A369-DB216B21FD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
136155
{CEECDD90-4400-436D-A369-DB216B21FD93}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{CEECDD90-4400-436D-A369-DB216B21FD93}.Debug|x86.ActiveCfg = Debug|Any CPU
157+
{CEECDD90-4400-436D-A369-DB216B21FD93}.Debug|x86.Build.0 = Debug|Any CPU
137158
{CEECDD90-4400-436D-A369-DB216B21FD93}.Release|Any CPU.ActiveCfg = Release|Any CPU
138159
{CEECDD90-4400-436D-A369-DB216B21FD93}.Release|Any CPU.Build.0 = Release|Any CPU
160+
{CEECDD90-4400-436D-A369-DB216B21FD93}.Release|x86.ActiveCfg = Release|Any CPU
161+
{CEECDD90-4400-436D-A369-DB216B21FD93}.Release|x86.Build.0 = Release|Any CPU
139162
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
140163
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
164+
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Debug|x86.ActiveCfg = Debug|Any CPU
165+
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Debug|x86.Build.0 = Debug|Any CPU
141166
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
142167
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Release|Any CPU.Build.0 = Release|Any CPU
168+
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Release|x86.ActiveCfg = Release|Any CPU
169+
{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}.Release|x86.Build.0 = Release|Any CPU
143170
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
144171
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
172+
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Debug|x86.ActiveCfg = Debug|Any CPU
173+
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Debug|x86.Build.0 = Debug|Any CPU
145174
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
146175
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Release|Any CPU.Build.0 = Release|Any CPU
176+
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Release|x86.ActiveCfg = Release|Any CPU
177+
{C93C22D7-4EB2-4EC0-A7F0-FBCFB9F6F72D}.Release|x86.Build.0 = Release|Any CPU
147178
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148179
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
180+
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Debug|x86.ActiveCfg = Debug|Any CPU
181+
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Debug|x86.Build.0 = Debug|Any CPU
149182
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
150183
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Release|Any CPU.Build.0 = Release|Any CPU
151-
{D9FF21D8-A953-405B-84D7-41D7F1EDA96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152-
{D9FF21D8-A953-405B-84D7-41D7F1EDA96D}.Debug|Any CPU.Build.0 = Debug|Any CPU
153-
{D9FF21D8-A953-405B-84D7-41D7F1EDA96D}.Release|Any CPU.ActiveCfg = Release|Any CPU
154-
{D9FF21D8-A953-405B-84D7-41D7F1EDA96D}.Release|Any CPU.Build.0 = Release|Any CPU
184+
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Release|x86.ActiveCfg = Release|Any CPU
185+
{F9430C77-589D-4C56-8458-2DF7E344C0FC}.Release|x86.Build.0 = Release|Any CPU
186+
{232710A8-9180-4139-8FF2-8F21F649D927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187+
{232710A8-9180-4139-8FF2-8F21F649D927}.Debug|Any CPU.Build.0 = Debug|Any CPU
188+
{232710A8-9180-4139-8FF2-8F21F649D927}.Debug|x86.ActiveCfg = Debug|Any CPU
189+
{232710A8-9180-4139-8FF2-8F21F649D927}.Debug|x86.Build.0 = Debug|Any CPU
190+
{232710A8-9180-4139-8FF2-8F21F649D927}.Release|Any CPU.ActiveCfg = Release|Any CPU
191+
{232710A8-9180-4139-8FF2-8F21F649D927}.Release|Any CPU.Build.0 = Release|Any CPU
192+
{232710A8-9180-4139-8FF2-8F21F649D927}.Release|x86.ActiveCfg = Release|Any CPU
193+
{232710A8-9180-4139-8FF2-8F21F649D927}.Release|x86.Build.0 = Release|Any CPU
194+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
195+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Debug|Any CPU.Build.0 = Debug|Any CPU
196+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Debug|x86.ActiveCfg = Debug|Any CPU
197+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Debug|x86.Build.0 = Debug|Any CPU
198+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|Any CPU.ActiveCfg = Release|Any CPU
199+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|Any CPU.Build.0 = Release|Any CPU
200+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|x86.ActiveCfg = Release|Any CPU
201+
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|x86.Build.0 = Release|Any CPU
155202
EndGlobalSection
156203
GlobalSection(SolutionProperties) = preSolution
157204
HideSolutionNode = FALSE
@@ -160,7 +207,6 @@ Global
160207
{25750BF1-1502-4F65-8D69-CEA8C87D6446} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
161208
{2379A486-0D28-4CAD-BB13-E77FBA538E0D} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
162209
{156BFEDA-D477-43B2-92DA-FCC9BAF1F893} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
163-
{7250A438-7B43-4FED-BB2B-9FB1FB2F69AF} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
164210
{E5D27495-EE4F-4AAF-8749-A6BA848111E2} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
165211
{3A860CDD-94B9-4002-BA08-87E8822DDE50} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
166212
{1912618E-7942-4BB0-BC2B-7F48A38D1049} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
@@ -173,7 +219,11 @@ Global
173219
{F9430C77-589D-4C56-8458-2DF7E344C0FC} = {D982BD8C-2257-413B-8513-8043AB3035F3}
174220
{8C92DCAE-EDE7-4DEC-A5CB-BB2388905064} = {3BF27572-9D3A-497C-8375-29110EBBD3D1}
175221
{CB26AB5B-DB85-4A59-A3AE-FA55A35D05B0} = {3A860CDD-94B9-4002-BA08-87E8822DDE50}
176-
{D9FF21D8-A953-405B-84D7-41D7F1EDA96D} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
222+
{232710A8-9180-4139-8FF2-8F21F649D927} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
223+
{FF0C329F-41E8-4540-BCDB-97690911077D} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
224+
{55C41D48-17AC-4ED5-9440-B42AF65CCE4E} = {FF0C329F-41E8-4540-BCDB-97690911077D}
225+
{7E981C51-DADD-4047-AF5B-21B0E3442B99} = {55C41D48-17AC-4ED5-9440-B42AF65CCE4E}
226+
{7DC0A312-39AD-41B0-BB53-72ACACC76959} = {7E981C51-DADD-4047-AF5B-21B0E3442B99}
177227
EndGlobalSection
178228
GlobalSection(ExtensibilityGlobals) = postSolution
179229
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ If you wish to debug or make enhancements to the code then you should install:
9696

9797
1. **Visual Studio Code** or **Visual Studio 2019+**. [VS Code](https://code.visualstudio.com/download) is available on Windows, macOS and Linux. Visual Studio is available on Windows and macOS. We've tested against both, but not against other IDEs at this point
9898
2. **Python**. Either via the Visual Studio Installer, or [download python directly](https://www.python.org/downloads/)
99-
3. **.NET 5** Download [.NET 5 here](https://dotnet.microsoft.com/download/dotnet/5.0).
99+
3. **.NET 6 SDK** Download the [.NET SDK 6 here](https://dotnet.microsoft.com/download/dotnet/6.0). (**Note** You on;y need .NET 6 when creating an installer. [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0) is fine for setting up and running an installed version, and for developing and debugging the code)
100100

101101
#### If you are using VS Code
102102

‎demos/dotNet/CodeProject.SenseAI.Playground/Form1.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demos/dotNet/CodeProject.SenseAI.Playground/Properties/launchSettings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"CodeProject.SenseAI.Playground": {
4+
"commandName": "Project",
5+
"commandLineArgs": "--MODE=high"
6+
}
7+
}
8+
}

‎docs/Welcome.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</div>
5858

5959
<h1>Introducing CodeProject SenseAI</h1>
60-
<div style="margin: -15px 0 20px 0;"><code>Alpha 1.0</code></div>
60+
<div style="margin: -15px 0 20px 0;"><code>Beta 2</code></div>
6161

6262
<p>Our standalone, self-hosted, fast, free and Open Source Artificial Intelligence microserver
6363
for any platform, any language.</p>

‎global.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"sdk": {
3-
"version": "5.0.404"
4-
}
2+
"sdk": {
3+
"version": "6.0.101"
4+
// "version": "5.0.404" // If you wish to use .NET 5, but remember to disable the check for .NET 6 in install/create_installer
5+
}
56
}

‎install/Setup_SenseAI_Win.bat‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,13 @@ set deepstackDir=DeepStack
7777
set pythonDir=python37
7878

7979
:: The name of the dir containing the AI models themselves (within the deepstack dir)
80-
set modelsDir=assets
80+
set deepStackModelsDir=assets
81+
82+
:: The name of the dir holding the DeepStack modules (within the analysis services dir)
83+
set yoloNetDir=CodeProject.SenseAI.AnalysisLayer.Yolo
84+
85+
:: The name of the dir containing the AI models themselves (within the yolo.net dir)
86+
set yoloNetModelsDir=assets
8187

8288
:: Set the noise level when installing Python packages
8389
set pipFlags=-q
@@ -90,12 +96,16 @@ if /i "%verbosity%" == "info" set pipFlags=
9096
set analysisPath=%srcDir%\%analysisLayerDir%
9197

9298
:: Module 1: Deepstack
93-
set deepStackPath=%cd%\%analysisPath%\DeepStack
99+
set deepStackPath=%cd%\%analysisPath%\%deepstackDir%
100+
101+
:: Module 2: Yolo.net
102+
set yoloNetPath=%cd%\%analysisPath%\%yoloNetDir%
94103

95104
:: Warn the user about potential download size
96105
set /a downloadSize=0
97106
if not exist "%deepStackPath%\%pythonDir%" set /a downloadSize=downloadSize+25
98-
if not exist "%deepStackPath%\%modelsDir%" set /a downloadSize=downloadSize+550
107+
if not exist "%deepStackPath%\%deepStackModelsDir%" set /a downloadSize=downloadSize+550
108+
if not exist "%yoloNetPath%\%yoloNetModelsDir%" set /a downloadSize=downloadSize+98
99109

100110
if !downloadSize! gtr 0 (
101111
choice /M "To continue I need to download !downloadSize!Mb of files. Is this OK"
@@ -110,12 +120,19 @@ if exist "%deepStackPath%\%pythonDir%" (
110120
call :Download "%storageUrl%" "%deepStackPath%\" python37.zip "%pythonDir%" ^
111121
"Downloading Python interpreter..."
112122
)
113-
if exist "%deepStackPath%\%modelsDir%" (
114-
call :Write White "Checking AI Models..."
123+
if exist "%deepStackPath%\%deepStackModelsDir%" (
124+
call :Write White "Checking Module 1 AI Models..."
125+
call :WriteLine Green "Present"
126+
) else (
127+
call :Download "%storageUrl%" "%deepStackPath%\" models.zip "%deepStackModelsDir%" ^
128+
"Downloading Module 1 AI Models..."
129+
)
130+
if exist "%yoloNetPath%\%yoloNetModelsDir%" (
131+
call :Write White "Checking Module 2 AI Models..."
115132
call :WriteLine Green "Present"
116133
) else (
117-
call :Download "%storageUrl%" "%deepStackPath%\" models.zip "%modelsDir%" ^
118-
"Downloading AI Models..."
134+
call :Download "%storageUrl%" "%yoloNetPath%\" yolonet-models.zip "%yoloNetModelsDir%" ^
135+
"Downloading Module 2 AI Models..."
119136
)
120137

121138
:: ----------------------------------------------------------------------------

‎install/Start_SenseAI_Win.bat‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ if "%verbosity%" NEQ "quiet" (
105105
call :WriteLine DarkGreen " CPSENSEAI_ANALYSISDIR = !CPSENSEAI_ANALYSISDIR!
106106
call :WriteLine DarkGreen " CPSENSEAI_PORT = !PORT!
107107
call :WriteLine DarkGreen " CPSENSEAI_PROFILE = !PROFILE!
108-
call :WriteLine DarkGreen " CPSENSEAI_MODULES = !CPSENSEAI_MODULES!
109108
call :WriteLine DarkGreen " CPSENSEAI_PRODUCTION = !CPSENSEAI_PRODUCTION!
110109
call :WriteLine DarkGreen " CPSENSEAI_CONFIG = !CPSENSEAI_CONFIG!
111110
call :WriteLine DarkGreen " CPSENSEAI_BUILDSERVER = !CPSENSEAI_BUILDSERVER!
@@ -116,9 +115,6 @@ if "%verbosity%" NEQ "quiet" (
116115
call :WriteLine DarkGreen " DATA_DIR = !DATA_DIR!"
117116
call :WriteLine DarkGreen " TEMP_PATH = !TEMP_PATH!"
118117
call :WriteLine DarkGreen " PORT = !PORT!"
119-
call :WriteLine DarkGreen " VISION_FACE = !VISION_FACE!"
120-
call :WriteLine DarkGreen " VISION_DETECTION = !VISION_DETECTION!"
121-
call :WriteLine DarkGreen " VISION_SCENE = !VISION_SCENE!"
122118
REM call :WriteLine Yellow "Module: CodeProject YOLO"
123119
REM call :WriteLine DarkGreen ...
124120
)
@@ -162,35 +158,6 @@ if "%verbosity%"=="loud" where Python.exe
162158
:: ============================================================================
163159
:: 3. Start front end server
164160

165-
:: a. Startup the backend Analysis services
166-
167-
:: The API now starts up all dependent services itself. No need to manually
168-
:: start up the python modules anymore.
169-
set startPythonDirectly=false
170-
171-
if "%startPythonDirectly%" == "true" (
172-
call :Write White "Starting Analysis Services..."
173-
if /i "!VISION_DETECTION!" == "true" (
174-
START "CodeProject SenseAI Analysis Services" /B python "!APPDIR!\detection.py"
175-
)
176-
if /i "!VISION_FACE!" == "true" (
177-
START "CodeProject SenseAI Analysis Services" /B python "!APPDIR!\face.py"
178-
)
179-
if /i "!VISION_SCENE!" == "true" (
180-
START "CodeProject SenseAI Analysis Services" /B python "!APPDIR!\scene.py"
181-
)
182-
REM To start them all in one fell swoop...
183-
REM START "CodeProject SenseAI Analysis Services" /B python "!APPDIR!\runAll.py"
184-
call :WriteLine Green "Done"
185-
)
186-
187-
:: b. Build and startup the API server
188-
189-
set featureFlags=
190-
if /i "!VISION_FACE!" == "true" set featureFlags=!featureFlags! --VISION-FACE true
191-
if /i "!VISION_DETECTION!" == "true" set featureFlags=!featureFlags! --VISION-DETECTION true
192-
if /i "!VISION_SCENE!" == "true" set featureFlags=!featureFlags! --VISION-SCENE true
193-
194161
:: In an installed, Production version of SenseAI, the server exe sits directly
195162
:: in the /src/Server/Frontend folder. For the development environment the
196163
:: server exe is in /src/Server/Frontend/bin/Debug/... folder. Hence we need to
@@ -222,7 +189,7 @@ if /i "!CPSENSEAI_PRODUCTION!" == "true" (
222189

223190
call :WriteLine Yellow "Launching CodeProject.SenseAI Server"
224191

225-
"!appExe!" !featureFlags! --urls http://*:%port%
192+
"!appExe!" --urls http://*:%port%
226193

227194
:: Pause and let backend services catch up (to be controlled via messages soon)
228195
if "%startPythonDirectly %" == "true" Timeout /T 5 /NOBREAK >nul 2>nul

0 commit comments

Comments
 (0)