refactor: Remove superfluous interfaces

src/Cellm/AddIn/Functions.cs

@@ -119,7 +119,7 @@ private static async Task<string> CallModelAsync(Prompt prompt, string? provider
     {
         try
         {
-            var client = ServiceLocator.Get<IClient>();
+            var client = ServiceLocator.Get<Client>();
             var response = await client.Send(prompt, provider, baseAddress);
             var content = response.Messages.Last().Content;
             return content;

src/Cellm/Models/Anthropic/AnthropicRequestHandler.cs

@@ -15,20 +15,17 @@ internal class AnthropicRequestHandler : IModelRequestHandler<AnthropicRequest,
     private readonly AnthropicConfiguration _anthropicConfiguration;
     private readonly CellmConfiguration _cellmConfiguration;
     private readonly HttpClient _httpClient;
-    private readonly ICache _cache;
-    private readonly ISerde _serde;
+    private readonly Serde _serde;
 
     public AnthropicRequestHandler(
         IOptions<AnthropicConfiguration> anthropicConfiguration,
         IOptions<CellmConfiguration> cellmConfiguration,
         HttpClient httpClient,
-        ICache cache,
-        ISerde serde)
+        Serde serde)
     {
         _anthropicConfiguration = anthropicConfiguration.Value;
         _cellmConfiguration = cellmConfiguration.Value;
         _httpClient = httpClient;
-        _cache = cache;
         _serde = serde;
     }
 

src/Cellm/Models/Cache.cs

@@ -7,7 +7,7 @@
 
 namespace Cellm.Models;
 
-internal class Cache : ICache
+internal class Cache
 {
     private readonly IMemoryCache _memoryCache;
     private readonly MemoryCacheEntryOptions _memoryCacheEntryOptions;

src/Cellm/Models/Client.cs

@@ -12,7 +12,7 @@
 
 namespace Cellm.Models;
 
-internal class Client : IClient
+internal class Client
 {
     private readonly CellmConfiguration _cellmConfiguration;
     private readonly ISender _sender;

src/Cellm/Models/GoogleAi/GoogleAiRequestHandler.cs

@@ -14,13 +14,13 @@ internal class GoogleAiRequestHandler : IModelRequestHandler<GoogleAiRequest, Go
     private readonly GoogleAiConfiguration _googleAiConfiguration;
     private readonly CellmConfiguration _cellmConfiguration;
     private readonly HttpClient _httpClient;
-    private readonly ISerde _serde;
+    private readonly Serde _serde;
 
     public GoogleAiRequestHandler(
         IOptions<GoogleAiConfiguration> googleAiConfiguration,
         IOptions<CellmConfiguration> cellmConfiguration,
         HttpClient httpClient,
-        ISerde serde)
+        Serde serde)
     {
         _googleAiConfiguration = googleAiConfiguration.Value;
         _cellmConfiguration = cellmConfiguration.Value;

src/Cellm/Models/ModelRequestBehavior/CachingBehavior.cs

@@ -5,9 +5,9 @@ namespace Cellm.Models.PipelineBehavior;
 internal class CachingBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
     where TRequest : IModelRequest<TResponse>
 {
-    private readonly ICache _cache;
+    private readonly Cache _cache;
 
-    public CachingBehavior(ICache cache)
+    public CachingBehavior(Cache cache)
     {
         _cache = cache;
     }

src/Cellm/Models/OpenAi/OpenAiRequestHandler.cs

@@ -17,14 +17,14 @@ internal class OpenAiRequestHandler : IModelRequestHandler<OpenAiRequest, OpenAi
     private readonly CellmConfiguration _cellmConfiguration;
     private readonly HttpClient _httpClient;
     private readonly ToolRunner _toolRunner;
-    private readonly ISerde _serde;
+    private readonly Serde _serde;
 
     public OpenAiRequestHandler(
         IOptions<OpenAiConfiguration> openAiConfiguration,
         IOptions<CellmConfiguration> cellmConfiguration,
         HttpClient httpClient,
         ToolRunner toolRunner,
-        ISerde serde)
+        Serde serde)
     {
         _openAiConfiguration = openAiConfiguration.Value;
         _cellmConfiguration = cellmConfiguration.Value;

src/Cellm/Models/Serde.cs

@@ -5,7 +5,7 @@
 
 namespace Cellm.Models;
 
-internal class Serde : ISerde
+internal class Serde
 {
     private readonly JsonSerializerOptions _defaultOptions = new()
     {

src/Cellm/Services/ServiceLocator.cs

@@ -83,28 +83,26 @@ private static IServiceCollection ConfigureServices(IServiceCollection services)
                       sentryLoggingOptions.ExperimentalMetrics = new ExperimentalMetricsOptions { EnableCodeLocations = true };
                       sentryLoggingOptions.AddIntegration(new ProfilingIntegration());
                   });
-          })
-          .AddSingleton(typeof(IPipelineBehavior<,>), typeof(SentryBehavior<,>));
+          });
 
         // Internals
         services
             .AddSingleton(configuration)
             .AddMediatR(cfg => cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly()))
             .AddTransient<ArgumentParser>()
-            .AddSingleton<IClient, Client>()
-            .AddSingleton<ISerde, Serde>();
+            .AddSingleton<Client>()
+            .AddSingleton<Serde>();
 
         // Cache
         services
             .AddMemoryCache()
-            .AddSingleton<ICache, Cache>()
-            .AddSingleton(typeof(IPipelineBehavior<,>), typeof(CachingBehavior<,>));
+            .AddSingleton<Cache>();
+
 
         // Tools
         services
             .AddSingleton<ToolRunner>()
-            .AddSingleton<ToolFactory>()
-            .AddSingleton(typeof(IPipelineBehavior<,>), typeof(ToolBehavior<,>));
+            .AddSingleton<ToolFactory>();
 
         // Model Providers
         var rateLimiterConfiguration = configuration.GetRequiredSection(nameof(RateLimiterConfiguration)).Get<RateLimiterConfiguration>()
@@ -150,6 +148,12 @@ private static IServiceCollection ConfigureServices(IServiceCollection services)
             .AddSingleton<LlamafileRequestHandler>()
             .AddSingleton<LLamafileProcessManager>();
 
+        // Model request pipeline
+        services
+            .AddSingleton(typeof(IPipelineBehavior<,>), typeof(SentryBehavior<,>))
+            .AddSingleton(typeof(IPipelineBehavior<,>), typeof(CachingBehavior<,>))
+            .AddSingleton(typeof(IPipelineBehavior<,>), typeof(ToolBehavior<,>));
+
         return services;
     }
 

src/Cellm/Tools/ToolRunner.cs

@@ -8,11 +8,11 @@ namespace Cellm.Tools;
 internal class ToolRunner
 {
     private readonly ISender _sender;
-    private readonly ISerde _serde;
+    private readonly Serde _serde;
     private readonly ToolFactory _toolFactory;
     private readonly IEnumerable<Type> _toolTypes;
 
-    public ToolRunner(ISender sender, ISerde serde, ToolFactory toolFactory)
+    public ToolRunner(ISender sender, Serde serde, ToolFactory toolFactory)
     {
         _sender = sender;
         _serde = serde;