Merge branch 'v2.9.0' of https://github.com/codeproject/CodeProject.AI-Server into v2.9.0

Chris Maunder · Chris Maunder · commit cbc02622a788 · 2024-10-09T13:31:06.000-04:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -490,6 +490,7 @@
             }
         },
 
+        /*
         {
             "presentation": {
                 "group": "9 Demo clients",
@@ -502,25 +503,26 @@
             "console": "internalConsole",
             "request": "launch",
             "preLaunchTask": "build-explorer",
-            "cwd": "${workspaceFolder}/src/demos/clients/Net/CodeProject.AI.Explorer/",
+            "cwd": "${workspaceFolder}/src/demos/clients/Net/AiExplorer/",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development",
                 "RUNNING_IN_VSCODE": "true",
                 "DOTNET_NOLOGO": "true"
             }
         },
+        */
 
         {
             "presentation": {
                 "group": "9 Demo clients",
                 // "order": 90
             },
-            "name": "[Win] Run Explorer App",
+            "name": "[Win] AI Explorer Demo",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-explorer",
+            "preLaunchTask": "build-ai-explorer",
             "windows": {
-                "program": "${workspaceFolder}/src/demos/clients/Net/CodeProject.AI.Explorer/bin/Debug/net8.0-windows/CodeProject.AI.Explorer.exe",
+                "program": "${workspaceFolder}/src/demos/clients/Net/AiExplorer/bin/Debug/net8.0-windows/AiExplorer.exe",
             },
             "args": [],
             "cwd": "${workspaceFolder}",
@@ -533,6 +535,33 @@
             }
         },
 
+        {
+            "presentation": {
+                "group": "9 Demo clients",
+                // "order": 90
+            },
+            "name": "JSON client Demo",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build-json-client",
+            "program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/net8.0/JsonAPI",
+            "linux": {
+                "program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/net8.0/JsonAPI.dll",
+            },
+            "osx": {
+                "program": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/bin/Debug/net8.0/JsonAPI.dll",
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}/src/demos/clients/Net/JsonAPI/",
+            "stopAtEntry": false,
+            "console": "internalConsole",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development",
+                "RUNNING_IN_VSCODE": "true",
+                "DOTNET_NOLOGO": "true"
+            }
+        },
+
         {
             "presentation": {
                 "group": "9 Demo clients",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -250,13 +250,27 @@
         },   
 
         {
-            "label": "build-explorer",      // Builds ONLY the Windows Forms .NET demo explorer (windows only)
+            "label": "build-ai-explorer",      // Builds ONLY the Windows Forms .NET demo explorer (windows only)
             "type": "process",
             "group": "build",
             "command": "dotnet",
             "args": [
                 "build",
-                "${workspaceFolder}/src/demos/clients/Net/CodeProject.AI.Explorer",
+                "${workspaceFolder}/src/demos/clients/Net/AiExplorer",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },   
+
+        {
+            "label": "build-json-client",      // Builds ONLY the Windows Forms .NET demo explorer (windows only)
+            "type": "process",
+            "group": "build",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "${workspaceFolder}/src/demos/clients/Net/JsonApi",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -293,7 +307,7 @@
             "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}/src/demos/clients/Net/CodeProject.AI.Explorer/bin/Debug/net8.0-windows/win-x64/",
+            "command": "${workspaceFolder}/src/demos/clients/Net/AiExplorer/bin/Debug/net8.0-windows/win-x64/",
             "args": [],
             "type": "process"
         },
diff --git a/CodeProject.AI.sln b/CodeProject.AI.sln
@@ -181,7 +181,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetSimple", "src\demos\m
 EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "PythonSimple", "src\demos\modules\PythonSimple\PythonSimple.pyproj", "{6AE28B59-221B-4E3D-A66C-E255B26DAC92}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.AI.Explorer", "src\demos\clients\Net\CodeProject.AI.Explorer\CodeProject.AI.Explorer.csproj", "{1DB03AEC-8318-4F36-9A4B-FCC5BE00A029}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AiExplorer", "src\demos\clients\Net\AiExplorer\AiExplorer.csproj", "{1DB03AEC-8318-4F36-9A4B-FCC5BE00A029}"
 EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Face", "src\demos\clients\Python\Face\Face.pyproj", "{C2500118-FD99-49EF-B726-3E2A3B30A717}"
 EndProject
@@ -251,8 +251,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B2D0FCB2
 		devops\utils\stop_all.sh = devops\utils\stop_all.sh
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LlamaChatConsole", "src\demos\clients\Net\LlamaChatConsole\LlamaChatConsole.csproj", "{484D0804-BB60-4F8E-99B5-5779B10631D8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Go", "Go", "{1E0E93ED-1CBF-4D0D-AFD9-A91ECDB3BBF2}"
 	ProjectSection(SolutionItems) = preProject
 		src\demos\clients\Go\object-detect.go = src\demos\clients\Go\object-detect.go
@@ -325,7 +323,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "httpFiles", "httpFiles", "{
 		jsonPayload.http = jsonPayload.http
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CpaiJsonApiCall", "src\demos\clients\Net\CpaiJsonApiCall\CpaiJsonApiCall.csproj", "{7BFCEBCA-0677-4122-B474-B08D958F7FC7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApi", "src\demos\clients\Net\JsonApi\JsonApi.csproj", "{7BFCEBCA-0677-4122-B474-B08D958F7FC7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/demos/clients/Net/AiExplorer/AiExplorer.csproj b/src/demos/clients/Net/AiExplorer/AiExplorer.csproj
@@ -5,7 +5,7 @@
 
 	<PropertyGroup>
 		<RootNamespace>CodeProject.AI.Explorer</RootNamespace>
-		<AssemblyName>CodeProject.AI.Explorer</AssemblyName>
+		<AssemblyName>AiExplorer</AssemblyName>
 		<OutputType>WinExe</OutputType>
 		<Nullable>enable</Nullable>
 		<UseWindowsForms>true</UseWindowsForms>
diff --git a/src/demos/clients/Net/AiExplorer/Properties/launchSettings.json b/src/demos/clients/Net/AiExplorer/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "CodeProject.AI.Explorer": {
+    "AiExplorer": {
       "commandName": "Project",
       "commandLineArgs": "--MODE=high"
     }
diff --git a/src/demos/clients/Net/JsonAPI/Program.cs b/src/demos/clients/Net/JsonAPI/Program.cs
@@ -3,13 +3,18 @@
 using System.Net.Http.Headers;
 using System.Text;
 
-var filename = ".\\images\\study-group.jpg";
+// A demonstration of sending a request to CodeProject.AI Server as JSON instead
+// of FormData.
+
+string filename = "./images/study-group.jpg";
 using var httpClient = new HttpClient()
 {
     BaseAddress = new Uri("http://localhost:32168/v1/"),
-    Timeout = TimeSpan.FromMinutes(5),
+    Timeout     = TimeSpan.FromSeconds(30),
 };
 httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+
 string result;
 
 // Image detection
@@ -20,7 +25,7 @@
 Console.WriteLine(result);
 
 // Sentiment Analysis
-Console.WriteLine($"Sending {filename} to 'vision/detection'");
+Console.WriteLine($"Sending {filename} to 'text/sentiment'");
 var sentimentPayload = new RequestPayload();
 string textValue = "This movie was the worst thing since 'Green Lantern'.";
 Console.WriteLine($"\nSending '{textValue}' to 'text/sentiment'.");
@@ -31,6 +36,13 @@
 Console.WriteLine("Press ENTER to exit.");
 Console.ReadLine();
 
+/// <summary>
+/// Sends a JSON payload to CodeProject.AI Server and returns the result as a
+/// JSON string.
+/// </summary>
+/// <param name="url">The URL of the AI server endpoint</param>
+/// <param name="payload">The request payload</param>
+/// <returns>The result as a JSON string</returns>
 async Task<string> SendPayload( string url, RequestPayload payload)
 {
     string json = System.Text.Json.JsonSerializer.Serialize(payload);
@@ -40,5 +52,4 @@ async Task<string> SendPayload( string url, RequestPayload payload)
     using var response = await httpClient.PostAsync(url, content);
     var result = await response.Content.ReadAsStringAsync();
     return result;
-}
-
+}
diff --git a/src/scripts/utils.sh b/src/scripts/utils.sh
@@ -718,12 +718,21 @@ function setupDotNet () {
             return 6 # unable to download required asset
         fi
 
+        if [ "$architecture" = 'arm64' ]; then
+            dotnet_path="/opt/dotnet"
+        elif [ "$os" = "linux" ]; then
+            dotnet_path="/usr/lib/dotnet/"
+        else
+            # dotnet_path="/usr/lib/dotnet/"
+            # dotnet_path="~/.dotnet/"
+            dotnet_path="/usr/local/share/dotnet/"
+        fi
+
         # output a warning message if no admin rights and instruct user on manual steps
         if [ "$architecture" = 'arm64' ]; then
-            # installs in /opt/dotnet
             install_instructions="sudo bash '${installScriptsDirPath}/dotnet-install-arm.sh' $requestedNetMajorMinorVersion $requestedType"
         else
-            install_instructions="sudo bash '${installScriptsDirPath}/dotnet-install.sh' --install-dir '/usr/lib/dotnet/' --channel $requestedNetMajorMinorVersion --runtime $requestedType"
+            install_instructions="sudo bash '${installScriptsDirPath}/dotnet-install.sh' --install-dir '${dotnet_path}' --channel $requestedNetMajorMinorVersion --runtime $requestedType"
         fi
         checkForAdminAndWarn "$install_instructions"
 
@@ -752,21 +761,21 @@ function setupDotNet () {
                         fi               
                     else
                         if [ $verbosity = "quiet" ]; then
-                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--quiet"
+                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "$dotnet_path" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--quiet"
                         elif [ $verbosity = "loud" ]; then
-                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--verbose"
+                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "$dotnet_path" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--verbose"
                         else
-                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType"
+                            sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "$dotnet_path" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType"
                         fi
                     fi
                 fi
             else
                 if [ $verbosity = "quiet" ]; then
-                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--quiet"
+                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "${dotnet_path}" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--quiet"
                 elif [ $verbosity = "loud" ]; then
-                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--verbose"
+                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "${dotnet_path}" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--verbose"
                 else
-                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "/usr/lib/dotnet/" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType"
+                    sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "${dotnet_path}" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType"
                 fi
             fi
         fi
@@ -795,17 +804,24 @@ function setupDotNet () {
         if [ "$os" == "macos" ]; then
             # The install script is for CI/CD and doesn't actually register .NET. So add 
             # link and env variable
-            export DOTNET_ROOT=~/.dotnet
+            export DOTNET_ROOT=${dotnet_path}
             export PATH=${DOTNET_ROOT}${PATH:+:${PATH}}
 
             if [ ! -e /usr/local/bin/dotnet ]; then
-                ln -fs ~/.dotnet/dotnet /usr/local/bin/dotnet
+                ln -fs "${dotnet_path}dotnet" "/usr/local/bin/dotnet"
             fi
 
-            if grep -q 'export DOTNET_ROOT=' ~/.bashrc; then
-                echo 'export DOTNET_ROOT=~/.dotnet'                >> ~/.bashrc
-                echo "export PATH=${DOTNET_ROOT}${PATH:+:${PATH}}" >> ~/.bashrc
-            fi
+            # if [ -f ~/.bashrc ]; then
+                if [ ! -f ~/.bashrc ] || [ $(grep -q 'export DOTNET_ROOT=' ~/.bashrc) ]; then
+                    sudo echo "export DOTNET_ROOT=${dotnet_path}"           >> ~/.bashrc
+                    sudo echo "export PATH=${dotnet_path}${PATH:+:${PATH}}" >> ~/.bashrc
+                fi
+            # elif [ -f ~/.bash_profile ]; then
+            #     if grep -q 'export DOTNET_ROOT=' ~/.bash_profile; then
+            #         echo 'export DOTNET_ROOT=${dotnet_path}'           >> ~/.bash_profile
+            #         echo "export PATH=${dotnet_path}${PATH:+:${PATH}}" >> ~/.bash_profile
+            #     fi
+            # fi
         fi
     fi
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"profiles": {`
`3`		`- "CodeProject.AI.Explorer": {`
	`3`	`+ "AiExplorer": {`
`4`	`4`	`"commandName": "Project",`
`5`	`5`	`"commandLineArgs": "--MODE=high"`
`6`	`6`	`}`