Merge branch 'main' of https://github.com/codeproject/CodeProject.AI-Server

Chris Maunder · Chris Maunder · commit bd64e4fd359a · 2024-10-26T19:48:48.000-04:00
diff --git a/README.md b/README.md
@@ -9,19 +9,19 @@
 
 # CodeProject.AI Server
 
- [**Download the latest version**](https://www.codeproject.com/ai/latest.aspx)
+ [**Download the latest version**](https://codeproject.github.io/codeproject.ai/latest.html)
 
 A standalone, self-hosted, fast, free and Open Source Artificial Intelligence microserver for any 
 platform, any language. It can be installed locally, required no off-device or out of network data
 transfer, and is easy to use.
 
-![Object detection](https://www.codeproject.com/ai/docs/img/DetectThings.png)
+![Object detection](https://codeproject.github.io/codeproject.ai/img/DetectThings.png)
 
 # Supported Platforms
 
 <div style="width:75%;min-width:700px;margin:30px auto">
 
-| <img src="https://www.codeproject.com/ai/docs/img/windows.svg" title="Windows" style="width:64px">  | <img src="https://www.codeproject.com/ai/docs/img/macos.svg" title="macOS" style="width:72px">  | <img src="https://www.codeproject.com/ai/docs/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/Ubuntu.svg" title="Ubuntu" style="width:64px">  | <img src="https://www.codeproject.com/ai/docs/img/RaspberryPi64.svg" title="Raspberry Pi arm64" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/docker.svg" title="Docker" style="width:64px">  |  <img src="https://www.codeproject.com/ai/docs/img/VisualStudio.svg" title="Visual Studio" style="width:64px">         |         <img src="https://www.codeproject.com/ai/docs/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px">        |
+| <img src="https://codeproject.github.io/codeproject.ai/img/windows.svg" title="Windows" style="width:64px">  | <img src="https://codeproject.github.io/codeproject.ai/img/macos.svg" title="macOS" style="width:72px">  | <img src="https://codeproject.github.io/codeproject.ai/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://codeproject.github.io/codeproject.ai/img/Ubuntu.svg" title="Ubuntu" style="width:64px">  | <img src="https://codeproject.github.io/codeproject.ai/img/RaspberryPi64.svg" title="Raspberry Pi arm64" style="width:64px"> | <img src="https://codeproject.github.io/codeproject.ai/img/docker.svg" title="Docker" style="width:64px">  |  <img src="https://codeproject.github.io/codeproject.ai/img/VisualStudio.svg" title="Visual Studio" style="width:64px">         |         <img src="https://codeproject.github.io/codeproject.ai/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px">        |
 | :------: |  :---: | :---------: | :-----: | :----: | :----: | :--------------------: | :-------------------: |
 | Windows  | macOS  | macOS arm64 |  Ubuntu / Debian | Raspberry&nbsp;Pi arm64 |  Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
 
@@ -32,15 +32,15 @@ transfer, and is easy to use.
 
 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 as a focus for articles and exploration to make it fun and painless to learn AI programming.
 
-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.
+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.
   
 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.
 
 ## Cut to the chase: how do I play with it?
 
 ### 1: Running and playing with the features
 
-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.
+1. [**Download the latest version**](https://codeproject.github.io/codeproject.ai/latest.html), install, and launch the shortcut to the server's dashboard on your desktop.
 2. On the dashboard, top and centre, is a link to the CodeProject.AI Explorer. Open that and play!
 
 ### 2: Running and debugging the code
@@ -127,8 +127,8 @@ The current release provides support for CPU on each platform, DirectML on Windo
 
 ## How to Guides
 
- - [Installing CodeProject.AI on your machine](https://www.codeproject.com/ai/docs/why/install_on_windows.html). For those who have CodeProject.AI integrated with Home Assist or Blue Iris
- - [Setting up the development environment](https://www.codeproject.com/ai/docs/devguide/install_dev.html) (spoiler: it's easy!)
- - [Running in Docker](https://www.codeproject.com/ai/docs/why/running_in_docker.html)
- - Setup or install issues? See [Common Errors](https://www.codeproject.com/ai/docs/devguide/common_errors.html)
+ - [Installing CodeProject.AI on your machine](https://codeproject.github.io/codeproject.ai/why/install_on_windows.html). For those who have CodeProject.AI integrated with Home Assist or Blue Iris
+ - [Setting up the development environment](https://codeproject.github.io/codeproject.ai/devguide/install_dev.html) (spoiler: it's easy!)
+ - [Running in Docker](https://codeproject.github.io/codeproject.ai/why/running_in_docker.html)
+ - Setup or install issues? See [Common Errors](https://codeproject.github.io/codeproject.ai/devguide/common_errors.html)
 
diff --git a/modules/ObjectDetectionYOLOv5-6.2/modulesettings.json b/modules/ObjectDetectionYOLOv5-6.2/modulesettings.json
@@ -11,7 +11,7 @@
         "License": "GPL-3.0",
         "LicenseUrl": "https://opensource.org/licenses/GPL-3.0",
         "Author": "Matthew Dennis",
-        "Homepage": "https://codeproject.com/ai",
+        "Homepage": "https://codeproject.github.io/codeproject.ai",
         "BasedOn": "Ultralytics YOLOv5",
         "BasedOnUrl": "https://github.com/ultralytics/yolov5"
       },
diff --git a/modules/ObjectDetectionYOLOv5Net/modulesettings.json b/modules/ObjectDetectionYOLOv5Net/modulesettings.json
@@ -12,7 +12,7 @@
         "License": "MIT",
         "LicenseUrl": "https://opensource.org/licenses/MIT",
         "Author": "Matthew Dennis",
-        "Homepage": "https://codeproject.com/ai",
+        "Homepage": "https://codeproject.github.io/codeproject.ai",
         "BasedOn": "yolov5-net",
         "BasedOnUrl": "https://github.com/techwingslab/yolov5-net"
       },
diff --git a/src/SDK/NET/Common/VersionInfo.cs b/src/SDK/NET/Common/VersionInfo.cs
@@ -2,6 +2,22 @@
 
 namespace CodeProject.AI.SDK.Common
 {
+    /// <summary>
+    /// Maps to the server's version.json file
+    /// </summary>
+    public class VersionFileContents
+    {
+        public class VersionSectionWrap
+        {
+            /// <summary>
+            /// The Version info
+            /// </summary>
+            public VersionInfo? VersionInfo { get; set; } = null;
+        }
+
+        public VersionSectionWrap? VersionSection { get; set; } = null;
+    }
+
     /// <summary>
     /// The current version of the server.
     /// </summary>
diff --git a/src/demos/clients/Javascript/Vision.html b/src/demos/clients/Javascript/Vision.html
@@ -1057,7 +1057,7 @@
         <div class=" mx-auto p-3" style="max-width:1100px;">
 
             <div class="w-100 header d-flex justify-content-between">
-                <a href="https://www.codeproject.com" style="margin:2px 0 2px 5px">
+                <a href="https://codeproject.github.io/codeproject.ai" style="margin:2px 0 2px 5px">
                     <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
                          xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24" role="img"
                          style="height: 60px; margin-right: -12px;">
@@ -1108,7 +1108,7 @@
 
                 <!--<div style="font-size: 2.1rem; margin-top: 12px;">CodeProject.AI Explorer</div>-->
 
-                <a href="https://www.codeproject.com/ai" style="margin:0px 5px 0 0">
+                <a href="https://codeproject.github.io/codeproject.ai" style="margin:0px 5px 0 0">
                     <svg viewBox="0 0 660 160" xmlns="http://www.w3.org/2000/svg" style="height:60px">
                         <defs>
                             <style>
diff --git a/src/demos/modules/DotNetLongProcess/modulesettings.json b/src/demos/modules/DotNetLongProcess/modulesettings.json
@@ -12,7 +12,7 @@
         "License": "MIT",
         "LicenseUrl": "https://opensource.org/licenses/MIT",
         "Author": "Chris Maunder",
-        "Homepage": "https://codeproject.com/ai",
+        "Homepage": "https://codeproject.github.io/codeproject.ai",
         "BasedOn":     null,
         "BasedOnUrl":  null
       },
diff --git a/src/demos/modules/DotNetSimple/modulesettings.json b/src/demos/modules/DotNetSimple/modulesettings.json
@@ -12,7 +12,7 @@
         "License": "MIT",
         "LicenseUrl": "https://opensource.org/licenses/MIT",
         "Author": "Chris Maunder",
-        "Homepage": "https://codeproject.com/ai",
+        "Homepage": "https://codeproject.github.io/codeproject.ai",
         "BasedOn":     "Yolov8.Net",
         "BasedOnUrl":  "https://github.com/sstainba/Yolov8.Net"
       },
diff --git a/src/demos/modules/PythonLongProcess/modulesettings.json b/src/demos/modules/PythonLongProcess/modulesettings.json
@@ -13,7 +13,7 @@
         "License": "MIT",
         "LicenseUrl": "",
         "Author": "Chris Maunder",
-        "Homepage": "https://codeproject.com/ai",
+        "Homepage": "https://codeproject.github.io/codeproject.ai",
         "BasedOn": "",
         "BasedOnUrl": ""
       },
diff --git a/src/demos/modules/PythonSimple/modulesettings.json b/src/demos/modules/PythonSimple/modulesettings.json
@@ -11,7 +11,7 @@
         "License":     "AGPL-3.0",
         "LicenseUrl":  "https://www.gnu.org/licenses/agpl-3.0.en.html",
         "Author":      "Chris Maunder",
-        "Homepage":    "https://codeproject.com/ai",
+        "Homepage":    "https://codeproject.github.io/codeproject.ai",
         "BasedOn":     "ultralytics",
         "BasedOnUrl":  "https://github.com/ultralytics/ultralytics"
       },
diff --git a/src/server/Modules/ModuleInstaller.cs b/src/server/Modules/ModuleInstaller.cs
@@ -269,7 +269,7 @@ public async Task<List<ModuleDescription>> GetInstallableModulesAsync()
 #if DEBUG
             TimeSpan checkInterval = TimeSpan.FromSeconds(15);
 #else
-            TimeSpan checkInterval = TimeSpan.FromMinutes(5);
+            TimeSpan checkInterval = TimeSpan.FromHours(24);
 #endif
             List<ModuleDescription>? downloadableModuleList = null;
 
diff --git a/src/server/Server.csproj b/src/server/Server.csproj
@@ -43,7 +43,7 @@ https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=v
 	<!-- Package properties -->
 	<PropertyGroup>
 		<PackageLicenseExpression>SSPL-1.0</PackageLicenseExpression>
-		<PackageProjectUrl>https://www.codeproject.com/ai</PackageProjectUrl>
+		<PackageProjectUrl>https://codeproject.github.io/codeproject.ai</PackageProjectUrl>
 		<PackageIcon>codeproject125x125.png</PackageIcon>
 	</PropertyGroup>
 
diff --git a/src/server/Version/ServerVersionService.cs b/src/server/Version/ServerVersionService.cs
@@ -104,7 +104,20 @@ public ServerVersionService(IOptions<VersionConfig> versionOptions,
                     {
                         PropertyNameCaseInsensitive = true
                     };
+
+                    // We have two formats we need to deal with: first was the JSON returned by the
+                    // previous CodeProject webservice. This was purely a VersionInfo JSON object.
+                    // The second is the JSON from the server's version.json file itself, which 
+                    // contains a VersionInfo object inside a VersionSection object
+                    //
                     version = JsonSerializer.Deserialize<VersionInfo>(data, options);
+                    if (version is null || version.Major == 0)
+                    {
+                        var versionFileContents = JsonSerializer.Deserialize<VersionFileContents>(data, options);
+                        if (versionFileContents?.VersionSection?.VersionInfo is not null)
+                            version = versionFileContents?.VersionSection?.VersionInfo;
+                    }
+
                     if (version is not null)
                     {
                         // A small adjustment. The version info contains the file *name* not a file
diff --git a/src/server/appsettings.development.json b/src/server/appsettings.development.json
@@ -6,8 +6,13 @@
   },
 
   "ServerOptions": {
-    "ServerVersionCheckUrl": "https://www.codeproject.com/ai/version.aspx",
-    "ServerDownloadUrl": "https://www.codeproject.com/ai/latest.aspx"
+    // URLs and Endpoints on CodeProject.com
+    // "ServerVersionCheckUrl": "https://www.codeproject.com/ai/version.aspx", // Check for latest version
+    // "ServerDownloadUrl":     "https://www.codeproject.com/ai/latest.aspx",  // Link to download latest server
+
+    // URLs and Endpoints on GitHub.io
+    "ServerVersionCheckUrl": "https://codeproject.github.io/codeproject.ai/config/version.json",
+    "ServerDownloadUrl":     "https://codeproject.github.io/codeproject.ai/latest.html",  // Link to download latest server
   },
 
   "MeshOptions": {
diff --git a/src/server/appsettings.json b/src/server/appsettings.json
@@ -59,8 +59,12 @@
     "DisableIPv6": false,
 
     // URLs and Endpoints on CodeProject.com
-    "ServerVersionCheckUrl": "https://www.codeproject.com/ai/version.aspx", // Check for latest version
-    "ServerDownloadUrl":     "https://www.codeproject.com/ai/latest.aspx",  // Link to download latest server
+    // "ServerVersionCheckUrl": "https://www.codeproject.com/ai/version.aspx", // Check for latest version
+    // "ServerDownloadUrl":     "https://www.codeproject.com/ai/latest.aspx",  // Link to download latest server
+
+    // URLs and Endpoints on GitHub.io
+    "ServerVersionCheckUrl": "https://codeproject.github.io/codeproject.ai/config/version.json",
+    "ServerDownloadUrl":     "https://codeproject.github.io/codeproject.ai/latest.html",  // Link to download latest server
 
     // These key/values are added to the set of environment variables when the backend analysis
     // modules are launched.
@@ -92,11 +96,19 @@
     "ModuleInstallTimeout": "00:20:00",
 
     // URLs and Endpoints on CodeProject.com
-    "ModuleListUrl":   "https://www.codeproject.com/ai/modules/list",  // Location of the JSON list of modules that can be downloaded
-    "ModelListUrl":    "https://www.codeproject.com/ai/models/list",   // Location of the JSON list of models that can be downloaded
-    // "AssetStorageUrl": "https://codeproject-ai.s3.ca-central-1.amazonaws.com/server/assets/",
-    // "AssetStorageUrl": "https://codeproject-ai-bunny.b-cdn.net/server/assets/",
-    "AssetStorageUrl": "https://www.codeproject.com/ai/download/server/assets/", // Location of downloadable models
+    // "ModuleListUrl":   "https://www.codeproject.com/ai/modules/list",  // Location of the JSON list of modules that can be downloaded
+    // "ModelListUrl":    "https://www.codeproject.com/ai/models/list",   // Location of the JSON list of models that can be downloaded
+    // "AssetStorageUrl": "https://www.codeproject.com/ai/download/server/assets/", // Location of downloadable models
+
+    // URLs on Bunny.net
+    "AssetStorageUrl": "https://codeproject-ai-bunny.b-cdn.net/server/assets/",
+    // "ModuleListUrl":   "https://codeproject-ai-bunny.b-cdn.net/modules/modules.json",
+    // "ModelListUrl":    "https://codeproject-ai-bunny.b-cdn.net/models/models.json",
+
+    // URLs on github.io
+    // "AssetStorageUrl": "https://codeproject.github.io/codeproject.ai/assets/",
+    "ModuleListUrl":   "https://codeproject.github.io/codeproject.ai/config/modules.json",
+    "ModelListUrl":    "https://codeproject.github.io/codeproject.ai/config/modules.json",
 
     // The location of the AI modules (pre-installed and downloaded/side-loaded)
     "ModuleInstallerScriptsDirPath":   "%ROOT_PATH%",                      // Where the installer scripts (setup.bat/.sh) live
diff --git a/src/server/wwwroot/explorer.html b/src/server/wwwroot/explorer.html
@@ -115,7 +115,7 @@
 					</svg>
 				</a>
 
-                <a href="https://www.codeproject.com/ai" style="margin:0px 5px 0 0">
+                <a href="https://www.codeproject.github.io/codeproject.ai" style="margin:0px 5px 0 0">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 40 860 160" height="60px">
                 <defs><style>.cls-1{fill:#fff;}.cls-2{fill:#b3ddca;}</style></defs>
                 <g><title>CodeProject.AI</title>
diff --git a/src/server/wwwroot/index.html b/src/server/wwwroot/index.html
@@ -142,7 +142,7 @@
 		S12.291,7.968,12.291,8.455z" />
                     </svg>
                 </a>
-                <a href="https://www.codeproject.com/ai" style="margin:0px 5px 0 0">
+                <a href="https://www.codeproject.github.io/codeproject.ai" style="margin:0px 5px 0 0">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 40 860 160" height="60px">
                 <defs><style>.cls-1{fill:#fff;}.cls-2{fill:#b3ddca;}</style></defs>
                 <g><title>CodeProject.AI</title>
@@ -153,10 +153,10 @@
             </div>
             <div class="d-flex justify-content-around small flex-nowrap overflow-hidden top-nav-bar" style="margin-top:-1rem">
                 <div class="me-3" title="Go to the CodeProject.AI homepage">
-                    <a href="https://www.codeproject.com/AI" target="_blank">CodeProject.AI</a>
+                    <a href="https://codeproject.github.io/codeproject.ai" target="_blank">CodeProject.AI</a>
                 </div>
                 <div title="Go to the CodeProject.AI documentation">
-                    <a href="https://www.codeproject.com/AI/docs/" target="_blank">Docs</a>
+                    <a href="https://codeproject.github.io/codeproject.ai/" target="_blank">Docs</a>
                 </div>
                 <div class="mx-3" title="Got a question or suggestion?">
                     <a href="https://www.codeproject.com/Feature/CodeProjectAI-Discussions.aspx"
@@ -183,20 +183,20 @@
                     Your self-contained AI server. 
                     
                     &nbsp;&nbsp; Need help?
-                    <a href="https://www.codeproject.com/AI/docs/devguide/common_errors.html" target="_blank">Common solutions</a> or
+                    <a href="https://codeproject.github.io/codeproject.ai/devguide/common_errors.html" target="_blank">Common solutions</a> or
                     <a href="https://www.codeproject.com/Feature/CodeProjectAI-Discussions.aspx" target="_blank">ask a Question</a>.
                     
                     &nbsp;&nbsp;
 
                     Use in your apps:
-                    <a href="https://www.codeproject.com/AI/docs/api/api_reference.html" target="_blank">API guide</a> or
-                    <a href="https://www.codeproject.com/AI/docs/devguide/module_examples/adding_new_modules.html" target="_blank">add
+                    <a href="https://codeproject.github.io/codeproject.ai/api/api_reference.html" target="_blank">API guide</a> or
+                    <a href="https://codeproject.github.io/codeproject.ai/devguide/module_examples/adding_new_modules.html" target="_blank">add
                     your own AI module</a>.
 
                     &nbsp;
 
-                    <b>FAQs</b>: <a href="https://www.codeproject.com/ai/docs/faq/blue-iris.html" target="_blank">Blue Iris</a>, 
-                    <a href="https://www.codeproject.com/ai/docs/faq/home-assistant.html" target="_blank">Home Assistant</a>, 
+                    <b>FAQs</b>: <a href="https://codeproject.github.io/codeproject.ai/faq/blue-iris.html" target="_blank">Blue Iris</a>, 
+                    <a href="https://codeproject.github.io/codeproject.ai/faq/home-assistant.html" target="_blank">Home Assistant</a>, 
                     <a href="https://www.codeproject.com/Articles/5349191/How-to-Setup-Agent-DVR-and-CodeProject-AI-Server-o" target="_blank">Agent DVR</a>,
                     <a href="https://www.codeproject.com/Articles/5345399/Setting-Up-a-Wyze-Cam-with-Blue-Iris-and-CodeProje" target="_blank">Wyze cams</a>.
                 </div>
