Skip to content

Commit df1974b

Browse files
author
ChrisMaunder
committed
Version 1.5: rebrand, Custom models and leaner installer
1 parent c590e35 commit df1974b

File tree

333 files changed

+9447
-32664
lines changed

Some content is hidden

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

333 files changed

+9447
-32664
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,3 +392,10 @@ FodyWeavers.xsd
392392
*.DS_Store
393393
/src/AnalysisLayer/BackgroundRemover/models
394394
/docs/mkdocs/senseAI/site
395+
/src/AnalysisLayer/Vision/assets
396+
/src/AnalysisLayer/CustomDetection/assets/openlogo.pt
397+
/src/AnalysisLayer/CustomDetection/assets/actionnetv2.pt
398+
/src/AnalysisLayer/CustomDetection/assets/license-plate.pt
399+
/src/AnalysisLayer/CustomDetection/assets/yolov5m.pt
400+
/docs/mkdocs/CodeProject.AI/site
401+
/src/AnalysisLayer/CodeProject.AI.AnalysisLayer.Yolo/assets

‎.vscode/launch.json‎

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"request": "launch",
99
"preLaunchTask": "build-all-win",
1010
"program": "dotnet",
11-
"args": [ "--version" ],
11+
"args": [
12+
"--version"
13+
],
1214
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
1315
"stopAtEntry": false,
1416
"env": {
@@ -22,52 +24,53 @@
2224
"request": "launch",
2325
"preLaunchTask": "build-all-linux",
2426
"program": "dotnet",
25-
"args": [ "--version" ],
27+
"args": [
28+
"--version"
29+
],
2630
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
2731
"stopAtEntry": false,
2832
"env": {
2933
"ASPNETCORE_ENVIRONMENT": "Development"
3034
}
31-
},
35+
},
3236

3337
{
34-
"name": "Launch SenseAI (Win)",
38+
"name": "Launch CodeProject.AI (Win)",
3539
"type": "coreclr",
3640
"request": "launch",
3741
"preLaunchTask": "build-all-win",
38-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server.exe",
39-
"args" : [ ],
42+
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server.exe",
43+
"args": [],
4044
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
4145
"stopAtEntry": false,
42-
4346
"serverReadyAction": {
4447
"action": "openExternally",
4548
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
4649
"uriFormat": "http://localhost:%s/swagger"
4750
},
48-
51+
4952
"env": {
5053
"ASPNETCORE_ENVIRONMENT": "Development",
5154
"RUNNING_IN_VSCODE": "true"
5255
}
5356
},
5457

5558
{
56-
"name": "Launch SenseAI (Linux)",
59+
"name": "Launch CodeProject.AI (Linux/macOS)",
5760
"type": "coreclr",
5861
"request": "launch",
5962
"preLaunchTask": "build-all-linux",
60-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server",
61-
"args" : [ ],
63+
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
64+
"args": [],
6265
"cwd": "${workspaceFolder}",
6366
"stopAtEntry": false,
64-
67+
6568
"serverReadyAction": {
6669
"action": "openExternally",
6770
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
6871
"uriFormat": "http://localhost:%s/swagger"
6972
},
70-
73+
7174
"env": {
7275
"ASPNETCORE_ENVIRONMENT": "Development",
7376
"RUNNING_IN_VSCODE": "true"
@@ -78,25 +81,27 @@
7881
"moduleLoad": false,
7982
"exceptions": false,
8083
"browserStdOut": false
81-
},
84+
},
8285
},
8386

8487
{
8588
"name": "Launch Server & Modules separately",
8689
"type": "coreclr",
8790
"request": "launch",
8891
"preLaunchTask": "pre-launch-server-debug",
89-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server",
90-
"args" : [ "--LaunchAnalysisServices=false" ],
92+
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
93+
"args": [
94+
"--LaunchAnalysisServices=false"
95+
],
9196
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/",
9297
"stopAtEntry": false,
93-
98+
9499
"serverReadyAction": {
95100
"action": "openExternally",
96101
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
97102
"uriFormat": "http://localhost:%s/swagger"
98103
},
99-
104+
100105
"env": {
101106
"ASPNETCORE_ENVIRONMENT": "Development",
102107
"RUNNING_IN_VSCODE": "true"
@@ -107,18 +112,18 @@
107112
"moduleLoad": false,
108113
"exceptions": true,
109114
"browserStdOut": false
110-
},
115+
},
111116
},
112117

113118
{
114-
"name": "Launch SenseAI Playground (Win)",
119+
"name": "Launch CodeProject.AI Explorer (Win)",
115120
"type": "coreclr",
116121
"request": "launch",
117122
"preLaunchTask": "launch-server-win",
118123
// "windows": { - VS Code linter gets all upset at this
119-
"program": "${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground/bin/Debug/net5.0-windows/win-x64/CodeProject.SenseAI.Demo.Playground.exe",
124+
"program": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net5.0-windows/win-x64/CodeProject.AI.Demo.Explorer.exe",
120125
// },
121-
"args": [ ],
126+
"args": [],
122127
"cwd": "${workspaceFolder}",
123128
"stopAtEntry": false,
124129
"console": "internalConsole",
@@ -127,6 +132,18 @@
127132
"ASPNETCORE_ENVIRONMENT": "Development",
128133
"RUNNING_IN_VSCODE": "true"
129134
}
135+
},
136+
137+
// See https://code.visualstudio.com/docs/editor/variables-reference#_settings-command-variables-and-input-variables
138+
// For variables that can be used
139+
{
140+
"name": "Python: Current File",
141+
"type": "python",
142+
"request": "launch",
143+
"program": "${file}",
144+
"console": "integratedTerminal",
145+
"cwd": "${fileDirname}",
146+
"justMyCode": true
130147
}
131148
]
132149
}

‎.vscode/tasks.json‎

Lines changed: 68 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"version": "2.0.0",
33
"tasks": [
44

5-
// All platforms
5+
// Build individual projects ==================================================================================
6+
67
{
7-
"label": "build-server", // Builds ONLY the API server, and not any backend analsysis or playground apps
8+
"label": "build-server", // Builds ONLY the API server, and not any backend analsysis or explorer apps
89
"type": "process",
910
"group": "build",
1011
"command": "dotnet",
@@ -17,14 +18,28 @@
1718
"problemMatcher": "$msCompile"
1819
},
1920

21+
{
22+
"label": "build-common", // Builds ONLY the Yolo .NET analysis module
23+
"type": "process",
24+
"group": "build",
25+
"command": "dotnet",
26+
"args": [
27+
"build",
28+
"${workspaceFolder}/src/API/Common",
29+
"/property:GenerateFullPaths=true",
30+
"/consoleloggerparameters:NoSummary"
31+
],
32+
"problemMatcher": "$msCompile"
33+
},
34+
2035
{
2136
"label": "build-yolo", // Builds ONLY the Yolo .NET analysis module
2237
"type": "process",
2338
"group": "build",
2439
"command": "dotnet",
2540
"args": [
2641
"build",
27-
"${workspaceFolder}/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo",
42+
"${workspaceFolder}/src/AnalysisLayer/CodeProject.AI.AnalysisLayer.Yolo",
2843
"/property:GenerateFullPaths=true",
2944
"/consoleloggerparameters:NoSummary"
3045
],
@@ -46,47 +61,81 @@
4661
},
4762

4863
{
49-
"label": "build-playground", // Builds ONLY the Yolo .NET analysis module
64+
"label": "build-sentimentanalysis", // Builds ONLY the Yolo .NET analysis module
5065
"type": "process",
5166
"group": "build",
5267
"command": "dotnet",
5368
"args": [
5469
"build",
55-
"${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground",
70+
"${workspaceFolder}/src/AnalysisLayer/SentimentAnalysis",
5671
"/property:GenerateFullPaths=true",
5772
"/consoleloggerparameters:NoSummary"
5873
],
5974
"problemMatcher": "$msCompile"
6075
},
6176

6277
{
63-
"label": "build-common", // Builds ONLY the Yolo .NET analysis module
78+
"label": "build-explorer", // Builds ONLY the Yolo .NET analysis module
6479
"type": "process",
6580
"group": "build",
6681
"command": "dotnet",
6782
"args": [
6883
"build",
69-
"${workspaceFolder}/src/API/Common",
84+
"${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer",
7085
"/property:GenerateFullPaths=true",
7186
"/consoleloggerparameters:NoSummary"
7287
],
7388
"problemMatcher": "$msCompile"
7489
},
7590

91+
{
92+
"label": "build-all-linux", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
93+
"group": "build",
94+
"dependsOrder": "sequence",
95+
"dependsOn": [
96+
"build-server",
97+
"build-analysisservices",
98+
]
99+
},
100+
101+
{
102+
"label": "build-all-win", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
103+
"group": "build",
104+
"dependsOrder": "sequence",
105+
"dependsOn": [
106+
"build-server",
107+
"build-analysisservices",
108+
"build-explorer"
109+
]
110+
},
111+
112+
{
113+
"label": "build-analysisservices",
114+
"group": "build",
115+
"dependsOrder": "sequence",
116+
"dependsOn": [
117+
"build-yolo",
118+
"build-portraitfilter",
119+
"build-sentimentanalysis",
120+
]
121+
},
122+
123+
// Launch apps ================================================================================================
124+
76125
{
77126
"label": "start-api", // Starts the API server, which in turn will start the backend analysis modules. No build is performed
78127
"isBackground": true,
79128
"type": "process",
80129
"group": "none",
81-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe",
130+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe",
82131
"windows": {
83-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe"
132+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe"
84133
},
85134
"osx": {
86-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
135+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
87136
},
88137
"linux": {
89-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
138+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
90139
},
91140
"args": [],
92141

@@ -116,15 +165,15 @@
116165
"isBackground": true,
117166
"type": "process",
118167
"group": "none",
119-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe",
168+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe",
120169
"windows": {
121-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe"
170+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe"
122171
},
123172
"osx": {
124-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
173+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
125174
},
126175
"linux": {
127-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
176+
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
128177
},
129178
"args": [ "--LaunchAnalysisServices=false" ],
130179

@@ -149,19 +198,6 @@
149198
]
150199
},
151200

152-
// Linux / macOS
153-
{
154-
"label": "build-all-linux", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
155-
"group": "build",
156-
"dependsOrder": "sequence",
157-
"dependsOn": [
158-
"build-common",
159-
"build-yolo",
160-
"build-portraitfilter",
161-
"build-server"
162-
]
163-
},
164-
165201
{
166202
"label": "launch-analysis", // Launches ONLY the backend Python analysis services. Allows us to debug them
167203
"type": "process",
@@ -208,9 +244,8 @@
208244
"group": "none",
209245
"dependsOrder": "sequence",
210246
"dependsOn": [
211-
"build-yolo",
212-
"build-portraitfilter",
213247
"build-server",
248+
"build-analysisservices",
214249
"start-api"
215250
]
216251
},
@@ -220,27 +255,12 @@
220255
"group": "none",
221256
"dependsOrder": "sequence",
222257
"dependsOn": [
223-
"build-yolo",
224-
"build-portraitfilter",
225258
"build-server",
259+
"build-analysisservices",
226260
"launch-analysis"
227261
]
228262
},
229263

230-
// Windows (includes Playground, which is Windows Forms)
231-
{
232-
"label": "build-all-win", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
233-
"group": "build",
234-
"dependsOrder": "sequence",
235-
"dependsOn": [
236-
"build-common",
237-
"build-yolo",
238-
"build-portraitfilter",
239-
"build-server",
240-
"build-playground"
241-
]
242-
},
243-
244264
{
245265
"label": "launch-server-win", // Builds all projects then launches the front end API server
246266
"group": "none",
@@ -252,10 +272,10 @@
252272
},
253273

254274
{
255-
"label": "start-playground", // Starts the Playground Windows form app. No building or launching of API server done.
275+
"label": "start-explorer", // Starts the Explorer Windows form app. No building or launching of API server done.
256276
"group": "none",
257277
// Windows form apps only work in Windows
258-
"command": "${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground/bin/Debug/net6.0-windows/",
278+
"command": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net6.0-windows/",
259279
"args": [],
260280
"type": "process",
261281
},

0 commit comments

Comments
 (0)