Merge pull request #1153 from HexToString/fix_grpc_bug

Fix grpc bug

python/examples/bert/bert_web_service_gpu.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # pylint: disable=doc-string-missing
-from paddle_serving_server_gpu.web_service import WebService
+from paddle_serving_server.web_service import WebService
 from paddle_serving_app.reader import ChineseBertReader
 import sys
 import os

python/paddle_serving_client/client.py

@@ -555,7 +555,14 @@ class MultiLangClient(object):
         )
         resp = self.stub_.GetClientConfig(get_client_config_req)
         model_config_path_list = resp.client_config_str_list
-        self._parse_model_config(model_config_path_list)
+        file_path_list = []
+        for single_model_config in model_config_path_list:
+            if os.path.isdir(single_model_config):
+                file_path_list.append("{}/serving_server_conf.prototxt".format(
+                    single_model_config))
+            elif os.path.isfile(single_model_config):
+                file_path_list.append(single_model_config)
+        self._parse_model_config(file_path_list)
 
     def _flatten_list(self, nested_list):
         for item in nested_list:

python/paddle_serving_server/rpc_service.py

@@ -34,11 +34,18 @@ class MultiLangServerServiceServicer(multi_lang_general_model_service_pb2_grpc.
         self._parse_model_config(self.model_config_path_list)
 
     def _init_bclient(self, model_config_path_list, endpoints, timeout_ms=None):
+        file_path_list = []
+        for single_model_config in model_config_path_list:
+            if os.path.isdir(single_model_config):
+                file_path_list.append("{}/serving_server_conf.prototxt".format(
+                    single_model_config))
+            elif os.path.isfile(single_model_config):
+                file_path_list.append(single_model_config)
         from paddle_serving_client import Client
         self.bclient_ = Client()
         if timeout_ms is not None:
             self.bclient_.set_rpc_timeout_ms(timeout_ms)
-        self.bclient_.load_client_config(model_config_path_list)
+        self.bclient_.load_client_config(file_path_list)
         self.bclient_.connect(endpoints)
 
     def _parse_model_config(self, model_config_path_list):