Fixes after refactoring (#1244)

Author: waldekmastykarz

DevProxy.Abstractions/LanguageModel/LanguageModelClientFactory.cs

@@ -14,14 +14,14 @@ public static ILanguageModelClient Create(IServiceProvider serviceProvider, ICon
         ArgumentNullException.ThrowIfNull(serviceProvider);
         ArgumentNullException.ThrowIfNull(configuration);
 
-        var lmSection = configuration.GetSection("LanguageModelClient");
-        var config = lmSection?.Get<LanguageModelConfiguration>();
+        var lmSection = configuration.GetSection("LanguageModel");
+        var config = lmSection?.Get<LanguageModelConfiguration>() ?? new();
 
-        return config?.Client switch
+        return config.Client switch
         {
-            LanguageModelClient.Ollama => ActivatorUtilities.CreateInstance<OllamaLanguageModelClient>(serviceProvider),
-            LanguageModelClient.OpenAI => ActivatorUtilities.CreateInstance<OpenAILanguageModelClient>(serviceProvider),
-            _ => ActivatorUtilities.CreateInstance<OpenAILanguageModelClient>(serviceProvider)
+            LanguageModelClient.Ollama => ActivatorUtilities.CreateInstance<OllamaLanguageModelClient>(serviceProvider, config),
+            LanguageModelClient.OpenAI => ActivatorUtilities.CreateInstance<OpenAILanguageModelClient>(serviceProvider, config),
+            _ => ActivatorUtilities.CreateInstance<OpenAILanguageModelClient>(serviceProvider, config)
         };
     }
 }

DevProxy.Abstractions/LanguageModel/OllamaLanguageModelClient.cs

@@ -170,7 +170,7 @@ private async Task<bool> IsEnabledInternalAsync()
 
         try
         {
-            var url = $"{_configuration.Url}/api/generate";
+            var url = $"{_configuration.Url?.TrimEnd('/')}/api/generate";
             _logger.LogDebug("Requesting completion. Prompt: {Prompt}", prompt);
 
             var response = await _httpClient.PostAsJsonAsync(url,
@@ -216,7 +216,7 @@ private async Task<bool> IsEnabledInternalAsync()
 
         try
         {
-            var url = $"{_configuration.Url}/api/chat";
+            var url = $"{_configuration.Url?.TrimEnd('/')}/api/chat";
             _logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
 
             var response = await _httpClient.PostAsJsonAsync(url,

DevProxy.Abstractions/LanguageModel/OpenAILanguageModelClient.cs

@@ -163,7 +163,7 @@ private async Task<bool> IsEnabledInternalAsync()
 
         try
         {
-            var url = $"{_configuration.Url}/chat/completions";
+            var url = $"{_configuration.Url?.TrimEnd('/')}/chat/completions";
             _logger.LogDebug("Requesting chat completion. Message: {LastMessage}", messages.Last().Content);
 
             var payload = new OpenAIChatCompletionRequest

DevProxy.Plugins/Generation/OpenApiSpecGeneratorPlugin.cs

@@ -106,7 +106,7 @@ request.Context.Session is null ||
                 continue;
             }
 
-            var methodAndUrlString = request.Message.First();
+            var methodAndUrlString = request.Message;
             Logger.LogDebug("Processing request {MethodAndUrlString}...", methodAndUrlString);
 
             try

DevProxy.Plugins/Mocking/MockResponsePlugin.cs

@@ -148,6 +148,7 @@ public override Task BeforeRequestAsync(ProxyRequestArgs e)
             var clonedResponse = (MockResponse)matchingResponse.Clone();
             ProcessMockResponseInternal(e, clonedResponse);
             state.HasBeenSet = true;
+            return Task.CompletedTask;
         }
         else if (Configuration.BlockUnmockedRequests)
         {
@@ -169,6 +170,7 @@ public override Task BeforeRequestAsync(ProxyRequestArgs e)
                 }
             });
             state.HasBeenSet = true;
+            return Task.CompletedTask;
         }
 
         Logger.LogRequest("No matching mock response found", MessageType.Skipped, new(e.Session));

DevProxy/Commands/DevProxyCommand.cs

@@ -419,6 +419,8 @@ private void ConfigureCommand()
             _recordOption,
             _watchPidsOption,
             _watchProcessNamesOption,
+            // _configFileOption is set during DI, so it's always set here
+            _configFileOption!,
             _noFirstRunOption,
             _asSystemProxyOption,
             _installCertOption,

DevProxy/Extensions/ILoggingBuilderExtensions.cs

@@ -13,7 +13,7 @@ static class ILoggingBuilderExtensions
 {
     public static ILoggingBuilder AddRequestLogger(this ILoggingBuilder builder)
     {
-        _ = builder.Services.AddSingleton<ILogger, RequestLogger>();
+        _ = builder.Services.AddSingleton<ILoggerProvider, RequestLoggerProvider>();
 
         return builder;
     }

DevProxy/Logging/RequestLogger.cs

@@ -9,10 +9,10 @@
 
 namespace DevProxy.Logging;
 
-sealed class RequestLogger(IEnumerable<IPlugin> plugins, IProxyState proxyState) : ILogger
+sealed class RequestLogger(IServiceProvider serviceProvider, IProxyState proxyState) : ILogger
 {
-    private readonly IEnumerable<IPlugin> _plugins = plugins;
     private readonly IProxyState _proxyState = proxyState;
+    private readonly IServiceProvider _serviceProvider = serviceProvider;
 
     public bool IsEnabled(LogLevel logLevel) => true;
 
@@ -32,7 +32,10 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             using var joinableTaskContext = new JoinableTaskContext();
             var joinableTaskFactory = new JoinableTaskFactory(joinableTaskContext);
 
-            foreach (var plugin in _plugins.Where(p => p.Enabled))
+            // Lazily resolve plugins to avoid circular dependency
+            var plugins = _serviceProvider.GetRequiredService<IEnumerable<IPlugin>>();
+
+            foreach (var plugin in plugins.Where(p => p.Enabled))
             {
                 joinableTaskFactory.Run(async () => await plugin.AfterRequestLogAsync(requestLogArgs));
             }

DevProxy/Logging/RequestLoggerProvider.cs

@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using DevProxy.Proxy;
+using System.Collections.Concurrent;
+
+namespace DevProxy.Logging;
+
+sealed class RequestLoggerProvider(IServiceProvider serviceProvider) : ILoggerProvider
+{
+    private readonly ConcurrentDictionary<string, RequestLogger> _loggers = new();
+    private readonly IServiceProvider _serviceProvider = serviceProvider;
+
+    public ILogger CreateLogger(string categoryName)
+    {
+        return _loggers.GetOrAdd(categoryName, name =>
+        {
+            var proxyState = _serviceProvider.GetRequiredService<IProxyState>();
+            return new RequestLogger(_serviceProvider, proxyState);
+        });
+    }
+
+    public void Dispose()
+    {
+        _loggers.Clear();
+    }
+}

DevProxy/Proxy/ProxyConfiguration.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using DevProxy.Abstractions.LanguageModel;
 using DevProxy.Abstractions.Models;
 using DevProxy.Abstractions.Proxy;
 using System.Text.Json.Serialization;
@@ -34,7 +33,6 @@ public string ConfigFile
     public IEnumerable<MockRequestHeader>? FilterByHeaders { get; set; }
     public string? IPAddress { get; set; } = "127.0.0.1";
     public bool InstallCert { get; set; } = true;
-    public LanguageModelConfiguration? LanguageModel { get; set; }
     [JsonConverter(typeof(JsonStringEnumConverter))]
     public LogLevel LogLevel { get; set; } = LogLevel.Information;
     public bool NoFirstRun { get; set; }