Skip to content

Commit

Permalink
Version 1.5: rebrand, Custom models and leaner installer
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisMaunder committed Jun 24, 2022
1 parent c590e35 commit df1974b
Show file tree
Hide file tree
Showing 333 changed files with 9,447 additions and 32,664 deletions.
7 changes: 7 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,10 @@ FodyWeavers.xsd
*.DS_Store
/src/AnalysisLayer/BackgroundRemover/models
/docs/mkdocs/senseAI/site
/src/AnalysisLayer/Vision/assets
/src/AnalysisLayer/CustomDetection/assets/openlogo.pt
/src/AnalysisLayer/CustomDetection/assets/actionnetv2.pt
/src/AnalysisLayer/CustomDetection/assets/license-plate.pt
/src/AnalysisLayer/CustomDetection/assets/yolov5m.pt
/docs/mkdocs/CodeProject.AI/site
/src/AnalysisLayer/CodeProject.AI.AnalysisLayer.Yolo/assets
61 changes: 39 additions & 22 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"request": "launch",
"preLaunchTask": "build-all-win",
"program": "dotnet",
"args": [ "--version" ],
"args": [
"--version"
],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,
"env": {
Expand All @@ -22,52 +24,53 @@
"request": "launch",
"preLaunchTask": "build-all-linux",
"program": "dotnet",
"args": [ "--version" ],
"args": [
"--version"
],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
},

{
"name": "Launch SenseAI (Win)",
"name": "Launch CodeProject.AI (Win)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-win",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server.exe",
"args" : [ ],
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server.exe",
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,

"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
"uriFormat": "http://localhost:%s/swagger"
},

"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true"
}
},

{
"name": "Launch SenseAI (Linux)",
"name": "Launch CodeProject.AI (Linux/macOS)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-linux",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server",
"args" : [ ],
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,

"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
"uriFormat": "http://localhost:%s/swagger"
},

"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true"
Expand All @@ -78,25 +81,27 @@
"moduleLoad": false,
"exceptions": false,
"browserStdOut": false
},
},
},

{
"name": "Launch Server & Modules separately",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "pre-launch-server-debug",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server",
"args" : [ "--LaunchAnalysisServices=false" ],
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
"args": [
"--LaunchAnalysisServices=false"
],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/",
"stopAtEntry": false,

"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
"uriFormat": "http://localhost:%s/swagger"
},

"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true"
Expand All @@ -107,18 +112,18 @@
"moduleLoad": false,
"exceptions": true,
"browserStdOut": false
},
},
},

{
"name": "Launch SenseAI Playground (Win)",
"name": "Launch CodeProject.AI Explorer (Win)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "launch-server-win",
// "windows": { - VS Code linter gets all upset at this
"program": "${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground/bin/Debug/net5.0-windows/win-x64/CodeProject.SenseAI.Demo.Playground.exe",
"program": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net5.0-windows/win-x64/CodeProject.AI.Demo.Explorer.exe",
// },
"args": [ ],
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole",
Expand All @@ -127,6 +132,18 @@
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true"
}
},

// See https://code.visualstudio.com/docs/editor/variables-reference#_settings-command-variables-and-input-variables
// For variables that can be used
{
"name": "Python: Current File",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal",
"cwd": "${fileDirname}",
"justMyCode": true
}
]
}
116 changes: 68 additions & 48 deletions .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"version": "2.0.0",
"tasks": [

// All platforms
// Build individual projects ==================================================================================

{
"label": "build-server", // Builds ONLY the API server, and not any backend analsysis or playground apps
"label": "build-server", // Builds ONLY the API server, and not any backend analsysis or explorer apps
"type": "process",
"group": "build",
"command": "dotnet",
Expand All @@ -17,14 +18,28 @@
"problemMatcher": "$msCompile"
},

{
"label": "build-common", // Builds ONLY the Yolo .NET analysis module
"type": "process",
"group": "build",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/src/API/Common",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},

{
"label": "build-yolo", // Builds ONLY the Yolo .NET analysis module
"type": "process",
"group": "build",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo",
"${workspaceFolder}/src/AnalysisLayer/CodeProject.AI.AnalysisLayer.Yolo",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -46,47 +61,81 @@
},

{
"label": "build-playground", // Builds ONLY the Yolo .NET analysis module
"label": "build-sentimentanalysis", // Builds ONLY the Yolo .NET analysis module
"type": "process",
"group": "build",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground",
"${workspaceFolder}/src/AnalysisLayer/SentimentAnalysis",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},

{
"label": "build-common", // Builds ONLY the Yolo .NET analysis module
"label": "build-explorer", // Builds ONLY the Yolo .NET analysis module
"type": "process",
"group": "build",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/src/API/Common",
"${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},

{
"label": "build-all-linux", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
"group": "build",
"dependsOrder": "sequence",
"dependsOn": [
"build-server",
"build-analysisservices",
]
},

{
"label": "build-all-win", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
"group": "build",
"dependsOrder": "sequence",
"dependsOn": [
"build-server",
"build-analysisservices",
"build-explorer"
]
},

{
"label": "build-analysisservices",
"group": "build",
"dependsOrder": "sequence",
"dependsOn": [
"build-yolo",
"build-portraitfilter",
"build-sentimentanalysis",
]
},

// Launch apps ================================================================================================

{
"label": "start-api", // Starts the API server, which in turn will start the backend analysis modules. No build is performed
"isBackground": true,
"type": "process",
"group": "none",
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe",
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe",
"windows": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe"
},
"osx": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
},
"linux": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
},
"args": [],

Expand Down Expand Up @@ -116,15 +165,15 @@
"isBackground": true,
"type": "process",
"group": "none",
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe",
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe",
"windows": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.exe"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.exe"
},
"osx": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
},
"linux": {
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.AI.Server.dll"
},
"args": [ "--LaunchAnalysisServices=false" ],

Expand All @@ -149,19 +198,6 @@
]
},

// Linux / macOS
{
"label": "build-all-linux", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
"group": "build",
"dependsOrder": "sequence",
"dependsOn": [
"build-common",
"build-yolo",
"build-portraitfilter",
"build-server"
]
},

{
"label": "launch-analysis", // Launches ONLY the backend Python analysis services. Allows us to debug them
"type": "process",
Expand Down Expand Up @@ -208,9 +244,8 @@
"group": "none",
"dependsOrder": "sequence",
"dependsOn": [
"build-yolo",
"build-portraitfilter",
"build-server",
"build-analysisservices",
"start-api"
]
},
Expand All @@ -220,27 +255,12 @@
"group": "none",
"dependsOrder": "sequence",
"dependsOn": [
"build-yolo",
"build-portraitfilter",
"build-server",
"build-analysisservices",
"launch-analysis"
]
},

// Windows (includes Playground, which is Windows Forms)
{
"label": "build-all-win", // Builds all projects that can be built for Linux (ie not any Windows Forms apps)
"group": "build",
"dependsOrder": "sequence",
"dependsOn": [
"build-common",
"build-yolo",
"build-portraitfilter",
"build-server",
"build-playground"
]
},

{
"label": "launch-server-win", // Builds all projects then launches the front end API server
"group": "none",
Expand All @@ -252,10 +272,10 @@
},

{
"label": "start-playground", // Starts the Playground Windows form app. No building or launching of API server done.
"label": "start-explorer", // Starts the Explorer Windows form app. No building or launching of API server done.
"group": "none",
// Windows form apps only work in Windows
"command": "${workspaceFolder}/demos/dotNet/CodeProject.SenseAI.Playground/bin/Debug/net6.0-windows/",
"command": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net6.0-windows/",
"args": [],
"type": "process",
},
Expand Down
Loading

0 comments on commit df1974b

Please sign in to comment.