adjust import lib order

huangmingming

2023-01-30 cbe4817bc1b21fe6c3f38210bd38e5d54b464c33

adjust import lib order

 funasr/runtime/python/grpc/.gitignore

New file
@@ -0,0 +1 @@
**/__pycache__

 funasr/runtime/python/grpc/grpc_client.py

@@ -1,12 +1,10 @@
import paraformer_pb2
import paraformer_pb2_grpc
import grpc
import queue
import paraformer_pb2

def transcribe_audio_bytes(stub, chunk, user='zksz', language='zh-CN', speaking = True, isEnd = False):
    req = paraformer_pb2.Request()
    if chunk is not None:
        req.audio_data = chunk.tostring()
        req.audio_data = chunk
    req.user = user
    req.language = language
    req.speaking = speaking

 funasr/runtime/python/grpc/grpc_main_client_mic.py

@@ -1,23 +1,19 @@
import pyaudio
import scipy.io.wavfile as wav
import grpc_client
import grpc
import json
from grpc_client import transcribe_audio_bytes
from paraformer_pb2_grpc import ASRStub
import webrtcvad
import numpy as np
import time
import asyncio
import datetime
import argparse

from grpc_client import transcribe_audio_bytes
from paraformer_pb2_grpc import ASRStub

async def deal_chunk(sig_mic):
    global stub,SPEAKING,asr_user,language,sample_rate
    sig = np.frombuffer(sig_mic, 'int16')
    if vad.is_speech(sig.tobytes(), sample_rate): #speaking
    if vad.is_speech(sig_mic, sample_rate): #speaking
        SPEAKING = True
        response = transcribe_audio_bytes(stub, sig, user=asr_user, language=language, speaking = True, isEnd = False) #speaking, send audio to server.
        response = transcribe_audio_bytes(stub, sig_mic, user=asr_user, language=language, speaking = True, isEnd = False) #speaking, send audio to server.
    else: #silence   
        begin_time = 0
        if SPEAKING: #means we have some audio recorded, send recognize order to server.

 funasr/runtime/python/grpc/grpc_main_server.py

@@ -1,8 +1,9 @@
import grpc
from concurrent import futures
import argparse

import paraformer_pb2_grpc
from grpc_server import ASRServicer
import grpc
import argparse

def serve(args):
      server = grpc.server(futures.ThreadPoolExecutor(max_workers=10),

 funasr/runtime/python/grpc/grpc_server.py

@@ -1,13 +1,12 @@
from concurrent import futures
import grpc
import json
import paraformer_pb2
import paraformer_pb2_grpc
import time

from paraformer_pb2 import Response
from modelscope.pipelines import pipeline
from modelscope.utils.constant import Tasks
import paraformer_pb2_grpc
from paraformer_pb2 import Response


class ASRServicer(paraformer_pb2_grpc.ASRServicer):