Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Moved to ORTGenAI's IChatClient. #246

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Moved to ORTGenAI's IChatClient. #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8ae2816
Moved to ORTGenAI's IChatClient.
azchohfi Feb 27, 2025
efa77f9
Small update to send chatOptions to the GetPrompt method.
azchohfi Feb 27, 2025
2d97db2
Simplified project for arm64.
azchohfi Feb 27, 2025
7ef8661
Simplified exported projects.
azchohfi Feb 27, 2025
4588722
Small fix.
azchohfi Feb 27, 2025
762aaf5
More fixes on generated projects.
azchohfi Feb 28, 2025
0ed5a0d
Merge branch 'main' into alzollin/ortgenaiichatclient
zateutsch Feb 28, 2025
9146962
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 4, 2025
725b5b1
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 4, 2025
22b448e
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 10, 2025
42c1eca
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 13, 2025
a76f616
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 14, 2025
109999d
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 14, 2025
8c0c37d
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 14, 2025
170f72e
Updated to 0.7.0-rc2.
azchohfi Mar 14, 2025
2718b9e
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 18, 2025
5b61cee
Small fix.
azchohfi Mar 18, 2025
2427263
Merge branch 'main' into alzollin/ortgenaiichatclient
azchohfi Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions AIDevGallery/AIDevGallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<PackageReference Include="CommunityToolkit.WinUI.Media" />
<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" />
Expand All @@ -85,18 +85,13 @@
<PackageReference Include="HtmlAgilityPack"/>
<PackageReference Include="Markdig"/>
<PackageReference Include="Roman-Numerals"/>
<PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.Managed" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

<ItemGroup Condition="$(Platform) == 'ARM64'">
<PackageReference Include="Microsoft.ML.OnnxRuntime.Qnn" />
<PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI" GeneratePathProperty="true" ExcludeAssets="all" />
<None Include="$(PKGMicrosoft_ML_OnnxRuntimeGenAI)\runtimes\win-arm64\native\onnxruntime-genai.dll">
<Link>onnxruntime-genai.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>
<PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.Managed" />
<PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.QNN" />
</ItemGroup>

<ItemGroup Condition="$(Platform) == 'x64'">
Expand Down
13 changes: 7 additions & 6 deletions AIDevGallery/Helpers/SamplesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,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);
}
Expand Down Expand Up @@ -62,6 +62,7 @@ public static List<string> GetAllNugetPackageReferences(this Sample sample, Dict

if (isLanguageModel)
{
AddUnique("Microsoft.ML.OnnxRuntimeGenAI.Managed");
AddUnique("Microsoft.ML.OnnxRuntimeGenAI.DirectML");
}

Expand Down Expand Up @@ -164,7 +165,7 @@ static string EscapeNewLines(string str)
private static string? GetChatClientLoaderString(List<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;
}
Expand All @@ -174,7 +175,7 @@ static string EscapeNewLines(string str)
return "PhiSilicaClient.CreateAsync()";
}

return $"GenAIModel.CreateAsync({modelPath}, {promptTemplate})";
return $"OnnxRuntimeGenAIChatClientFactory.CreateAsync({modelPath}, {promptTemplate})";
}

public static string GetCleanCSCode(this Sample sample, Dictionary<ModelType, (ExpandedModelDetails ExpandedModelDetails, string ModelPathStr)> modelInfos)
Expand Down Expand Up @@ -242,9 +243,9 @@ public static string GetCleanCSCode(this Sample sample, Dictionary<ModelType, (E
}
}

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();");
}

return cleanCsSource;
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Models/BaseSampleNavigationParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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);
Expand Down
20 changes: 5 additions & 15 deletions AIDevGallery/ProjectGenerator/Generator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,38 +279,28 @@ 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.QNN" ||
packageName == "Microsoft.ML.OnnxRuntimeGenAI")
{
packageReferenceItem.Condition = "$(Platform) == 'ARM64'";
}

var versionStr = PackageVersionHelpers.PackageVersions[packageName];
packageReferenceItem.AddMetadata("Version", versionStr, true);

if (packageName == "Microsoft.ML.OnnxRuntimeGenAI")
{
var noneItem = itemGroup.AddItem("None", "$(PKGMicrosoft_ML_OnnxRuntimeGenAI)\\runtimes\\win-arm64\\native\\onnxruntime-genai.dll");
noneItem.Condition = "$(Platform) == 'ARM64'";
noneItem.AddMetadata("Link", "onnxruntime-genai.dll", false);
noneItem.AddMetadata("CopyToOutputDirectory", "PreserveNewest", false);
noneItem.AddMetadata("Visible", "false", false);

packageReferenceItem.AddMetadata("GeneratePathProperty", "true", true);
packageReferenceItem.AddMetadata("ExcludeAssets", "all", true);
}
}

foreach (var packageName in packageReferences)
{
if (packageName == "Microsoft.ML.OnnxRuntime.DirectML")
{
AddPackageReference(itemGroup, "Microsoft.AI.DirectML");
AddPackageReference(itemGroup, "Microsoft.ML.OnnxRuntime.Qnn");
}
else if (packageName == "Microsoft.ML.OnnxRuntimeGenAI.DirectML")
{
AddPackageReference(itemGroup, "Microsoft.AI.DirectML");
AddPackageReference(itemGroup, "Microsoft.ML.OnnxRuntime.Qnn");
AddPackageReference(itemGroup, "Microsoft.ML.OnnxRuntimeGenAI");
AddPackageReference(itemGroup, "Microsoft.ML.OnnxRuntimeGenAI.QNN");
AddPackageReference(itemGroup, "Microsoft.ML.OnnxRuntimeGenAI.Managed");
}

Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Embeddings/RetrievalAugmentedGeneration.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSearch.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Embeddings/SemanticSuggest.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/Chat.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/ContentModeration.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/CustomSystemPrompt.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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
{
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/ExplainCode.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/Generate.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/GenerateCode.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/GrammarCheck.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/Paraphrase.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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")]
Expand Down
1 change: 1 addition & 0 deletions AIDevGallery/Samples/Open Source Models/Language Models/SemanticKernelChat.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace AIDevGallery.Samples.OpenSourceModels.LanguageModels;
Scenario = ScenarioType.TextSemanticKernelChat,
NugetPackageReferences = [
"CommunityToolkit.Mvvm",
"Microsoft.Extensions.AI",
"Microsoft.SemanticKernel.Core"
],
SharedCode = [
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/SentimentAnalysis.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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",
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/SmartPaste.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/SmartText.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/Summarize.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion AIDevGallery/Samples/Open Source Models/Language Models/Translate.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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")]
Expand Down
Loading