Merge pull request #807 from iceljc/master

refine ai client

Author: iceljc

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs

@@ -13,7 +13,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
 
     private string _model;
 
-    public string Provider => "google-gemini";
+    public string Provider => "google-ai";
 
     public GeminiChatCompletionProvider(
         IServiceProvider services,
@@ -33,7 +33,7 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
             await hook.BeforeGenerating(agent, conversations);
         }
 
-        var client = ProviderHelper.GetGeminiClient(_services);
+        var client = ProviderHelper.GetGeminiClient(Provider, _model, _services);
         var aiModel = client.GenerativeModel(_model);
         var (prompt, request) = PrepareOptions(aiModel, agent, conversations);
 

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/PalmChatCompletionProvider.cs

@@ -16,7 +16,7 @@ public class PalmChatCompletionProvider : IChatCompletion
 
     private string _model;
 
-    public string Provider => "google-ai";
+    public string Provider => "google-palm";
 
     public PalmChatCompletionProvider(
         IServiceProvider services,
@@ -36,7 +36,7 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
             await hook.BeforeGenerating(agent, conversations);
         }
 
-        var client = ProviderHelper.GetPalmClient(_services);
+        var client = ProviderHelper.GetPalmClient(Provider, _model, _services);
         var (prompt, messages, hasFunctions) = PrepareOptions(agent, conversations);
 
         RoleDialogModel msg;

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/ProviderHelper.cs

@@ -5,17 +5,19 @@ namespace BotSharp.Plugin.GoogleAi.Providers;
 
 public static class ProviderHelper
 {
-    public static GoogleAI GetGeminiClient(IServiceProvider services)
+    public static GoogleAI GetGeminiClient(string provider, string model, IServiceProvider services)
     {
-        var settings = services.GetRequiredService<GoogleAiSettings>();
-        var client = new GoogleAI(settings.Gemini.ApiKey);
+        var settingsService = services.GetRequiredService<ILlmProviderService>();
+        var settings = settingsService.GetSetting(provider, model);
+        var client = new GoogleAI(settings.ApiKey);
         return client;
     }
 
-    public static GooglePalmClient GetPalmClient(IServiceProvider services)
+    public static GooglePalmClient GetPalmClient(string provider, string model, IServiceProvider services)
     {
-        var settings = services.GetRequiredService<GoogleAiSettings>();
-        var client = new GooglePalmClient(settings.PaLM.ApiKey);
+        var settingsService = services.GetRequiredService<ILlmProviderService>();
+        var settings = settingsService.GetSetting(provider, model);
+        var client = new GooglePalmClient(settings.ApiKey);
         return client;
     }
 }

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Text/GeminiTextCompletionProvider.cs

@@ -13,7 +13,7 @@ public class GeminiTextCompletionProvider : ITextCompletion
     private readonly ITokenStatistics _tokenStatistics;
     private string _model;
 
-    public string Provider => "google-gemini";
+    public string Provider => "google-ai";
 
     public GeminiTextCompletionProvider(
         IServiceProvider services,
@@ -45,7 +45,7 @@ public async Task<string> GetCompletion(string text, string agentId, string mess
             await hook.BeforeGenerating(agent, new List<RoleDialogModel> { userMessage });
         }
 
-        var client = ProviderHelper.GetGeminiClient(_services);
+        var client = ProviderHelper.GetGeminiClient(Provider, _model, _services);
         var aiModel = client.GenerativeModel(_model);
         PrepareOptions(aiModel);
 

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Text/PalmTextCompletionProvider.cs

@@ -13,7 +13,7 @@ public class PalmTextCompletionProvider : ITextCompletion
 
     private string _model;
 
-    public string Provider => "google-ai";
+    public string Provider => "google-palm";
 
     public PalmTextCompletionProvider(
         IServiceProvider services,
@@ -38,7 +38,7 @@ public async Task<string> GetCompletion(string text, string agentId, string mess
             await hook.BeforeGenerating(agent, new List<RoleDialogModel> { userMessage });
         }
 
-        var client = ProviderHelper.GetPalmClient(_services);
+        var client = ProviderHelper.GetPalmClient(Provider, _model, _services);
         _tokenStatistics.StartTimer();
         var response = await client.GenerateTextAsync(text, null);
         _tokenStatistics.StopTimer();