update model management APIs (#564)

Author: zadesai

Samples/WindowsML/Resources/SqueezeNetModelCatalog.json

@@ -2,13 +2,15 @@
   "base": "https://learn.microsoft.com/azure/ai-foundry/foundry-local/reference/reference-catalog-api",
   "models": [
     {
-      "alias": "squeezenet",
+      "id": "squeezenet",
       "name": "squeezenet",
       "version": "1",
-      "modelType": "ONNX",
       "publisher": "microsoft",
-      "executionProvider": "CPUExecutionProvider",
-      "description": "",
+      "executionProviders": [
+        {
+          "name": "CPUExecutionProvider"
+        }
+      ],
       "modelSizeBytes": 1250000,
       "license": "BSD",
       "licenseUri": "https://github.com/microsoft/WindowsAppSDK-Samples/raw/refs/heads/release/experimental/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop/SqueezeNet.LICENSE.txt",
@@ -33,13 +35,15 @@
       ]
     },
     {
-      "alias": "squeezenet-fp32",
+      "id": "squeezenet-fp32",
       "name": "squeezenet-fp32",
       "version": "1.1-7",
-      "modelType": "ONNX",
       "publisher": "microsoft",
-      "executionProvider": "NvTensorRTRTXExecutionProvider",
-      "description": "",
+      "executionProviders": [
+        {
+          "name": "NvTensorRTRTXExecutionProvider"
+        }
+      ],
       "modelSizeBytes": 4730000,
       "license": "BSD",
       "licenseUri": "https://github.com/microsoft/WindowsAppSDK-Samples/blob/main/Samples/WindowsML/Resources/SqueezeNet.LICENSE.txt",

Samples/WindowsML/Shared/cs/ModelManager.cs

@@ -126,33 +126,33 @@ public static string GetModelVariantPath(string executableFolder, ModelVariant v
                 // Build source
                 string sampleCatalogJsonPath = Path.Combine(executableFolder, "SqueezeNetModelCatalog.json");
                 var uri = new System.Uri(sampleCatalogJsonPath);
-                var sampleCatalogSource = await CatalogModelSource.CreateFromUri(uri);
-                
-                WinMLModelCatalog modelCatalog = new WinMLModelCatalog(new[] { sampleCatalogSource });
-                
+                var sampleCatalogSource = await ModelCatalogSource.CreateFromUriAsync(uri);
+
+                ModelCatalog modelCatalog = new ModelCatalog(new[] { sampleCatalogSource });
+
                 // Use intelligent model variant selection based on execution provider and device capabilities
                 ModelVariant actualVariant = DetermineModelVariant(options, ortEnv);
 
                 CatalogModelInfo modelFromCatalog;
 
                 string modelVariantName = (actualVariant == ModelVariant.FP32) ? "squeezenet-fp32" : "squeezenet";
 
-                modelFromCatalog = await modelCatalog.FindModel(modelVariantName);
+                modelFromCatalog = await modelCatalog.FindModelAsync(modelVariantName);
 
                 if (modelFromCatalog != null)
                 {
                     var additionalHeaders = new Dictionary<string, string>();
-                    var catalogModelInstanceOp = modelFromCatalog.GetInstance(additionalHeaders);
+                    var catalogModelInstanceOp = modelFromCatalog.GetInstanceAsync(additionalHeaders);
 
                     catalogModelInstanceOp.Progress += (operation, progress) => {
                         Console.Write($"Model download progress: {progress}%\r");
                     };
 
                     var catalogModelInstanceResult = await catalogModelInstanceOp;
 
-                    if (catalogModelInstanceResult.Status == CatalogModelStatus.Available)
+                    if (catalogModelInstanceResult.Status == CatalogModelInstanceStatus.Available)
                     {
-                        var catalogModelInstance = catalogModelInstanceResult.Instance;
+                        using var catalogModelInstance = catalogModelInstanceResult.GetInstance();
                         var modelPaths = catalogModelInstance.ModelPaths;
 
                         string modelFolderPath = modelPaths[0];

Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.cpp

@@ -41,9 +41,9 @@ IAsyncAction RunInferenceAsync(const CommandLineOptions& options)
 
             auto sampleCatalogJsonPath = executableFolder / L"SqueezeNetModelCatalog.json";
             auto uri = winrt::Windows::Foundation::Uri(sampleCatalogJsonPath.c_str());
-            auto sampleCatalogSource = winrt::Microsoft::Windows::AI::MachineLearning::CatalogModelSource::CreateFromUri(uri).get();
+            auto sampleCatalogSource = winrt::Microsoft::Windows::AI::MachineLearning::ModelCatalogSource::CreateFromUriAsync(uri).get();
 
-            winrt::Microsoft::Windows::AI::MachineLearning::WinMLModelCatalog modelCatalog({sampleCatalogSource});
+            winrt::Microsoft::Windows::AI::MachineLearning::ModelCatalog modelCatalog({sampleCatalogSource});
 
             // Use intelligent model variant selection based on execution provider and device capabilities
             ModelVariant actualVariant = ModelManager::DetermineModelVariant(options, env);
@@ -52,21 +52,21 @@ IAsyncAction RunInferenceAsync(const CommandLineOptions& options)
 
             std::wstring modelVariantName = (actualVariant == ModelVariant::FP32) ? L"squeezenet-fp32" : L"squeezenet";
 
-            modelFromCatalog = modelCatalog.FindModel(modelVariantName.c_str()).get();
+            modelFromCatalog = modelCatalog.FindModelAsync(modelVariantName.c_str()).get();
 
             if (modelFromCatalog != nullptr)
             {
-                auto catalogModelInstanceOp = modelFromCatalog.GetInstance({});
+                auto catalogModelInstanceOp = modelFromCatalog.GetInstanceAsync({});
 
                 catalogModelInstanceOp.Progress([](auto const& /*operation*/, double progress) {
                     std::wcout << L"Model download progress: " << progress << L"%\r";
                 });
 
                 auto catalogModelInstanceResult = co_await catalogModelInstanceOp;
 
-                if (catalogModelInstanceResult.Status() == winrt::Microsoft::Windows::AI::MachineLearning::CatalogModelStatus::Available)
+                if (catalogModelInstanceResult.Status() == winrt::Microsoft::Windows::AI::MachineLearning::CatalogModelInstanceStatus::Available)
                 {
-                    auto catalogModelInstance = catalogModelInstanceResult.Instance();
+                    auto catalogModelInstance = catalogModelInstanceResult.GetInstance();
                     auto modelPaths = catalogModelInstance.ModelPaths();
 
                     auto modelFolderPath = std::filesystem::path(modelPaths.GetAt(0).c_str());