fix: image generation small fix to match results of AUTOMATIC1111 UI (#…

…97) * image generation small fix to match results of AUTOMATIC1111 UI --------- Co-authored-by: Konstantin S <[email protected]>
tryAGI · Jan 6, 2024 · 8589d11 · 8589d11
1 parent 8bc18a9
commit 8589d11
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 22 deletions.
diff --git a/src/libs/LangChain.Core/Chains/Chain.cs b/src/libs/LangChain.Core/Chains/Chain.cs
@@ -1,4 +1,4 @@
-using LangChain.Chains.HelperChains;
+using LangChain.Chains.HelperChains;
 using LangChain.Chains.StackableChains;
 using LangChain.Chains.StackableChains.Agents;
 using LangChain.Chains.StackableChains.Files;
@@ -228,4 +228,4 @@ public static SaveIntoFileChain SaveIntoFile(
     {
         return new SaveIntoFileChain(path, inputKey);
     }
-}
+}
diff --git a/src/libs/LangChain.Core/Chains/StackableChains/Files/SaveIntoFileChain.cs b/src/libs/LangChain.Core/Chains/StackableChains/Files/SaveIntoFileChain.cs
@@ -1,4 +1,4 @@
-using LangChain.Abstractions.Schema;
+using LangChain.Abstractions.Schema;
 using LangChain.Chains.HelperChains;
 
 namespace LangChain.Chains.StackableChains.Files;
@@ -58,4 +58,4 @@ Task<IChainValues> InternalCall(IChainValues values)
         return Task.FromResult(values);
 #endif
     }
-}
+}
diff --git a/src/libs/LangChain.Core/Chains/StackableChains/ImageGeneration/ImageGenerationChain.cs b/src/libs/LangChain.Core/Chains/StackableChains/ImageGeneration/ImageGenerationChain.cs
@@ -1,4 +1,4 @@
-using LangChain.Abstractions.Schema;
+using LangChain.Abstractions.Schema;
 using LangChain.Chains.HelperChains;
 using LangChain.Providers;
 
@@ -39,4 +39,4 @@ protected override async Task<IChainValues> InternalCall(IChainValues values)
         values.Value[OutputKeys[0]] = image;
         return values;
     }
-}
+}
diff --git a/src/libs/Providers/LangChain.Providers.Automatic1111/Automatic1111Model.cs b/src/libs/Providers/LangChain.Providers.Automatic1111/Automatic1111Model.cs
@@ -1,4 +1,4 @@
-using LangChain.Providers;
+using LangChain.Providers;
 
 namespace StableDiffusion;
 
@@ -28,6 +28,8 @@ public Automatic1111Model(
         _client = new StableDiffusionClient(url, httpClient);
     }
 
+    public event Action<string> PromptSent = delegate { };
+
     /// <inheritdoc />
     public Task<Uri> GenerateImageAsUrlAsync(string prompt, CancellationToken cancellationToken = default)
     {
@@ -44,6 +46,9 @@ public async Task<Stream> GenerateImageAsStreamAsync(string prompt, Cancellation
     /// <inheritdoc />
     public async Task<byte[]> GenerateImageAsBytesAsync(string prompt, CancellationToken cancellationToken = default)
     {
+        PromptSent(prompt);
+
+        var samplers = await _client.Get_samplers_sdapi_v1_samplers_getAsync();
         var response = await _client.Text2imgapi_sdapi_v1_txt2img_postAsync(
             new StableDiffusionProcessingTxt2Img
             {
@@ -54,6 +59,8 @@ public async Task<byte[]> GenerateImageAsBytesAsync(string prompt, CancellationT
                 Steps = Options.Steps,
                 Seed = Options.Seed,
                 Cfg_scale = Options.CfgScale,
+                Sampler_index = Options.Sampler,
+                Sampler_name = Options.Sampler,
             }, cancellationToken).ConfigureAwait(false);
 
         var encoded = response.Images.First();
@@ -62,4 +69,4 @@ public async Task<byte[]> GenerateImageAsBytesAsync(string prompt, CancellationT
         var bytes = Convert.FromBase64String(encoded);
         return bytes;
     }
-}
+}
diff --git a/src/libs/Providers/LangChain.Providers.Automatic1111/Automatic1111ModelOptions.cs b/src/libs/Providers/LangChain.Providers.Automatic1111/Automatic1111ModelOptions.cs
@@ -1,4 +1,4 @@
-namespace StableDiffusion;
+namespace StableDiffusion;
 
 /// <summary>
 /// 
@@ -23,7 +23,7 @@ public class Automatic1111ModelOptions
     /// <summary>
     /// 
     /// </summary>
-    public double CfgScale { get; set; } = 7;
+    public float CfgScale { get; set; } = 6.0F;
 
     /// <summary>
     /// 
@@ -34,6 +34,9 @@ public class Automatic1111ModelOptions
     /// 
     /// </summary>
     public int Height { get; set; } = 512;
-
-
-}
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Sampler { get; set; } = "Euler a";
+}
diff --git a/...libs/Providers/LangChain.Providers.Automatic1111/LangChain.Providers.Automatic1111.csproj b/...libs/Providers/LangChain.Providers.Automatic1111/LangChain.Providers.Automatic1111.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="LLamaSharp" />
-		<PackageReference Include="Newtonsoft.Json" OverrideVersion="13.0.3" />
+		<PackageReference Include="Newtonsoft.Json" />
 		<PackageReference Include="System.Net.Http" />
 	</ItemGroup>
 

diff --git a/src/libs/Providers/LangChain.Providers.Automatic1111/StableDiffusionClient.cs b/src/libs/Providers/LangChain.Providers.Automatic1111/StableDiffusionClient.cs
@@ -5,7 +5,7 @@
 //----------------------
 
 #pragma warning disable CS3008 // Identifier is not CLS-compliant
-
+    
 #pragma warning disable 108 // Disable "CS0108 '{derivedDto}.ToJson()' hides inherited member '{dtoBase}.ToJson()'. Use the new keyword if hiding was intended."
 #pragma warning disable 114 // Disable "CS0114 '{derivedDto}.RaisePropertyChanged(String)' hides inherited member 'dtoBase.RaisePropertyChanged(String)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword."
 #pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?'
@@ -12562,10 +12562,10 @@ public partial class StableDiffusionProcessingTxt2Img
         public bool Do_not_save_grid { get; set; } = false;
 
         [Newtonsoft.Json.JsonProperty("eta", Required = Newtonsoft.Json.Required.AllowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public double Eta { get; set; }
+        public double? Eta { get; set; }=null;
 
         [Newtonsoft.Json.JsonProperty("denoising_strength", Required = Newtonsoft.Json.Required.AllowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public double Denoising_strength { get; set; } = 0D;
+        public double? Denoising_strength { get; set; } = null;
 
         [Newtonsoft.Json.JsonProperty("s_min_uncond", Required = Newtonsoft.Json.Required.AllowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public double S_min_uncond { get; set; }
@@ -12949,4 +12949,4 @@ public ApiException(string message, int statusCode, string response, System.Coll
 #pragma warning restore  114
 #pragma warning restore  108
 #pragma warning restore 3016
-#pragma warning restore 8603
+#pragma warning restore 8603
diff --git a/src/libs/Providers/LangChain.Providers.Ollama/OllamaApiClient.cs b/src/libs/Providers/LangChain.Providers.Ollama/OllamaApiClient.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -137,6 +137,4 @@ public async Task<GenerateEmbeddingResponse> GenerateEmbeddings(GenerateEmbeddin
         var streamedResponse = JsonSerializer.Deserialize<GenerateEmbeddingResponse>(line) ?? throw new InvalidOperationException("Response body was null");
         return streamedResponse;
     }
-
-
-}
+}