Skip to content

Commit afeaa16

Browse files
committed
Remove legacy Google PaLM
1 parent d1df7f7 commit afeaa16

File tree

8 files changed

+70
-250
lines changed

8 files changed

+70
-250
lines changed

src/Plugins/BotSharp.Plugin.GoogleAI/BotSharp.Plugin.GoogleAI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<ItemGroup>
1818
<PackageReference Include="Google_GenerativeAI" />
1919
<PackageReference Include="Google_GenerativeAI.Live" />
20-
<PackageReference Include="LLMSharp.Google.Palm" />
2120
</ItemGroup>
2221

2322
</Project>

src/Plugins/BotSharp.Plugin.GoogleAI/GoogleAiPlugin.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class GoogleAiPlugin : IBotSharpPlugin
1010
{
1111
public string Id => "962ff441-2b40-4db4-b530-49efb1688a75";
1212
public string Name => "Google AI";
13-
public string Description => "Making AI helpful for everyone (PaLM 2, Gemini)";
13+
public string Description => "Making AI helpful for everyone";
1414
public string IconUrl => "https://vectorseek.com/wp-content/uploads/2021/12/Google-AI-Logo-Vector.png";
1515
public void RegisterDI(IServiceCollection services, IConfiguration config)
1616
{
@@ -20,10 +20,8 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
2020
return settingService.Bind<GoogleAiSettings>("GoogleAi");
2121
});
2222

23-
services.AddScoped<ITextCompletion, PalmTextCompletionProvider>();
24-
services.AddScoped<ITextCompletion, GeminiTextCompletionProvider>();
25-
services.AddScoped<IChatCompletion, PalmChatCompletionProvider>();
26-
services.AddScoped<IChatCompletion, GeminiChatCompletionProvider>();
23+
services.AddScoped<ITextCompletion, TextCompletionProvider>();
24+
services.AddScoped<IChatCompletion, ChatCompletionProvider>();
2725
services.AddScoped<IRealTimeCompletion, GoogleRealTimeProvider>();
2826
services.AddScoped<ITextEmbedding, TextEmbeddingProvider>();
2927
}
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
using GenerativeAI;
66
using GenerativeAI.Core;
77
using GenerativeAI.Types;
8-
using Google.Ai.Generativelanguage.V1Beta2;
98

109
namespace BotSharp.Plugin.GoogleAi.Providers.Chat;
1110

12-
public class GeminiChatCompletionProvider : IChatCompletion
11+
public class ChatCompletionProvider : IChatCompletion
1312
{
1413
private readonly IServiceProvider _services;
15-
private readonly ILogger<GeminiChatCompletionProvider> _logger;
14+
private readonly ILogger<ChatCompletionProvider> _logger;
1615
private List<string> renderedInstructions = [];
1716

1817
private string _model;
@@ -21,10 +20,10 @@ public class GeminiChatCompletionProvider : IChatCompletion
2120
public string Model => _model;
2221

2322
private GoogleAiSettings _settings;
24-
public GeminiChatCompletionProvider(
23+
public ChatCompletionProvider(
2524
IServiceProvider services,
2625
GoogleAiSettings googleSettings,
27-
ILogger<GeminiChatCompletionProvider> logger)
26+
ILogger<ChatCompletionProvider> logger)
2827
{
2928
_settings = googleSettings;
3029
_services = services;
@@ -104,7 +103,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent, List<RoleDialogMode
104103
var (prompt, messages) = PrepareOptions(chatClient, agent, conversations);
105104

106105
var response = await chatClient.GenerateContentAsync(messages);
107-
106+
108107
var candidate = response.Candidates?.First();
109108
var part = candidate?.Content?.Parts?.FirstOrDefault();
110109
var text = part?.Text ?? string.Empty;

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

Lines changed: 0 additions & 156 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
using System.IO;
2+
3+
namespace BotSharp.Plugin.GoogleAI.Providers.Image;
4+
5+
public partial class ImageCompletionProvider : IImageCompletion
6+
{
7+
protected readonly GoogleAiSettings _settings;
8+
protected readonly IServiceProvider _services;
9+
protected readonly ILogger<ImageCompletionProvider> _logger;
10+
11+
private const int DEFAULT_IMAGE_COUNT = 1;
12+
private const int IMAGE_COUNT_LIMIT = 5;
13+
14+
protected string _model;
15+
16+
public virtual string Provider => "google-ai";
17+
public string Model => _model;
18+
19+
public ImageCompletionProvider(
20+
GoogleAiSettings settings,
21+
ILogger<ImageCompletionProvider> logger,
22+
IServiceProvider services)
23+
{
24+
_settings = settings;
25+
_services = services;
26+
_logger = logger;
27+
}
28+
29+
public void SetModelName(string model)
30+
{
31+
_model = model;
32+
}
33+
34+
public Task<RoleDialogModel> GetImageGeneration(Agent agent, RoleDialogModel message)
35+
{
36+
throw new NotImplementedException();
37+
}
38+
39+
public Task<RoleDialogModel> GetImageVariation(Agent agent, RoleDialogModel message, Stream image, string imageFileName)
40+
{
41+
throw new NotImplementedException();
42+
}
43+
44+
public Task<RoleDialogModel> GetImageEdits(Agent agent, RoleDialogModel message, Stream image, string imageFileName)
45+
{
46+
throw new NotImplementedException();
47+
}
48+
49+
public Task<RoleDialogModel> GetImageEdits(Agent agent, RoleDialogModel message, Stream image, string imageFileName, Stream mask, string maskFileName)
50+
{
51+
throw new NotImplementedException();
52+
}
53+
54+
public Task<RoleDialogModel> GetImageComposition(Agent agent, RoleDialogModel message, Stream[] images, string[] imageFileNames)
55+
{
56+
throw new NotImplementedException();
57+
}
58+
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using LLMSharp.Google.Palm;
2-
31
namespace BotSharp.Plugin.GoogleAi.Providers;
42

53
public static class ProviderHelper
@@ -19,12 +17,4 @@ public static GenerativeAI.GoogleAi GetGeminiClient(string provider, string mode
1917
return new GenerativeAI.GoogleAi(aiSettings.Gemini.ApiKey);
2018
}
2119
}
22-
23-
public static GooglePalmClient GetPalmClient(string provider, string model, IServiceProvider services)
24-
{
25-
var settingsService = services.GetRequiredService<ILlmProviderService>();
26-
var settings = settingsService.GetSetting(provider, model);
27-
var client = new GooglePalmClient(settings.ApiKey);
28-
return client;
29-
}
3020
}

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

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)