Skip to content

Commit 6b0f4eb

Browse files
author
ChrisMaunder
committed
Update to 1.4: Refactor installers, module settings, added sentiment analysis
1 parent ca3b33a commit 6b0f4eb

File tree

164 files changed

+9990
-2637
lines changed

Some content is hidden

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

164 files changed

+9990
-2637
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,3 +391,4 @@ FodyWeavers.xsd
391391
/Installers/downloads
392392
*.DS_Store
393393
/src/AnalysisLayer/BackgroundRemover/models
394+
/docs/mkdocs/senseAI/site

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
},
8383

8484
{
85-
"name": "Launch SenseAI (Debug/Linux)",
85+
"name": "Launch Server & Modules separately",
8686
"type": "coreclr",
8787
"request": "launch",
88-
"preLaunchTask": "pre-launch-server-linux-debug",
88+
"preLaunchTask": "pre-launch-server-debug",
8989
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.SenseAI.Server",
9090
"args" : [ "--LaunchAnalysisServices=false" ],
9191
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/",

‎.vscode/tasks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
},
164164

165165
{
166-
"label": "launch-analysis-linux", // Launches ONLY the backend Python analysis services. Allows us to debug them
166+
"label": "launch-analysis", // Launches ONLY the backend Python analysis services. Allows us to debug them
167167
"type": "process",
168168
"isBackground": true,
169169
"group": "none",
@@ -216,14 +216,14 @@
216216
},
217217

218218
{
219-
"label": "pre-launch-server-linux-debug", // Builds all, then Launches only background processes, allowing Python debug
219+
"label": "pre-launch-server-debug", // Builds all, then Launches only background processes, allowing Python debug
220220
"group": "none",
221221
"dependsOrder": "sequence",
222222
"dependsOn": [
223223
"build-yolo",
224224
"build-portraitfilter",
225225
"build-server",
226-
"launch-analysis-linux"
226+
"launch-analysis"
227227
]
228228
},
229229

‎CodeProject.SenseAI.sln‎

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "API", "API", "{2379A486-0D2
2020
EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{3BF27572-9D3A-497C-8375-29110EBBD3D1}"
2222
ProjectSection(SolutionItems) = preProject
23-
docs\Docker Hub SenesAI Server ReadMe.md = docs\Docker Hub SenesAI Server ReadMe.md
24-
docs\installing on WSL.md = docs\installing on WSL.md
2523
LICENCE.md = LICENCE.md
2624
README.md = README.md
2725
THIRD-PARTY-NOTICES.md = THIRD-PARTY-NOTICES.md
@@ -92,6 +90,7 @@ EndProject
9290
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Frontend", "src\API\Server\FrontEnd\Frontend.csproj", "{A0CF3BEE-8EE3-4B23-BEB8-9D258C0510A3}"
9391
ProjectSection(ProjectDependencies) = postProject
9492
{232710A8-9180-4139-8FF2-8F21F649D927} = {232710A8-9180-4139-8FF2-8F21F649D927}
93+
{6814F27C-7026-4D22-8E38-2047747495E3} = {6814F27C-7026-4D22-8E38-2047747495E3}
9594
{7DC0A312-39AD-41B0-BB53-72ACACC76959} = {7DC0A312-39AD-41B0-BB53-72ACACC76959}
9695
{AB47CC99-15ED-4928-A2F2-DC8F83DA9482} = {AB47CC99-15ED-4928-A2F2-DC8F83DA9482}
9796
EndProjectSection
@@ -129,7 +128,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
129128
BuildDockerBase.bat = BuildDockerBase.bat
130129
commands.json = commands.json
131130
Dockerfile-Base = Dockerfile-Base
132-
global.json = global.json
133131
EndProjectSection
134132
EndProject
135133
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDetector", "src\AnalysisLayer\CodeProject.SenseAI.AnalysisLayer.Yolo\ObjectDetector.csproj", "{232710A8-9180-4139-8FF2-8F21F649D927}"
@@ -167,17 +165,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SenseAI.BootStrapper", "Ins
167165
{ED492608-6013-4552-A29B-A7E14F4BEB0B} = {ED492608-6013-4552-A29B-A7E14F4BEB0B}
168166
EndProjectSection
169167
EndProject
170-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Old School Scripts", "Old School Scripts", "{FDB25B74-D0CD-4665-9152-DE968A1028D8}"
171-
ProjectSection(SolutionItems) = preProject
172-
Installers\Old School\create_installer_win.bat = Installers\Old School\create_installer_win.bat
173-
Installers\Old School\CreateWindowsService.cmd = Installers\Old School\CreateWindowsService.cmd
174-
Installers\Old School\DeleteWindowsService.cmd = Installers\Old School\DeleteWindowsService.cmd
175-
Installers\Old School\load_environment.bat = Installers\Old School\load_environment.bat
176-
Installers\Old School\save_environment.bat = Installers\Old School\save_environment.bat
177-
Installers\Old School\Setup_SenseAI_Win.bat = Installers\Old School\Setup_SenseAI_Win.bat
178-
Installers\Old School\Start_SenseAI_Win.bat = Installers\Old School\Start_SenseAI_Win.bat
179-
EndProjectSection
180-
EndProject
181168
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DeepStack.Installer", "Installers\Windows\DeepStack.Installer\DeepStack.Installer.wixproj", "{ED492608-6013-4552-A29B-A7E14F4BEB0B}"
182169
EndProject
183170
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DeepStackModels.Installer", "Installers\Windows\DeepStackModels.Installer\DeepStackModels.Installer.wixproj", "{D0B74BE9-8195-4907-AEEE-45631E37251F}"
@@ -190,6 +177,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dev", "Dev", "{00BBF52C-217
190177
ProjectSection(SolutionItems) = preProject
191178
Installers\Dev\setup_dev_env_linux.sh = Installers\Dev\setup_dev_env_linux.sh
192179
Installers\Dev\setup_dev_env_win.bat = Installers\Dev\setup_dev_env_win.bat
180+
Installers\Dev\utils.bat = Installers\Dev\utils.bat
181+
Installers\Dev\utils.sh = Installers\Dev\utils.sh
193182
EndProjectSection
194183
EndProject
195184
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET 3.5.1", ".NET 3.5.1", "{8A423F72-C92C-4C8E-87D8-02849FD079E2}"
@@ -210,12 +199,20 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "TextSummary", "src\Analysis
210199
EndProject
211200
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Articles", "Articles", "{2E9D03C1-BF8F-4E3D-944A-0DDEDDE620C5}"
212201
ProjectSection(SolutionItems) = preProject
213-
docs\Articles\adding-a-module.md = docs\Articles\adding-a-module.md
214202
docs\Articles\adding-a-net6-module.md = docs\Articles\adding-a-net6-module.md
215-
docs\Articles\dog_and_man_rembg.png = docs\Articles\dog_and_man_rembg.png
216-
docs\Articles\How-to-add-AI-to-an-app.md = docs\Articles\How-to-add-AI-to-an-app.md
217-
docs\Articles\pexels-thirdman-7268587.jpg = docs\Articles\pexels-thirdman-7268587.jpg
203+
docs\Articles\Additional Information Dialog.png = docs\Articles\Additional Information Dialog.png
204+
docs\Articles\Dashboard.png = docs\Articles\Dashboard.png
205+
docs\Articles\ModuleStatus.png = docs\Articles\ModuleStatus.png
206+
docs\Articles\portrait-filter-example.png = docs\Articles\portrait-filter-example.png
207+
docs\Articles\Project Configuration Dialog.png = docs\Articles\Project Configuration Dialog.png
208+
docs\Articles\Project Structure.png = docs\Articles\Project Structure.png
209+
docs\Articles\Sentiment Analysis Text Page.png = docs\Articles\Sentiment Analysis Text Page.png
210+
docs\Articles\SentimentAnalysisProjectConfig.png = docs\Articles\SentimentAnalysisProjectConfig.png
211+
docs\Articles\SentimentAnalysysProjectStructure.png = docs\Articles\SentimentAnalysysProjectStructure.png
212+
docs\Articles\Simpler NET module creation using improved SDK.md = docs\Articles\Simpler NET module creation using improved SDK.md
218213
docs\Articles\test.html.jpg = docs\Articles\test.html.jpg
214+
docs\Articles\test.html.png = docs\Articles\test.html.png
215+
docs\Articles\test_html.png = docs\Articles\test_html.png
219216
EndProjectSection
220217
EndProject
221218
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{D2B223B6-983B-4782-B231-5F481504A86F}"
@@ -240,6 +237,12 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PortraitFilter.Installer",
240237
EndProject
241238
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Python39.Installer", "Installers\Windows\Python39.Installer\Python39.Installer.wixproj", "{0DBC85BC-52C3-491F-90F9-6D728FFA2E8F}"
242239
EndProject
240+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "mkdocs", "docs\mkdocs\mkdocs.shproj", "{343EE377-FB9C-4D81-8A17-68509C9F6659}"
241+
EndProject
242+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SentimentAnalysis", "src\AnalysisLayer\SentimentAnalysis\SentimentAnalysis.csproj", "{6814F27C-7026-4D22-8E38-2047747495E3}"
243+
EndProject
244+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SentimentAnalysis.Installer", "Installers\Windows\SentimentAnalysis.Installer\SentimentAnalysis.Installer.wixproj", "{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}"
245+
EndProject
243246
Global
244247
GlobalSection(SolutionConfigurationPlatforms) = preSolution
245248
Debug|Any CPU = Debug|Any CPU
@@ -404,6 +407,22 @@ Global
404407
{0DBC85BC-52C3-491F-90F9-6D728FFA2E8F}.Release|Any CPU.Build.0 = Release|x86
405408
{0DBC85BC-52C3-491F-90F9-6D728FFA2E8F}.Release|x86.ActiveCfg = Release|x86
406409
{0DBC85BC-52C3-491F-90F9-6D728FFA2E8F}.Release|x86.Build.0 = Release|x86
410+
{6814F27C-7026-4D22-8E38-2047747495E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
411+
{6814F27C-7026-4D22-8E38-2047747495E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
412+
{6814F27C-7026-4D22-8E38-2047747495E3}.Debug|x86.ActiveCfg = Debug|Any CPU
413+
{6814F27C-7026-4D22-8E38-2047747495E3}.Debug|x86.Build.0 = Debug|Any CPU
414+
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
415+
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|Any CPU.Build.0 = Release|Any CPU
416+
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.ActiveCfg = Release|Any CPU
417+
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.Build.0 = Release|Any CPU
418+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Debug|Any CPU.ActiveCfg = Debug|x86
419+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Debug|Any CPU.Build.0 = Debug|x86
420+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Debug|x86.ActiveCfg = Debug|x86
421+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Debug|x86.Build.0 = Debug|x86
422+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Release|Any CPU.ActiveCfg = Release|x86
423+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Release|Any CPU.Build.0 = Release|x86
424+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Release|x86.ActiveCfg = Release|x86
425+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39}.Release|x86.Build.0 = Release|x86
407426
EndGlobalSection
408427
GlobalSection(SolutionProperties) = preSolution
409428
HideSolutionNode = FALSE
@@ -432,7 +451,6 @@ Global
432451
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
433452
{5F1052CB-8586-49CB-8F46-427A5F6901C2} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
434453
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
435-
{FDB25B74-D0CD-4665-9152-DE968A1028D8} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
436454
{ED492608-6013-4552-A29B-A7E14F4BEB0B} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
437455
{D0B74BE9-8195-4907-AEEE-45631E37251F} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
438456
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
@@ -452,8 +470,14 @@ Global
452470
{7E70C376-7119-4C90-AC30-344EEA29594E} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
453471
{476475CE-3C81-446B-914E-AC472D41B82A} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
454472
{0DBC85BC-52C3-491F-90F9-6D728FFA2E8F} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
473+
{343EE377-FB9C-4D81-8A17-68509C9F6659} = {3BF27572-9D3A-497C-8375-29110EBBD3D1}
474+
{6814F27C-7026-4D22-8E38-2047747495E3} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
475+
{92208AE3-1035-4BE5-BE7F-1DDC72D0ED39} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
455476
EndGlobalSection
456477
GlobalSection(ExtensibilityGlobals) = postSolution
457478
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}
458479
EndGlobalSection
480+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
481+
docs\mkdocs\mkdocs.projitems*{343ee377-fb9c-4d81-8a17-68509c9f6659}*SharedItemsImports = 13
482+
EndGlobalSection
459483
EndGlobal

0 commit comments

Comments
 (0)