From 1d97d628f2f19674fa50495e984db8185604ca8e Mon Sep 17 00:00:00 2001
From: lzr265946 <lzr265946@alibaba-inc.com>
Date: 星期五, 03 二月 2023 14:11:22 +0800
Subject: [PATCH] Merge branch 'main' into dev

---
 funasr/runtime/python/grpc/Readme.md |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/funasr/runtime/python/grpc/Readme.md b/funasr/runtime/python/grpc/Readme.md
index 3b4ff51..053b3d0 100644
--- a/funasr/runtime/python/grpc/Readme.md
+++ b/funasr/runtime/python/grpc/Readme.md
@@ -5,30 +5,52 @@
 
 ## Steps
 
-Step 1) Prepare server environment (on server).
+Step 1) Prepare server environment (on server).  
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Install modelscope and funasr with pip or with cuda-docker image.
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Option 1: Install modelscope and funasr with [pip](https://github.com/alibaba-damo-academy/FunASR#installation)
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Option 2: or install with cuda-docker image as: 
+
 ```
-# Optional, modelscope cuda docker is preferred.
 CID=`docker run --network host -d -it --gpus '"device=0"' registry.cn-hangzhou.aliyuncs.com/modelscope-repo/modelscope:ubuntu20.04-cuda11.3.0-py37-torch1.11.0-tf1.15.5-1.2.0`
 echo $CID
 docker exec -it $CID /bin/bash
-cd /opt/conda/lib/python3.7/site-packages/funasr/runtime/python/grpc
+```
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Get funasr source code and get into grpc directory.
+```
+git clone https://github.com/alibaba-damo-academy/FunASR
+cd FunASR/funasr/runtime/python/grpc/
 ```
 
-Step 2) Generate protobuf file (for server and client).
+
+Step 2) Optional, generate protobuf file (run on server, the two generated pb files are both used for server and client).
 ```
-# Optional, paraformer_pb2.py and paraformer_pb2_grpc.py are already generated.
+# Optional, Install dependency.
+python -m pip install grpcio grpcio-tools
+```
+
+```
+# paraformer_pb2.py and paraformer_pb2_grpc.py are already generated, 
+# regenerate it only when you make changes to ./proto/paraformer.proto file.
 python -m grpc_tools.protoc  --proto_path=./proto -I ./proto    --python_out=. --grpc_python_out=./ ./proto/paraformer.proto
 ```
 
 Step 3) Start grpc server (on server).
 ```
+# Optional, Install dependency.
+python -m pip install grpcio grpcio-tools
+```
+```
+# Start server.
 python grpc_main_server.py --port 10095
 ```
 
 Step 4) Start grpc client (on client with microphone).
 ```
-# Install dependency. Optional.
-python -m pip install pyaudio webrtcvad
+# Optional, Install dependency.
+python -m pip install pyaudio webrtcvad grpcio grpcio-tools
 ```
 ```
 # Start client.
@@ -41,7 +63,7 @@
 
 
 ## Reference
-We borrow or refer to some code from:
+We borrow from or refer to some code as:
 
 1)https://github.com/wenet-e2e/wenet/tree/main/runtime/core/grpc
 

--
Gitblit v1.9.1