Refactored network code (#253)

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

@@ -11,11 +11,6 @@ namespace AIStudio.Provider.SelfHosted;
 
 public sealed class ProviderSelfHosted(ILogger logger, Host host, string hostname) : BaseProvider($"{hostname}{host.BaseURL()}", logger)
 {
-    private static readonly JsonSerializerOptions JSON_SERIALIZER_OPTIONS = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
-    };
-
     #region Implementation of IProvider
 
     public override string Id => LLMProviders.SELF_HOSTED.ToName();
@@ -67,113 +62,22 @@ public sealed class ProviderSelfHosted(ILogger logger, Host host, string hostnam
             MaxTokens = -1,
         }, JSON_SERIALIZER_OPTIONS);
 
-        StreamReader? streamReader = null;
-        try
+        async Task<HttpRequestMessage> RequestBuilder()
         {
-            async Task<HttpRequestMessage> RequestBuilder()
-            {
-                // Build the HTTP post request:
-                var request = new HttpRequestMessage(HttpMethod.Post, host.ChatURL());
+            // 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 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;
-            }
-            
-            // Send the request using exponential backoff:
-            var responseData = await this.SendRequest(RequestBuilder, token);
-            if(responseData.IsFailedAfterAllRetries)
-            {
-                this.logger.LogError($"Self-hosted provider's chat completion failed: {responseData.ErrorMessage}");
-                yield break;
-            }
-            
-            // Open the response stream:
-            var providerStream = await responseData.Response!.Content.ReadAsStreamAsync(token);
-
-            // Add a stream reader to read the stream, line by line:
-            streamReader = new StreamReader(providerStream);
-        }
-        catch(Exception e)
-        {
-            this.logger.LogError($"Failed to stream chat completion from self-hosted provider '{this.InstanceName}': {e.Message}");
-        }
-
-        if (streamReader is null)
-            yield break;
-        
-        // Read the stream, line by line:
-        while (true)
-        {
-            try
-            {
-                if(streamReader.EndOfStream)
-                    break;
-            }
-            catch (Exception e)
-            {
-                this.logger.LogWarning($"Failed to read the end-of-stream state from self-hosted provider '{this.InstanceName}': {e.Message}");
-                break;
-            }
-                
-            // Check if the token is canceled:
-            if (token.IsCancellationRequested)
-                yield break;
-
-            // Read the next line:
-            string? line;
-            try
-            {
-                line = await streamReader.ReadLineAsync(token);
-            }
-            catch (Exception e)
-            {
-                this.logger.LogError($"Failed to read the stream from self-hosted provider '{this.InstanceName}': {e.Message}");
-                break;
-            }
-
-            // Skip empty lines:
-            if (string.IsNullOrWhiteSpace(line))
-                continue;
-            
-            // Skip lines that do not start with "data: ". Regard
-            // to the specification, we only want to read the data lines:
-            if (!line.StartsWith("data: ", StringComparison.InvariantCulture))
-                continue;
-
-            // Check if the line is the end of the stream:
-            if (line.StartsWith("data: [DONE]", StringComparison.InvariantCulture))
-                yield break;
-
-            ResponseStreamLine providerResponse;
-            try
-            {
-                // We know that the line starts with "data: ". Hence, we can
-                // skip the first 6 characters to get the JSON data after that.
-                var jsonData = line[6..];
-
-                // Deserialize the JSON data:
-                providerResponse = JsonSerializer.Deserialize<ResponseStreamLine>(jsonData, JSON_SERIALIZER_OPTIONS);
-            }
-            catch
-            {
-                // Skip invalid JSON data:
-                continue;
-            }
-
-            // Skip empty responses:
-            if (providerResponse == default || providerResponse.Choices.Count == 0)
-                continue;
-
-            // Yield the response:
-            yield return providerResponse.Choices[0].Delta.Content;
+            // Set the content:
+            request.Content = new StringContent(providerChatRequest, Encoding.UTF8, "application/json");
+            return request;
         }
         
-        streamReader.Dispose();
+        await foreach (var content in this.StreamChatCompletionInternal<ResponseStreamLine>("self-hosted provider", RequestBuilder, token))
+            yield return content;
     }
 
     #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously