Chat request refactoring for OpenAI-compatible providers (#722)

app/MindWork AI Studio/Provider/AlibabaCloud/ProviderAlibabaCloud.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,17 @@ public sealed class ProviderAlibabaCloud() : BaseProvider(LLMProviders.ALIBABA_C
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "AlibabaCloud",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the AlibabaCloud HTTP chat request:
-        var alibabaCloudChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -54,22 +43,9 @@ public sealed class ProviderAlibabaCloud() : BaseProvider(LLMProviders.ALIBABA_C
 
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(alibabaCloudChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("AlibabaCloud", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/BaseProvider.cs

@@ -565,6 +565,78 @@ public abstract class BaseProvider : IProvider, ISecretId
         streamReader.Dispose();
     }
 
+    /// <summary>
+    /// Streams the chat completion from an OpenAI-compatible provider using the Chat Completion API.
+    /// </summary>
+    /// <param name="providerName">The provider name for logging and error reporting.</param>
+    /// <param name="chatModel">The selected chat model.</param>
+    /// <param name="chatThread">The current chat thread.</param>
+    /// <param name="settingsManager">The settings manager.</param>
+    /// <param name="requestFactory">Builds the provider-specific request body.</param>
+    /// <param name="storeType">The secret store type.</param>
+    /// <param name="isTryingSecret">Whether the API key is optional.</param>
+    /// <param name="systemPromptRole">The system prompt role to use.</param>
+    /// <param name="requestPath">The request path, relative to the provider base URL.</param>
+    /// <param name="headersAction">Optional additional headers to add.</param>
+    /// <param name="token">The cancellation token.</param>
+    /// <typeparam name="TRequest">The request DTO type.</typeparam>
+    /// <typeparam name="TDelta">The delta stream line type.</typeparam>
+    /// <typeparam name="TAnnotation">The annotation stream line type.</typeparam>
+    /// <returns>The streamed content chunks.</returns>
+    protected async IAsyncEnumerable<ContentStreamChunk> StreamOpenAICompatibleChatCompletion<TRequest, TDelta, TAnnotation>(
+        string providerName,
+        Model chatModel,
+        ChatThread chatThread,
+        SettingsManager settingsManager,
+        Func<TextMessage, IDictionary<string, object>, Task<TRequest>> requestFactory,
+        SecretStoreType storeType = SecretStoreType.LLM_PROVIDER,
+        bool isTryingSecret = false,
+        string systemPromptRole = "system",
+        string requestPath = "chat/completions",
+        Action<HttpRequestHeaders>? headersAction = null,
+        [EnumeratorCancellation] CancellationToken token = default)
+        where TDelta : IResponseStreamLine
+        where TAnnotation : IAnnotationStreamLine
+    {
+        // Get the API key:
+        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, storeType, isTrying: isTryingSecret);
+        if(!requestedSecret.Success && !isTryingSecret)
+            yield break;
+
+        // Prepare the system prompt:
+        var systemPrompt = new TextMessage
+        {
+            Role = systemPromptRole,
+            Content = chatThread.PrepareSystemPrompt(settingsManager),
+        };
+
+        // Parse the API parameters:
+        var apiParameters = this.ParseAdditionalApiParameters();
+
+        // Prepare the provider HTTP chat request:
+        var providerChatRequest = JsonSerializer.Serialize(await requestFactory(systemPrompt, apiParameters), JSON_SERIALIZER_OPTIONS);
+
+        async Task<HttpRequestMessage> RequestBuilder()
+        {
+            // Build the HTTP post request:
+            var request = new HttpRequestMessage(HttpMethod.Post, requestPath);
+
+            // Set the authorization header:
+            if (requestedSecret.Success)
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
+
+            // Set provider-specific headers:
+            headersAction?.Invoke(request.Headers);
+
+            // Set the content:
+            request.Content = new StringContent(providerChatRequest, Encoding.UTF8, "application/json");
+            return request;
+        }
+
+        await foreach (var content in this.StreamChatCompletionInternal<TDelta, TAnnotation>(providerName, RequestBuilder, token))
+            yield return content;
+    }
+
     protected async Task<string> PerformStandardTranscriptionRequest(RequestedSecret requestedSecret, Model transcriptionModel, string audioFilePath, Host host = Host.NONE, CancellationToken token = default)
     {
         try

app/MindWork AI Studio/Provider/DeepSeek/ProviderDeepSeek.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,17 @@ public sealed class ProviderDeepSeek() : BaseProvider(LLMProviders.DEEP_SEEK, "h
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "DeepSeek",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingDirectImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the DeepSeek HTTP chat request:
-        var deepSeekChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -54,22 +43,9 @@ public sealed class ProviderDeepSeek() : BaseProvider(LLMProviders.DEEP_SEEK, "h
 
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(deepSeekChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("DeepSeek", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Fireworks/ChatRequest.cs

@@ -1,20 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Fireworks;
-
-/// <summary>
-/// The Fireworks chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}

app/MindWork AI Studio/Provider/Fireworks/ProviderFireworks.cs

@@ -1,7 +1,4 @@
-using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +21,17 @@ public class ProviderFireworks() : BaseProvider(LLMProviders.FIREWORKS, "https:/
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ResponseStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "Fireworks",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the Fireworks HTTP chat request:
-        var fireworksChatRequest = JsonSerializer.Serialize(new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -55,22 +43,9 @@ public class ProviderFireworks() : BaseProvider(LLMProviders.FIREWORKS, "https:/
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(fireworksChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ResponseStreamLine, ChatCompletionAnnotationStreamLine>("Fireworks", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/GWDG/ProviderGWDG.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,17 @@ public sealed class ProviderGWDG() : BaseProvider(LLMProviders.GWDG, "https://ch
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "GWDG",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the GWDG HTTP chat request:
-        var gwdgChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -54,22 +43,9 @@ public sealed class ProviderGWDG() : BaseProvider(LLMProviders.GWDG, "https://ch
 
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(gwdgChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>("GWDG", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Google/ChatRequest.cs

@@ -1,20 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Google;
-
-/// <summary>
-/// The Google chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}

app/MindWork AI Studio/Provider/Google/ProviderGoogle.cs

@@ -24,26 +24,17 @@ public class ProviderGoogle() : BaseProvider(LLMProviders.GOOGLE, "https://gener
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "Google",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the Google HTTP chat request:
-        var geminiChatRequest = JsonSerializer.Serialize(new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -55,22 +46,9 @@ public class ProviderGoogle() : BaseProvider(LLMProviders.GOOGLE, "https://gener
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(geminiChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("Google", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Groq/ChatRequest.cs

@@ -1,22 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Groq;
-
-/// <summary>
-/// The Groq chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-/// <param name="Seed">The seed for the chat completion.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream,
-    int Seed
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}

app/MindWork AI Studio/Provider/Groq/ProviderGroq.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,20 @@ public class ProviderGroq() : BaseProvider(LLMProviders.GROQ, "https://api.groq.
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "Groq",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
+                               if (TryPopIntParameter(apiParameters, "seed", out var parsedSeed))
+                                   apiParameters["seed"] = parsedSeed;
 
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the OpenAI HTTP chat request:
-        var groqChatRequest = JsonSerializer.Serialize(new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -55,22 +47,9 @@ public class ProviderGroq() : BaseProvider(LLMProviders.GROQ, "https://api.groq.
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(groqChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>("Groq", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Helmholtz/ProviderHelmholtz.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,17 @@ public sealed class ProviderHelmholtz() : BaseProvider(LLMProviders.HELMHOLTZ, "
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "Helmholtz",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-            
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the Helmholtz HTTP chat request:
-        var helmholtzChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -54,22 +43,9 @@ public sealed class ProviderHelmholtz() : BaseProvider(LLMProviders.HELMHOLTZ, "
 
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(helmholtzChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>("Helmholtz", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/HuggingFace/ProviderHuggingFace.cs

@@ -1,7 +1,4 @@
-using System.Net.Http.Headers;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
+using System.Runtime.CompilerServices;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -29,52 +26,30 @@ public sealed class ProviderHuggingFace : BaseProvider
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "HuggingFace",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
-        var message = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
+                               var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the HuggingFace HTTP chat request:
-        var huggingfaceChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
                                    // Build the messages:
                                    // - First of all the system prompt
                                    // - Then none-empty user and AI messages
-            Messages = [systemPrompt, ..message],
+                                   Messages = [systemPrompt, ..messages],
 
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(huggingfaceChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>("HuggingFace", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Mistral/ChatRequest.cs

@@ -1,25 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Mistral;
-
-/// <summary>
-/// The OpenAI chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-/// <param name="RandomSeed">The seed for the chat completion.</param>
-/// <param name="SafePrompt">Whether to inject a safety prompt before all conversations.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream,
-    [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    int? RandomSeed,
-    bool SafePrompt = false
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}

app/MindWork AI Studio/Provider/Mistral/ProviderMistral.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -22,28 +20,23 @@ public sealed class ProviderMistral() : BaseProvider(LLMProviders.MISTRAL, "http
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Provider.Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "Mistral",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
+                               if (TryPopBoolParameter(apiParameters, "safe_prompt", out var parsedSafePrompt))
+                                   apiParameters["safe_prompt"] = parsedSafePrompt;
 
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        var safePrompt = TryPopBoolParameter(apiParameters, "safe_prompt", out var parsedSafePrompt) && parsedSafePrompt;
-        var randomSeed = TryPopIntParameter(apiParameters, "random_seed", out var parsedRandomSeed) ? parsedRandomSeed : (int?)null;
+                               if (TryPopIntParameter(apiParameters, "random_seed", out var parsedRandomSeed))
+                                   apiParameters["random_seed"] = parsedRandomSeed;
 
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingDirectImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the Mistral HTTP chat request:
-        var mistralChatRequest = JsonSerializer.Serialize(new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -54,26 +47,10 @@ public sealed class ProviderMistral() : BaseProvider(LLMProviders.MISTRAL, "http
 
                                    // Right now, we only support streaming completions:
                                    Stream = true,
-            RandomSeed = randomSeed,
-            SafePrompt = safePrompt,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(mistralChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("Mistral", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs

@@ -79,9 +79,9 @@ public sealed class ProviderOpenAI() : BaseProvider(LLMProviders.OPEN_AI, "https
         //
         // Prepare the tools we want to use:
         //
-        IList<Tool> tools = modelCapabilities.Contains(Capability.WEB_SEARCH) switch
+        IList<ProviderTool> providerTools = modelCapabilities.Contains(Capability.WEB_SEARCH) switch
         {
-            true => [ Tools.WEB_SEARCH ],
+            true => [ ProviderTools.WEB_SEARCH ],
             _ => []
         };
         
@@ -178,7 +178,7 @@ public sealed class ProviderOpenAI() : BaseProvider(LLMProviders.OPEN_AI, "https
                 Store = false,
                 
                 // Tools we want to use:
-                Tools = tools,
+                ProviderTools = providerTools,
                 
                 // Additional API parameters:
                 AdditionalApiParameters = apiParameters

app/MindWork AI Studio/Provider/OpenAI/ProviderTool.cs

@@ -1,7 +1,7 @@
 namespace AIStudio.Provider.OpenAI;
 
 /// <summary>
-/// Represents a tool used by the AI model.
+/// Represents a tool executed on the provider side.
 /// </summary>
 /// <remarks>
 /// Right now, only our OpenAI provider is using tools. Thus, this class is located in the
@@ -9,4 +9,4 @@ namespace AIStudio.Provider.OpenAI;
 /// be moved into the provider namespace.
 /// </remarks>
 /// <param name="Type">The type of the tool.</param>
-public record Tool(string Type);
+public record ProviderTool(string Type);

app/MindWork AI Studio/Provider/OpenAI/ProviderTools.cs

@@ -1,14 +1,14 @@
 namespace AIStudio.Provider.OpenAI;
 
 /// <summary>
-/// Known tools for LLM providers.
+/// Known provider-side tools for LLM providers.
 /// </summary>
 /// <remarks>
 /// Right now, only our OpenAI provider is using tools. Thus, this class is located in the
 /// OpenAI namespace. In the future, when other providers also support tools, this class can
 /// be moved into the provider namespace.
 /// </remarks>
-public static class Tools
+public static class ProviderTools
 {
-    public static readonly Tool WEB_SEARCH = new("web_search");
+    public static readonly ProviderTool WEB_SEARCH = new("web_search");
 }

app/MindWork AI Studio/Provider/OpenAI/ResponsesAPIRequest.cs

@@ -9,13 +9,13 @@ namespace AIStudio.Provider.OpenAI;
 /// <param name="Input">The chat messages.</param>
 /// <param name="Stream">Whether to stream the response.</param>
 /// <param name="Store">Whether to store the response on the server (usually OpenAI's infrastructure).</param>
-/// <param name="Tools">The tools to use for the request.</param>
+/// <param name="ProviderTools">The provider-side tools to use for the request.</param>
 public record ResponsesAPIRequest(
     string Model,
     IList<IMessageBase> Input,
     bool Stream,
     bool Store,
-    IList<Tool> Tools)
+    [property: JsonPropertyName("tools")] IList<ProviderTool> ProviderTools)
 {
     public ResponsesAPIRequest() : this(string.Empty, [], true, false, [])
     {

app/MindWork AI Studio/Provider/OpenRouter/ProviderOpenRouter.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -27,26 +25,17 @@ public sealed class ProviderOpenRouter() : BaseProvider(LLMProviders.OPEN_ROUTER
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "OpenRouter",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the OpenRouter HTTP chat request:
-        var openRouterChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -58,26 +47,15 @@ public sealed class ProviderOpenRouter() : BaseProvider(LLMProviders.OPEN_ROUTER
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
+                               };
+                           },
+                           headersAction: headers =>
                            {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-            
                                // Set custom headers for project identification:
-            request.Headers.Add("HTTP-Referer", PROJECT_WEBSITE);
-            request.Headers.Add("X-Title", PROJECT_NAME);
-
-            // Set the content:
-            request.Content = new StringContent(openRouterChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("OpenRouter", RequestBuilder, token))
+                               headers.Add("HTTP-Referer", PROJECT_WEBSITE);
+                               headers.Add("X-Title", PROJECT_NAME);
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/Perplexity/ProviderPerplexity.cs

@@ -1,7 +1,4 @@
-using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -33,26 +30,17 @@ public sealed class ProviderPerplexity() : BaseProvider(LLMProviders.PERPLEXITY,
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ResponseStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "Perplexity",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the Perplexity HTTP chat request:
-        var perplexityChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -62,22 +50,9 @@ public sealed class ProviderPerplexity() : BaseProvider(LLMProviders.PERPLEXITY,
                                    Messages = [systemPrompt, ..messages],
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(perplexityChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ResponseStreamLine, NoChatCompletionAnnotationStreamLine>("Perplexity", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/SelfHosted/ChatRequest.cs

@@ -1,20 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.SelfHosted;
-
-/// <summary>
-/// The chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}

app/MindWork AI Studio/Provider/SelfHosted/ProviderSelfHosted.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -25,19 +23,13 @@ public sealed class ProviderSelfHosted(Host host, string hostname) : BaseProvide
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Provider.Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER, isTrying: true);
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+                           "self-hosted provider",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-
                                // Build the list of messages. The image format depends on the host:
                                // - Ollama uses the direct image URL format: { "type": "image_url", "image_url": "data:..." }
                                // - LM Studio, vLLM, and llama.cpp use the nested image URL format: { "type": "image_url", "image_url": { "url": "data:..." } }
@@ -47,8 +39,7 @@ public sealed class ProviderSelfHosted(Host host, string hostname) : BaseProvide
                                    _ => await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel),
                                };
 
-        // Prepare the OpenAI HTTP chat request:
-        var providerChatRequest = JsonSerializer.Serialize(new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -60,23 +51,11 @@ public sealed class ProviderSelfHosted(Host host, string hostname) : BaseProvide
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, host.ChatURL());
-
-            // Set the authorization header:
-            if (requestedSecret.Success)
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(providerChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>("self-hosted provider", RequestBuilder, token))
+                               };
+                           },
+                           isTryingSecret: true,
+                           requestPath: host.ChatURL(),
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/Provider/X/ProviderX.cs

@@ -1,7 +1,5 @@
 using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
 
 using AIStudio.Chat;
 using AIStudio.Provider.OpenAI;
@@ -24,26 +22,17 @@ public sealed class ProviderX() : BaseProvider(LLMProviders.X, "https://api.x.ai
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        // Get the API key:
-        var requestedSecret = await RUST_SERVICE.GetAPIKey(this, SecretStoreType.LLM_PROVIDER);
-        if(!requestedSecret.Success)
-            yield break;
-        
-        // Prepare the system prompt:
-        var systemPrompt = new TextMessage
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+                           "xAI",
+                           chatModel,
+                           chatThread,
+                           settingsManager,
+                           async (systemPrompt, apiParameters) =>
                            {
-            Role = "system",
-            Content = chatThread.PrepareSystemPrompt(settingsManager),
-        };
-        
-        // Parse the API parameters:
-        var apiParameters = this.ParseAdditionalApiParameters();
-        
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-        // Prepare the xAI HTTP chat request:
-        var xChatRequest = JsonSerializer.Serialize(new ChatCompletionAPIRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -55,22 +44,9 @@ public sealed class ProviderX() : BaseProvider(LLMProviders.X, "https://api.x.ai
                                    // Right now, we only support streaming completions:
                                    Stream = true,
                                    AdditionalApiParameters = apiParameters
-        }, JSON_SERIALIZER_OPTIONS);
-
-        async Task<HttpRequestMessage> RequestBuilder()
-        {
-            // Build the HTTP post request:
-            var request = new HttpRequestMessage(HttpMethod.Post, "chat/completions");
-
-            // Set the authorization header:
-            request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await requestedSecret.Secret.Decrypt(ENCRYPTION));
-
-            // Set the content:
-            request.Content = new StringContent(xChatRequest, Encoding.UTF8, "application/json");
-            return request;
-        }
-        
-        await foreach (var content in this.StreamChatCompletionInternal<ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>("xAI", RequestBuilder, token))
+                               };
+                           },
+                           token: token))
             yield return content;
     }
 

app/MindWork AI Studio/wwwroot/changelog/v26.3.1.md

@@ -26,6 +26,7 @@
 - Improved the validation of additional API parameters in the advanced provider settings to help catch formatting mistakes earlier.
 - Improved the app startup resilience by allowing AI Studio to continue without Qdrant if it fails to initialize.
 - Improved the translation assistant by updating the system and user prompts.
+- Improved OpenAI-compatible providers by refactoring their streaming request handling to be more consistent and reliable.
 - Fixed an issue where assistants hidden via configuration plugins still appear in "Send to ..." menus. Thanks, Gunnar, for reporting this issue.
 - Fixed an issue with chat templates that could stop working because the stored validation result for attached files was reused. AI Studio now checks attached files again when you use a chat template.
 - Fixed an issue with voice recording where AI Studio could log errors and keep the feature available even though required parts failed to initialize. Voice recording is now disabled automatically for the current session in that case.