Moved to ORTGenAI's IChatClient.

azchohfi · azchohfi · commit 0abda9dc951e · 2025-02-27T10:17:49.000-08:00
diff --git a/AIDevGallery/AIDevGallery.csproj b/AIDevGallery/AIDevGallery.csproj
@@ -59,7 +59,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
     <PackageReference Include="MathNet.Numerics" />
     <PackageReference Include="Microsoft.Build" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.AI" />
     <PackageReference Include="Microsoft.ML.OnnxRuntime.Extensions" />
     <PackageReference Include="Microsoft.ML.Tokenizers" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.InMemory" />
@@ -98,6 +98,7 @@
     <PackageReference Include="Microsoft.AI.DirectML" />
     <PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" />
     <PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.DirectML" />
+    <PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.Managed" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AIDevGallery/Helpers/SamplesHelper.cs b/AIDevGallery/Helpers/SamplesHelper.cs
@@ -19,10 +19,10 @@ public static List<SharedCodeEnum> GetAllSharedCode(this Sample sample, Dictiona
 
         if (isLanguageModel)
         {
-            AddUnique(SharedCodeEnum.GenAIModel);
+            AddUnique(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory);
         }
 
-        if (sharedCode.Contains(SharedCodeEnum.GenAIModel))
+        if (sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory))
         {
             AddUnique(SharedCodeEnum.LlmPromptTemplate);
         }
@@ -59,6 +59,7 @@ public static List<string> GetAllNugetPackageReferences(this Sample sample, Dict
 
         if (isLanguageModel)
         {
+            AddUnique("Microsoft.ML.OnnxRuntimeGenAI.Managed");
             AddUnique("Microsoft.ML.OnnxRuntimeGenAI.DirectML");
         }
 
diff --git a/AIDevGallery/Models/BaseSampleNavigationParameters.cs b/AIDevGallery/Models/BaseSampleNavigationParameters.cs
@@ -27,7 +27,7 @@ public void NotifyCompletion()
             return await PhiSilicaClient.CreateAsync(CancellationToken).ConfigureAwait(false);
         }
 
-        return await GenAIModel.CreateAsync(ChatClientModelPath, ChatClientPromptTemplate, CancellationToken).ConfigureAwait(false);
+        return await OnnxRuntimeGenAIChatClientFactory.CreateAsync(ChatClientModelPath, ChatClientPromptTemplate, CancellationToken).ConfigureAwait(false);
     }
 
     internal abstract void SendSampleInteractionEvent(string? customInfo = null);
diff --git a/AIDevGallery/ProjectGenerator/Generator.cs b/AIDevGallery/ProjectGenerator/Generator.cs
@@ -296,8 +296,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag
                     packageReferenceItem.Condition = "$(Platform) == 'x64'";
                 }
                 else if (packageName == "Microsoft.ML.OnnxRuntime.Qnn" ||
-                            packageName == "Microsoft.ML.OnnxRuntimeGenAI" ||
-                            packageName == "Microsoft.ML.OnnxRuntimeGenAI.Managed")
+                            packageName == "Microsoft.ML.OnnxRuntimeGenAI")
                 {
                     packageReferenceItem.Condition = "$(Platform) == 'ARM64'";
                 }
@@ -403,7 +402,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag
     private string? GetChatClientLoaderString(List<Samples.SharedCodeEnum> sharedCode, string modelPath, string promptTemplate, bool isPhiSilica, ModelType modelType)
     {
         bool isLanguageModel = ModelDetailsHelper.EqualOrParent(modelType, ModelType.LanguageModels);
-        if (!sharedCode.Contains(SharedCodeEnum.GenAIModel) && !isPhiSilica && !isLanguageModel)
+        if (!sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory) && !isPhiSilica && !isLanguageModel)
         {
             return null;
         }
@@ -413,7 +412,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag
             return "PhiSilicaClient.CreateAsync()";
         }
 
-        return $"GenAIModel.CreateAsync({modelPath}, {promptTemplate})";
+        return $"OnnxRuntimeGenAIChatClientFactory.CreateAsync({modelPath}, {promptTemplate})";
     }
 
     private static async Task CopyFileAsync(string sourceFile, string destinationFile, CancellationToken cancellationToken)
@@ -601,9 +600,9 @@ private async Task<string> AddFilesFromSampleAsync(
                 }
             }
 
-            if (sharedCode.Contains(SharedCodeEnum.GenAIModel))
+            if (sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory))
             {
-                cleanCsSource = RegexInitializeComponent().Replace(cleanCsSource, $"$1this.InitializeComponent();$1GenAIModel.InitializeGenAI();");
+                cleanCsSource = RegexInitializeComponent().Replace(cleanCsSource, $"$1this.InitializeComponent();$1OnnxRuntimeGenAIChatClientFactory.InitializeGenAI();");
             }
 
             await File.WriteAllTextAsync(Path.Join(outputPath, $"Sample.xaml.cs"), cleanCsSource, cancellationToken);
diff --git a/AIDevGallery/Samples/Open Source Models/Embeddings/RetrievalAugmentedGeneration.xaml.cs b/AIDevGallery/Samples/Open Source Models/Embeddings/RetrievalAugmentedGeneration.xaml.cs
@@ -42,7 +42,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.SentenceEmbeddings.Embeddings;
         "Microsoft.ML.Tokenizers",
         "System.Numerics.Tensors",
         "Microsoft.ML.OnnxRuntime.DirectML",
-        "Microsoft.Extensions.AI.Abstractions",
+        "Microsoft.Extensions.AI",
         "Microsoft.SemanticKernel.Connectors.InMemory"
     ],
     Id = "9C1FB14D-4841-449C-9563-4551106BB693",
diff --git a/AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSearch.xaml.cs b/AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSearch.xaml.cs
@@ -35,7 +35,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.SentenceEmbeddings.Embeddings;
         "System.Numerics.Tensors",
         "Microsoft.ML.Tokenizers",
         "Microsoft.ML.OnnxRuntime.DirectML",
-        "Microsoft.Extensions.AI.Abstractions",
+        "Microsoft.Extensions.AI",
         "Microsoft.SemanticKernel.Connectors.InMemory"
     ],
     Id = "41391b3f-f143-4719-a171-b0ce9c4cdcd6",
diff --git a/AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSuggest.xaml.cs b/AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSuggest.xaml.cs
@@ -26,7 +26,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.SentenceEmbeddings.Embeddings;
         "System.Numerics.Tensors",
         "Microsoft.ML.Tokenizers",
         "Microsoft.ML.OnnxRuntime.DirectML",
-        "Microsoft.Extensions.AI.Abstractions",
+        "Microsoft.Extensions.AI",
         "Microsoft.SemanticKernel.Connectors.InMemory"
     ],
     Id = "c0d6c4f1-8daa-409f-a686-3de388edbf91",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/Chat.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/Chat.xaml.cs
@@ -25,7 +25,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Scenario = ScenarioType.TextChat,
     NugetPackageReferences = [
         "CommunityToolkit.Mvvm",
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     SharedCode = [
         SharedCodeEnum.Message,
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/ContentModeration.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/ContentModeration.xaml.cs
@@ -18,7 +18,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextContentModeration,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     SharedCode = [],
     Id = "language-content-moderation",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/CustomSystemPrompt.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/CustomSystemPrompt.xaml.cs
@@ -24,7 +24,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Icon = "\uE8D4",
     Scenario = ScenarioType.TextCustomParameters,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ])]
 internal sealed partial class CustomSystemPrompt : BaseSamplePage, INotifyPropertyChanged
 {
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/ExplainCode.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/ExplainCode.xaml.cs
@@ -18,7 +18,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Scenario = ScenarioType.CodeExplainCode,
     SharedCode = [],
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Name = "Explain Code",
     Id = "ad763407-6a97-4916-ab05-30fd22f54252",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/Generate.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/Generate.xaml.cs
@@ -18,7 +18,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextGenerateText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Id = "25bb4e58-d909-4377-b59c-975cd6baff19",
     Icon = "\uE8D4")]
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/GenerateCode.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/GenerateCode.xaml.cs
@@ -24,7 +24,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Scenario = ScenarioType.CodeGenerateCode,
     NugetPackageReferences = [
         "ColorCode.WinUI",
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Name = "Generate Code",
     Id = "2270c051-a91c-4af9-8975-a99fda6b024b",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/GrammarCheck.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/GrammarCheck.xaml.cs
@@ -16,7 +16,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextGrammarCheckText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Name = "Grammar Check",
     Id = "9e1b5ac5-3521-4e88-a2ce-60152a6cb44f",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/Paraphrase.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/Paraphrase.xaml.cs
@@ -17,7 +17,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextParaphraseText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Id = "9e006e82-8e3f-4401-8a83-d4c4c59cc20c",
     Icon = "\uE8D4")]
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/SemanticKernelChat.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/SemanticKernelChat.xaml.cs
@@ -26,6 +26,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Scenario = ScenarioType.TextSemanticKernelChat,
     NugetPackageReferences = [
         "CommunityToolkit.Mvvm",
+        "Microsoft.Extensions.AI",
         "Microsoft.SemanticKernel.Core"
     ],
     SharedCode = [
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/SentimentAnalysis.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/SentimentAnalysis.xaml.cs
@@ -17,7 +17,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextAnalyzeSentimentText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Name = "Sentiment Analysis",
     Id = "9cc84d1e-6b02-4bd2-a350-6e38c3a92ced",
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/SmartPaste.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/SmartPaste.xaml.cs
@@ -18,7 +18,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Scenario = ScenarioType.SmartControlsSmartPaste,
     NugetPackageReferences = [
         "CommunityToolkit.Mvvm",
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     SharedCode = [
         SharedCodeEnum.SmartPasteFormCs,
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/SmartText.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/SmartText.xaml.cs
@@ -16,7 +16,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Icon = "\uE8D4",
     Scenario = ScenarioType.SmartControlsSmartTextBox,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     SharedCode = [
         SharedCodeEnum.SmartTextBoxCs,
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/Summarize.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/Summarize.xaml.cs
@@ -17,7 +17,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextSummarizeText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Id = "21bf3574-aaa5-42fd-9f6c-3bfbbca00876",
     Icon = "\uE8D4")]
diff --git a/AIDevGallery/Samples/Open Source Models/Language Models/Translate.xaml.cs b/AIDevGallery/Samples/Open Source Models/Language Models/Translate.xaml.cs
@@ -18,7 +18,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
     Model1Types = [ModelType.LanguageModels, ModelType.PhiSilica],
     Scenario = ScenarioType.TextTranslateText,
     NugetPackageReferences = [
-        "Microsoft.Extensions.AI.Abstractions"
+        "Microsoft.Extensions.AI"
     ],
     Id = "f045fca2-c657-4894-99f2-d0a1115176bc",
     Icon = "\uE8D4")]
diff --git a/AIDevGallery/Samples/SharedCode/IChatClient/GenAIModel.cs b/AIDevGallery/Samples/SharedCode/IChatClient/GenAIModel.cs
diff --git a/AIDevGallery/Samples/SharedCode/IChatClient/OnnxRuntimeGenAIChatClientFactory.cs b/AIDevGallery/Samples/SharedCode/IChatClient/OnnxRuntimeGenAIChatClientFactory.cs
diff --git a/AIDevGallery/Samples/WCRAPIs/PhiSilicaBasic.xaml.cs b/AIDevGallery/Samples/WCRAPIs/PhiSilicaBasic.xaml.cs
diff --git a/Directory.Packages.props b/Directory.Packages.props

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ public static List<SharedCodeEnum> GetAllSharedCode(this Sample sample, Dictiona`
`19`	`19`
`20`	`20`	`if (isLanguageModel)`
`21`	`21`	`{`
`22`		`- AddUnique(SharedCodeEnum.GenAIModel);`
	`22`	`+ AddUnique(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory);`
`23`	`23`	`}`
`24`	`24`
`25`		`- if (sharedCode.Contains(SharedCodeEnum.GenAIModel))`
	`25`	`+ if (sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory))`
`26`	`26`	`{`
`27`	`27`	`AddUnique(SharedCodeEnum.LlmPromptTemplate);`
`28`	`28`	`}`
`@@ -59,6 +59,7 @@ public static List<string> GetAllNugetPackageReferences(this Sample sample, Dict`
`59`	`59`
`60`	`60`	`if (isLanguageModel)`
`61`	`61`	`{`
	`62`	`+ AddUnique("Microsoft.ML.OnnxRuntimeGenAI.Managed");`
`62`	`63`	`AddUnique("Microsoft.ML.OnnxRuntimeGenAI.DirectML");`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void NotifyCompletion()`
`27`	`27`	`return await PhiSilicaClient.CreateAsync(CancellationToken).ConfigureAwait(false);`
`28`	`28`	`}`
`29`	`29`
`30`		`- return await GenAIModel.CreateAsync(ChatClientModelPath, ChatClientPromptTemplate, CancellationToken).ConfigureAwait(false);`
	`30`	`+ return await OnnxRuntimeGenAIChatClientFactory.CreateAsync(ChatClientModelPath, ChatClientPromptTemplate, CancellationToken).ConfigureAwait(false);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`internal abstract void SendSampleInteractionEvent(string? customInfo = null);`
Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag`
`296`	`296`	`packageReferenceItem.Condition = "$(Platform) == 'x64'";`
`297`	`297`	`}`
`298`	`298`	`else if (packageName == "Microsoft.ML.OnnxRuntime.Qnn" \|\|`
`299`		`- packageName == "Microsoft.ML.OnnxRuntimeGenAI" \|\|`
`300`		`- packageName == "Microsoft.ML.OnnxRuntimeGenAI.Managed")`
	`299`	`+ packageName == "Microsoft.ML.OnnxRuntimeGenAI")`
`301`	`300`	`{`
`302`	`301`	`packageReferenceItem.Condition = "$(Platform) == 'ARM64'";`
`303`	`302`	`}`
`@@ -403,7 +402,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag`
`403`	`402`	`private string? GetChatClientLoaderString(List<Samples.SharedCodeEnum> sharedCode, string modelPath, string promptTemplate, bool isPhiSilica, ModelType modelType)`
`404`	`403`	`{`
`405`	`404`	`bool isLanguageModel = ModelDetailsHelper.EqualOrParent(modelType, ModelType.LanguageModels);`
`406`		`- if (!sharedCode.Contains(SharedCodeEnum.GenAIModel) && !isPhiSilica && !isLanguageModel)`
	`405`	`+ if (!sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory) && !isPhiSilica && !isLanguageModel)`
`407`	`406`	`{`
`408`	`407`	`return null;`
`409`	`408`	`}`
`@@ -413,7 +412,7 @@ static void AddPackageReference(ProjectItemGroupElement itemGroup, string packag`
`413`	`412`	`return "PhiSilicaClient.CreateAsync()";`
`414`	`413`	`}`
`415`	`414`
`416`		`- return $"GenAIModel.CreateAsync({modelPath}, {promptTemplate})";`
	`415`	`+ return $"OnnxRuntimeGenAIChatClientFactory.CreateAsync({modelPath}, {promptTemplate})";`
`417`	`416`	`}`
`418`	`417`
`419`	`418`	`private static async Task CopyFileAsync(string sourceFile, string destinationFile, CancellationToken cancellationToken)`
`@@ -601,9 +600,9 @@ private async Task<string> AddFilesFromSampleAsync(`
`601`	`600`	`}`
`602`	`601`	`}`
`603`	`602`
`604`		`- if (sharedCode.Contains(SharedCodeEnum.GenAIModel))`
	`603`	`+ if (sharedCode.Contains(SharedCodeEnum.OnnxRuntimeGenAIChatClientFactory))`
`605`	`604`	`{`
`606`		`- cleanCsSource = RegexInitializeComponent().Replace(cleanCsSource, $"$1this.InitializeComponent();$1GenAIModel.InitializeGenAI();");`
	`605`	`+ cleanCsSource = RegexInitializeComponent().Replace(cleanCsSource, $"$1this.InitializeComponent();$1OnnxRuntimeGenAIChatClientFactory.InitializeGenAI();");`
`607`	`606`	`}`
`608`	`607`
`609`	`608`	`await File.WriteAllTextAsync(Path.Join(outputPath, $"Sample.xaml.cs"), cleanCsSource, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;`
`24`	`24`	`Icon = "\uE8D4",`
`25`	`25`	`Scenario = ScenarioType.TextCustomParameters,`
`26`	`26`	`NugetPackageReferences = [`
`27`		`- "Microsoft.Extensions.AI.Abstractions"`
	`27`	`+ "Microsoft.Extensions.AI"`
`28`	`28`	`])]`
`29`	`29`	`internal sealed partial class CustomSystemPrompt : BaseSamplePage, INotifyPropertyChanged`
`30`	`30`	`{`