refactor namespace to SpongeLLM and misc

SpongeEngine · Jan 26, 2025 · edb62f8 · edb62f8
1 parent 4918e25
commit edb62f8
Show file tree

Hide file tree

Showing 43 changed files with 120 additions and 73 deletions.
diff --git a/SpongeEngine.KoboldSharp.Tests/Integration/IntegrationTestBase.cs b/SpongeEngine.KoboldSharp.Tests/Integration/IntegrationTestBase.cs
@@ -1,24 +1,20 @@
 using Microsoft.Extensions.Logging;
 using SpongeEngine.KoboldSharp.Tests.Common;
-using SpongeEngine.LLMSharp.Core;
+using SpongeEngine.SpongeLLM.Core.Interfaces;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace SpongeEngine.KoboldSharp.Tests.Integration
 {
     public abstract class IntegrationTestBase : TestBase, IAsyncLifetime
     {
-        protected readonly KoboldSharpClient Client;
+        protected readonly KoboldSharpClient? Client;
         protected readonly ITestOutputHelper Output;
-        protected readonly ILogger Logger;
         protected bool ServerAvailable;
 
         protected IntegrationTestBase(ITestOutputHelper output)
         {
             Output = output;
-            Logger = LoggerFactory
-                .Create(builder => builder.AddXUnit(output))
-                .CreateLogger(GetType());
 
             Client = new KoboldSharpClient(
                 new KoboldSharpClientOptions() 
@@ -27,7 +23,9 @@ protected IntegrationTestBase(ITestOutputHelper output)
                     { 
                         BaseAddress = new Uri(TestConfig.BaseUrl)
                     },
-                    Logger = Logger,
+                    Logger = LoggerFactory
+                        .Create(builder => builder.AddXUnit(output))
+                        .CreateLogger(GetType())
                 });
         }
 
@@ -36,6 +34,7 @@ public async Task InitializeAsync()
             try
             {
                 ServerAvailable = await Client.IsAvailableAsync();
+
                 if (ServerAvailable)
                 {
                     Output.WriteLine("KoboldCpp server is available");
@@ -55,18 +54,11 @@ public async Task InitializeAsync()
             }
         }
 
-        public Task DisposeAsync()
+        public async Task DisposeAsync()
         {
-            if (Client is IDisposable disposable)
-            {
-                disposable.Dispose();
-            }
-            return Task.CompletedTask;
-        }
-
-        private class SkipException : Exception
-        {
-            public SkipException(string message) : base(message) { }
+            Client?.Options.HttpClient?.Dispose();
+
+            await Task.CompletedTask;
         }
     }
 }
diff --git a/SpongeEngine.KoboldSharp.Tests/SpongeEngine.KoboldSharp.Tests.csproj b/SpongeEngine.KoboldSharp.Tests/SpongeEngine.KoboldSharp.Tests.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-        <PackageReference Include="WireMock.Net" Version="1.6.9" />
+        <PackageReference Include="WireMock.Net" Version="1.7.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/AbortGenerate.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/AbortGenerate.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/CountTokensAsync.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/CountTokensAsync.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/DetokenizeAsync.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/DetokenizeAsync.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/LogProbs.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/LogProbs.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/PendingOutput.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/PendingOutput.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Extra/PerfInfo.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Extra/PerfInfo.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/GetMultiplayerStory.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/GetMultiplayerStory.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/MultiplayerStatus.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/MultiplayerStatus.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/SetMultiplayerStory.cs b/SpongeEngine.KoboldSharp.Tests/Unit/Multiplayer/SetMultiplayerStory.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/ImageToImage.cs b/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/ImageToImage.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/InterrogateImage.cs b/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/InterrogateImage.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/StableDiffusionModels.cs b/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/StableDiffusionModels.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/StableDiffusionSamplers.cs b/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/StableDiffusionSamplers.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/TextToImage.cs b/SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/TextToImage.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.Tests/Unit/United/GetVersionInfoAsync.cs b/SpongeEngine.KoboldSharp.Tests/Unit/United/GetVersionInfoAsync.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;

diff --git a/SpongeEngine.KoboldSharp.sln b/SpongeEngine.KoboldSharp.sln
@@ -3,6 +3,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpongeEngine.KoboldSharp",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpongeEngine.KoboldSharp.Tests", "SpongeEngine.KoboldSharp.Tests\SpongeEngine.KoboldSharp.Tests.csproj", "{B4C06852-1A11-45B9-8E83-CF7ABEE36F12}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpongeEngine.SpongeLLM.Core", "..\SpongeLLM.Core\SpongeEngine.SpongeLLM.Core\SpongeEngine.SpongeLLM.Core.csproj", "{9223BC93-3F5D-4A17-B564-59C662F4B63F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,5 +19,9 @@ Global
 		{B4C06852-1A11-45B9-8E83-CF7ABEE36F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4C06852-1A11-45B9-8E83-CF7ABEE36F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4C06852-1A11-45B9-8E83-CF7ABEE36F12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9223BC93-3F5D-4A17-B564-59C662F4B63F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9223BC93-3F5D-4A17-B564-59C662F4B63F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9223BC93-3F5D-4A17-B564-59C662F4B63F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9223BC93-3F5D-4A17-B564-59C662F4B63F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/SpongeEngine.KoboldSharp/Extra/AbortGenerateAsync.cs b/SpongeEngine.KoboldSharp/Extra/AbortGenerateAsync.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/CountTokensAsync.cs b/SpongeEngine.KoboldSharp/Extra/CountTokensAsync.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/DetokenizeAsync.cs b/SpongeEngine.KoboldSharp/Extra/DetokenizeAsync.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GenerateStreamAsync.cs b/SpongeEngine.KoboldSharp/Extra/GenerateStreamAsync.cs
@@ -5,13 +5,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {
     public partial class KoboldSharpClient
-    {
-                /// <summary>
+    { 
+        /// <summary>
         /// Generates text given a prompt and generation settings, with SSE streaming. Unspecified values are set to defaults.
         /// SSE streaming establishes a persistent connection, returning ongoing process in the form of message events.
         /// event: message

diff --git a/SpongeEngine.KoboldSharp/Extra/GetExtraVersionInfoAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetExtraVersionInfoAsync.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GetLastLogProbsAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetLastLogProbsAsync.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GetPendingOutputAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetPendingOutputAsync.cs
@@ -1,6 +1,6 @@
 using System.Net.Http.Json;
 using System.Text.Json;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GetPerfInfoAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetPerfInfoAsync.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GetServerPropertiesAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetServerPropertiesAsync.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/GetStableDiffusionModelsAsync.cs b/SpongeEngine.KoboldSharp/Extra/GetStableDiffusionModelsAsync.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {

diff --git a/SpongeEngine.KoboldSharp/Extra/WebSearchAsync.cs b/SpongeEngine.KoboldSharp/Extra/WebSearchAsync.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.LLMSharp.Core.Exceptions;
+using SpongeEngine.SpongeLLM.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {