Make Microsoft.ML.OnnxRuntimeGenAI.Tokenizer a Microsoft.ML.Tokenizers.Tokenizer

stephentoub · stephentoub · commit 8a306e7fd4cc · 2025-03-05T16:59:25.000-05:00
This enables an ONNX Runtime GenAI tokenizer instance to be used anywhere a Microsoft.ML.Tokenizers tokenizer is accepted. If we'd prefer, rather than having Tokenizer be a base class for the ONNX Runtime one, we could instead expose some sort of `public Microsoft.ML.Tokenizer.Tokenizer AsTokenizer()` conversion method that returns a wrapper object (though that's a bit confusing given the names of the type are the same, just different namespaces).
diff --git a/src/csharp/Adapters.cs b/src/csharp/Adapters.cs
@@ -31,8 +31,10 @@ public Adapters(Model model) : base(IntPtr.Zero, true)
         /// <param name="adapterName">adapter name</param>
         public void LoadAdapter(string adapterPath, string adapterName)
         {
-            Result.VerifySuccess(NativeMethods.OgaLoadAdapter(handle,
-                StringUtils.ToUtf8(adapterPath), StringUtils.ToUtf8(adapterName)));
+            Result.VerifySuccess(NativeMethods.OgaLoadAdapter(
+                handle,
+                StringUtils.ToNullTerminatedUtf8(adapterPath), 
+                StringUtils.ToNullTerminatedUtf8(adapterName)));
         }
 
         /// <summary>
@@ -42,7 +44,9 @@ public void LoadAdapter(string adapterPath, string adapterName)
         /// <param name="adapterName"></param>
         public void UnloadAdapter(string adapterName)
         {
-            Result.VerifySuccess(NativeMethods.OgaUnloadAdapter(handle, StringUtils.ToUtf8(adapterName)));
+            Result.VerifySuccess(NativeMethods.OgaUnloadAdapter(
+                handle, 
+                StringUtils.ToNullTerminatedUtf8(adapterName)));
         }
 
         internal IntPtr Handle { get { return handle; } }
diff --git a/src/csharp/Audios.cs b/src/csharp/Audios.cs
@@ -23,7 +23,9 @@ public static Audios Load(string[] audioPaths)
             Result.VerifySuccess(NativeMethods.OgaCreateStringArray(out IntPtr stringArray));
             foreach (string audioPath in audioPaths)
             {
-                Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(stringArray, StringUtils.ToUtf8(audioPath)));
+                Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(
+                    stringArray,
+                    StringUtils.ToNullTerminatedUtf8(audioPath)));
             }
             Result.VerifySuccess(NativeMethods.OgaLoadAudios(stringArray, out IntPtr audiosHandle));
             NativeMethods.OgaDestroyStringArray(stringArray);
diff --git a/src/csharp/Config.cs b/src/csharp/Config.cs
@@ -11,7 +11,9 @@ public class Config : IDisposable
         private bool _disposed = false;
         public Config(string modelPath)
         {
-            Result.VerifySuccess(NativeMethods.OgaCreateConfig(StringUtils.ToUtf8(modelPath), out _configHandle));
+            Result.VerifySuccess(NativeMethods.OgaCreateConfig(
+                StringUtils.ToNullTerminatedUtf8(modelPath),
+                out _configHandle));
         }
 
         internal IntPtr Handle { get { return _configHandle; } }
@@ -22,12 +24,18 @@ public void ClearProviders()
 
         public void AppendProvider(string provider)
         {
-            Result.VerifySuccess(NativeMethods.OgaConfigAppendProvider(_configHandle, StringUtils.ToUtf8(provider)));
+            Result.VerifySuccess(NativeMethods.OgaConfigAppendProvider(
+                _configHandle, 
+                StringUtils.ToNullTerminatedUtf8(provider)));
         }
 
         public void SetProviderOption(string provider, string option, string value)
         {
-            Result.VerifySuccess(NativeMethods.OgaConfigSetProviderOption(_configHandle, StringUtils.ToUtf8(provider), StringUtils.ToUtf8(option), StringUtils.ToUtf8(value)));
+            Result.VerifySuccess(NativeMethods.OgaConfigSetProviderOption(
+                _configHandle, 
+                StringUtils.ToNullTerminatedUtf8(provider), 
+                StringUtils.ToNullTerminatedUtf8(option), 
+                StringUtils.ToNullTerminatedUtf8(value)));
         }
 
         ~Config()
diff --git a/src/csharp/Generator.cs b/src/csharp/Generator.cs
@@ -70,7 +70,7 @@ public ReadOnlySpan<int> GetSequence(ulong index)
         public Tensor GetOutput(string outputName)
         {
             Result.VerifySuccess(NativeMethods.OgaGenerator_GetOutput(_generatorHandle,
-                                                                      StringUtils.ToUtf8(outputName),
+                                                                      StringUtils.ToNullTerminatedUtf8(outputName),
                                                                       out IntPtr outputTensor));
             return new Tensor(outputTensor);
         }
@@ -85,7 +85,7 @@ public void SetActiveAdapter(Adapters adapters, string adapterName)
         {
             Result.VerifySuccess(NativeMethods.OgaSetActiveAdapter(_generatorHandle,
                                                                    adapters.Handle,
-                                                                   StringUtils.ToUtf8(adapterName)));
+                                                                   StringUtils.ToNullTerminatedUtf8(adapterName)));
         }
 
         ~Generator()
diff --git a/src/csharp/GeneratorParams.cs b/src/csharp/GeneratorParams.cs
@@ -2,9 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.ML.OnnxRuntimeGenAI
 {
@@ -21,27 +18,38 @@ public GeneratorParams(Model model)
 
         public void SetSearchOption(string searchOption, double value)
         {
-            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchNumber(_generatorParamsHandle, StringUtils.ToUtf8(searchOption), value));
+            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchNumber(
+                _generatorParamsHandle, 
+                StringUtils.ToNullTerminatedUtf8(searchOption), value));
         }
 
         public void SetSearchOption(string searchOption, bool value)
         {
-            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchBool(_generatorParamsHandle, StringUtils.ToUtf8(searchOption), value));
+            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchBool(
+                _generatorParamsHandle,
+                StringUtils.ToNullTerminatedUtf8(searchOption), value));
         }
 
         public void TryGraphCaptureWithMaxBatchSize(int maxBatchSize)
         {
-            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsTryGraphCaptureWithMaxBatchSize(_generatorParamsHandle, maxBatchSize));
+            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsTryGraphCaptureWithMaxBatchSize(
+                _generatorParamsHandle, 
+                maxBatchSize));
         }
 
         public void SetModelInput(string name, Tensor value)
         {
-            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetModelInput(_generatorParamsHandle, StringUtils.ToUtf8(name), value.Handle));
+            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetModelInput(
+                _generatorParamsHandle, 
+                StringUtils.ToNullTerminatedUtf8(name),
+                value.Handle));
         }
 
         public void SetInputs(NamedTensors namedTensors)
         {
-            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetInputs(_generatorParamsHandle, namedTensors.Handle));
+            Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetInputs(
+                _generatorParamsHandle, 
+                namedTensors.Handle));
         }
 
         ~GeneratorParams()
diff --git a/src/csharp/Images.cs b/src/csharp/Images.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.ML.OnnxRuntimeGenAI
 {
@@ -23,7 +22,9 @@ public static Images Load(string[] imagePaths)
             Result.VerifySuccess(NativeMethods.OgaCreateStringArray(out IntPtr stringArray));
             foreach (string imagePath in imagePaths)
             {
-                Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(stringArray, StringUtils.ToUtf8(imagePath)));
+                Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(
+                    stringArray,
+                    StringUtils.ToNullTerminatedUtf8(imagePath)));
             }
             Result.VerifySuccess(NativeMethods.OgaLoadImages(stringArray, out IntPtr imagesHandle));
             NativeMethods.OgaDestroyStringArray(stringArray);
diff --git a/src/csharp/Microsoft.ML.OnnxRuntimeGenAI.csproj b/src/csharp/Microsoft.ML.OnnxRuntimeGenAI.csproj
@@ -123,6 +123,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
+    <PackageReference Include="Microsoft.ML.Tokenizers" Version="1.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/csharp/Model.cs b/src/csharp/Model.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.ML.OnnxRuntimeGenAI
 {
@@ -13,7 +12,9 @@ public class Model : IDisposable
 
         public Model(string modelPath)
         {
-            Result.VerifySuccess(NativeMethods.OgaCreateModel(StringUtils.ToUtf8(modelPath), out _modelHandle));
+            Result.VerifySuccess(NativeMethods.OgaCreateModel(
+                StringUtils.ToNullTerminatedUtf8(modelPath), 
+                out _modelHandle));
         }
 
         public Model(Config config)
diff --git a/src/csharp/MultiModalProcessor.cs b/src/csharp/MultiModalProcessor.cs
@@ -20,8 +20,11 @@ public MultiModalProcessor(Model model)
         public NamedTensors ProcessImages(string prompt, Images images)
         {
             IntPtr imagesHandle = images == null ? IntPtr.Zero : images.Handle;
-            Result.VerifySuccess(NativeMethods.OgaProcessorProcessImages(_processorHandle, StringUtils.ToUtf8(prompt),
-                                                                         imagesHandle, out IntPtr namedTensorsHandle));
+            Result.VerifySuccess(NativeMethods.OgaProcessorProcessImages(
+                _processorHandle, 
+                StringUtils.ToNullTerminatedUtf8(prompt),
+                imagesHandle, 
+                out IntPtr namedTensorsHandle));
             return new NamedTensors(namedTensorsHandle);
         }
 
@@ -41,8 +44,12 @@ public NamedTensors ProcessImagesAndAudios(string prompt, Images images, Audios
         {
             IntPtr imagesHandle = images == null ? IntPtr.Zero : images.Handle;
             IntPtr audiosHandle = audios == null ? IntPtr.Zero : audios.Handle;
-            Result.VerifySuccess(NativeMethods.OgaProcessorProcessImagesAndAudios(_processorHandle, StringUtils.ToUtf8(prompt),
-                                                                         imagesHandle, audiosHandle, out IntPtr namedTensorsHandle));
+            Result.VerifySuccess(NativeMethods.OgaProcessorProcessImagesAndAudios(
+                _processorHandle, 
+                StringUtils.ToNullTerminatedUtf8(prompt),
+                imagesHandle, 
+                audiosHandle, 
+                out IntPtr namedTensorsHandle));
             return new NamedTensors(namedTensorsHandle);
         }
 
@@ -68,7 +75,7 @@ public string Decode(ReadOnlySpan<int> sequence)
             }
             try
             {
-                return StringUtils.FromUtf8(outStr);
+                return StringUtils.FromNullTerminatedUtf8(outStr);
             }
             finally
             {
diff --git a/src/csharp/Result.cs b/src/csharp/Result.cs
@@ -6,18 +6,22 @@
 
 namespace Microsoft.ML.OnnxRuntimeGenAI
 {
-    class Result
+    internal static class Result
     {
-        private static string GetErrorMessage(IntPtr nativeResult)
+        internal static string GetErrorMessage(IntPtr nativeResult)
         {
-
-            return StringUtils.FromUtf8(NativeMethods.OgaResultGetError(nativeResult));
+            return StringUtils.FromNullTerminatedUtf8(NativeMethods.OgaResultGetError(nativeResult));
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void VerifySuccess(IntPtr nativeResult)
         {
             if (nativeResult != IntPtr.Zero)
+            {
+                Throw(nativeResult);
+            }
+
+            static void Throw(IntPtr nativeResult)
             {
                 try
                 {
diff --git a/src/csharp/Tokenizer.cs b/src/csharp/Tokenizer.cs
diff --git a/src/csharp/TokenizerStream.cs b/src/csharp/TokenizerStream.cs
diff --git a/src/csharp/Utils.cs b/src/csharp/Utils.cs

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ public Adapters(Model model) : base(IntPtr.Zero, true)`
`31`	`31`	`/// <param name="adapterName">adapter name</param>`
`32`	`32`	`public void LoadAdapter(string adapterPath, string adapterName)`
`33`	`33`	`{`
`34`		`- Result.VerifySuccess(NativeMethods.OgaLoadAdapter(handle,`
`35`		`- StringUtils.ToUtf8(adapterPath), StringUtils.ToUtf8(adapterName)));`
	`34`	`+ Result.VerifySuccess(NativeMethods.OgaLoadAdapter(`
	`35`	`+ handle,`
	`36`	`+ StringUtils.ToNullTerminatedUtf8(adapterPath),`
	`37`	`+ StringUtils.ToNullTerminatedUtf8(adapterName)));`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`/// <summary>`
`@@ -42,7 +44,9 @@ public void LoadAdapter(string adapterPath, string adapterName)`
`42`	`44`	`/// <param name="adapterName"></param>`
`43`	`45`	`public void UnloadAdapter(string adapterName)`
`44`	`46`	`{`
`45`		`- Result.VerifySuccess(NativeMethods.OgaUnloadAdapter(handle, StringUtils.ToUtf8(adapterName)));`
	`47`	`+ Result.VerifySuccess(NativeMethods.OgaUnloadAdapter(`
	`48`	`+ handle,`
	`49`	`+ StringUtils.ToNullTerminatedUtf8(adapterName)));`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`internal IntPtr Handle { get { return handle; } }`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ public static Audios Load(string[] audioPaths)`
`23`	`23`	`Result.VerifySuccess(NativeMethods.OgaCreateStringArray(out IntPtr stringArray));`
`24`	`24`	`foreach (string audioPath in audioPaths)`
`25`	`25`	`{`
`26`		`- Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(stringArray, StringUtils.ToUtf8(audioPath)));`
	`26`	`+ Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(`
	`27`	`+ stringArray,`
	`28`	`+ StringUtils.ToNullTerminatedUtf8(audioPath)));`
`27`	`29`	`}`
`28`	`30`	`Result.VerifySuccess(NativeMethods.OgaLoadAudios(stringArray, out IntPtr audiosHandle));`
`29`	`31`	`NativeMethods.OgaDestroyStringArray(stringArray);`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ public class Config : IDisposable`
`11`	`11`	`private bool _disposed = false;`
`12`	`12`	`public Config(string modelPath)`
`13`	`13`	`{`
`14`		`- Result.VerifySuccess(NativeMethods.OgaCreateConfig(StringUtils.ToUtf8(modelPath), out _configHandle));`
	`14`	`+ Result.VerifySuccess(NativeMethods.OgaCreateConfig(`
	`15`	`+ StringUtils.ToNullTerminatedUtf8(modelPath),`
	`16`	`+ out _configHandle));`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`internal IntPtr Handle { get { return _configHandle; } }`
`@@ -22,12 +24,18 @@ public void ClearProviders()`
`22`	`24`
`23`	`25`	`public void AppendProvider(string provider)`
`24`	`26`	`{`
`25`		`- Result.VerifySuccess(NativeMethods.OgaConfigAppendProvider(_configHandle, StringUtils.ToUtf8(provider)));`
	`27`	`+ Result.VerifySuccess(NativeMethods.OgaConfigAppendProvider(`
	`28`	`+ _configHandle,`
	`29`	`+ StringUtils.ToNullTerminatedUtf8(provider)));`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`public void SetProviderOption(string provider, string option, string value)`
`29`	`33`	`{`
`30`		`- Result.VerifySuccess(NativeMethods.OgaConfigSetProviderOption(_configHandle, StringUtils.ToUtf8(provider), StringUtils.ToUtf8(option), StringUtils.ToUtf8(value)));`
	`34`	`+ Result.VerifySuccess(NativeMethods.OgaConfigSetProviderOption(`
	`35`	`+ _configHandle,`
	`36`	`+ StringUtils.ToNullTerminatedUtf8(provider),`
	`37`	`+ StringUtils.ToNullTerminatedUtf8(option),`
	`38`	`+ StringUtils.ToNullTerminatedUtf8(value)));`
`31`	`39`	`}`
`32`	`40`
`33`	`41`	`~Config()`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public ReadOnlySpan<int> GetSequence(ulong index)`
`70`	`70`	`public Tensor GetOutput(string outputName)`
`71`	`71`	`{`
`72`	`72`	`Result.VerifySuccess(NativeMethods.OgaGenerator_GetOutput(_generatorHandle,`
`73`		`- StringUtils.ToUtf8(outputName),`
	`73`	`+ StringUtils.ToNullTerminatedUtf8(outputName),`
`74`	`74`	`out IntPtr outputTensor));`
`75`	`75`	`return new Tensor(outputTensor);`
`76`	`76`	`}`
`@@ -85,7 +85,7 @@ public void SetActiveAdapter(Adapters adapters, string adapterName)`
`85`	`85`	`{`
`86`	`86`	`Result.VerifySuccess(NativeMethods.OgaSetActiveAdapter(_generatorHandle,`
`87`	`87`	`adapters.Handle,`
`88`		`- StringUtils.ToUtf8(adapterName)));`
	`88`	`+ StringUtils.ToNullTerminatedUtf8(adapterName)));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`~Generator()`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Runtime.InteropServices;`
`8`	`5`
`9`	`6`	`namespace Microsoft.ML.OnnxRuntimeGenAI`
`10`	`7`	`{`
`@@ -21,27 +18,38 @@ public GeneratorParams(Model model)`
`21`	`18`
`22`	`19`	`public void SetSearchOption(string searchOption, double value)`
`23`	`20`	`{`
`24`		`- Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchNumber(_generatorParamsHandle, StringUtils.ToUtf8(searchOption), value));`
	`21`	`+ Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchNumber(`
	`22`	`+ _generatorParamsHandle,`
	`23`	`+ StringUtils.ToNullTerminatedUtf8(searchOption), value));`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`public void SetSearchOption(string searchOption, bool value)`
`28`	`27`	`{`
`29`		`- Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchBool(_generatorParamsHandle, StringUtils.ToUtf8(searchOption), value));`
	`28`	`+ Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetSearchBool(`
	`29`	`+ _generatorParamsHandle,`
	`30`	`+ StringUtils.ToNullTerminatedUtf8(searchOption), value));`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`public void TryGraphCaptureWithMaxBatchSize(int maxBatchSize)`
`33`	`34`	`{`
`34`		`- Result.VerifySuccess(NativeMethods.OgaGeneratorParamsTryGraphCaptureWithMaxBatchSize(_generatorParamsHandle, maxBatchSize));`
	`35`	`+ Result.VerifySuccess(NativeMethods.OgaGeneratorParamsTryGraphCaptureWithMaxBatchSize(`
	`36`	`+ _generatorParamsHandle,`
	`37`	`+ maxBatchSize));`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`public void SetModelInput(string name, Tensor value)`
`38`	`41`	`{`
`39`		`- Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetModelInput(_generatorParamsHandle, StringUtils.ToUtf8(name), value.Handle));`
	`42`	`+ Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetModelInput(`
	`43`	`+ _generatorParamsHandle,`
	`44`	`+ StringUtils.ToNullTerminatedUtf8(name),`
	`45`	`+ value.Handle));`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`public void SetInputs(NamedTensors namedTensors)`
`43`	`49`	`{`
`44`		`- Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetInputs(_generatorParamsHandle, namedTensors.Handle));`
	`50`	`+ Result.VerifySuccess(NativeMethods.OgaGeneratorParamsSetInputs(`
	`51`	`+ _generatorParamsHandle,`
	`52`	`+ namedTensors.Handle));`
`45`	`53`	`}`
`46`	`54`
`47`	`55`	`~GeneratorParams()`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using System.Runtime.InteropServices;`
`6`	`5`
`7`	`6`	`namespace Microsoft.ML.OnnxRuntimeGenAI`
`8`	`7`	`{`
`@@ -23,7 +22,9 @@ public static Images Load(string[] imagePaths)`
`23`	`22`	`Result.VerifySuccess(NativeMethods.OgaCreateStringArray(out IntPtr stringArray));`
`24`	`23`	`foreach (string imagePath in imagePaths)`
`25`	`24`	`{`
`26`		`- Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(stringArray, StringUtils.ToUtf8(imagePath)));`
	`25`	`+ Result.VerifySuccess(NativeMethods.OgaStringArrayAddString(`
	`26`	`+ stringArray,`
	`27`	`+ StringUtils.ToNullTerminatedUtf8(imagePath)));`
`27`	`28`	`}`
`28`	`29`	`Result.VerifySuccess(NativeMethods.OgaLoadImages(stringArray, out IntPtr imagesHandle));`
`29`	`30`	`NativeMethods.OgaDestroyStringArray(stringArray);`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@ public MultiModalProcessor(Model model)`
`20`	`20`	`public NamedTensors ProcessImages(string prompt, Images images)`
`21`	`21`	`{`
`22`	`22`	`IntPtr imagesHandle = images == null ? IntPtr.Zero : images.Handle;`
`23`		`- Result.VerifySuccess(NativeMethods.OgaProcessorProcessImages(_processorHandle, StringUtils.ToUtf8(prompt),`
`24`		`- imagesHandle, out IntPtr namedTensorsHandle));`
	`23`	`+ Result.VerifySuccess(NativeMethods.OgaProcessorProcessImages(`
	`24`	`+ _processorHandle,`
	`25`	`+ StringUtils.ToNullTerminatedUtf8(prompt),`
	`26`	`+ imagesHandle,`
	`27`	`+ out IntPtr namedTensorsHandle));`
`25`	`28`	`return new NamedTensors(namedTensorsHandle);`
`26`	`29`	`}`
`27`	`30`
`@@ -41,8 +44,12 @@ public NamedTensors ProcessImagesAndAudios(string prompt, Images images, Audios`
`41`	`44`	`{`
`42`	`45`	`IntPtr imagesHandle = images == null ? IntPtr.Zero : images.Handle;`
`43`	`46`	`IntPtr audiosHandle = audios == null ? IntPtr.Zero : audios.Handle;`
`44`		`- Result.VerifySuccess(NativeMethods.OgaProcessorProcessImagesAndAudios(_processorHandle, StringUtils.ToUtf8(prompt),`
`45`		`- imagesHandle, audiosHandle, out IntPtr namedTensorsHandle));`
	`47`	`+ Result.VerifySuccess(NativeMethods.OgaProcessorProcessImagesAndAudios(`
	`48`	`+ _processorHandle,`
	`49`	`+ StringUtils.ToNullTerminatedUtf8(prompt),`
	`50`	`+ imagesHandle,`
	`51`	`+ audiosHandle,`
	`52`	`+ out IntPtr namedTensorsHandle));`
`46`	`53`	`return new NamedTensors(namedTensorsHandle);`
`47`	`54`	`}`
`48`	`55`
`@@ -68,7 +75,7 @@ public string Decode(ReadOnlySpan<int> sequence)`
`68`	`75`	`}`
`69`	`76`	`try`
`70`	`77`	`{`
`71`		`- return StringUtils.FromUtf8(outStr);`
	`78`	`+ return StringUtils.FromNullTerminatedUtf8(outStr);`
`72`	`79`	`}`
`73`	`80`	`finally`
`74`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,22 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.ML.OnnxRuntimeGenAI`
`8`	`8`	`{`
`9`		`- class Result`
	`9`	`+ internal static class Result`
`10`	`10`	`{`
`11`		`- private static string GetErrorMessage(IntPtr nativeResult)`
	`11`	`+ internal static string GetErrorMessage(IntPtr nativeResult)`
`12`	`12`	`{`
`13`		`-`
`14`		`- return StringUtils.FromUtf8(NativeMethods.OgaResultGetError(nativeResult));`
	`13`	`+ return StringUtils.FromNullTerminatedUtf8(NativeMethods.OgaResultGetError(nativeResult));`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`18`	`17`	`public static void VerifySuccess(IntPtr nativeResult)`
`19`	`18`	`{`
`20`	`19`	`if (nativeResult != IntPtr.Zero)`
	`20`	`+ {`
	`21`	`+ Throw(nativeResult);`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ static void Throw(IntPtr nativeResult)`
`21`	`25`	`{`
`22`	`26`	`try`
`23`	`27`	`{`