Apr2023 - monthly release merge (#15)

* Issue with $.find()

* Structured dataset for demo

* Tiak upgrade to 2.7.0

* Disable FTP and SCM Basic Authentication

* 429 Too many request for Translation

* Apache Tika pulled from puthurr/tika2 (docker.io)

* Support updating the retry tag

* April changes log

* More sample documents

Author: puthurr

CHANGES.md

@@ -1,5 +1,11 @@
 # Changes log
 
+## April 2023 - v1.6 
+
+- Apache Tika 2.7.0 upgrade - Tika now taken from my own docker repository https://hub.docker.com/repository/docker/puthurr/tika2/general
+- Documentation
+- Bugs fixing
+
 ## March 2023 - v1.5
 
 - Open AI scenarios (documentation)

configuration/README.md

@@ -94,9 +94,9 @@ The built images will be build and published to the solution designated Azure Co
 {
     "Images": [
         {
-            "Id":1,
-            "Name": "microsoft/tikaserver",
-            "Path": "..\\src\\CognitiveSearch.Skills\\Java\\ApacheTika"
+            "Id":2,
+            "Name": "microsoft/vision",
+            "Path": "..\\src\\CognitiveSearch.Skills\\Python\\Vision"
         }
     ]
 }
@@ -274,20 +274,26 @@ The **config.json** holds the list of Web Applications to build for the solution
 
 ```json
 {
+    "enable": true,
+    "GroupId": "WebApps",
+    "Apptype": "WebApp",
+    "PrivateDNSZone": "privatelink.azurewebsites.net",
+    "Parameters" : [],
     "AppPlans": [
         {
             "Name": "{{config.name}}uiplan",
             "Sku": "{{param.pricing.premium}}",
-            "ResourceGroup":"{{config.ResourceGroupName}}",
-            "IsLinux":false,
-            "WebApps": [
+            "ResourceGroup": "{{config.ResourceGroupName}}",
+            "IsLinux": false,
+            "Services": [
                 {
-                    "Id":"webappui",
+                    "Id": "webappui",
                     "Name": "{{config.name}}ui",
                     "Path": "src\\CognitiveSearch.UI\\CognitiveSearch.UI",
-                    "vnetPrivateEndpoint":false,
-                    "vnetIntegration":true,
-                    "slots":[
+                    "AccessIPRestriction": false,
+                    "AccessSubnetRestriction": false,
+                    "EnablePrivateAccess": false,
+                    "slots": [
                         "staging"
                     ]
                 }
@@ -296,15 +302,16 @@ The **config.json** holds the list of Web Applications to build for the solution
         {
             "Name": "{{config.name}}tikaplan",
             "Sku": "{{param.pricing.premium}}",
-            "ResourceGroup":"{{config.ResourceGroupName}}",
-            "IsLinux":true,
-            "WebApps": [
+            "ResourceGroup": "{{config.ResourceGroupName}}",
+            "IsLinux": true,
+            "Services": [
                 {
-                    "Id":"tikaserver",
+                    "Id": "tikaserver",
                     "Name": "{{config.name}}tikaserver",
-                    "Image": "microsoft/tikaserver:latest",
-                    "vnetPrivateEndpoint":true,
-                    "vnetIntegration":true
+                    "Image": "docker.io/puthurr/tika2:latest",
+                    "AccessIPRestriction": true,
+                    "AccessSubnetRestriction": true,
+                    "EnablePrivateAccess": true
                 }
             ]
         }

configuration/config/docker/config.json

@@ -1,12 +1,6 @@
 {
     "enable": true,
     "Images": [
-        {
-            "Id":1,
-            "Name": "microsoft/tikaserver",
-            "Path": "..\\src\\CognitiveSearch.Skills\\Java\\ApacheTika",
-            "webapp": true
-        },
         {
             "Id":2,
             "Name": "microsoft/vision",

configuration/config/webapps/config.json

@@ -33,7 +33,7 @@
                 {
                     "Id": "tikaserver",
                     "Name": "{{config.name}}tikaserver",
-                    "Image": "microsoft/tikaserver:latest",
+                    "Image": "docker.io/puthurr/tika2:latest",
                     "AccessIPRestriction": true,
                     "AccessSubnetRestriction": true,
                     "EnablePrivateAccess": true

data/documents/Licenses/MIT.txt

@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE