Skip to content

Commit 382027b

Browse files
author
ChrisMaunder
committed
Updated to v2.2.4
1 parent 31ad131 commit 382027b

File tree

343 files changed

+7051
-4719
lines changed

Some content is hidden

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

343 files changed

+7051
-4719
lines changed

‎.vscode/launch.json

Lines changed: 65 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
"type": "coreclr",
1313
"request": "launch",
1414
"preLaunchTask": "build-server",
15-
"postDebugTask": "stop-all",
16-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
15+
// "postDebugTask": "stop-all",
16+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
1717
"linux": {
18-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
18+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
1919
},
2020
"args": [],
21-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
21+
"cwd": "${workspaceFolder}/src/server/",
2222
"stopAtEntry": false,
2323
"requireExactSource": false,
2424
"serverReadyAction": {
@@ -37,18 +37,35 @@
3737
"group": "3 Server"
3838
},
3939

40-
"name": "Build Server only",
40+
"name": "Build Server Debug",
4141

4242
"type": "python",
43-
"code":"#", // dummy command
43+
"code": "#", // dummy command
4444
"console": "internalConsole",
4545
"request": "launch",
4646
"preLaunchTask": "build-server",
47-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
47+
"cwd": "${workspaceFolder}/src/server/",
4848
"env": {
4949
"ASPNETCORE_ENVIRONMENT": "Development"
5050
}
5151
},
52+
{
53+
"presentation": {
54+
"group": "3 Server"
55+
},
56+
57+
"name": "Build Server Release",
58+
59+
"type": "python",
60+
"code": "#", // dummy command
61+
"console": "internalConsole",
62+
"request": "launch",
63+
"preLaunchTask": "build-server-release",
64+
"cwd": "${workspaceFolder}/src/server/",
65+
"env": {
66+
"ASPNETCORE_ENVIRONMENT": "Production"
67+
}
68+
},
5269

5370
// Build x64 --------------------------------------------------------------
5471

@@ -60,13 +77,13 @@
6077
"type": "coreclr",
6178
"request": "launch",
6279
"preLaunchTask": "build-all",
63-
"postDebugTask": "stop-all",
64-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
80+
// "postDebugTask": "stop-all",
81+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
6582
"linux": {
66-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
83+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
6784
},
6885
"args": [],
69-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
86+
"cwd": "${workspaceFolder}/src/server/",
7087
"stopAtEntry": false,
7188
"requireExactSource": false,
7289
"serverReadyAction": {
@@ -104,7 +121,7 @@
104121
// "args": [ "--version" ], // dummy command
105122

106123
"preLaunchTask": "build-all",
107-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
124+
"cwd": "${workspaceFolder}/src/server/",
108125
"env": {
109126
"ASPNETCORE_ENVIRONMENT": "Development"
110127
}
@@ -121,13 +138,13 @@
121138
"type": "coreclr",
122139
"request": "launch",
123140
"preLaunchTask": "build-all-arm64",
124-
"postDebugTask": "stop-all",
125-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
141+
// "postDebugTask": "stop-all",
142+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
126143
"linux": {
127-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
144+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
128145
},
129146
"args": [],
130-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
147+
"cwd": "${workspaceFolder}/src/server/",
131148
"stopAtEntry": false,
132149
"requireExactSource": false,
133150
"serverReadyAction": {
@@ -164,7 +181,7 @@
164181
// "args": [ "--version" ], // dummy command
165182

166183
"preLaunchTask": "build-all-arm64",
167-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
184+
"cwd": "${workspaceFolder}/src/server/",
168185
"env": {
169186
"ASPNETCORE_ENVIRONMENT": "Development"
170187
}
@@ -181,12 +198,12 @@
181198
"name": "Launch Server",
182199
"type": "coreclr",
183200
"request": "launch",
184-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
201+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
185202
"linux": {
186-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
203+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
187204
},
188205
"args": [],
189-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
206+
"cwd": "${workspaceFolder}/src/server/",
190207
"stopAtEntry": false,
191208
"requireExactSource": false,
192209
"serverReadyAction": {
@@ -235,14 +252,14 @@
235252
"type": "coreclr",
236253
"request": "launch",
237254
"preLaunchTask": "build-server",
238-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.exe",
255+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.exe",
239256
"linux": {
240-
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
257+
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
241258
},
242259
"args": [
243260
"--ModuleOptions:LaunchModules=false"
244261
],
245-
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/",
262+
"cwd": "${workspaceFolder}/src/server/bin/Debug/net7.0/",
246263
"stopAtEntry": false,
247264
"serverReadyAction": {
248265
"action": "openExternally",
@@ -332,7 +349,8 @@
332349
"env": {
333350
"DEBUG_IN_VSCODE": "True",
334351
"RUNNING_IN_VSCODE": "True",
335-
"CPAI_PORT": "32168"
352+
"CPAI_PORT": "32168",
353+
"U2NET_HOME": "${workspaceFolder}/src/modules/BackgroundRemover/models"
336354
},
337355
"windows": {
338356
"python": "${workspaceFolder}/src/modules/BackgroundRemover/bin/windows/python39/venv/Scripts/python.exe",
@@ -494,37 +512,6 @@
494512
}
495513
},
496514

497-
{
498-
"presentation": {
499-
"group": "5 Launch Individual",
500-
"hidden": false
501-
},
502-
"name": "Object Detect TFLite",
503-
"type": "python",
504-
"request": "launch",
505-
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/windows/python39/venv/Scripts/python.exe",
506-
"program": "objectdetection_tflite_adapter.py",
507-
"cwd": "${workspaceFolder}/src/modules/ObjectDetectionTFLite",
508-
"console": "integratedTerminal",
509-
"justMyCode": false,
510-
"env": {
511-
"DEBUG_IN_VSCODE": "True",
512-
"RUNNING_IN_VSCODE": "True",
513-
"CPAI_PORT": "32168",
514-
"CPAI_MODULE_QUEUENAME": "objectdetection_queue",
515-
"MODEL_SIZE": "tiny"
516-
},
517-
"windows": {
518-
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/windows/python39/venv/Scripts/python.exe",
519-
},
520-
"linux": {
521-
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/linux/python39/venv/bin/python",
522-
},
523-
"osx": {
524-
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/macos/python39/venv/bin/python",
525-
}
526-
},
527-
528515
{
529516
"presentation": {
530517
"group": "5 Launch Individual",
@@ -615,6 +602,29 @@
615602
*/
616603
},
617604

605+
{
606+
"presentation": {
607+
"group": "5 Launch Individual",
608+
"hidden": false
609+
},
610+
"name": "Portrait Filter",
611+
"type": "coreclr",
612+
"request": "launch",
613+
"preLaunchTask": "build-portraitfilter",
614+
"program": "${workspaceFolder}/src/modules/PortraitFilter/bin/Debug/net7.0/PortraitFilter",
615+
"args": [],
616+
"cwd": "${workspaceFolder}/src/modules/PortraitFilter",
617+
"stopAtEntry": false,
618+
"console": "internalConsole",
619+
"requireExactSource": false,
620+
"justMyCode": false,
621+
"env": {
622+
"ASPNETCORE_ENVIRONMENT": "Development",
623+
"RUNNING_IN_VSCODE": "true",
624+
"DOTNET_NOLOGO": "true"
625+
}
626+
},
627+
618628
{
619629
"presentation": {
620630
"group": "5 Launch Individual",

‎.vscode/tasks.json

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependsOn": [
1010
"build-server",
1111
"build-analysisservices",
12-
"build-tests"
12+
"build-tests"
1313
],
1414
"windows": {
1515
"dependsOn": [
@@ -28,7 +28,7 @@
2828
"dependsOn": [
2929
"build-server",
3030
"build-analysisservices-arm64",
31-
"build-tests"
31+
"build-tests"
3232
],
3333
"windows": {
3434
"dependsOn": [
@@ -47,7 +47,7 @@
4747
"dependsOn": [
4848
"build-yolo-net",
4949
"build-portraitfilter",
50-
"build-sentimentanalysis",
50+
"build-sentimentanalysis"
5151
]
5252
},
5353

@@ -71,12 +71,28 @@
7171
"command": "dotnet",
7272
"args": [
7373
"build",
74-
"${workspaceFolder}/src/API/Server/FrontEnd",
74+
"${workspaceFolder}/src/server",
7575
"/property:GenerateFullPaths=true",
7676
"/consoleloggerparameters:NoSummary"
7777
],
7878
"problemMatcher": "$msCompile"
7979
},
80+
81+
{
82+
"label": "build-server-release", // Builds ONLY the API server, and not any backend analsysis or explorer apps
83+
"type": "process",
84+
"group": "build",
85+
"command": "dotnet",
86+
"args": [
87+
"build",
88+
"${workspaceFolder}/src/server",
89+
"/property:GenerateFullPaths=true",
90+
"/consoleloggerparameters:NoSummary",
91+
"-c",
92+
"Release"
93+
],
94+
"problemMatcher": "$msCompile"
95+
},
8096

8197
{
8298
"label": "build-yolo-net", // Builds ONLY the Yolo .NET analysis module
@@ -153,7 +169,7 @@
153169
{
154170
"label": "launch-server-win", // Builds all projects then launches the front end API server
155171
"group": "none",
156-
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.exe",
172+
"command": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.exe",
157173
"dependsOrder": "sequence",
158174
"dependsOn": [
159175
"build-all-win"
@@ -166,7 +182,7 @@
166182
// Windows form apps only work in Windows
167183
"command": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net7.0-windows/win-x64/",
168184
"args": [],
169-
"type": "process",
185+
"type": "process"
170186
},
171187

172188
{
@@ -191,7 +207,7 @@
191207
"type": "process",
192208
"args": [
193209
"publish",
194-
"${workspaceFolder}/src/API/Server/FrontEnd/Frontend.csproj",
210+
"${workspaceFolder}/src/server/server.csproj",
195211
"/property:GenerateFullPaths=true",
196212
"/consoleloggerparameters:NoSummary"
197213
],
@@ -206,11 +222,28 @@
206222
"args": [
207223
"watch",
208224
"run",
209-
"${workspaceFolder}/src/API/Server/FrontEnd/Frontend.csproj",
225+
"${workspaceFolder}/src/server/server.csproj",
210226
"/property:GenerateFullPaths=true",
211227
"/consoleloggerparameters:NoSummary"
212228
],
213229
"problemMatcher": "$msCompile"
214-
}
230+
},
231+
232+
{
233+
"label": "Inno Setup: Compile Script",
234+
"type": "process",
235+
"command": "C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe",
236+
"args": [
237+
"${file}"
238+
],
239+
"presentation": {
240+
"reveal": "always",
241+
"echo": false
242+
},
243+
"group": {
244+
"kind": "build",
245+
"isDefault": true
246+
}
247+
}
215248
]
216249
}

0 commit comments

Comments
 (0)