From 726a5582567216b1b4cb29ab11c4d8c0c7825562 Mon Sep 17 00:00:00 2001
From: Dirk <sourcetree.d@dimuso.de>
Date: Thu, 31 Dec 2020 14:36:59 +0100
Subject: [PATCH 1/2] Computer Vision: Updated API V3.1, Computer Vision: Added
 endpoint address to config, Computer Vision: Added new operation "Color"

---
 .../cognitive-services/computervision.html    | 29 ++++++++----
 .../cognitive-services/computervision.js      | 46 +++++++++++++++----
 2 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/cognitive-services/cognitive-services/computervision.html b/cognitive-services/cognitive-services/computervision.html
index 8f3fa7a..a2c684b 100644
--- a/cognitive-services/cognitive-services/computervision.html
+++ b/cognitive-services/cognitive-services/computervision.html
@@ -1,10 +1,14 @@
 <script type="text/javascript">
     RED.nodes.registerType('Computer Vision', {
-        category: 'analysis',
+        category: 'Microsoft Cognitive Services',
         color: '#049580',
         defaults: {
             operation: {
-                value: "description",
+                value: "Description",
+                required: true
+            },
+            endpoint: {
+                value: "https://westus.api.cognitive.microsoft.com/",
                 required: true
             },
             name: {
@@ -27,18 +31,23 @@
 
 <script type="text/x-red" data-template-name="Computer Vision">
     <div class="form-row">
-        <label for="node-input-operation"><i class="icon-tag"></i> Operation (<a href="https://dev.projectoxford.ai/docs/services/56f91f2d778daf23d8ec6739/operations/56f91f2e778daf14a499e1fa" target="_blank">See details</a>)</label>
+        <label for="node-input-operation"><i class="icon-tag"></i> Operation (<a href="https://westcentralus.dev.cognitive.microsoft.com/docs/services/computer-vision-v3-1-ga/operations/56f91f2e778daf14a499f21b" target="_blank">Documentation</a>)</label>
         <select type="text" id="node-input-operation">
-            <option value="tags">Tags</option>
-            <option value="description">Description</option>
-            <option value="age">Face Age</option>
-            <option value="gender">Face Gender</option>
-            <option value="adult">Adult Score</option>
+            <option value="Tags">Tags</option>
+            <option value="Description">Description</option>
+            <option value="Faces Age">Face Age</option>
+            <option value="Faces Gender">Face Gender</option>
+            <option value="Adult">Adult Score</option>
+            <option value="Color">Color</option>
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-key"><i class="icon-tag"></i> Subscription (<a href="https://www.microsoft.com/cognitive-services" target="_blank">Get key</a>)</label>
-        <input type="password" id="node-input-key" placeholder="Paste subscription key of West US region">
+        <label for="node-input-endpoint"><i class="icon-tag"></i> Endpoint </label>
+        <input type="text" id="node-input-endpoint" placeholder="Paste endpoint url from 'Keys and Endpoints'">
+    </div>
+    <div class="form-row">
+        <label for="node-input-key"><i class="icon-tag"></i> Key </label>
+        <input type="password" id="node-input-key" placeholder="Paste key from 'Keys and Endpoints'">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="icon-tag"></i> Name (Optional)</label>
diff --git a/cognitive-services/cognitive-services/computervision.js b/cognitive-services/cognitive-services/computervision.js
index 9220854..ba05d18 100644
--- a/cognitive-services/cognitive-services/computervision.js
+++ b/cognitive-services/cognitive-services/computervision.js
@@ -1,3 +1,6 @@
+// https://github.com/Azure/node-red-contrib-azure/blob/master/cognitive-services/cognitive-services/computervision.js
+// https://westcentralus.dev.cognitive.microsoft.com/docs/services/computer-vision-v3-1-ga/operations/56f91f2e778daf14a499f21b
+
 var request = require('request');
 
 module.exports = function(RED)
@@ -15,13 +18,23 @@ module.exports = function(RED)
                 node.status({fill: "red", shape: "ring", text: "Error"});
                 console.log("Input subscription key");
             }
+            else if (config.endpoint == null || config.endpoint == "")
+            {
+                node.error("Input endpoint address", msg);
+                node.status({fill: "red", shape: "rint", text: "Error"});
+                console.log("Input endpoint address");
+            }
             else
             {
                 var options = null;
+                //var endpoint = "https://westus.api.cognitive.microsoft.com/";
+                var endpoint = config.endpoint;
+                //var visualFeatures = "Categories,Tags,Description,Faces,ImageType,Color,Adult";
+                var visualFeatures = config.operation.split(" ")[0];
                 if (Buffer.isBuffer(msg.payload))
                 {
                     options = {
-                        url: 'https://westus.api.cognitive.microsoft.com/vision/v1.0/analyze?visualFeatures=Categories,Tags,Description,Faces,ImageType,Color,Adult',
+                        url: endpoint + 'vision/v3.1/analyze?visualFeatures=' + visualFeatures,
                         method: 'POST',
                         headers: {
                             'Ocp-Apim-Subscription-Key': this.credentials.key,
@@ -33,7 +46,7 @@ module.exports = function(RED)
                 else if (typeof(msg.payload) == 'string' && (msg.payload.indexOf('http://') === 0 || msg.payload.indexOf('https://') === 0))
                 {
                     options = {
-                        url: 'https://westus.api.cognitive.microsoft.com/vision/v1.0/analyze?visualFeatures=Categories,Tags,Description,Faces,ImageType,Color,Adult',
+                        url: endpoint + 'vision/v3.1/analyze?visualFeatures=' + visualFeatures,
                         method: 'POST',
                         headers: {
                             'Ocp-Apim-Subscription-Key': this.credentials.key,
@@ -58,7 +71,7 @@ module.exports = function(RED)
                                 console.log("response.statusCode=" + response.statusCode + ", body=" + JSON.stringify(body));
                                 if (response.statusCode == 200 && body != null)
                                 {
-                                    if (config.operation == "tags") // Tags
+                                    if (config.operation == "Tags") // Tags
                                     {
                                         if (body.tags.length > 0 && body.categories[0].name != null)
                                         {
@@ -80,7 +93,7 @@ module.exports = function(RED)
                                         node.send(msg);
                                         node.status({});
                                     }
-                                    else  if (config.operation == "description") // Description
+                                    else  if (config.operation == "Description") // Description
                                     {
                                         if (body != null && body.description != null && body.description.captions != null && body.description.captions.length > 0)
                                         {
@@ -97,7 +110,7 @@ module.exports = function(RED)
                                         node.send(msg);
                                         node.status({});
                                     }
-                                    else  if (config.operation == "age") // Faces(age)
+                                    else  if (config.operation == "Faces Age") // Faces(age)
                                     {
                                         if (body.faces != null && body.faces.length > 0 && body.faces[0].age != null)
                                         {
@@ -111,7 +124,7 @@ module.exports = function(RED)
                                         node.send(msg);
                                         node.status({});
                                     }
-                                    else  if (config.operation == "gender") // Faces(gender)
+                                    else  if (config.operation == "Faces Gender") // Faces(gender)
                                     {
                                         if (body.faces != null && body.faces.length > 0 && body.faces[0].gender != null)
                                         {
@@ -125,7 +138,7 @@ module.exports = function(RED)
                                         node.send(msg);
                                         node.status({});
                                     }
-                                    else  if (config.operation == "adult") // Adult
+                                    else  if (config.operation == "Adult") // Adult
                                     {
                                         if (body.adult != null && body.adult.adultScore != null)
                                         {
@@ -139,6 +152,23 @@ module.exports = function(RED)
                                         node.send(msg);
                                         node.status({});
                                     }
+                                    else  if (config.operation == "Color")
+                                    {
+                                        if (body.color != null && body.color.dominantColorForeground != null && body.color.dominantColorBackground != null)
+                                        {
+                                            msg.payload = {
+                                                    foregroundColor: body.color.dominantColorForeground,
+                                                    backgroundColor: body.color.dominantColorBackground
+                                                };
+                                        }
+                                        else
+                                        {
+                                            msg.payload = null;
+                                        }
+                                        msg.detail = body;
+                                        node.send(msg);
+                                        node.status({});
+                                    }
                                     else
                                     {
                                         node.error("Unsupported operation: " + config.operation);
@@ -181,4 +211,4 @@ module.exports = function(RED)
             }
         }
     });                       
-}
\ No newline at end of file
+}

From 515c379a0a32305d1d88f2eee71366e5ae7318cd Mon Sep 17 00:00:00 2001
From: Dirk <sourcetree.d@dimuso.de>
Date: Thu, 31 Dec 2020 17:11:06 +0100
Subject: [PATCH 2/2] Computer Vision: "Tags" did not work

---
 cognitive-services/cognitive-services/computervision.html | 6 +++---
 cognitive-services/cognitive-services/computervision.js   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cognitive-services/cognitive-services/computervision.html b/cognitive-services/cognitive-services/computervision.html
index a2c684b..b164590 100644
--- a/cognitive-services/cognitive-services/computervision.html
+++ b/cognitive-services/cognitive-services/computervision.html
@@ -33,12 +33,12 @@
     <div class="form-row">
         <label for="node-input-operation"><i class="icon-tag"></i> Operation (<a href="https://westcentralus.dev.cognitive.microsoft.com/docs/services/computer-vision-v3-1-ga/operations/56f91f2e778daf14a499f21b" target="_blank">Documentation</a>)</label>
         <select type="text" id="node-input-operation">
-            <option value="Tags">Tags</option>
+            <option value="Adult">Adult Score</option>
+            <option value="Color">Color</option>
             <option value="Description">Description</option>
             <option value="Faces Age">Face Age</option>
             <option value="Faces Gender">Face Gender</option>
-            <option value="Adult">Adult Score</option>
-            <option value="Color">Color</option>
+            <option value="Tags">Tags</option>
         </select>
     </div>
     <div class="form-row">
diff --git a/cognitive-services/cognitive-services/computervision.js b/cognitive-services/cognitive-services/computervision.js
index ba05d18..b6fea11 100644
--- a/cognitive-services/cognitive-services/computervision.js
+++ b/cognitive-services/cognitive-services/computervision.js
@@ -18,6 +18,7 @@ module.exports = function(RED)
                 node.status({fill: "red", shape: "ring", text: "Error"});
                 console.log("Input subscription key");
             }
+            // 2020-12-31 DM
             else if (config.endpoint == null || config.endpoint == "")
             {
                 node.error("Input endpoint address", msg);
@@ -27,6 +28,7 @@ module.exports = function(RED)
             else
             {
                 var options = null;
+                // 2020-12-31 DM
                 //var endpoint = "https://westus.api.cognitive.microsoft.com/";
                 var endpoint = config.endpoint;
                 //var visualFeatures = "Categories,Tags,Description,Faces,ImageType,Color,Adult";
@@ -73,7 +75,7 @@ module.exports = function(RED)
                                 {
                                     if (config.operation == "Tags") // Tags
                                     {
-                                        if (body.tags.length > 0 && body.categories[0].name != null)
+                                        if (body.tags.length > 0)
                                         {
                                             var tmp = body.tags.sort(function(a, b) {
                                                 return b.confidence - a.confidence;