Users can add local GenAI models. also remembers execution provider in MRU

AIDevGallery.Utils/ModelUrl.cs

@@ -252,6 +252,10 @@ public static string GetFullUrl(string url)
         {
             return url;
         }
+        else if (url.StartsWith("local", StringComparison.InvariantCultureIgnoreCase))
+        {
+            return url;
+        }
         else
         {
             return new HuggingFaceUrl(url).FullUrl;

AIDevGallery/AIDevGallery.csproj

@@ -89,13 +89,8 @@
   </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.OnnxRuntime.QNN" />
+    <PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.QNN" />
     <PackageReference Include="Microsoft.ML.OnnxRuntimeGenAI.Managed" />
   </ItemGroup>
 
@@ -250,6 +245,7 @@
     <None Remove="Assets\ModelIcons\HuggingFace.svg" />
     <None Remove="Assets\ModelIcons\Microsoft.svg" />
     <None Remove="Assets\ModelIcons\Mistral.svg" />
+    <None Remove="Assets\ModelIcons\onnx.svg" />
     <None Remove="Assets\ModelIcons\OpenAI.png" />
     <None Remove="Assets\TileImages\Chat.png" />
     <None Remove="Assets\TileImages\ClassifyImage.png" />

AIDevGallery/Controls/ModelSelectionControl.xaml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <UserControl
     x:Class="AIDevGallery.Controls.ModelSelectionControl"
+    xmlns:local="using:AIDevGallery.Controls"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -122,13 +123,15 @@
                                                     Source="{x:Bind utils:AppUtils.GetModelSourceImageFromUrl(ModelDetails.Url)}">
                                                     <ToolTipService.ToolTip>
                                                         <TextBlock TextWrapping="Wrap">
-                                                            <Run Text="This model is from" />
                                                             <Run Text="{x:Bind utils:AppUtils.GetModelSourceNameFromUrl(ModelDetails.Url)}" />
                                                         </TextBlock>
                                                     </ToolTipService.ToolTip>
                                                 </Image>
-                                                <TextBlock Text="• " />
-                                                <TextBlock VerticalAlignment="Center" Text="{x:Bind utils:AppUtils.GetLicenseShortNameFromString(ModelDetails.License)}">
+                                                <TextBlock Text="• " 
+                                                           Visibility="{x:Bind local:ModelSelectionControl.ShowForDownloadedModelsOnly(ModelDetails)}" />
+                                                <TextBlock VerticalAlignment="Center" 
+                                                           Text="{x:Bind utils:AppUtils.GetLicenseShortNameFromString(ModelDetails.License)}"
+                                                           Visibility="{x:Bind local:ModelSelectionControl.ShowForDownloadedModelsOnly(ModelDetails)}">
                                                     <ToolTipService.ToolTip>
                                                         <TextBlock TextWrapping="Wrap">
                                                             <Run Text="This model is under the" />
@@ -166,7 +169,7 @@
                                                         Icon="{ui:FontIcon Glyph=&#xE8A5;}"
                                                         Tag="{x:Bind ModelDetails}"
                                                         Text="View model card"
-                                                        Visibility="{x:Bind ModelDetails.Size, Converter={StaticResource NotZeroToVisibilityConverter}}" />
+                                                        Visibility="{x:Bind local:ModelSelectionControl.ShowForDownloadedModelsOnly(ModelDetails)}" />
                                                     <MenuFlyoutItem
                                                         Click="ApiDocumentation_Click"
                                                         Icon="{ui:FontIcon Glyph=&#xE8A5;}"
@@ -178,7 +181,7 @@
                                                         Icon="{ui:FontIcon Glyph=&#xE82D;}"
                                                         Tag="{x:Bind ModelDetails}"
                                                         Text="View license"
-                                                        Visibility="{x:Bind ModelDetails.Size, Converter={StaticResource NotZeroToVisibilityConverter}}" />
+                                                        Visibility="{x:Bind local:ModelSelectionControl.ShowForDownloadedModelsOnly(ModelDetails)}"  />
                                                     <MenuFlyoutSeparator Visibility="{x:Bind ModelDetails.Size, Converter={StaticResource NotZeroToVisibilityConverter}}" />
                                                     <MenuFlyoutItem
                                                         Click="CopyModelPath_Click"
@@ -302,7 +305,6 @@
                                                 Source="{x:Bind utils:AppUtils.GetModelSourceImageFromUrl(ModelDetails.Url)}">
                                                 <ToolTipService.ToolTip>
                                                     <TextBlock TextWrapping="Wrap">
-                                                        <Run Text="This model is from" />
                                                         <Run Text="{x:Bind utils:AppUtils.GetModelSourceNameFromUrl(ModelDetails.Url)}" />
                                                     </TextBlock>
                                                 </ToolTipService.ToolTip>
@@ -488,7 +490,6 @@
                                                 Source="{x:Bind utils:AppUtils.GetModelSourceImageFromUrl(ModelDetails.Url)}">
                                                 <ToolTipService.ToolTip>
                                                     <TextBlock TextWrapping="Wrap">
-                                                        <Run Text="This model is from" />
                                                         <Run Text="{x:Bind utils:AppUtils.GetModelSourceNameFromUrl(ModelDetails.Url)}" />
                                                     </TextBlock>
                                                 </ToolTipService.ToolTip>

AIDevGallery/Controls/ModelSelectionControl.xaml.cs

@@ -102,7 +102,7 @@ private void ResetAndLoadModelList(ModelDetails? selectedModel = null)
         if (AvailableModels.Count > 0)
         {
             var modelIds = AvailableModels.Select(s => s.ModelDetails.Id);
-            var modelOrApiUsageHistory = App.AppData.UsageHistory.Where(id => modelIds.Contains(id));
+            var modelOrApiUsageHistory = App.AppData.UsageHistoryV2?.FirstOrDefault(u => modelIds.Contains(u.Id));
 
             ModelDetails? modelToPreselect = null;
 
@@ -111,20 +111,33 @@ private void ResetAndLoadModelList(ModelDetails? selectedModel = null)
                 modelToPreselect = AvailableModels.Where(m => m.ModelDetails.Id == selectedModel.Id).FirstOrDefault()?.ModelDetails;
             }
 
-            if (modelToPreselect != null)
+            if (modelToPreselect == null && modelOrApiUsageHistory != default)
             {
-                SetSelectedModel(selectedModel);
-            }
-            else if (modelOrApiUsageHistory.Any())
-            {
-                // select most recently used if there is one
-                var modelId = modelOrApiUsageHistory.First();
-                SetSelectedModel(AvailableModels.Where(s => s.ModelDetails.Id == modelId).First().ModelDetails);
+                var models = AvailableModels.Where(am => am.ModelDetails.Id == modelOrApiUsageHistory.Id).ToList();
+                if (models.Count > 0)
+                {
+                    if (modelOrApiUsageHistory.HardwareAccelerator != null)
+                    {
+                        var model = models.FirstOrDefault(m => m.ModelDetails.HardwareAccelerators.Contains(modelOrApiUsageHistory.HardwareAccelerator.Value));
+                        if (model != null)
+                        {
+                            modelToPreselect = model.ModelDetails;
+                        }
+                    }
+
+                    if (modelToPreselect == null)
+                    {
+                        modelToPreselect = models.FirstOrDefault()?.ModelDetails;
+                    }
+                }
             }
-            else
+
+            if (modelToPreselect == null)
             {
-                SetSelectedModel(AvailableModels[0].ModelDetails);
+                modelToPreselect = AvailableModels[0].ModelDetails;
             }
+
+            SetSelectedModel(modelToPreselect);
         }
         else
         {
@@ -133,7 +146,7 @@ private void ResetAndLoadModelList(ModelDetails? selectedModel = null)
         }
     }
 
-    private void SetSelectedModel(ModelDetails? modelDetails)
+    private void SetSelectedModel(ModelDetails? modelDetails, HardwareAccelerator? accelerator = null)
     {
         if (modelDetails != null)
         {
@@ -166,7 +179,13 @@ private void SetViewSelection(ModelDetails modelDetails)
         if (IsSelectionEnabled)
         {
             ModelSelectionItemsView.DeselectAll();
-            ModelSelectionItemsView.Select(AvailableModels.IndexOf(AvailableModels.First(a => a.ModelDetails.Id == modelDetails.Id)));
+
+            var models = AvailableModels.Where(a => a.ModelDetails == modelDetails).ToList();
+
+            if (models.Count != 0)
+            {
+                ModelSelectionItemsView.Select(AvailableModels.IndexOf(models.First()));
+            }
         }
     }
 
@@ -545,4 +564,14 @@ public void HideDownloadDialog()
     {
         DownloadDialog?.Hide();
     }
+
+    public static Visibility ShowForDownloadedModelsOnly(ModelDetails details)
+    {
+        if (!details.HardwareAccelerators.Contains(HardwareAccelerator.WCRAPI) && !details.IsUserAdded)
+        {
+            return Visibility.Visible;
+        }
+
+        return Visibility.Collapsed;
+    }
 }

AIDevGallery/MainWindow.xaml.cs

@@ -57,6 +57,10 @@ public void NavigateToPage(object? obj)
         {
             NavigateToApiOrModelPage(modelTypes[0]);
         }
+        else if (obj is ModelDetails)
+        {
+            Navigate("Models", obj);
+        }
         else
         {
             Navigate("Home");

AIDevGallery/Models/BaseSampleNavigationParameters.cs

@@ -14,6 +14,7 @@ internal abstract class BaseSampleNavigationParameters(TaskCompletionSource samp
     public TaskCompletionSource SampleLoadedCompletionSource { get; set; } = sampleLoadedCompletionSource;
 
     protected abstract string ChatClientModelPath { get; }
+    protected abstract HardwareAccelerator ChatClientHardwareAccelerator { get; }
     protected abstract LlmPromptTemplate? ChatClientPromptTemplate { get; }
 
     public void NotifyCompletion()
@@ -28,7 +29,11 @@ public void NotifyCompletion()
             return await PhiSilicaClient.CreateAsync(CancellationToken).ConfigureAwait(false);
         }
 
-        return await GenAIModel.CreateAsync(ChatClientModelPath, ChatClientPromptTemplate, CancellationToken).ConfigureAwait(false);
+        return await GenAIModel.CreateAsync(
+            ChatClientModelPath,
+            ChatClientPromptTemplate,
+            ChatClientHardwareAccelerator == HardwareAccelerator.QNN ? "qnn" : null,
+            CancellationToken).ConfigureAwait(false);
     }
 
     internal abstract void SendSampleInteractionEvent(string? customInfo = null);

AIDevGallery/Models/CachedModel.cs

@@ -25,6 +25,11 @@ public CachedModel(ModelDetails details, string path, bool isFile, long modelSiz
             Url = details.Url;
             Source = CachedModelSource.GitHub;
         }
+        else if (details.Url.StartsWith("local", StringComparison.InvariantCulture))
+        {
+            Url = details.Url;
+            Source = CachedModelSource.Local;
+        }
         else
         {
             Url = new HuggingFaceUrl(details.Url).FullUrl;
@@ -42,5 +47,6 @@ public CachedModel(ModelDetails details, string path, bool isFile, long modelSiz
 internal enum CachedModelSource
 {
     GitHub,
-    HuggingFace
+    HuggingFace,
+    Local
 }

AIDevGallery/Models/MultiModelSampleNavigationParameters.cs

@@ -22,6 +22,7 @@ internal class MultiModelSampleNavigationParameters(
     public HardwareAccelerator[] HardwareAccelerators { get; } = hardwareAccelerators;
 
     protected override string ChatClientModelPath => ModelPaths[0];
+    protected override HardwareAccelerator ChatClientHardwareAccelerator => HardwareAccelerators[0];
     protected override LlmPromptTemplate? ChatClientPromptTemplate => promptTemplates[0];
 
     internal override void SendSampleInteractionEvent(string? customInfo = null)

AIDevGallery/Models/SampleNavigationParameters.cs

@@ -23,6 +23,7 @@ internal class SampleNavigationParameters(
     public string SampleId => sampleId;
 
     protected override string ChatClientModelPath => ModelPath;
+    protected override HardwareAccelerator ChatClientHardwareAccelerator => HardwareAccelerator;
     protected override LlmPromptTemplate? ChatClientPromptTemplate => promptTemplate;
 
     internal override void SendSampleInteractionEvent(string? customInfo = null)

AIDevGallery/Models/Samples.cs

@@ -108,6 +108,10 @@ public string Icon
                         icon = "GitHub.dark.svg";
                     }
                 }
+                else if (Url.StartsWith("local", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    icon = "onnx.svg";
+                }
                 else
                 {
                     icon = "HuggingFace.svg";

AIDevGallery/Pages/Models/AddModelPage.xaml

@@ -68,6 +68,10 @@
                         IsEnabled="{Binding ElementName=SearchTextBox, Path=Text, Converter={StaticResource EmptyStringToObjectConverter}}"
                         Style="{StaticResource AccentButtonStyle}" />
                 </Grid>
+                <HyperlinkButton Content="or add a local model"
+                                 Margin="0,8,0,0"
+                                 HorizontalAlignment="Center"
+                                 Click="AddLocalClicked"></HyperlinkButton>
             </StackPanel>
 
             <ProgressBar