switch to SpongeLLM.Core v0.1.0

SpongeEngine · Jan 31, 2025 · 4bf8d1c · 4bf8d1c
1 parent 777fd4a
commit 4bf8d1c
Show file tree

Hide file tree

Showing 39 changed files with 143 additions and 143 deletions.
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.7.0" />
+        <PackageReference Include="WireMock.Net" Version="1.7.1" />
         <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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -66,7 +66,7 @@ public async Task AbortGenerate_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.AbortGenerateAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to abort generation");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -57,7 +57,7 @@ public async Task CountTokensAsync_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.CountTokensAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to count tokens");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -82,7 +82,7 @@ public async Task DetokenizeAsync_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.DetokenizeAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to detokenize");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -105,7 +105,7 @@ public async Task GetLastLogProbs_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetLastLogProbsAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get last log probabilities");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -87,7 +87,7 @@ public async Task GetPendingOutput_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetPendingOutputAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get pending output");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -99,7 +99,7 @@ public async Task GetPerfInfo_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetPerfInfoAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get performance info");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -67,7 +67,7 @@ public async Task GetMultiplayerStory_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetMultiplayerStoryAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get multiplayer story");
         }
 

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -97,7 +97,7 @@ public async Task GetMultiplayerStatus_WithInvalidSender_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetMultiplayerStatusAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get multiplayer status");
         }
 
@@ -121,7 +121,7 @@ public async Task GetMultiplayerStatus_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetMultiplayerStatusAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get multiplayer status");
         }
 

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -108,7 +108,7 @@ public async Task SetMultiplayerStory_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.SetMultiplayerStoryAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to set multiplayer story");
         }
 

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -121,7 +121,7 @@ public async Task ImageToImage_WithNoInitialImage_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.ImageToImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to generate image from image");
         }
 
@@ -145,7 +145,7 @@ public async Task ImageToImage_WithInvalidImage_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.ImageToImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to generate image from image");
         }
 
@@ -169,7 +169,7 @@ public async Task ImageToImage_WithServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.ImageToImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to generate image from image");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -58,7 +58,7 @@ public async Task InterrogateImage_WithInvalidImage_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.InterrogateImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to interrogate image");
         }
 
@@ -81,7 +81,7 @@ public async Task InterrogateImage_WithEmptyImage_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.InterrogateImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to interrogate image");
         }
 
@@ -104,7 +104,7 @@ public async Task InterrogateImage_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.InterrogateImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to interrogate image");
         }
 
@@ -127,7 +127,7 @@ public async Task InterrogateImage_WithNullResponse_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.InterrogateImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to interrogate image");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -84,7 +84,7 @@ public async Task GetStableDiffusionModels_WhenServerError_ShouldThrowException(
 
             // Act & Assert
             await Client.Invoking(c => c.GetStableDiffusionModelsAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get Stable Diffusion models");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -87,7 +87,7 @@ public async Task GetStableDiffusionSamplers_WhenServerError_ShouldThrowExceptio
 
             // Act & Assert
             await Client.Invoking(c => c.GetStableDiffusionSamplersAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get Stable Diffusion samplers");
         }
 

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -112,7 +112,7 @@ public async Task TextToImage_WithInvalidDimensions_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.TextToImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to generate image from text");
         }
 
@@ -135,7 +135,7 @@ public async Task TextToImage_WithServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.TextToImageAsync(request))
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to generate image from text");
         }
     }

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.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using Xunit;
@@ -45,7 +45,7 @@ public async Task GetVersionInfoAsync_WhenServerError_ShouldThrowException()
 
             // Act & Assert
             await Client.Invoking(c => c.GetVersionInfoAsync())
-                .Should().ThrowAsync<LlmSharpException>()
+                .Should().ThrowAsync<SpongeLLMException>()
                 .WithMessage("Failed to get version info");
         }
     }

diff --git a/SpongeEngine.KoboldSharp/Extra/AbortGenerateAsync.cs b/SpongeEngine.KoboldSharp/Extra/AbortGenerateAsync.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {
@@ -32,7 +32,7 @@ public async Task<bool> AbortGenerateAsync(string? genKey = null, CancellationTo
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    throw new LlmSharpException(
+                    throw new SpongeLLMException(
                         "Failed to abort generation",
                         (int)response.StatusCode,
                         content);
@@ -41,9 +41,9 @@ public async Task<bool> AbortGenerateAsync(string? genKey = null, CancellationTo
                 var result = JsonSerializer.Deserialize<AbortResponse>(content);
                 return result?.Success == "true";
             }
-            catch (Exception ex) when (ex is not LlmSharpException)
+            catch (Exception ex) when (ex is not SpongeLLMException)
             {
-                throw new LlmSharpException("Failed to abort generation", innerException: ex);
+                throw new SpongeLLMException("Failed to abort generation", innerException: ex);
             }
         }
     }

diff --git a/SpongeEngine.KoboldSharp/Extra/CountTokensAsync.cs b/SpongeEngine.KoboldSharp/Extra/CountTokensAsync.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using SpongeEngine.SpongeLLM.Core.Exceptions;
+using SpongeEngine.LLMSharp.Core.Exceptions;
 
 namespace SpongeEngine.KoboldSharp
 {
@@ -41,17 +41,17 @@ public async Task<CountTokensResponse> CountTokensAsync(CountTokensRequest reque
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    throw new LlmSharpException(
+                    throw new SpongeLLMException(
                         "Failed to count tokens",
                         (int)response.StatusCode,
                         content);
                 }
 
-                return JsonSerializer.Deserialize<CountTokensResponse>(content) ?? throw new LlmSharpException("Failed to deserialize token count response");
+                return JsonSerializer.Deserialize<CountTokensResponse>(content) ?? throw new SpongeLLMException("Failed to deserialize token count response");
             }
-            catch (Exception ex) when (ex is not LlmSharpException)
+            catch (Exception ex) when (ex is not SpongeLLMException)
             {
-                throw new LlmSharpException("Failed to count tokens", innerException: ex);
+                throw new SpongeLLMException("Failed to count tokens", innerException: ex);
             }
         }
     }