add helper method to download actual mlmodel, add integration tests

Author: mediumTaj

IBM.WatsonDeveloperCloud.sln

@@ -105,8 +105,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.As
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests", "test\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests.csproj", "{8616701B-F226-4462-9949-DE1F2C88B194}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.WatsonDeveloperCloud.VisualRecogntion.v3.Example", "GetCoreMLModelExample\IBM.WatsonDeveloperCloud.VisualRecogntion.v3.Example.csproj", "{C57D4E65-87CF-4D93-BB3E-7473056C4D49}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -257,10 +255,6 @@ Global
 		{8616701B-F226-4462-9949-DE1F2C88B194}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8616701B-F226-4462-9949-DE1F2C88B194}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8616701B-F226-4462-9949-DE1F2C88B194}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C57D4E65-87CF-4D93-BB3E-7473056C4D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C57D4E65-87CF-4D93-BB3E-7473056C4D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C57D4E65-87CF-4D93-BB3E-7473056C4D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C57D4E65-87CF-4D93-BB3E-7473056C4D49}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -315,7 +309,6 @@ Global
 		{E3D238D7-7A09-4447-B836-8D6ABF4BFF80} = {28E61676-E9FF-4DA9-99CC-5E0D16F02380}
 		{60793E3F-EF8D-4FF8-9C69-33D1ADBC3C39} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
 		{8616701B-F226-4462-9949-DE1F2C88B194} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
-		{C57D4E65-87CF-4D93-BB3E-7473056C4D49} = {A1BC3262-1837-40D9-A530-DCFE679927C2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9D9D17B-1C17-402F-B701-DC671528690A}

src/IBM.WatsonDeveloperCloud.VisualRecognition.v3/VisualRecognitionServiceExtension.cs

@@ -18,13 +18,15 @@
 using IBM.WatsonDeveloperCloud.Http;
 using IBM.WatsonDeveloperCloud.Http.Extensions;
 using IBM.WatsonDeveloperCloud.Service;
+using IBM.WatsonDeveloperCloud.Util;
 using IBM.WatsonDeveloperCloud.VisualRecognition.v3.Model;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace IBM.WatsonDeveloperCloud.VisualRecognition.v3
 {
@@ -155,7 +157,12 @@ public Classifier UpdateClassifier(UpdateClassifier updateClassifier)
             return result;
         }
 
-        public System.Threading.Tasks.Task<Stream> GetCoreMlModel(string classifierId)
+        /// <summary>
+        /// Gets the stream of a Core ML model file (.mlmodel) of a custom classifier that returns "core_ml_enabled": true in the classifier details.
+        /// </summary>
+        /// <param name="classifierId"></param>
+        /// <returns>The Core ML model of the requested classifier.</returns>
+        public Task<Stream> GetCoreMlModel(string classifierId)
         {
             if (string.IsNullOrEmpty(classifierId))
                 throw new ArgumentNullException(nameof(classifierId));
@@ -178,6 +185,22 @@ public System.Threading.Tasks.Task<Stream> GetCoreMlModel(string classifierId)
 
             return result;
         }
+
+        /// <summary>
+        /// Downloads a Core ML model file (.mlmodel) of a custom classifier that returns "core_ml_enabled": true in the classifier details.
+        /// The name of the retreived Core ML model will be [classifierId].mlmodel.
+        /// </summary>
+        /// <param name="classifierId">The requested Core ML model's classifier ID</param>
+        /// <param name="filePath">The file path (without the filename) to download the Core ML model.</param>
+        public void DownloadCoreMlModel(string classifierId, string filePath)
+        {
+            var data = GetCoreMlModel(classifierId);
+
+            using (Stream file = File.Create(string.Format("{0}{1}.mlmodel", filePath, classifierId)))
+            {
+                Utility.CopyStream(data.Result, file);
+            }
+        }
     }
 
     /// <summary>

src/IBM.WatsonDeveloperCloud/Util/Utility.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.IO;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 /**
@@ -50,5 +51,20 @@ public static async Task<string> SimpleGet(string url, string username = null, s
 
             return msg;
         }
+
+        /// <summary>
+        /// Copies an input stream to an output stream.
+        /// </summary>
+        /// <param name="input">The input stream to copy.</param>
+        /// <param name="output">The output stream to copy to.</param>
+        public static void CopyStream(Stream input, Stream output)
+        {
+            byte[] buffer = new byte[8 * 1024];
+            int len;
+            while ((len = input.Read(buffer, 0, buffer.Length)) > 0)
+            {
+                output.Write(buffer, 0, len);
+            }
+        }
     }
 }

test/IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests/VisualRecognitionServiceIntegrationTests.cs

@@ -137,7 +137,7 @@ public void DetectFacesURL_Success()
         #endregion
 
         [TestMethod]
-        public void ListClassifiersSuccess()
+        public void ListClassifiers_Success()
         {
             Classifiers listClassifiersResult = null;
 
@@ -201,7 +201,7 @@ public void TestClassifiers_Success()
             }
             autoEvent.WaitOne();
 
-            Stream getCoreMlModelResult = null;
+            Task<Stream> getCoreMlModelResult = null;
             try
             {
                 getCoreMlModelResult = GetCoreMlModel(createdClassifierId);
@@ -321,9 +321,9 @@ private Classifiers ListClassifiers(bool? verbose = null)
         #endregion
 
         #region Get Core ML Model
-        private Stream GetCoreMlModel(string createdClassifierId)
+        private Task<Stream> GetCoreMlModel(string createdClassifierId)
         {
-            Stream getCoreMlModelResult = null;
+            Task<Stream> getCoreMlModelResult = null;
 
             try
             {