Update to M.E.AI.Abstractions 9.9

Author: stephentoub

src/GenerativeAI.Microsoft/Extensions/MicrosoftExtensions.cs

@@ -33,9 +33,9 @@ from c in m.Contents
             let p = c.ToPart(options)
             where p is not null
             select p).ToArray();
-        if (systemParts.Length > 0)
+        if (systemParts.Length > 0 || !string.IsNullOrWhiteSpace(options?.Instructions))
         {
-            request.SystemInstruction = new Content(systemParts, Roles.System);
+            request.SystemInstruction = new Content(systemParts.Concat([new Part { Text = options!.Instructions }]), Roles.System);
         }
 
         request.Contents = (from m in chatMessages
@@ -45,24 +45,51 @@ where p is not null
                 where p is not null
                 select p).ToArray(), m.Role == ChatRole.Assistant ? Roles.Model : Roles.User)).ToList();
 
-        var functionDeclarations = options?.Tools?.OfType<AIFunction>().Select(f => 
-            new FunctionDeclaration()
+        if (options?.Tools is not null)
+        {
+            List<FunctionDeclaration>? functionDeclarations = null;
+            List<Tool>? tools = null;
+            foreach (var tool in options.Tools)
             {
-                Name = f.Name,
-                Description = f.Description,
-                Parameters = ParseFunctionParameters(f.JsonSchema),
+                switch (tool)
+                {
+                    case AIFunctionDeclaration f:
+                        (functionDeclarations ??= []).Add(new()
+                        {
+                            Name = f.Name,
+                            Description = f.Description,
+                            Parameters = ParseFunctionParameters(f.JsonSchema),
+                        });
+                        break;
+
+                    case HostedWebSearchTool ws:
+                        (tools ??= []).Add(new Tool
+                        {
+                            GoogleSearch = new GoogleSearchTool()
+                        });
+                        break;
+
+                    case HostedCodeInterpreterTool ci:
+                        (tools ??= []).Add(new Tool
+                        {
+                            CodeExecution = new CodeExecutionTool(),
+                        });
+                        break;
+                }
             }
-        ).ToList();
 
-        if (functionDeclarations != null && functionDeclarations.Count > 0)
-        {
-            request.Tools = new List<Tool>()
+            if (functionDeclarations is not null)
             {
-                new Tool
+                (tools ??= []).Add(new Tool
                 {
                     FunctionDeclarations = functionDeclarations.ToList()
-                }
-            };
+                });
+            }
+
+            if (tools is not null)
+            {
+                request.Tools = tools;
+            }
         }
 
         return request;
@@ -564,7 +591,7 @@ public static IList<AIContent> ToAiContents(this List<Part>? parts, ChatOptions?
             if (objectSchema == null && !string.IsNullOrEmpty(parameterName) && !string.IsNullOrEmpty(functionName) && options?.Tools != null)
             {
                 // Try to get the schema for this object parameter
-                var function = options.Tools.OfType<AIFunction>().FirstOrDefault(f => f.Name == functionName);
+                var function = options.Tools.OfType<AIFunctionDeclaration>().FirstOrDefault(f => f.Name == functionName);
                 if (function?.JsonSchema != null)
                 {
                     var schemaNode = JsonSerializer.SerializeToNode(function.JsonSchema);
@@ -697,7 +724,7 @@ public static IList<AIContent> ToAiContents(this List<Part>? parts, ChatOptions?
             JsonNode? itemSchema = null;
             if (!string.IsNullOrEmpty(parameterName) && !string.IsNullOrEmpty(functionName) && options?.Tools != null)
             {
-                var function = options.Tools.OfType<AIFunction>().FirstOrDefault(f => f.Name == functionName);
+                var function = options.Tools.OfType<AIFunctionDeclaration>().FirstOrDefault(f => f.Name == functionName);
                 if (function?.JsonSchema != null)
                 {
                     var schemaNode = JsonSerializer.SerializeToNode(function.JsonSchema);
@@ -747,7 +774,7 @@ public static IList<AIContent> ToAiContents(this List<Part>? parts, ChatOptions?
         if (!string.IsNullOrEmpty(parameterName) && !string.IsNullOrEmpty(functionName) && options?.Tools != null)
         {
             // Find the function in the tools
-            var function = options.Tools.OfType<AIFunction>().FirstOrDefault(f => f.Name == functionName);
+            var function = options.Tools.OfType<AIFunctionDeclaration>().FirstOrDefault(f => f.Name == functionName);
             if (function?.JsonSchema != null)
             {
                 // Parse the schema to check the parameter's format

src/GenerativeAI.Microsoft/GenerativeAI.Microsoft.csproj

@@ -32,7 +32,7 @@
       <ProjectReference Include="..\GenerativeAI\GenerativeAI.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.8.0" />
+      <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
     </ItemGroup>
 
 </Project>