Update to net10

.github/workflows/dotnet.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/release.yaml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Get latest tag version
       id: vars
       run: echo "tag=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_OUTPUT

DotPrompt.Tests/DotPrompt.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

DotPrompt.Tests/PromptFileTests.cs

@@ -329,7 +329,7 @@ public void GenerateUserPrompt_WithAllParameterValues_GeneratesValidPrompt()
     {
         var promptFile = PromptFile.FromFile("SamplePrompts/param-types.prompt");
 
-        var expectedPrompt =
+        const string expectedPrompt =
             "Parameter 1: Arthur Dent\nParameter 2: 42\nParameter 3: true\nParameter 4: 2024-01-02 03:04:05Z\nParameter 5: { SEP = True }\nParameter 6: Hello : 12";
 
         var userPrompt = promptFile.GetUserPrompt(new Dictionary<string, object>

DotPrompt/DotPrompt.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>DotPrompt</PackageId>
@@ -21,9 +21,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fluid.Core" Version="2.25.0" />
-    <PackageReference Include="JsonSchema.Net" Version="7.4.0" />
-    <PackageReference Include="OpenAI" Version="2.3.0" />
+    <PackageReference Include="Fluid.Core" Version="2.31.0" />
+    <PackageReference Include="JsonSchema.Net" Version="8.0.5" />
+    <PackageReference Include="OpenAI" Version="2.8.0" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 

DotPrompt/Extensions/OpenAi/OpenAiExtensions.cs

@@ -7,73 +7,74 @@ namespace DotPrompt.Extensions.OpenAi;
 /// </summary>
 public static class OpenAiExtensions
 {
-    /// <summary>
-    /// Converts a <see cref="PromptFile"/> instance to a collection of <see cref="ChatMessage"/> objects.
-    /// </summary>
     /// <param name="promptFile">The <see cref="PromptFile"/> instance containing prompt definitions.</param>
-    /// <param name="values">A dictionary of values to be substituted in the user prompt template.</param>
-    /// <returns>An enumerable collection of <see cref="ChatMessage"/> objects.</returns>
-    public static IEnumerable<ChatMessage> ToOpenAiChatMessages(this PromptFile promptFile,
-        IDictionary<string, object>? values)
+    extension(PromptFile promptFile)
     {
-        var messages = new List<ChatMessage>();
-
-        // If the prompt file provides any few shot prompts, then include these first
-        if (promptFile.FewShots.Length != 0)
+        /// <summary>
+        /// Converts a <see cref="PromptFile"/> instance to a collection of <see cref="ChatMessage"/> objects.
+        /// </summary>
+        /// <param name="values">A dictionary of values to be substituted in the user prompt template.</param>
+        /// <returns>An enumerable collection of <see cref="ChatMessage"/> objects.</returns>
+        public IEnumerable<ChatMessage> ToOpenAiChatMessages(IDictionary<string, object>? values)
         {
-            foreach (var fewShot in promptFile.FewShots)
+            var messages = new List<ChatMessage>();
+
+            // If the prompt file provides any few shot prompts, then include these first
+            if (promptFile.FewShots.Length != 0)
             {
-                messages.Add(new UserChatMessage(fewShot.User));
-                messages.Add(new AssistantChatMessage(fewShot.Response));
+                foreach (var fewShot in promptFile.FewShots)
+                {
+                    messages.Add(new UserChatMessage(fewShot.User));
+                    messages.Add(new AssistantChatMessage(fewShot.Response));
+                }
             }
-        }
 
-        if (!string.IsNullOrEmpty(promptFile.Prompts!.System))
-        {
-            messages.Add(new SystemChatMessage(promptFile.GetSystemPrompt(values)));
-        }
+            if (!string.IsNullOrEmpty(promptFile.Prompts!.System))
+            {
+                messages.Add(new SystemChatMessage(promptFile.GetSystemPrompt(values)));
+            }
 
-        messages.Add(new UserChatMessage(promptFile.GetUserPrompt(values)));
+            messages.Add(new UserChatMessage(promptFile.GetUserPrompt(values)));
 
-        return messages;
-    }
+            return messages;
+        }
 
-    /// <summary>
-    /// Converts a <see cref="PromptFile"/> instance to an <see cref="ChatCompletionOptions"/> object.
-    /// </summary>
-    /// <param name="promptFile">The <see cref="PromptFile"/> instance containing configuration and prompt definitions.</param>
-    /// <returns>A <see cref="ChatCompletionOptions"/> object configured based on the <see cref="PromptFile"/> instance.</returns>
-    public static ChatCompletionOptions ToOpenAiChatCompletionOptions(this PromptFile promptFile)
-    {
-        var chatResponseFormat = promptFile.Config.OutputFormat switch
+        /// <summary>
+        /// Converts a <see cref="PromptFile"/> instance to an <see cref="ChatCompletionOptions"/> object.
+        /// </summary>
+        /// <returns>A <see cref="ChatCompletionOptions"/> object configured based on the <see cref="PromptFile"/> instance.</returns>
+        public ChatCompletionOptions ToOpenAiChatCompletionOptions()
         {
-            OutputFormat.Text => ChatResponseFormat.CreateTextFormat(),
-            OutputFormat.Json => ChatResponseFormat.CreateJsonObjectFormat(),
-            OutputFormat.JsonSchema when promptFile.Config.Output?.Schema is not null =>
-                ChatResponseFormat.CreateJsonSchemaFormat(
-                    promptFile.Name,
-                    BinaryData.FromString(promptFile.Config.Output.ToSchemaDocument()),
-                    jsonSchemaIsStrict: true),
-            OutputFormat.JsonSchema when promptFile.Config.Output?.Schema is null =>
-                throw new DotPromptException("A valid schema was not provided to be used with the JsonSchema response type"),
-            _ => throw new DotPromptException("The requested output format is not available")
-        };
+            var chatResponseFormat = promptFile.Config.OutputFormat switch
+            {
+                OutputFormat.Text => ChatResponseFormat.CreateTextFormat(),
+                OutputFormat.Json => ChatResponseFormat.CreateJsonObjectFormat(),
+                OutputFormat.JsonSchema when promptFile.Config.Output?.Schema is not null =>
+                    ChatResponseFormat.CreateJsonSchemaFormat(
+                        promptFile.Name,
+                        BinaryData.FromString(promptFile.Config.Output.ToSchemaDocument()),
+                        jsonSchemaIsStrict: true),
+                OutputFormat.JsonSchema when promptFile.Config.Output?.Schema is null =>
+                    throw new DotPromptException("A valid schema was not provided to be used with the JsonSchema response type"),
+                _ => throw new DotPromptException("The requested output format is not available")
+            };
 
-        var chatCompletionOptions = new ChatCompletionOptions
-        {
-            ResponseFormat = chatResponseFormat
-        };
+            var chatCompletionOptions = new ChatCompletionOptions
+            {
+                ResponseFormat = chatResponseFormat
+            };
 
-        if (promptFile.Config.Temperature is not null)
-        {
-            chatCompletionOptions.Temperature = promptFile.Config.Temperature;
-        }
+            if (promptFile.Config.Temperature is not null)
+            {
+                chatCompletionOptions.Temperature = promptFile.Config.Temperature;
+            }
 
-        if (promptFile.Config.MaxTokens is not null)
-        {
-            chatCompletionOptions.MaxOutputTokenCount = promptFile.Config.MaxTokens;
-        }
+            if (promptFile.Config.MaxTokens is not null)
+            {
+                chatCompletionOptions.MaxOutputTokenCount = promptFile.Config.MaxTokens;
+            }
 
-        return chatCompletionOptions;
+            return chatCompletionOptions;
+        }
     }
 }

DotPrompt/Output.cs

@@ -8,7 +8,7 @@ namespace DotPrompt;
 /// </summary>
 public class Output
 {
-    private string? _schemaDocument = null;
+    private string? _schemaDocument;
 
     /// <summary>
     /// Gets or sets the format of the output. This determines how the output should be structured.

DotPrompt/PromptFile.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using Fluid;
-using Json.Schema;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;