From a1be1526c9b5e0a095bf82a4516848099444f804 Mon Sep 17 00:00:00 2001 From: MRXLT Date: Sun, 24 May 2020 12:54:28 +0000 Subject: [PATCH] fix web service && fix app --- python/paddle_serving_app/models/model_list.py | 2 +- python/paddle_serving_app/reader/__init__.py | 6 +++++- python/paddle_serving_server/serve.py | 2 +- python/paddle_serving_server/web_service.py | 4 ++-- python/paddle_serving_server_gpu/serve.py | 2 +- python/paddle_serving_server_gpu/web_service.py | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/python/paddle_serving_app/models/model_list.py b/python/paddle_serving_app/models/model_list.py index 49a90b66..ed83fee7 100644 --- a/python/paddle_serving_app/models/model_list.py +++ b/python/paddle_serving_app/models/model_list.py @@ -37,7 +37,7 @@ class ServingModels(object): object_detection_url = "https://paddle-serving.bj.bcebos.com/paddle_hub_models/image/ObjectDetection/" senta_url = "https://paddle-serving.bj.bcebos.com/paddle_hub_models/text/SentimentAnalysis/" semantic_url = "https://paddle-serving.bj.bcebos.com/paddle_hub_models/text/SemanticRepresentation/" - wordseg_url = "https://paddle-serving.bj.bcebos.com/paddle_hub_models/text/ChineseWordSegmentation/" + wordseg_url = "https://paddle-serving.bj.bcebos.com/paddle_hub_models/text/LexicalAnalysis/" self.url_dict = {} diff --git a/python/paddle_serving_app/reader/__init__.py b/python/paddle_serving_app/reader/__init__.py index 9b556a11..c60240b1 100644 --- a/python/paddle_serving_app/reader/__init__.py +++ b/python/paddle_serving_app/reader/__init__.py @@ -11,4 +11,8 @@ # 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 .image_reader import ImageReader, File2Image, URL2Image, Sequential, Normalize, CenterCrop, Resize, Transpose, Div, RGB2BGR, BGR2RGB, RCNNPostprocess, SegPostprocess, PadStride +from .chinese_bert_reader import ChineseBertReader +from .image_reader import ImageReader, File2Image, URL2Image, Sequential, Normalize, CenterCrop, Resize, PadStride +from .lac_reader import LACReader +from .senta_reader import SentaReader +from .imdb_reader import IMDBDataset diff --git a/python/paddle_serving_server/serve.py b/python/paddle_serving_server/serve.py index 70aafbf5..894b0c5b 100644 --- a/python/paddle_serving_server/serve.py +++ b/python/paddle_serving_server/serve.py @@ -103,7 +103,7 @@ if __name__ == "__main__": service.load_model_config(args.model) service.prepare_server( workdir=args.workdir, port=args.port, device=args.device) - service.run_server() + service.run_rpc_service() app_instance = Flask(__name__) diff --git a/python/paddle_serving_server/web_service.py b/python/paddle_serving_server/web_service.py index f8c43707..7f37b10b 100755 --- a/python/paddle_serving_server/web_service.py +++ b/python/paddle_serving_server/web_service.py @@ -92,7 +92,7 @@ class WebService(object): result = {"result": "Request Value Error"} return result - def run_server(self): + def run_rpc_service(self): import socket localIP = socket.gethostbyname(socket.gethostname()) print("web service address:") @@ -115,7 +115,7 @@ class WebService(object): self.app_instance = app_instance - def run_flask(self): + def run_web_service(self): self.app_instance.run(host="0.0.0.0", port=self.port, threaded=False, diff --git a/python/paddle_serving_server_gpu/serve.py b/python/paddle_serving_server_gpu/serve.py index 297ff25d..309896a8 100644 --- a/python/paddle_serving_server_gpu/serve.py +++ b/python/paddle_serving_server_gpu/serve.py @@ -118,7 +118,7 @@ if __name__ == "__main__": web_service.set_gpus(gpu_ids) web_service.prepare_server( workdir=args.workdir, port=args.port, device=args.device) - web_service.run_server() + web_service.run_rpc_service() app_instance = Flask(__name__) diff --git a/python/paddle_serving_server_gpu/web_service.py b/python/paddle_serving_server_gpu/web_service.py index e64e7319..478c2ecb 100644 --- a/python/paddle_serving_server_gpu/web_service.py +++ b/python/paddle_serving_server_gpu/web_service.py @@ -138,7 +138,7 @@ class WebService(object): result = {"result": "Request Value Error"} return result - def run_server(self): + def run_rpc_service(self): import socket localIP = socket.gethostbyname(socket.gethostname()) print("web service address:") @@ -165,7 +165,7 @@ class WebService(object): self.app_instance = app_instance - def run_flask(self): + def run_web_service(self): self.app_instance.run(host="0.0.0.0", port=self.port, threaded=False, -- GitLab