SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed session initialization

Browse source
This commit is contained in:
Gunpal Jain 2025-04-04 07:50:45 +05:30
parent 6a03b67e1c
commit 3859383f71
4 changed files with 34 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Directory.Packages.props
View file

@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="EntityFramework" Version="6.4.4" />
<PackageVersion Include="Google_GenerativeAI" Version="2.5.3" />
<PackageVersion Include="Google_GenerativeAI.Live" Version="2.5.3" />
<PackageVersion Include="Google_GenerativeAI" Version="2.5.5" />
<PackageVersion Include="Google_GenerativeAI.Live" Version="2.5.5" />
<PackageVersion Include="LLMSharp.Google.Palm" Version="1.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
@ -145,4 +145,4 @@
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.26" />
</ItemGroup>
</Project>
</Project>

46
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
View file

@ -217,16 +217,13 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
systemInstruction: request.SystemInstruction?.Parts.FirstOrDefault()?.Text);
_client.UseGoogleSearch = _settings.Gemini.UseGoogleSearch;
if (request.Tools != null && request.Tools.Count > 0)
if (_settings.Gemini.UseGoogleSearch)
{
var lst = (request.Tools.Select(s => (IFunctionTool)new TemporaryFunctionTool(s)).ToList());
_client.AddFunctionTools(lst, new ToolConfig()
if (request.Tools == null)
request.Tools = new List<Tool>();
request.Tools.Add(new Tool()
{
FunctionCallingConfig = new FunctionCallingConfig()
{
Mode = FunctionCallingMode.AUTO
}
GoogleSearch = new GoogleSearchTool()
});
}
@ -234,8 +231,14 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
await _client.ConnectAsync();
_client.FunctionTools?.Clear();
await _client.SendSetupAsync(new BidiGenerateContentSetup()
{
GenerationConfig = config,
Model = Model,
SystemInstruction = request.SystemInstruction,
Tools = request.Tools?.ToArray(),
});
return new RealtimeSession()
{
Id = _client.ConnectionId.ToString(),
@ -271,13 +274,14 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
config.Temperature = Math.Max(realtimeModelSettings.Temperature, 0.6f);
config.MaxOutputTokens = realtimeModelSettings.MaxResponseOutputTokens;
}
var functions = request.Tools?.SelectMany(s => s.FunctionDeclarations).Select(x =>
{
var fn = new FunctionDef
{
Name = x.Name ?? string.Empty,
Description = x.Description?? string.Empty,
Description = x.Description ?? string.Empty,
};
fn.Parameters = x.Parameters != null
? JsonSerializer.Deserialize<FunctionParametersDef>(JsonSerializer.Serialize(x.Parameters))
@ -287,6 +291,16 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
await HookEmitter.Emit<IContentGeneratingHook>(_services,
async hook => { await hook.OnSessionUpdated(agent, prompt, functions); });
if (_settings.Gemini.UseGoogleSearch)
{
if (request.Tools == null)
request.Tools = new List<Tool>();
request.Tools.Add(new Tool()
{
GoogleSearch = new GoogleSearchTool()
});
}
//ToDo: Not sure what's the purpose of UpdateSession, Google Realtime conversion works right away after sending the message!
@ -309,7 +323,7 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
{
var function = new FunctionResponse()
{
Name = message.FunctionName?? string.Empty,
Name = message.FunctionName ?? string.Empty,
Response = JsonNode.Parse(message.Content ?? "{}")
};
@ -323,11 +337,7 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
}
else if (message.Role == AgentRole.User)
{
await _client.SendClientContentAsync(new BidiGenerateContentClientContent()
{
TurnComplete = true,
Turns = [new Content(message.Content, AgentRole.User)]
});
await _client.SentTextAsync(message.Content);
}
else
{
@ -428,7 +438,7 @@ namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
{
FunctionResponse = new FunctionResponse
{
Name = message.FunctionName?? string.Empty,
Name = message.FunctionName ?? string.Empty,
Response = new JsonObject()
{
["result"] = message.Content ?? string.Empty

30
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/TemporaryFunctionTool.cs
View file

@ -1,30 +0,0 @@
using System.Threading;
using GenerativeAI.Core;
using GenerativeAI.Types;
namespace BotSharp.Plugin.GoogleAi.Providers.Realtime
{
public class TemporaryFunctionTool:IFunctionTool
{
public Tool Tool { get; set; }
public TemporaryFunctionTool(Tool tool)
{
this.Tool = tool;
}
public Tool AsTool()
{
return Tool;
}
public async Task<FunctionResponse?> CallAsync(FunctionCall functionCall, CancellationToken cancellationToken = new CancellationToken())
{
return null;
}
public bool IsContainFunction(string name)
{
return false;
}
}
}

5
tests/BotSharp.LLM.Tests/EmbeddingTests.cs
View file

@ -1,4 +1,6 @@
using BotSharp.Abstraction.Agents.Enums;

using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.Agents.Models;
using BotSharp.Abstraction.Conversations.Models;
using BotSharp.Abstraction.MLTasks;
@ -46,7 +48,6 @@ namespace BotSharp.Plugin.Google.Core
(services, configuration, modelName) = LLMProvider.CreateOpenAI();
yield return new object[] { services.BuildServiceProvider().GetService<ITextEmbedding>() ?? throw new Exception("Error while initializing"), agent, modelName };
}
}