fixed session initialization

Author: Gunpal Jain

Directory.Packages.props

@@ -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>

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -217,25 +217,28 @@ public async Task<RealtimeSession> CreateSession(Agent agent, List<RoleDialogMod
                 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()
                 });
             }
 
             await AttachEvents();
 
             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 @@ public async Task<string> UpdateSession(RealtimeHubConnection conn, bool interru
                 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 @@ public async Task<string> UpdateSession(RealtimeHubConnection conn, bool interru
 
             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 @@ public async Task InsertConversationItem(RoleDialogModel message)
             {
                 var function = new FunctionResponse()
                 {
-                    Name = message.FunctionName?? string.Empty,
+                    Name = message.FunctionName ?? string.Empty,
                     Response = JsonNode.Parse(message.Content ?? "{}")
                 };
 
@@ -323,11 +337,7 @@ await _client.SendToolResponseAsync(new BidiGenerateContentToolResponse()
             }
             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 @@ public Task<RoleDialogModel> OnConversationItemCreated(RealtimeHubConnection con
                         {
                             FunctionResponse = new FunctionResponse
                             {
-                                Name = message.FunctionName?? string.Empty,
+                                Name = message.FunctionName ?? string.Empty,
                                 Response = new JsonObject()
                                 {
                                     ["result"] = message.Content ?? string.Empty

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/TemporaryFunctionTool.cs

@@ -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 @@ public static IEnumerable<object[]> CreateTestLLMProviders()
                 (services, configuration, modelName) = LLMProvider.CreateOpenAI();
                 yield return new object[] { services.BuildServiceProvider().GetService<ITextEmbedding>() ?? throw new Exception("Error while initializing"), agent, modelName };
             }
-           
         }