added the merge skill back in

Author: vkurpad

Image-Processing/BFR_Sample_Rest.ipynb

@@ -80,7 +80,7 @@
     "# This sample assumes you will use the same storage account for the datasource, knowledge store and indexer cache. The knowledge store will contain the projected images\n",
     "know_store_cache = STORAGECONNSTRING\n",
     "# Contaimer where the sliced images will be projected to\n",
-    "know_store_container = \"slices\"\n",
+    "know_store_container = \"obfuscated\"\n",
     "skill_uri = \"https://<skillname>.azurewebsites.net/api/SplitImage?code=CODE\""
    ]
   },
@@ -196,7 +196,7 @@
     "        {\n",
     "          \"@odata.type\": \"#Microsoft.Skills.Text.PIIDetectionSkill\",\n",
     "          \"name\": \"#1\",\n",
-    "          \"description\": null,\n",
+    "          \"description\": \"\",\n",
     "          \"context\": \"/document/merged_content\",\n",
     "          \"defaultLanguageCode\": \"en\",\n",
     "          \"minimumPrecision\": 0.5,\n",
@@ -254,6 +254,34 @@
     "            }\n",
     "          ],\n",
     "          \"httpHeaders\": {}\n",
+    "        },\n",
+    "        {\n",
+    "          \"@odata.type\": \"#Microsoft.Skills.Text.MergeSkill\",\n",
+    "          \"name\": \"MergeSkill\",\n",
+    "          \"description\": \"Merge results from cracking with OCR text\",\n",
+    "          \"context\": \"/document\",\n",
+    "          \"insertPreTag\": \" \",\n",
+    "          \"insertPostTag\": \" \",\n",
+    "          \"inputs\": [\n",
+    "            {\n",
+    "              \"name\": \"text\",\n",
+    "              \"source\": \"/document/content\"\n",
+    "            },\n",
+    "            {\n",
+    "              \"name\": \"itemsToInsert\",\n",
+    "              \"source\": \"/document/normalized_images/*/text\"\n",
+    "            },\n",
+    "            {\n",
+    "              \"name\": \"offsets\",\n",
+    "              \"source\": \"/document/normalized_images/*/contentOffset\"\n",
+    "            }\n",
+    "          ],\n",
+    "          \"outputs\": [\n",
+    "            {\n",
+    "              \"name\": \"mergedText\",\n",
+    "              \"targetName\": \"merged_content\"\n",
+    "            }\n",
+    "          ]\n",
     "        }\n",
     "        \n",
     "    ],\n",
@@ -266,36 +294,36 @@
     "        \"objects\": [\n",
     "          {\n",
     "            \"storageContainer\": \"layout\",\n",
-    "            \"referenceKeyName\": null,\n",
+    "            \"referenceKeyName\": None,\n",
     "            \"generatedKeyName\": \"layoutKey\",\n",
     "            \"source\": \"/document/normalized_images/*/layoutText\",\n",
-    "            \"sourceContext\": null,\n",
+    "            \"sourceContext\": None,\n",
     "            \"inputs\": []\n",
     "          }\n",
     "        ],\n",
     "        \"files\": [\n",
     "          {\n",
     "            \"storageContainer\": \"slices\",\n",
-    "            \"referenceKeyName\": null,\n",
+    "            \"referenceKeyName\": None,\n",
     "            \"generatedKeyName\": \"slicesKey\",\n",
     "            \"source\": \"/document/normalized_images/*/slices/*\",\n",
-    "            \"sourceContext\": null,\n",
+    "            \"sourceContext\": None,\n",
     "            \"inputs\": []\n",
     "          },\n",
     "          {\n",
     "            \"storageContainer\": \"images\",\n",
-    "            \"referenceKeyName\": null,\n",
+    "            \"referenceKeyName\": None,\n",
     "            \"generatedKeyName\": \"imageKey\",\n",
     "            \"source\": \"/document/normalized_images/*\",\n",
-    "            \"sourceContext\": null,\n",
+    "            \"sourceContext\": None,\n",
     "            \"inputs\": []\n",
     "          },\n",
     "          {\n",
     "            \"storageContainer\": f'{know_store_container}',\n",
-    "            \"referenceKeyName\": null,\n",
+    "            \"referenceKeyName\": None,\n",
     "            \"generatedKeyName\": \"originalKey\",\n",
     "            \"source\": \"/document/normalized_images/*/original\",\n",
-    "            \"sourceContext\": null,\n",
+    "            \"sourceContext\": None,\n",
     "            \"inputs\": []\n",
     "          }\n",
     "        ]\n",