add in update classifier tests for vr, make messagerequest context dynamic

Author: mediumTaj

src/IBM.WatsonDeveloperCloud.Conversation.v1/Model/MessageRequest.cs

@@ -42,7 +42,7 @@ public class MessageRequest
         /// </summary>
         /// <value>State information for the conversation. Continue a conversation by including the context object from the previous response.</value>
         [JsonProperty("context", NullValueHandling = NullValueHandling.Ignore)]
-        public Context Context { get; set; }
+        public dynamic Context { get; set; }
         /// <summary>
         /// Include the entities from the previous response when they do not need to change and to prevent Watson from trying to identify them.
         /// </summary>

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

@@ -24,14 +24,11 @@ public partial interface IVisualRecognitionService
     {
         ClassifiedImages Classify(System.IO.Stream imagesFile = null, string acceptLanguage = null, string url = null, float? threshold = null, List<string> owners = null, List<string> classifierIds = null, string imagesFileContentType = null);
         DetectedFaces DetectFaces(System.IO.Stream imagesFile = null, string url = null, string imagesFileContentType = null);
-        Classifier CreateClassifier(string name, System.IO.Stream classnamePositiveExamples, System.IO.Stream negativeExamples = null);
 
         object DeleteClassifier(string classifierId);
 
         Classifier GetClassifier(string classifierId);
 
         Classifiers ListClassifiers(bool? verbose = null);
-
-        Classifier UpdateClassifier(string classifierId, System.IO.Stream classnamePositiveExamples = null, System.IO.Stream negativeExamples = null);
     }
 }

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

@@ -185,68 +185,7 @@ public DetectedFaces DetectFaces(System.IO.Stream imagesFile = null, string url
 
             return result;
         }
-        /// <summary>
-        /// Create a classifier. Train a new multi-faceted classifier on the uploaded image data. Create your custom classifier with positive or negative examples. Include at least two sets of examples, either two positive example files or one positive and one negative file. You can upload a maximum of 256 MB per call.  Encode all names in UTF-8 if they contain non-ASCII characters (.zip and image file names, and classifier and class names). The service assumes UTF-8 encoding if it encounters non-ASCII characters.
-        /// </summary>
-        /// <param name="name">The name of the new classifier. Encode special characters in UTF-8.</param>
-        /// <param name="classnamePositiveExamples">A .zip file of images that depict the visual subject of a class in the new classifier. You can include more than one positive example file in a call. Append `_positive_examples` to the form name. The prefix is used as the class name. For example, `goldenretriever_positive_examples` creates the class **goldenretriever**.  Include at least 10 images in .jpg or .png format. The minimum recommended image resolution is 32X32 pixels. The maximum number of images is 10,000 images or 100 MB per .zip file.  Encode special characters in the file name in UTF-8.  The API explorer limits you to training only one class. To train more classes, use the API functionality.</param>
-        /// <param name="negativeExamples">A compressed (.zip) file of images that do not depict the visual subject of any of the classes of the new classifier. Must contain a minimum of 10 images.  Encode special characters in the file name in UTF-8. (optional)</param>
-        /// <returns><see cref="Classifier" />Classifier</returns>
-        public Classifier CreateClassifier(string name, System.IO.Stream classnamePositiveExamples, System.IO.Stream negativeExamples = null)
-        {
-            if (string.IsNullOrEmpty(name))
-                throw new ArgumentNullException(nameof(name));
-            if (classnamePositiveExamples == null)
-                throw new ArgumentNullException(nameof(classnamePositiveExamples));
-
-            if(string.IsNullOrEmpty(VersionDate))
-                throw new ArgumentNullException("versionDate cannot be null.");
-
-            Classifier result = null;
-
-            try
-            {
-                var formData = new MultipartFormDataContent();
-
-                if (name != null)
-                {
-                    var nameContent = new StringContent(name, Encoding.UTF8, HttpMediaType.TEXT_PLAIN);
-                    nameContent.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
-                    formData.Add(nameContent, "name");
-                }
-
-                if (classnamePositiveExamples != null)
-                {
-                    var classnamePositiveExamplesContent = new ByteArrayContent((classnamePositiveExamples as Stream).ReadAllBytes());
-                    System.Net.Http.Headers.MediaTypeHeaderValue contentType;
-                    System.Net.Http.Headers.MediaTypeHeaderValue.TryParse("application/octet-stream", out contentType);
-                    classnamePositiveExamplesContent.Headers.ContentType = contentType;
-                    formData.Add(classnamePositiveExamplesContent, "classname_positive_examples", "filename");
-                }
-
-                if (negativeExamples != null)
-                {
-                    var negativeExamplesContent = new ByteArrayContent((negativeExamples as Stream).ReadAllBytes());
-                    System.Net.Http.Headers.MediaTypeHeaderValue contentType;
-                    System.Net.Http.Headers.MediaTypeHeaderValue.TryParse("application/octet-stream", out contentType);
-                    negativeExamplesContent.Headers.ContentType = contentType;
-                    formData.Add(negativeExamplesContent, "negative_examples", "filename");
-                }
-
-                var request = this.Client.PostAsync($"{this.Endpoint}/v3/classifiers");
-                request.WithArgument("api_key", ApiKey);
-                request.WithArgument("version", VersionDate);
-                request.WithBodyContent(formData);
-                result = request.As<Classifier>().Result;
-            }
-            catch(AggregateException ae)
-            {
-                throw ae.Flatten();
-            }
-
-            return result;
-        }
-
+        
         /// <summary>
         /// Delete a classifier. 
         /// </summary>
@@ -336,58 +275,5 @@ public Classifiers ListClassifiers(bool? verbose = null)
 
             return result;
         }
-
-        /// <summary>
-        /// Update a classifier. Update a custom classifier by adding new positive or negative classes (examples) or by adding new images to existing classes. You must supply at least one set of positive or negative examples. For details, see [Updating custom classifiers](https://console.bluemix.net/docs/services/visual-recognition/customizing.html#updating-custom-classifiers).  Encode all names in UTF-8 if they contain non-ASCII characters (.zip and image file names, and classifier and class names). The service assumes UTF-8 encoding if it encounters non-ASCII characters.  **Important:** You can't update a custom classifier with an API key for a Lite plan. To update a custom classifer on a Lite plan, create another service instance on a Standard plan and re-create your custom classifier.  **Tip:** Don't make retraining calls on a classifier until the status is ready. When you submit retraining requests in parallel, the last request overwrites the previous requests. The retrained property shows the last time the classifier retraining finished.
-        /// </summary>
-        /// <param name="classifierId">The ID of the classifier.</param>
-        /// <param name="classnamePositiveExamples">A .zip file of images that depict the visual subject of a class in the classifier. The positive examples create or update classes in the classifier. You can include more than one positive example file in a call. Append `_positive_examples` to the form name. The prefix is used to name the class. For example, `goldenretriever_positive_examples` creates the class `goldenretriever`.  Include at least 10 images in .jpg or .png format. The minimum recommended image resolution is 32X32 pixels. The maximum number of images is 10,000 images or 100 MB per .zip file.  Encode special characters in the file name in UTF-8. (optional)</param>
-        /// <param name="negativeExamples">A compressed (.zip) file of images that do not depict the visual subject of any of the classes of the new classifier. Must contain a minimum of 10 images.  Encode special characters in the file name in UTF-8. (optional)</param>
-        /// <returns><see cref="Classifier" />Classifier</returns>
-        public Classifier UpdateClassifier(string classifierId, System.IO.Stream classnamePositiveExamples = null, System.IO.Stream negativeExamples = null)
-        {
-            if (string.IsNullOrEmpty(classifierId))
-                throw new ArgumentNullException(nameof(classifierId));
-
-            if(string.IsNullOrEmpty(VersionDate))
-                throw new ArgumentNullException("versionDate cannot be null.");
-
-            Classifier result = null;
-
-            try
-            {
-                var formData = new MultipartFormDataContent();
-
-                if (classnamePositiveExamples != null)
-                {
-                    var classnamePositiveExamplesContent = new ByteArrayContent((classnamePositiveExamples as Stream).ReadAllBytes());
-                    System.Net.Http.Headers.MediaTypeHeaderValue contentType;
-                    System.Net.Http.Headers.MediaTypeHeaderValue.TryParse("application/octet-stream", out contentType);
-                    classnamePositiveExamplesContent.Headers.ContentType = contentType;
-                    formData.Add(classnamePositiveExamplesContent, "classname_positive_examples", "filename");
-                }
-
-                if (negativeExamples != null)
-                {
-                    var negativeExamplesContent = new ByteArrayContent((negativeExamples as Stream).ReadAllBytes());
-                    System.Net.Http.Headers.MediaTypeHeaderValue contentType;
-                    System.Net.Http.Headers.MediaTypeHeaderValue.TryParse("application/octet-stream", out contentType);
-                    negativeExamplesContent.Headers.ContentType = contentType;
-                    formData.Add(negativeExamplesContent, "negative_examples", "filename");
-                }
-
-                var request = this.Client.PostAsync($"{this.Endpoint}/v3/classifiers/{classifierId}");
-                request.WithArgument("api_key", ApiKey);
-                request.WithArgument("version", VersionDate);
-                request.WithBodyContent(formData);
-                result = request.As<Classifier>().Result;
-            }
-            catch(AggregateException ae)
-            {
-                throw ae.Flatten();
-            }
-
-            return result;
-        }
     }
 }

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

@@ -41,8 +41,8 @@ public class VisualRecognitionServiceIntegrationTests
         private string _localFaceFilePath = @"VisualRecognitionTestData/obama.jpg";
         private string _localGiraffePositiveExamplesFilePath = @"VisualRecognitionTestData/giraffe_positive_examples.zip";
         private string _giraffeClassname = "giraffe";
-        //private string _localTurtlePositiveExamplesFilePath = @"VisualRecognitionTestData/turtle_positive_examples.zip";
-        //private string _turtleClassname = "turtle";
+        private string _localTurtlePositiveExamplesFilePath = @"VisualRecognitionTestData/turtle_positive_examples.zip";
+        private string _turtleClassname = "turtle";
         private string _localNegativeExamplesFilePath = @"VisualRecognitionTestData/negative_examples.zip";
         private string _createdClassifierName = "dotnet-standard-test-integration-classifier";
         AutoResetEvent autoEvent = new AutoResetEvent(false);
@@ -158,20 +158,20 @@ public void TestClassifiers_Success()
             }
             autoEvent.WaitOne();
 
-            //Classifier updateClassifierResult = null;
-            //using (FileStream positiveExamplesStream = File.OpenRead(_localTurtlePositiveExamplesFilePath))
-            //{
-            //    Dictionary<string, Stream> positiveExamples = new Dictionary<string, Stream>();
-            //    positiveExamples.Add(_turtleClassname, positiveExamplesStream);
-            //    UpdateClassifier updateClassifier = new UpdateClassifier(createdClassifierId, positiveExamples);
-            //    updateClassifierResult = UpdateClassifier(updateClassifier);
-            //}
+            Classifier updateClassifierResult = null;
+            using (FileStream positiveExamplesStream = File.OpenRead(_localTurtlePositiveExamplesFilePath))
+            {
+                Dictionary<string, Stream> positiveExamples = new Dictionary<string, Stream>();
+                positiveExamples.Add(_turtleClassname, positiveExamplesStream);
+                UpdateClassifier updateClassifier = new UpdateClassifier(createdClassifierId, positiveExamples);
+                updateClassifierResult = _service.UpdateClassifier(updateClassifier);
+            }
 
             var deleteClassifierResult = DeleteClassifier(createdClassifierId);
 
             Assert.IsNotNull(deleteClassifierResult);
-            //Assert.IsNotNull(updateClassifierResult);
-            //Assert.IsTrue(updateClassifierResult.ClassifierId == createdClassifierId);
+            Assert.IsNotNull(updateClassifierResult);
+            Assert.IsTrue(updateClassifierResult.ClassifierId == createdClassifierId);
             Assert.IsNotNull(getClassifierResult);
             Assert.IsTrue(getClassifierResult.ClassifierId == createdClassifierId);
             Assert.IsNotNull(createClassifierResult);
@@ -253,26 +253,7 @@ private DetectedFaces DetectFaces(System.IO.Stream imagesFile = null, string url
             return result;
         }
         #endregion
-
-        #region CreateClassifier
-        private Classifier CreateClassifier(string name, System.IO.Stream classnamePositiveExamples, System.IO.Stream negativeExamples = null)
-        {
-            Console.WriteLine("\nAttempting to CreateClassifier()");
-            var result = _service.CreateClassifier(name: name, classnamePositiveExamples: classnamePositiveExamples, negativeExamples: negativeExamples);
-
-            if (result != null)
-            {
-                Console.WriteLine("CreateClassifier() succeeded:\n{0}", JsonConvert.SerializeObject(result, Formatting.Indented));
-            }
-            else
-            {
-                Console.WriteLine("Failed to CreateClassifier()");
-            }
-
-            return result;
-        }
-        #endregion
-
+        
         #region DeleteClassifier
         private object DeleteClassifier(string classifierId)
         {
@@ -329,26 +310,7 @@ private Classifiers ListClassifiers(bool? verbose = null)
             return result;
         }
         #endregion
-
-        #region UpdateClassifier
-        private Classifier UpdateClassifier(string classifierId, System.IO.Stream classnamePositiveExamples = null, System.IO.Stream negativeExamples = null)
-        {
-            Console.WriteLine("\nAttempting to UpdateClassifier()");
-            var result = _service.UpdateClassifier(classifierId: classifierId, classnamePositiveExamples: classnamePositiveExamples, negativeExamples: negativeExamples);
-
-            if (result != null)
-            {
-                Console.WriteLine("UpdateClassifier() succeeded:\n{0}", JsonConvert.SerializeObject(result, Formatting.Indented));
-            }
-            else
-            {
-                Console.WriteLine("Failed to UpdateClassifier()");
-            }
-
-            return result;
-        }
-        #endregion
-
+        
         #endregion
     }
 }