From dfa0c83c429d790c0268072e244af2556f033b74 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期三, 30 八月 2023 11:11:26 +0800
Subject: [PATCH] Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into main
---
docs/images/dingding.jpg | 0
funasr/runtime/html5/h5Server.py | 6 +++---
funasr/export/models/__init__.py | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/images/dingding.jpg b/docs/images/dingding.jpg
index 5bfbfa1..3da7efe 100644
--- a/docs/images/dingding.jpg
+++ b/docs/images/dingding.jpg
Binary files differ
diff --git a/funasr/export/models/__init__.py b/funasr/export/models/__init__.py
index cba92a8..94447dc 100644
--- a/funasr/export/models/__init__.py
+++ b/funasr/export/models/__init__.py
@@ -25,8 +25,9 @@
elif isinstance(model, BiCifParaformer):
return BiCifParaformer_export(model, **export_config)
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):
return Paraformer_export(model, **export_config)
elif isinstance(model, Conformer_export):
diff --git a/funasr/runtime/html5/h5Server.py b/funasr/runtime/html5/h5Server.py
index d0ecf27..96392f8 100644
--- a/funasr/runtime/html5/h5Server.py
+++ b/funasr/runtime/html5/h5Server.py
@@ -6,7 +6,7 @@
### 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
import datetime
@@ -20,7 +20,7 @@
@app.route('/')
def homePage():
- return render_template('recorderapp_test.html')
+ return redirect('/static/index.html')
parser = argparse.ArgumentParser()
@@ -62,4 +62,4 @@
#flask
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))
--
Gitblit v1.9.1