feat: Replace GoogleAI provider with Google's OpenAI compatible endpo…

…int (#63)
getcellm · Nov 21, 2024 · 1e7a4f0 · 1e7a4f0
1 parent e9df85d
commit 1e7a4f0
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 201 deletions.
diff --git a/src/Cellm/Models/Client.cs b/src/Cellm/Models/Client.cs
@@ -2,7 +2,6 @@
 using Cellm.AddIn;
 using Cellm.AddIn.Exceptions;
 using Cellm.Models.Anthropic;
-using Cellm.Models.GoogleAi;
 using Cellm.Models.Llamafile;
 using Cellm.Models.OpenAi;
 using Cellm.Prompts;
@@ -37,7 +36,6 @@ public async Task<Prompt> Send(Prompt prompt, string? provider, Uri? baseAddress
             IModelResponse response = parsedProvider switch
             {
                 Providers.Anthropic => await _sender.Send(new AnthropicRequest(prompt, provider, baseAddress)),
-                Providers.GoogleAi => await _sender.Send(new GoogleAiRequest(prompt, provider, baseAddress)),
                 Providers.Llamafile => await _sender.Send(new LlamafileRequest(prompt)),
                 Providers.OpenAi => await _sender.Send(new OpenAiRequest(prompt, provider, baseAddress)),
                 _ => throw new InvalidOperationException($"Provider {parsedProvider} is defined but not implemented")

diff --git a/src/Cellm/Models/GoogleAi/GoogleAiConfiguration.cs b/src/Cellm/Models/GoogleAi/GoogleAiConfiguration.cs
diff --git a/src/Cellm/Models/GoogleAi/GoogleAiRequest.cs b/src/Cellm/Models/GoogleAi/GoogleAiRequest.cs
diff --git a/src/Cellm/Models/GoogleAi/GoogleAiRequestHandler.cs b/src/Cellm/Models/GoogleAi/GoogleAiRequestHandler.cs
diff --git a/src/Cellm/Models/GoogleAi/GoogleAiResponse.cs b/src/Cellm/Models/GoogleAi/GoogleAiResponse.cs
diff --git a/src/Cellm/Models/GoogleAi/Models.cs b/src/Cellm/Models/GoogleAi/Models.cs
diff --git a/src/Cellm/Models/Providers.cs b/src/Cellm/Models/Providers.cs
@@ -3,7 +3,6 @@
 public enum Providers
 {
     Anthropic,
-    GoogleAi,
     Llamafile,
     OpenAi
 }
diff --git a/src/Cellm/Services/ServiceLocator.cs b/src/Cellm/Services/ServiceLocator.cs
@@ -3,7 +3,6 @@
 using Cellm.AddIn.Exceptions;
 using Cellm.Models;
 using Cellm.Models.Anthropic;
-using Cellm.Models.GoogleAi;
 using Cellm.Models.Llamafile;
 using Cellm.Models.OpenAi;
 using Cellm.Models.PipelineBehavior;
@@ -47,7 +46,6 @@ private static IServiceCollection ConfigureServices(IServiceCollection services)
         services
             .Configure<CellmConfiguration>(configuration.GetRequiredSection(nameof(CellmConfiguration)))
             .Configure<AnthropicConfiguration>(configuration.GetRequiredSection(nameof(AnthropicConfiguration)))
-            .Configure<GoogleAiConfiguration>(configuration.GetRequiredSection(nameof(GoogleAiConfiguration)))
             .Configure<OpenAiConfiguration>(configuration.GetRequiredSection(nameof(OpenAiConfiguration)))
             .Configure<LlamafileConfiguration>(configuration.GetRequiredSection(nameof(LlamafileConfiguration)))
             .Configure<RateLimiterConfiguration>(configuration.GetRequiredSection(nameof(RateLimiterConfiguration)))
@@ -125,15 +123,6 @@ private static IServiceCollection ConfigureServices(IServiceCollection services)
             anthropicHttpClient.Timeout = TimeSpan.FromHours(1);
         }).AddResilienceHandler($"{nameof(AnthropicRequestHandler)}ResiliencePipeline", resiliencePipelineConfigurator.ConfigureResiliencePipeline);
 
-        var googleAiConfiguration = configuration.GetRequiredSection(nameof(GoogleAiConfiguration)).Get<GoogleAiConfiguration>()
-            ?? throw new NullReferenceException(nameof(GoogleAiConfiguration));
-
-        services.AddHttpClient<IRequestHandler<GoogleAiRequest, GoogleAiResponse>, GoogleAiRequestHandler>(googleHttpClient =>
-        {
-            googleHttpClient.BaseAddress = googleAiConfiguration.BaseAddress;
-            googleHttpClient.Timeout = TimeSpan.FromHours(1);
-        }).AddResilienceHandler($"{nameof(GoogleAiRequestHandler)}ResiliencePipeline", resiliencePipelineConfigurator.ConfigureResiliencePipeline);
-
         var openAiConfiguration = configuration.GetRequiredSection(nameof(OpenAiConfiguration)).Get<OpenAiConfiguration>()
             ?? throw new NullReferenceException(nameof(OpenAiConfiguration));
 

diff --git a/src/Cellm/appsettings.Local.Google.json b/src/Cellm/appsettings.Local.Google.json
@@ -0,0 +1,12 @@
+{
+    "OpenAiConfiguration": {
+        "BaseAddress": "https://generativelanguage.googleapis.com/v1beta/openai/",
+        "DefaultModel": "gemini-1.5-flash",
+        "ApiKey": "YOUR_GEMINI_API_KEY"
+
+    },
+    "CellmConfiguration": {
+        "DefaultProvider": "OpenAi",
+        "HttpTimeoutInSeconds": 30
+    }
+}
diff --git a/src/Cellm/appsettings.Local.GoogleAi.json b/src/Cellm/appsettings.Local.GoogleAi.json