Merge pull request #30 from filipw/microsoft.extensions.ai

added AsChatClient to C# package + some clean up

Author: filipw

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-14, windows-latest]
+        os: [ubuntu-latest, macos-15, windows-latest]
 
     steps:
     - uses: actions/checkout@v3
@@ -75,6 +75,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
     - name: Download Linux artifacts
       uses: actions/download-artifact@v3
       with:
@@ -83,7 +86,7 @@ jobs:
     - name: Download macOS artifacts
       uses: actions/download-artifact@v3
       with:
-        name: native-library-macos-14
+        name: native-library-macos-15
         path: artifacts/macos
     - name: Download Windows artifacts
       uses: actions/download-artifact@v3

packages/csharp/Strathweb.Phi.Engine.Microsoft.Extensions.AI/PhiEngineChatClient.cs

@@ -94,12 +94,9 @@ private ConversationContext GetConversationContext(IList<ChatMessage> messages)
             var phiEngineMessages = head.Where(m => m.Role != ChatRole.System && m.Role != ChatRole.Tool)
                 .Select(m => m.ToConversationMessage()).ToList();
             var systemInstruction = head.LastOrDefault(m => m.Role == ChatRole.System)?.Text ?? _systemInstruction;
-            
-            Console.WriteLine($"Using system instruction: {systemInstruction}");
             return new ConversationContext(phiEngineMessages, systemInstruction);
         }
 
-        Console.WriteLine($"Using default system instruction: {_systemInstruction}");
         return new ConversationContext([], _systemInstruction);
     }
 

packages/csharp/Strathweb.Phi.Engine.Microsoft.Extensions.AI/PhiEngineExtensions.cs

@@ -0,0 +1,7 @@
+namespace Strathweb.Phi.Engine.Microsoft.Extensions.AI;
+
+public static class PhiEngineExtensions
+{
+    public static PhiEngineChatClient AsChatClient(this PhiEngine engine, string id, StreamingEventHandler handler, string systemInstruction = null, InferenceOptions inferenceOptions = null) => 
+        new(id, engine, handler, systemInstruction, inferenceOptions);
+}

samples/csharp/chatclient/Program.cs

@@ -10,7 +10,10 @@
 modelBuilder.WithEventHandler(new BoxedPhiEventHandler(handler));
 var model = modelBuilder.Build(cacheDir);
 
-var chatClient = new PhiEngineChatClient("Local Phi-3 Demo", model, handler, systemInstruction: "You convert what user said to all uppercase.");
+var chatClient = model.AsChatClient("Local Phi-3 Demo", handler,
+    systemInstruction: "You convert what user said to all uppercase.");
+// or alternatively
+//var chatClient = new PhiEngineChatClient("Local Phi-3 Demo", model, handler, systemInstruction: "You convert what user said to all uppercase.");
 
 var message = new ChatMessage(ChatRole.User, "hello world");
 var response = await chatClient.CompleteAsync([message]);

samples/csharp/chatclient/chatclient.console.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
       <!-- note: this is intentionally referencing the library via the nuget package: to test it, and to take advantage of the native assets there -->
-      <PackageReference Include="Strathweb.Phi.Engine.Microsoft.Extensions.AI" Version="0.1.3" />
+      <PackageReference Include="Strathweb.Phi.Engine.Microsoft.Extensions.AI" Version="0.1.2" />
   </ItemGroup>
 
   <!-- only use the below if you know what you are doing (e.g. the native assets have to provided by hand or by extra copy task) -->