Merge branch 'develop' of https://github.com/PaddlePaddle/Serving into develop

doc/NEW_WEB_SERVICE.md

@@ -21,7 +21,7 @@ class WebService(object):
 
 The preprocess method has two input parameters, `feed` and `fetch`. For an HTTP request `request`:
 
-- The value of `feed` is request data `request.json`
+- The value of `feed` is the feed part `request.json["feed"]` in the request data 
 - The value of `fetch` is the fetch part `request.json["fetch"]` in the request data
 
 The return values are the feed and fetch values used in the prediction.
@@ -30,7 +30,7 @@ The return values are the feed and fetch values used in the prediction.
 
 The postprocess method has three input parameters, `feed`, `fetch` and `fetch_map`:
 
-- The value of `feed` is request data `request.json`
+- The value of `feed` is the feed part `request.json["feed"]` in the request data 
 - The value of `fetch` is the fetch part `request.json["fetch"]` in the request data
 - The value of `fetch_map` is the model output value.
 
@@ -40,25 +40,17 @@ The return value will be processed as `{"reslut": fetch_map}` as the return of t
 
 ```python
 class ImageService(WebService):
+
     def preprocess(self, feed={}, fetch=[]):
         reader = ImageReader()
-        if "image" not in feed:
-            raise ("feed data error!")
-        if isinstance(feed["image"], list):
-            feed_batch = []
-            for image in feed["image"]:
-                sample = base64.b64decode(image)
-                img = reader.process_image(sample)
-                res_feed = {}
-                res_feed["image"] = img.reshape(-1)
-                feed_batch.append(res_feed)
-            return feed_batch, fetch
-        else:
-            sample = base64.b64decode(feed["image"])
+        feed_batch = []
+        for ins in feed:
+            if "image" not in ins:
+                raise ("feed data error!")
+            sample = base64.b64decode(ins["image"])
             img = reader.process_image(sample)
-            res_feed = {}
-            res_feed["image"] = img.reshape(-1)
-            return res_feed, fetch
+            feed_batch.append({"image": img})
+        return feed_batch, fetch
 ```
 
 For the above `ImageService`, only the `preprocess` method is rewritten to process the image data in Base64 format into the data format required by prediction.

doc/NEW_WEB_SERVICE_CN.md

@@ -21,7 +21,7 @@ class WebService(object):
 
 preprocess方法有两个输入参数，`feed`和`fetch`。对于一个HTTP请求`request`：
 
-- `feed`的值为请求数据`request.json`
+- `feed`的值为请求数据中的feed部分`request.json["feed"]`
 - `fetch`的值为请求数据中的fetch部分`request.json["fetch"]`
 
 返回值分别是预测过程中用到的feed和fetch值。
@@ -30,7 +30,7 @@ preprocess方法有两个输入参数，`feed`和`fetch`。对于一个HTTP请
 
 postprocess方法有三个输入参数，`feed`、`fetch`和`fetch_map`：
 
-- `feed`的值为请求数据`request.json`
+- `feed`的值为请求数据中的feed部分`request.json["feed"]`
 - `fetch`的值为请求数据中的fetch部分`request.json["fetch"]`
 - `fetch_map`的值为fetch到的模型输出值
 
@@ -40,25 +40,17 @@ postprocess方法有三个输入参数，`feed`、`fetch`和`fetch_map`：
 
 ```python
 class ImageService(WebService):
+
     def preprocess(self, feed={}, fetch=[]):
         reader = ImageReader()
-        if "image" not in feed:
-            raise ("feed data error!")
-        if isinstance(feed["image"], list):
-            feed_batch = []
-            for image in feed["image"]:
-                sample = base64.b64decode(image)
-                img = reader.process_image(sample)
-                res_feed = {}
-                res_feed["image"] = img.reshape(-1)
-                feed_batch.append(res_feed)
-            return feed_batch, fetch
-        else:
-            sample = base64.b64decode(feed["image"])
+        feed_batch = []
+        for ins in feed:
+            if "image" not in ins:
+                raise ("feed data error!")
+            sample = base64.b64decode(ins["image"])
             img = reader.process_image(sample)
-            res_feed = {}
-            res_feed["image"] = img.reshape(-1)
-            return res_feed, fetch
+            feed_batch.append({"image": img})
+        return feed_batch, fetch
 ```
 
 对于上述的`ImageService`，只重写了前处理方法，将base64格式的图片数据处理成模型预测需要的数据格式。

python/paddle_serving_app/__init__.py

@@ -15,3 +15,4 @@ from .reader.chinese_bert_reader import ChineseBertReader
 from .reader.image_reader import ImageReader
 from .reader.lac_reader import LACReader
 from .reader.senta_reader import SentaReader
+from .models import ServingModels

python/paddle_serving_app/models/__init__.py

+#   Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .model_list import ServingModels

python/paddle_serving_app/models/model_list.py

@@ -57,7 +57,7 @@ class ServingModels(object):
                 "resnet_v2_151_imagenet",
                 "resnet_v2_18_imagenet",
                 "resnet_v2_34_imagenet",
-                " resnet_v2_50_imagenet",
+                "resnet_v2_50_imagenet",
                 "resnext101_32x16d_wsl",
                 "resnext101_32x32d_wsl",
                 "resnext101_32x48d_wsl",

python/paddle_serving_app/package.py

+#   Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Usage:
+    Download a package for serving directly
+    Example:
+        python -m paddle_serving_app.models --get_model senta_bilstm
+        python -m paddle_serving_app.models --list_model
+"""
+
+import argparse
+from .models import ServingModels
+
+
+def parse_args():  # pylint: disable=doc-string-missing
+    parser = argparse.ArgumentParser("serve")
+    parser.add_argument(
+        "--get_model", type=str, default="", help="Download a specific model")
+    parser.add_argument(
+        '--list_model', nargs='*', default=None, help="List Models")
+    return parser.parse_args()
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    if args.list_model != None:
+        model_handle = ServingModels()
+        model_names = model_handle.get_model_list()
+        for key in model_names:
+            print(key)
+    elif args.get_model != "":
+        model_handle = ServingModels()
+        model_names = model_handle.get_model_list()
+        if args.get_model not in model_names:
+            print(
+                "Your model name does not exist in current model list, stay tuned"
+            )
+            sys.exit(0)
+        model_handle.download(args.get_model)
+    else:
+        print("Wrong argument")
+        print("""
+              Usage:
+              Download a package for serving directly
+              Example:
+                   python -m paddle_serving_app.models --get senta_bilstm
+                   python -m paddle_serving_app.models --list_model
+              """)
+        pass

python/setup.py.app.in

@@ -48,7 +48,8 @@ REQUIRED_PACKAGES = [
 packages=['paddle_serving_app',
           'paddle_serving_app.reader',
 	  'paddle_serving_app.utils',
-      'paddle_serving_app.reader.pddet']
+	  'paddle_serving_app.models',
+	  'paddle_serving_app.reader.pddet']
 
 package_data={}
 package_dir={'paddle_serving_app':
@@ -57,8 +58,10 @@ package_dir={'paddle_serving_app':
              '${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_app/reader',
 	     'paddle_serving_app.utils':
 	     '${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_app/utils',
-          'paddle_serving_app.reader.pddet':
-           '${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_app/reader/pddet',}
+	     'paddle_serving_app.models':
+	     '${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_app/models',
+	     'paddle_serving_app.reader.pddet':
+	     '${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_app/reader/pddet',}
 
 setup(
     name='paddle-serving-app',