Skip to content

Commit c720098

Browse files
author
ChrisMaunder
committed
Small patch to resolve an installer issue
1 parent df1974b commit c720098

File tree

16 files changed

+192
-183
lines changed

16 files changed

+192
-183
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,6 @@ FodyWeavers.xsd
393393
/src/AnalysisLayer/BackgroundRemover/models
394394
/docs/mkdocs/senseAI/site
395395
/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
396+
/src/AnalysisLayer/CustomDetection/assets
400397
/docs/mkdocs/CodeProject.AI/site
401398
/src/AnalysisLayer/CodeProject.AI.AnalysisLayer.Yolo/assets

CodeProject.AI.sln

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.1.32210.238
4+
VisualStudioVersion = 17.2.32616.157
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8B76501-496A-4011-9C37-8308A1EBDFA7}"
77
ProjectSection(SolutionItems) = preProject
@@ -125,6 +125,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{CB26AB
125125
EndProject
126126
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{460DB5C8-46F3-4407-A2DF-D9063D14493A}"
127127
ProjectSection(SolutionItems) = preProject
128+
BuildDockerBase.bat = BuildDockerBase.bat
128129
commands.json = commands.json
129130
kill_dotnet.bat = kill_dotnet.bat
130131
kill_dotnet.sh = kill_dotnet.sh

Installers/Dev/setup_dev_env_win.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ set useColor=true
2121
:: Platform can define where things are located
2222
set platform=windows
2323

24+
:: are we ready to support CUDA enabled GPUs?
25+
set supportCUDA=false
2426

2527
:: Basic locations
2628

Installers/Dev/utils.bat

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,18 @@ shift & goto :%~1
331331
rem This will be the python interpreter in the virtual env
332332
set pythonPath=!virtualEnv!\Scripts\python
333333

334-
call :Write "Checking for CUDA..."
335334
set hasCUDA=false
336-
wmic PATH Win32_VideoController get Name | find "NVIDIA" > NUL
337-
if errorlevel 0 (
338-
set hasCUDA=true
339-
call :WriteLine "Present" "Green"
340-
) else (
341-
call :WriteLine "Not found" "Gray"
342-
)
343335

336+
if "!supportCUDA!" == "true" (
337+
call :Write "Checking for CUDA..."
338+
wmic PATH Win32_VideoController get Name | find "NVIDIA" > NUL
339+
if errorlevel 0 (
340+
set hasCUDA=true
341+
call :WriteLine "Present" "Green"
342+
) else (
343+
call :WriteLine "Not found" "Gray"
344+
)
345+
)
344346

345347
REM Check for requirements.platform.[CUDA].txt first, then fall back to requirements.txt
346348

Installers/Docker/README

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
[![made-for-VSCode](https://img.shields.io/badge/Made%20for-VSCode-1f425f.svg)](https://open.vscode.dev/codeproject/CodeProject.SenseAI/) [![made-with-python](https://img.shields.io/badge/Made%20with-Python-orange)](https://www.python.org/) [![GitHub license](https://img.shields.io/badge/license-SSPL-green)](https://www.mongodb.com/licensing/server-side-public-license) [![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
1+
[![made-for-VSCode](https://img.shields.io/badge/Made%20for-VSCode-1f425f.svg)](https://open.vscode.dev/codeproject/CodeProject.AI-Server/) [![made-with-python](https://img.shields.io/badge/Made%20with-Python-orange)](https://www.python.org/) [![GitHub license](https://img.shields.io/badge/license-SSPL-green)](https://www.mongodb.com/licensing/server-side-public-license) [![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
22

3-
# CodeProject AI Server
3+
# CodeProject.AI Server
44

55
[**Download the latest version**](https://www.codeproject.com/ai/latest.aspx)
66

77
A standalone, self-hosted, fast, free and Open Source Artificial Intelligence microserver for any
88
platform, any language. It can be installed locally, required no off-device or out of network data
99
transfer, and is easy to use.
1010

11-
![Object detection](https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/mkdocs/CodeProject.AI/docs/img/DetectThings.PNG)
11+
![Object detection](https://www.codeproject.com/ai/docs/img/DetectThings.png)
1212

1313
# Supported Platforms
1414

1515
<div style="width:75%;min-width:700px;margin:30px auto">
16-
fse
17-
| <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/windows.svg" width=64 /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/macos.svg" title="macOS" width="64" />| <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/Ubuntu.svg" title="Ubuntu" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/docker.svg" title="Docker" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/VisualStudio.svg" title="Visual Studio" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/VisualStudioCode.svg" title="Visual Studio Code" width="64" /> |
18-
|:-------:|:-----:|:------:|:------:|:-------------------:|:------------------:|
19-
| Windows | macOS | Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
16+
17+
| <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/windows.svg" width=64 /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/macos.svg" title="macOS" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/apple-silicon.svg" title="macOS-Arm64" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/Ubuntu.svg" title="Ubuntu" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/docker.svg" title="Docker" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/VisualStudio.svg" title="Visual Studio" width="64" /> | <img src="https://github.com/codeproject/CodeProject.AI-Server/raw/main/docs/images/VisualStudioCode.svg" title="Visual Studio Code" width="64" /> |
18+
|:-------:| :-----: | :-----: | :------:|:------:|:-------------------:|:------------------:|
19+
| Windows | macOS | macOS Arm64 | Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
2020

2121
</div>
2222

2323
# Why
2424

25-
1. AI programming is something every single developer should be aware of. We wanted a fun project we could use to help teach developers and get them involved in AI. We'll be using SenseAI as a focus for articles and exploration to make it fun and painless to learn AI programming.
25+
1. AI programming is something every single developer should be aware of. We wanted a fun project we could use to help teach developers and get them involved in AI. We'll be using CodeProject.AI Server as a focus for articles and exploration to make it fun and painless to learn AI programming.
2626

27-
3. We got sick of fighting versions and libraries and models and being blocked by tiny annoying things every step of the way. So we put put this together so we could save you the frustration. We'll take care of the housekeeping, you focus on the code.
27+
3. We got sick of fighting versions and libraries and models and being blocked by tiny annoying things every step of the way. So we put put this together so we could save you the frustation. We'll take care of the housekeeping, you focus on the code.
2828

2929
2. We also got sick of needing to sign up to potentially expensive services for AI functionality. This is something we need, and by sharing maybe you can use it too, and hopefully add your own modules and improvements along the way.
3030

3131
## Cut to the chase: how do I play with it?
3232

3333
### 1: Running and playing with the features
3434

35-
1. [**Download the latest version**](https://www.codeproject.com/ai/sense/latest.aspx), install, and launch the shortcut to the server's dashboard on your desktop.
36-
2. On the dashboard, top and centre, is a link to the CodeProject AI Explorer. Open that and play!
35+
1. [**Download the latest version**](https://www.codeproject.com/ai/latest.aspx), install, and launch the shortcut to the server's dashboard on your desktop.
36+
2. On the dashboard, top and centre, is a link to the CodeProject.AI Server Explorer. Open that and play!
3737

3838
### 2: Running and debugging the code
3939

40-
1. Clone the CodeProject AI reposotory.
40+
1. Clone the CodeProject.AI Server repository.
4141
2. Make sure you have Visual Studio Code or Visual Studio 2019+ installed.
4242
3. Run the setup script in /Installers/Dev
4343
4. Debug the front-end server application (see notes below, but it's easy)
@@ -73,12 +73,12 @@ function detectScene(fileChooser) {
7373
</html>
7474
```
7575

76-
You can include the CodeProject AI installer (or just a link to the latest version of the installer) in your own apps and installers and voila, you have an AI enabled app.
76+
You can include the CodeProject.AI Server installer (or just a link to the latest version of the installer) in your own apps and installers and voila, you have an AI enabled app.
7777

7878

7979
## What does it include?
8080

81-
CodeProject AI includes
81+
CodeProject.AI Server includes
8282

8383
1. **A HTTP REST API Server.** The server listens for requests from other apps, passes them to the backend analysis services for processing, and then passes the results back to the caller. It runs as a simple self contained web service on your device.
8484
2. **Backend Analysis services**. The brains of the operation is in the analysis services sitting behind the front end API. All processing of data is done on the current machine. No calls to the cloud and no data leaving the device.
@@ -88,22 +88,22 @@ CodeProject AI includes
8888

8989
It can detect stuff!
9090

91-
This CodeProject AI container can
91+
CodeProject.AI Server can currently
9292

9393
- Detect objects in images
9494
- Detect faces in images
9595
- Detect the type of scene represented in an image
9696
- Recognise faces that have been registered with the service
97-
- Provide Custom object detection. We include a license plate detector, but you can add other detection models.
97+
- Perform detection using custom models
9898

99-
The development version of CodeProject.AI includes other modules including further image processing, text processing and demo modules to help you understand how to add your own modules and to explore the possibilities. We will be constantly expanding the feature list.
99+
We will be constantly expanding the feature list.
100100

101101
## Our Goals
102102

103-
1. **To promote AI development** and inspire the AI developer community to dive in and have a go. AI is here, it's in demand, and it's a huge paradigm change in the industry. Whether you like AI or not, developers owe it to themselves to experiment in and familiarise themselves with the technology. This is CodeProject AI: a demonstration, a playground, a learning tool, and a library and service that can be used out of the box.
103+
1. **To promote AI development** and inspire the AI developer community to dive in and have a go. AI is here, it's in demand, and it's a huge paradigm change in the industry. Whether you like AI or not, developers owe it to themselves to experiment in and familiarise themselves with the technology. This is CodeProject.AI Server: a demonstration, a playground, a learning tool, and a library and service that can be used out of the box.
104104
2. **To make AI development *easy***. It's not that AI development is that hard. It's that there are so, so many options. Our architecture is designed to allow any AI implementation to find a home in our system, and for our service to be callable from any language.
105105
3. **To focus on core use-cases**. We're deliberately not a solution for everyone. Instead we're a solution for common day-to-day needs. We will be adding dozens of modules and scores of AI capabilities to our system, but our goal is always clarity and simplicity over a 100% solution.
106-
4. **To tap the expertise of the Developer Community**. We're not experts but we know a developer or two out there who are. The true power of CodeProject AI comes from the contributions and improvements from our AI community.
106+
4. **To tap the expertise of the Developer Community**. We're not experts but we know a developer or two out there who are. The true power of CodeProject.AI Server comes from the contributions and improvements from our AI community.
107107

108108

109109
#### Supported Development Environments
@@ -113,8 +113,8 @@ This current release works in Visual Studio 2019+ on Windows 10+, and Visual Stu
113113

114114
## How to Guides
115115

116-
- [Installing CodeProject AI on your machine](https://www.codeproject.com/ai/senseai/why/install_on_windows.html). For those who have CodeProject AI integrated with HomeAssist or Blue Iris
117-
- [Setting up the development environment](https://www.codeproject.com/ai/senseai/devguide/install_dev.html) (spoiler: it's easy!)
118-
- [Running in Docker](https://www.codeproject.com/ai/senseai/why/running_in_docker.html)
119-
- Setup or install issues? See [Common Errors](https://www.codeproject.com/ai/senseai/devguide/common_errors.html)
116+
- [Installing CodeProject.AI Server on your machine](https://www.codeproject.com/ai/docs/why/install_on_windows.html). For those who have CodeProject.AI Server integrated with HomeAssist or Blue Iris
117+
- [Setting up the development environment](https://www.codeproject.com/ai/docs/devguide/install_dev.html) (spoiler: it's easy!)
118+
- [Running in Docker](https://www.codeproject.com/ai/docs/why/running_in_docker.html)
119+
- Setup or install issues? See [Common Errors](https://www.codeproject.com/ai/docs/devguide/common_errors.html)
120120

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ A standalone, self-hosted, fast, free and Open Source Artificial Intelligence mi
88
platform, any language. It can be installed locally, required no off-device or out of network data
99
transfer, and is easy to use.
1010

11-
![Object detection](docs/mkdocs/CodeProject.AI/docs/img/DetectThings.PNG)
11+
![Object detection](https://www.codeproject.com/ai/docs/img/DetectThings.png)
1212

1313
# Supported Platforms
1414

1515
<div style="width:75%;min-width:700px;margin:30px auto">
1616

17-
| <img src="docs/images/windows.svg" title="Windows" style="width:64px"> | <img src="docs/images/macos.svg" title="macOS" style="width:72px"> | <img src="docs/images/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="docs/images/Ubuntu.svg" title="Ubuntu" style="width:64px"> | <img src="docs/images/docker.svg" title="Docker" style="width:64px"> | <img src="docs/images/VisualStudio.svg" title="Visual Studio" style="width:64px"> | <img src="docs/images/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px"> |
18-
|:-------:|:-----:|:------:|:------:|:-------------------:|:------------------:|
19-
| Windows | macOS | Apple<br>Silicon | Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
17+
| <img src="docs/images/windows.svg" title="Windows" style="width:64px"> | <img src="docs/images/macos.svg" title="macOS" style="width:72px"> | <img src="docs/images/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="docs/images/Ubuntu.svg" title="Ubuntu" style="width:64px"> | <img src="docs/images/docker.svg" title="Docker" style="width:64px"> | <img src="docs/images/VisualStudio.svg" title="Visual Studio" style="width:64px"> | <img src="docs/images/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px"> |
18+
| :------: | :---: | :---------: | :-----: | :----: | :--------------------: | :-------------------: |
19+
| Windows | macOS | macOS-arm64 | Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
2020

2121
</div>
2222

docs/mkdocs/CodeProject.AI/docs/why/running_in_docker.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
---
32
title: Running CodeProject.AI Server in Docker
43
tags:
54
- CodeProject.AI
@@ -14,13 +13,13 @@ Internally, CodeProject.AI server runs on port 5000. You can expose this to the
1413
=== "Windows"
1514

1615
``` batch title='Command line'
17-
docker run -p 5000:5000 --name CodeProject.AI-Server -d -v c:\ProgramData\CodeProject\AI:/usr/share/CodeProject/AI codeproject/codeprojectai-server
16+
docker run -p 5000:5000 --name CodeProject.AI-Server -d -v c:\ProgramData\CodeProject\AI:/usr/share/CodeProject/AI codeproject/ai-server
1817
```
1918

2019
=== "Linux"
2120

2221
``` shell
23-
docker run -p 5000:5000 --name CodeProject.AI-Server -d -v /usr/share/CodeProject/AI:/usr/share/CodeProject/AI codeproject/codeprojectai-server
22+
docker run -p 5000:5000 --name CodeProject.AI-Server -d -v /usr/share/CodeProject/AI:/usr/share/CodeProject/AI codeproject/ai-server
2423
```
2524

2625
=== "macOS"
@@ -29,7 +28,7 @@ Internally, CodeProject.AI server runs on port 5000. You can expose this to the
2928
we'll use port 5500:
3029

3130
``` shell
32-
docker run -p 5500:5000 --name CodeProject.AI-Server -d -v /usr/share/CodeProject/AI:/usr/share/CodeProject/AI codeproject/codeprojectai-server
31+
docker run -p 5500:5000 --name CodeProject.AI-Server -d -v /usr/share/CodeProject/AI:/usr/share/CodeProject/AI codeproject/ai-server
3332
```
3433

3534

src/API/Server/FrontEnd/Frontend.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>CodeProject.AI.Server</AssemblyName>
8-
<Version>1.5.0.0</Version>
8+
<Version>1.5.1.0</Version>
99
<RootNamespace>CodeProject.AI.API.Server.Frontend</RootNamespace>
1010
<UserSecretsId>14515168-17dd-49db-9023-0749bb408a37</UserSecretsId>
1111
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

src/API/Server/FrontEnd/Properties/PublishProfiles/WinInstallPackage.pubxml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
7-
<DeleteExistingFiles>True</DeleteExistingFiles>
8-
<ExcludeApp_Data>False</ExcludeApp_Data>
9-
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
7+
<DeleteExistingFiles>true</DeleteExistingFiles>
8+
<ExcludeApp_Data>false</ExcludeApp_Data>
9+
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
1010
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
1111
<LastUsedPlatform>Any CPU</LastUsedPlatform>
1212
<PublishProvider>FileSystem</PublishProvider>
1313
<PublishUrl>bin\InstallPackage</PublishUrl>
1414
<WebPublishMethod>FileSystem</WebPublishMethod>
1515
<SiteUrlToLaunchAfterPublish />
16-
<TargetFramework>net5.0</TargetFramework>
16+
<TargetFramework>net6.0</TargetFramework>
1717
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
18-
<PublishSingleFile>True</PublishSingleFile>
19-
<PublishTrimmed>True</PublishTrimmed>
18+
<PublishSingleFile>false</PublishSingleFile>
2019
<ProjectGuid>a0cf3bee-8ee3-4b23-beb8-9d258c0510a3</ProjectGuid>
2120
<SelfContained>true</SelfContained>
21+
<PublishTrimmed>false</PublishTrimmed>
22+
<PublishReadyToRun>false</PublishReadyToRun>
2223
</PropertyGroup>
2324
</Project>

src/API/Server/FrontEnd/version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"versionInfo": {
44
"Major": 1,
55
"Minor": 5,
6-
"Patch": 0,
6+
"Patch": 1,
77
"Build": 0,
88
"PreRelease": "Beta",
99
"SecurityUpdate": false,
10-
"File": "CodeProject.AI.Server-1.5.0.zip",
10+
"File": "CodeProject.AI.Server-1.5.1.zip",
1111
"ReleaseNotes": "Custom Object detection models and a cleaner leaner installer."
1212
}
1313
}

0 commit comments

Comments
 (0)