Merge pull request #1256 from stephentoub/instructions

martindevans · web-flow · commit de00c15685fc · 2025-09-26T16:23:14.000+01:00
Respect ChatOptions.Instructions in LlamaExecutorChatClient
diff --git a/LLama.Examples/LLama.Examples.csproj b/LLama.Examples/LLama.Examples.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
     <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.98.250508.3" />
     <PackageReference Include="Microsoft.SemanticKernel" Version="1.64.0" />
     <PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.44.0-alpha" />
diff --git a/LLama/Extensions/LLamaExecutorExtensions.cs b/LLama/Extensions/LLamaExecutorExtensions.cs
@@ -63,7 +63,7 @@ public void Dispose() { }
         public async Task<ChatResponse> GetResponseAsync(
             IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default)
         {
-            var result = _executor.InferAsync(CreatePrompt(messages), CreateInferenceParams(options), cancellationToken);
+            var result = _executor.InferAsync(CreatePrompt(messages, options), CreateInferenceParams(options), cancellationToken);
 
             StringBuilder text = new();
             await foreach (var token in _outputTransform.TransformAsync(result))
@@ -86,7 +86,7 @@ public async Task<ChatResponse> GetResponseAsync(
         public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
             IEnumerable<ChatMessage> messages, ChatOptions? options = null, [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
-            var result = _executor.InferAsync(CreatePrompt(messages), CreateInferenceParams(options), cancellationToken);
+            var result = _executor.InferAsync(CreatePrompt(messages, options), CreateInferenceParams(options), cancellationToken);
 
             string messageId = Guid.NewGuid().ToString("N");
             await foreach (var token in _outputTransform.TransformAsync(result))
@@ -100,7 +100,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
         }
 
         /// <summary>Format the chat messages into a string prompt.</summary>
-        private string CreatePrompt(IEnumerable<ChatMessage> messages)
+        private string CreatePrompt(IEnumerable<ChatMessage> messages, ChatOptions? options = null)
         {
             if (messages is null)
             {
@@ -120,6 +120,11 @@ private string CreatePrompt(IEnumerable<ChatMessage> messages)
                         AuthorRole.User,
                         string.Concat(message.Contents.OfType<TextContent>()));
                 }
+
+                if (options?.Instructions is { } instructions)
+                {
+                    history.AddMessage(AuthorRole.System, instructions);
+                }
             }
             else
             {
diff --git a/LLama/LLamaSharp.csproj b/LLama/LLamaSharp.csproj
@@ -45,15 +45,15 @@
     <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="System.Memory" Version="4.6.3" PrivateAssets="all" />
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
-    <PackageReference Include="System.Text.Json" Version="9.0.8" />
+    <PackageReference Include="System.Text.Json" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.8.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageReference Include="System.Numerics.Tensors" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageReference Include="System.Numerics.Tensors" Version="9.0.9" />
   </ItemGroup>
 
   <PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void Dispose() { }`
`63`	`63`	`public async Task<ChatResponse> GetResponseAsync(`
`64`	`64`	`IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default)`
`65`	`65`	`{`
`66`		`- var result = _executor.InferAsync(CreatePrompt(messages), CreateInferenceParams(options), cancellationToken);`
	`66`	`+ var result = _executor.InferAsync(CreatePrompt(messages, options), CreateInferenceParams(options), cancellationToken);`
`67`	`67`
`68`	`68`	`StringBuilder text = new();`
`69`	`69`	`await foreach (var token in _outputTransform.TransformAsync(result))`
`@@ -86,7 +86,7 @@ public async Task<ChatResponse> GetResponseAsync(`
`86`	`86`	`public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(`
`87`	`87`	`IEnumerable<ChatMessage> messages, ChatOptions? options = null, [EnumeratorCancellation] CancellationToken cancellationToken = default)`
`88`	`88`	`{`
`89`		`- var result = _executor.InferAsync(CreatePrompt(messages), CreateInferenceParams(options), cancellationToken);`
	`89`	`+ var result = _executor.InferAsync(CreatePrompt(messages, options), CreateInferenceParams(options), cancellationToken);`
`90`	`90`
`91`	`91`	`string messageId = Guid.NewGuid().ToString("N");`
`92`	`92`	`await foreach (var token in _outputTransform.TransformAsync(result))`
`@@ -100,7 +100,7 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/// <summary>Format the chat messages into a string prompt.</summary>`
`103`		`- private string CreatePrompt(IEnumerable<ChatMessage> messages)`
	`103`	`+ private string CreatePrompt(IEnumerable<ChatMessage> messages, ChatOptions? options = null)`
`104`	`104`	`{`
`105`	`105`	`if (messages is null)`
`106`	`106`	`{`
`@@ -120,6 +120,11 @@ private string CreatePrompt(IEnumerable<ChatMessage> messages)`
`120`	`120`	`AuthorRole.User,`
`121`	`121`	`string.Concat(message.Contents.OfType<TextContent>()));`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ if (options?.Instructions is { } instructions)`
	`125`	`+ {`
	`126`	`+ history.AddMessage(AuthorRole.System, instructions);`
	`127`	`+ }`
`123`	`128`	`}`
`124`	`129`	`else`
`125`	`130`	`{`