Merge pull request #231 from microsoft/nmetulev/wcr-fixes

fixes in wcrmodeldownloader, apipage, and textrecognition
microsoft · Feb 21, 2025 · f91c398 · f91c398
2 parents 4892f01 + 62ac215
commit f91c398
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/AIDevGallery/Pages/APIs/APIPage.xaml.cs b/AIDevGallery/Pages/APIs/APIPage.xaml.cs
@@ -21,6 +21,7 @@ internal sealed partial class APIPage : Page
 {
     public ModelFamily? ModelFamily { get; set; }
     private ModelType? modelFamilyType;
+    private ModelDetails? modelDetails;
 
     public APIPage()
     {
@@ -38,6 +39,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             modelFamilyType = modelType;
             ModelFamily = modelFamilyDetails;
+            ModelTypeHelpers.ModelDetails.TryGetValue(modelType, out modelDetails);
         }
         else if (e.Parameter is ModelDetails details)
         {
@@ -48,11 +50,13 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
                 ReadmeUrl = details.ReadmeUrl ?? string.Empty,
                 Name = details.Name
             };
+            modelDetails = details;
         }
         else if (e.Parameter is ModelType apiType && ModelTypeHelpers.ApiDefinitionDetails.TryGetValue(apiType, out var apiDefinition))
         {
             // API
             modelFamilyType = apiType;
+            modelDetails = ModelDetailsHelper.GetModelDetailsFromApiDefinition(apiType, apiDefinition);
 
             ModelFamily = new ModelFamily
             {
@@ -67,7 +71,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
                 var sample = SampleDetails.Samples.FirstOrDefault(s => s.Id == apiDefinition.SampleIdToShowInDocs);
                 if (sample != null)
                 {
-                    _ = sampleContainer.LoadSampleAsync(sample, [ModelDetailsHelper.GetModelDetailsFromApiDefinition(apiType, apiDefinition)]);
+                    _ = sampleContainer.LoadSampleAsync(sample, [modelDetails]);
                 }
             }
             else
@@ -163,7 +167,7 @@ private void SampleList_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventA
     {
         if (args.InvokedItem is Sample sample)
         {
-            App.MainWindow.Navigate("Samples", new SampleNavigationArgs(sample));
+            App.MainWindow.Navigate("Samples", new SampleNavigationArgs(sample, modelDetails));
         }
     }
 

diff --git a/AIDevGallery/Samples/SharedCode/WcrApis/WcrModelDownloader.xaml b/AIDevGallery/Samples/SharedCode/WcrApis/WcrModelDownloader.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}" CornerRadius="4">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />

diff --git a/AIDevGallery/Samples/WCRAPIs/TextRecognition.xaml.cs b/AIDevGallery/Samples/WCRAPIs/TextRecognition.xaml.cs
@@ -56,15 +56,29 @@ protected override async Task LoadModelAsync(SampleNavigationParameters samplePa
             _ = WcrModelDownloader.SetDownloadOperation(ModelType.TextRecognitionOCR, sampleParams.SampleId, TextRecognizer.MakeAvailableAsync); // <exclude-line>
         }
 
-        await SetImage(System.IO.Path.Join(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, "Assets", "OCR.png"));
+        // <exclude>
+        else
+        {
+            await SetImage(System.IO.Path.Join(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, "Assets", "OCR.png"));
+        }
+
+        // </exclude>
         sampleParams.NotifyCompletion();
     }
 
     private async void WcrModelDownloader_DownloadClicked(object sender, EventArgs e)
     {
         var operation = TextRecognizer.MakeAvailableAsync();
 
-        await WcrModelDownloader.SetDownloadOperation(operation);
+        var success = await WcrModelDownloader.SetDownloadOperation(operation);
+
+        // <exclude>
+        if (success)
+        {
+            await SetImage(System.IO.Path.Join(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, "Assets", "OCR.png"));
+        }
+
+        // </exclude>
     }
 
     private async void LoadImage_Click(object sender, RoutedEventArgs e)