fixes

Picovoice · Jan 27, 2025 · 869eacf · 869eacf
1 parent 48fb86d
commit 869eacf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml
@@ -47,8 +47,13 @@ jobs:
 
     # ************** REMOVE AFTER RELEASE ********************
     - name: Remove local package
+      if: ${{ matrix.machine != 'pv-windows' && matrix.machine != 'pv-windows-igpu' && matrix.machine != 'pv-windows-arm64' }}
       run: rm -rf ~/.nuget/packages/picollm
 
+    - name: Remove local package
+      if: ${{ matrix.machine == 'pv-windows' && matrix.machine == 'pv-windows-igpu' && matrix.machine == 'pv-windows-arm64' }}
+      run: rm ~/.nuget/packages/picollm -r -force
+
     - name: Build Local Packages
       run: dotnet build && dotnet pack -c Release
       working-directory: binding/dotnet/PicoLLM

diff --git a/binding/dotnet/PicoLLM/PicoLLM.cs b/binding/dotnet/PicoLLM/PicoLLM.cs
@@ -225,9 +225,11 @@ public class PicoLLM : IDisposable
     {
         private const string LIBRARY = "libpv_picollm";
         private IntPtr _libraryPointer = IntPtr.Zero;
-        private Action<string> _streamCallback;
 
         private delegate void PicoLLMStreamCallbackDelegate(IntPtr token, IntPtr userData);
+        private PicoLLMStreamCallbackDelegate streamCallbackDelegate = new PicoLLMStreamCallbackDelegate(StreamCallbackWrapper);
+
+        private Action<string> _streamCallback;
 
         static PicoLLM()
         {
@@ -593,7 +595,6 @@ public PicoLLMCompletion Generate(
 
             _streamCallback = streamCallback;
 
-            PicoLLMStreamCallbackDelegate streamCallbackDelegate = new PicoLLMStreamCallbackDelegate(StreamCallbackWrapper);
             IntPtr streamCallbackPtr = Marshal.GetFunctionPointerForDelegate(streamCallbackDelegate);
 
             CPicoLLMUsage cUsage;
@@ -939,6 +940,7 @@ public void Dispose()
             {
                 pv_picollm_delete(_libraryPointer);
                 _libraryPointer = IntPtr.Zero;
+                _streamCallback = null;
 
                 // ensures finalizer doesn't trigger if already manually disposed
                 GC.SuppressFinalize(this);

diff --git a/demo/dotnet/PicoLLMDemo/ChatDemo.cs b/demo/dotnet/PicoLLMDemo/ChatDemo.cs
@@ -21,8 +21,6 @@ namespace PicoLLMDemo
 {
     public class ChatDemo
     {
-        private static Action<string> streamCallback;
-
         public static void RunDemo(
             string accessKey,
             string modelPath,
@@ -56,12 +54,11 @@ public static void RunDemo(
                     dialog.AddHumanRequest(prompt);
 
                     bool isInterrupt = false;
-                    PicoLLMCompletion response = null;
                     Task interruptKeyTask = Task.Run(async () =>
                     {
-                        while (!isInterrupt && response == null)
+                        while (!isInterrupt)
                         {
-                            if (!Console.IsInputRedirected && Console.KeyAvailable)
+                            if (Console.KeyAvailable)
                             {
                                 ConsoleKeyInfo keyInfo = Console.ReadKey(intercept: true);
                                 if (keyInfo.Key == ConsoleKey.Spacebar)
@@ -75,16 +72,7 @@ public static void RunDemo(
                         }
                     });
 
-                    streamCallback = (string token) =>
-                    {
-                        if (!isInterrupt)
-                        {
-                            Console.Write(token);
-                            Console.Out.Flush();
-                        }
-                    };
-
-                    response = picoLLM.Generate(
+                    PicoLLMCompletion response = picoLLM.Generate(
                         dialog.Prompt(),
                         completionTokenLimit,
                         stopPhrases.ToArray(),
@@ -93,7 +81,14 @@ public static void RunDemo(
                         frequencyPenalty,
                         temperature,
                         topP,
-                        streamCallback: streamCallback);
+                        streamCallback: (string token) =>
+                        {
+                            if (!isInterrupt)
+                            {
+                                Console.Write(token);
+                                Console.Out.Flush();
+                            }
+                        });
 
                     interruptKeyTask.Wait();
                     Console.WriteLine();

diff --git a/demo/dotnet/PicoLLMDemo/CompletionDemo.cs b/demo/dotnet/PicoLLMDemo/CompletionDemo.cs
@@ -21,8 +21,6 @@ namespace PicoLLMDemo
 {
     public class CompletionDemo
     {
-        private static Action<string> streamCallback;
-
         public static void RunDemo(
             string accessKey,
             string modelPath,
@@ -65,7 +63,7 @@ public static void RunDemo(
                 });
 
                 double startSec = 0.0;
-                streamCallback = (string token) =>
+                Action<string> streamCallback = (string token) =>
                 {
                     if (startSec == 0.0)
                     {