Jelajahi Sumber

Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into main

雾聪 2 tahun lalu
induk
melakukan
dfa0c83c42
3 mengubah file dengan 6 tambahan dan 5 penghapusan
  1. TEMPAT SAMPAH
      docs/images/dingding.jpg
  2. 3 2
      funasr/export/models/__init__.py
  3. 3 3
      funasr/runtime/html5/h5Server.py

TEMPAT SAMPAH
docs/images/dingding.jpg


+ 3 - 2
funasr/export/models/__init__.py

@@ -25,8 +25,9 @@ def get_model(model, export_config=None):
     elif isinstance(model, BiCifParaformer):
     elif isinstance(model, BiCifParaformer):
         return BiCifParaformer_export(model, **export_config)
         return BiCifParaformer_export(model, **export_config)
     elif isinstance(model, ParaformerOnline):
     elif isinstance(model, ParaformerOnline):
-        return (ParaformerOnline_encoder_predictor_export(model, model_name="model"),
-                ParaformerOnline_decoder_export(model, model_name="decoder"))
+        encoder = ParaformerOnline_encoder_predictor_export(model, model_name="model")
+        decoder = ParaformerOnline_decoder_export(model, model_name="decoder")
+        return [encoder, decoder]
     elif isinstance(model, Paraformer):
     elif isinstance(model, Paraformer):
         return Paraformer_export(model, **export_config)
         return Paraformer_export(model, **export_config)
     elif isinstance(model, Conformer_export):
     elif isinstance(model, Conformer_export):

+ 3 - 3
funasr/runtime/html5/h5Server.py

@@ -6,7 +6,7 @@
 ### 2022-2023 by zhaoming,mali aihealthx.com 
 ### 2022-2023 by zhaoming,mali aihealthx.com 
 
 
 
 
-from flask import Flask,render_template,request,send_from_directory,jsonify
+from flask import Flask,render_template,request,send_from_directory,jsonify,redirect,url_for
 #from gevent.pywsgi import WSGIServer
 #from gevent.pywsgi import WSGIServer
  
  
 import datetime
 import datetime
@@ -20,7 +20,7 @@ app = Flask(__name__,static_folder='static',static_url_path="/static")
 
 
 @app.route('/')
 @app.route('/')
 def homePage():
 def homePage():
-    return render_template('recorderapp_test.html')
+    return redirect('/static/index.html')
 
 
  
  
 parser = argparse.ArgumentParser()
 parser = argparse.ArgumentParser()
@@ -62,4 +62,4 @@ if __name__ == '__main__':
     #flask 
     #flask 
     print("srv run on ",port)
     print("srv run on ",port)
 
 
-    app.run(debug=True,host=args.host,port=port, ssl_context=(args.certfile,args.keyfile))
+    app.run(debug=False,threaded=True,host=args.host,port=port, ssl_context=(args.certfile,args.keyfile))