Skip to content

V
VisualDL

PaddlePaddle / VisualDL
大约 1 年 前同步成功

通知 88
Star 4655
Fork 642
V
VisualDL
未验证 提交 686cf212 编写于 作者: C chenjian 提交者： GitHub
浏览文件
操作

Optimize for better compatibility (#1254) 

* Optimize for better compatibility

* load api dynamically
上级 96f4c9c2
显示空白变更内容
内联 并排
Showing with 527 addition and 447 deletion
docs/README.md
浏览文件 @ 686cf212
...@@ -140,7 +140,7 @@ Parameter details: ...@@ -140,7 +140,7 @@ Parameter details:
| --language | The language of the VisualDL panel. Language can be specified as 'en' or 'zh', and the default is the language used by the browser. | | --language | The language of the VisualDL panel. Language can be specified as 'en' or 'zh', and the default is the language used by the browser. |
| --public-path | The URL path of the VisualDL panel. The default path is '/app', meaning that the access address is 'http://<host>:<port>/app'. | | --public-path | The URL path of the VisualDL panel. The default path is '/app', meaning that the access address is 'http://<host>:<port>/app'. |
| --api-only | Decide whether or not to provide only API. If this parameter is set, VisualDL will only provides API service without displaying the web page, and the API address is 'http://<host>:<port>/<public_path>/api'. Additionally, If the public_path parameter is not specified, the default address is 'http://<host>:<port>/api'. | | --api-only | Decide whether or not to provide only API. If this parameter is set, VisualDL will only provides API service without displaying the web page, and the API address is 'http://<host>:<port>/<public_path>/api'. Additionally, If the public_path parameter is not specified, the default address is 'http://<host>:<port>/api'. |
| --component_tabs | Decide which components are presented in page, currently support 15 components, i.e. 'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'. If this parameter is set, only specified components will be presented. If not set, and specify --logdir parameter, only components with data in vdlrecords log are presented. If both --component_tabs and --logdir are not set, only present 'static_graph', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client' components by default | | --component_tabs | Decide which components are presented in page, currently support 15 components, i.e. 'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'. If this parameter is set, only specified components will be presented. If not set, and specify --logdir parameter, only components with data in vdlrecords log are presented. If both --component_tabs and --logdir are not set, only present 'static_graph' by default |
To visualize the log file generated in the previous step, developers can launch the panel through the command: To visualize the log file generated in the previous step, developers can launch the panel through the command:
...@@ -177,7 +177,7 @@ The interface parameters are as follows: ...@@ -177,7 +177,7 @@ The interface parameters are as follows:
| public_path | string | The URL path of the VisualDL panel. The default path is '/app', meaning that the access address is 'http://<host>:<port>/app'. | | public_path | string | The URL path of the VisualDL panel. The default path is '/app', meaning that the access address is 'http://<host>:<port>/app'. |
| api_only | boolean | Decide whether or not to provide only API. If this parameter is set, VisualDL will only provides API service without displaying the web page, and the API address is 'http://<host>:<port>/<public_path>/api'. Additionally, If the parameter public_path is not specified, the default address is 'http://<host>:<port>/api'. | | api_only | boolean | Decide whether or not to provide only API. If this parameter is set, VisualDL will only provides API service without displaying the web page, and the API address is 'http://<host>:<port>/<public_path>/api'. Additionally, If the parameter public_path is not specified, the default address is 'http://<host>:<port>/api'. |
| open_browser | boolean | Whether or not to open the browser. If this parameter is set as True, the browser will be openned automatically and VisualDL panel will be launched at the same time. If parameter api_only is specified as True, parameter open_browser can be ignored. | | open_browser | boolean | Whether or not to open the browser. If this parameter is set as True, the browser will be openned automatically and VisualDL panel will be launched at the same time. If parameter api_only is specified as True, parameter open_browser can be ignored. |
| component_tabs | string or list[string_1, string_2, ... , string_n] | Decide which components are presented in page, currently support 15 components, i.e. 'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'. If this parameter is set, only specified components will be presented. If not set, and specify --logdir parameter, only components with data in vdlrecords log are presented. If both --component_tabs and --logdir are not set, only present 'static_graph', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client' components by default | | component_tabs | string or list[string_1, string_2, ... , string_n] | Decide which components are presented in page, currently support 15 components, i.e. 'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'. If this parameter is set, only specified components will be presented. If not set, and specify --logdir parameter, only components with data in vdlrecords log are presented. If both --component_tabs and --logdir are not set, only present 'static_graph' by default |
To visualize the log file generated in the previous step, developers can launch the panel through the command: To visualize the log file generated in the previous step, developers can launch the panel through the command:
......
docs/README_CN.md
浏览文件 @ 686cf212
...@@ -150,7 +150,7 @@ visualdl --logdir <dir_1, dir_2, ... , dir_n> --host <host> --port <port> --cach ...@@ -150,7 +150,7 @@ visualdl --logdir <dir_1, dir_2, ... , dir_n> --host <host> --port <port> --cach
| --language | VisualDL面板语言，可指定为'en'或'zh'，默认为浏览器使用语言 | | --language | VisualDL面板语言，可指定为'en'或'zh'，默认为浏览器使用语言 |
| --public-path | VisualDL面板URL路径，默认是'/app'，即访问地址为'http://&lt;host&gt;:&lt;port&gt;/app' | | --public-path | VisualDL面板URL路径，默认是'/app'，即访问地址为'http://&lt;host&gt;:&lt;port&gt;/app' |
| --api-only | 是否只提供API，如果设置此参数，则VisualDL不提供页面展示，只提供API服务，此时API地址为'http://&lt;host&gt;:&lt;port&gt;/&lt;public_path&gt;/api'；若没有设置public_path参数，则默认为'http://&lt;host&gt;:&lt;port&gt;/api' | | --api-only | 是否只提供API，如果设置此参数，则VisualDL不提供页面展示，只提供API服务，此时API地址为'http://&lt;host&gt;:&lt;port&gt;/&lt;public_path&gt;/api'；若没有设置public_path参数，则默认为'http://&lt;host&gt;:&lt;port&gt;/api' |
| --component_tabs | 设定需要显示的组件，当前支持'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'共15个组件。如果设置了此参数，将只展示所指定的组件。如果没有设置此参数，当指定了--logdir参数时候，将会根据日志文件中拥有的数据类型来自动显示相应的组件。当没有指定--logdir参数，默认显示'static_graph', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'这四个名称代表的组件 | | --component_tabs | 设定需要显示的组件，当前支持'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'共15个组件。如果设置了此参数，将只展示所指定的组件。如果没有设置此参数，当指定了--logdir参数时候，将会根据日志文件中拥有的数据类型来自动显示相应的组件。当没有指定--logdir参数，默认显示'static_graph'组件 |
针对上一步生成的日志，启动命令为： 针对上一步生成的日志，启动命令为：
...@@ -189,7 +189,7 @@ visualdl.server.app.run(logdir, ...@@ -189,7 +189,7 @@ visualdl.server.app.run(logdir,
| public_path | string | VisualDL面板URL路径，默认是'/app'，即访问地址为'http://&lt;host&gt;:&lt;port&gt;/app' | | public_path | string | VisualDL面板URL路径，默认是'/app'，即访问地址为'http://&lt;host&gt;:&lt;port&gt;/app' |
| api_only | boolean | 是否只提供API，如果设置此参数，则VisualDL不提供页面展示，只提供API服务，此时API地址为'http://&lt;host&gt;:&lt;port&gt;/&lt;public_path&gt;/api'；若没有设置public_path参数，则默认为'http://&lt;host&gt;:&lt;port&gt;/api' | | api_only | boolean | 是否只提供API，如果设置此参数，则VisualDL不提供页面展示，只提供API服务，此时API地址为'http://&lt;host&gt;:&lt;port&gt;/&lt;public_path&gt;/api'；若没有设置public_path参数，则默认为'http://&lt;host&gt;:&lt;port&gt;/api' |
| open_browser | boolean | 是否打开浏览器，设置为True则在启动后自动打开浏览器并访问VisualDL面板，若设置api_only，则忽略此参数 | | open_browser | boolean | 是否打开浏览器，设置为True则在启动后自动打开浏览器并访问VisualDL面板，若设置api_only，则忽略此参数 |
| --component_tabs | string或list[string_1, string_2, ... , string_n] | 设定需要显示的组件，当前支持'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'共15个组件。如果设置了此参数，将只展示所指定的组件。如果没有设置此参数，当指定了--logdir参数时候，将会根据日志文件中拥有的数据类型来自动显示相应的组件。当没有指定--logdir参数，默认显示'static_graph', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'这四个名称代表的组件 | | --component_tabs | string或list[string_1, string_2, ... , string_n] | 设定需要显示的组件，当前支持'scalar', 'image', 'text', 'embeddings', 'audio', 'histogram', 'hyper_parameters', 'static_graph', 'dynamic_graph', 'pr_curve', 'roc_curve', 'profiler', 'x2paddle', 'fastdeploy_server', 'fastdeploy_client'共15个组件。如果设置了此参数，将只展示所指定的组件。如果没有设置此参数，当指定了--logdir参数时候，将会根据日志文件中拥有的数据类型来自动显示相应的组件。当没有指定--logdir参数，默认显示'static_graph'组件 |
针对上一步生成的日志，我们的启动脚本为： 针对上一步生成的日志，我们的启动脚本为：
......
requirements.txt
浏览文件 @ 686cf212
...@@ -9,10 +9,5 @@ six >= 1.14.0 ...@@ -9,10 +9,5 @@ six >= 1.14.0
matplotlib matplotlib
pandas pandas
packaging packaging
x2paddle >= 1.4.0
paddle2onnx >= 1.0.5
rarfile rarfile
gradio == 3.11.0
tritonclient[all]
psutil psutil
onnx >= 1.6.0
visualdl/server/api.py
浏览文件 @ 686cf212
...@@ -417,10 +417,7 @@ def get_component_tabs(*apis, vdl_args, request_args): ...@@ -417,10 +417,7 @@ def get_component_tabs(*apis, vdl_args, request_args):
all_tabs.update(api('component_tabs', request_args)) all_tabs.update(api('component_tabs', request_args))
all_tabs.add('static_graph') all_tabs.add('static_graph')
else: else:
return [ return ['static_graph']
'static_graph', 'x2paddle', 'fastdeploy_server',
'fastdeploy_client'
]
return list(all_tabs) return list(all_tabs)
......
visualdl/server/app.py
浏览文件 @ 686cf212
...@@ -36,8 +36,6 @@ from flask_babel import Babel ...@@ -36,8 +36,6 @@ from flask_babel import Babel
import visualdl.server import visualdl.server
from visualdl import __version__ from visualdl import __version__
from visualdl.component.inference.fastdeploy_lib import get_start_arguments from visualdl.component.inference.fastdeploy_lib import get_start_arguments
from visualdl.component.inference.fastdeploy_server import create_fastdeploy_api_call
from visualdl.component.inference.model_convert_server import create_model_convert_api_call
from visualdl.component.profiler.profiler_server import create_profiler_api_call from visualdl.component.profiler.profiler_server import create_profiler_api_call
from visualdl.server.api import create_api_call from visualdl.server.api import create_api_call
from visualdl.server.api import get_component_tabs from visualdl.server.api import get_component_tabs
...@@ -83,104 +81,76 @@ def create_app(args): # noqa: C901 ...@@ -83,104 +81,76 @@ def create_app(args): # noqa: C901
signal.SIGINT, signal.SIG_DFL signal.SIGINT, signal.SIG_DFL
) # we add this to prevent SIGINT not work in multiprocess queue waiting ) # we add this to prevent SIGINT not work in multiprocess queue waiting
babel = Babel(app, locale_selector=get_locale) # noqa:F841 babel = Babel(app, locale_selector=get_locale) # noqa:F841
# Babel api from flask_babel v3.0.0
api_call = create_api_call(args.logdir, args.model, args.cache_timeout)
profiler_api_call = create_profiler_api_call(args.logdir)
inference_api_call = create_model_convert_api_call()
fastdeploy_api_call = create_fastdeploy_api_call()
if args.telemetry: if args.telemetry:
update_util.PbUpdater(args.product).start() update_util.PbUpdater(args.product).start()
public_path = args.public_path public_path = args.public_path
api_path = public_path + '/api' api_path = public_path + '/api'
# Babel api from flask_babel v3.0.0
api_call = create_api_call(args.logdir, args.model, args.cache_timeout)
profiler_api_call = create_profiler_api_call(args.logdir)
if args.component_tabs is not None:
if 'x2paddle' in args.component_tabs:
try:
import x2paddle # noqa F401
except Exception:
os.system('pip install x2paddle')
os.system('pip install onnx')
try:
import paddle2onnx # noqa F401
except Exception:
os.system('pip install paddle2onnx')
from visualdl.component.inference.model_convert_server import create_model_convert_api_call
inference_api_call = create_model_convert_api_call()
def append_query_string(url): @app.route(
query_string = '' api_path + '/inference/<path:method>', methods=["GET", "POST"])
if request.query_string:
query_string = '?' + request.query_string.decode()
return url + query_string
if not args.api_only:
template = Template(
os.path.join(server_path, template_file_path),
PUBLIC_PATH=public_path,
BASE_URI=public_path,
API_URL=api_path,
TELEMETRY_ID='63a600296f8a71f576c4806376a9245b'
if args.telemetry else '',
THEME='' if args.theme is None else args.theme)
@app.route('/')
def base():
return redirect(append_query_string(public_path), code=302)
@app.route('/favicon.ico')
def favicon():
icon = os.path.join(template_file_path, 'favicon.ico')
if os.path.exists(icon):
return send_file(icon)
return 'file not found', 404
@app.route(public_path + '/')
def index():
return redirect(
append_query_string(public_path + '/index'), code=302)
@app.route(public_path + '/<path:filename>')
def serve_static(filename):
is_not_page_request = re.search(r'\..+$', filename)
response = template.render(
filename if is_not_page_request else 'index.html')
if not is_not_page_request:
response.set_cookie(
'vdl_lng',
get_locale(),
path='/',
samesite='Strict',
secure=False,
httponly=False)
return response
@app.route(api_path + '/<path:method>', methods=["GET", "POST"])
def serve_api(method):
data, mimetype, headers = api_call(method, request.args)
return make_response(
Response(data, mimetype=mimetype, headers=headers))
@app.route(api_path + '/profiler/<path:method>', methods=["GET", "POST"])
def serve_profiler_api(method):
data, mimetype, headers = profiler_api_call(method, request.args)
return make_response(
Response(data, mimetype=mimetype, headers=headers))
@app.route(api_path + '/inference/<path:method>', methods=["GET", "POST"])
def serve_inference_api(method): def serve_inference_api(method):
if request.method == 'POST': if request.method == 'POST':
data, mimetype, headers = inference_api_call(method, request.form) data, mimetype, headers = inference_api_call(
method, request.form)
else: else:
data, mimetype, headers = inference_api_call(method, request.args) data, mimetype, headers = inference_api_call(
method, request.args)
return make_response( return make_response(
Response(data, mimetype=mimetype, headers=headers)) Response(data, mimetype=mimetype, headers=headers))
@app.route(api_path + '/fastdeploy/<path:method>', methods=["GET", "POST"]) if 'fastdeploy_server' in args.component_tabs or 'fastdeploy_client' in args.component_tabs:
try:
import tritonclient # noqa F401
except Exception:
os.system('pip install tritonclient[all]')
try:
import gradio # noqa F401
except Exception:
os.system('pip install gradio==3.11.0')
from visualdl.component.inference.fastdeploy_server import create_fastdeploy_api_call
fastdeploy_api_call = create_fastdeploy_api_call()
@app.route(
api_path + '/fastdeploy/<path:method>',
methods=["GET", "POST"])
def serve_fastdeploy_api(method): def serve_fastdeploy_api(method):
if request.method == 'POST': if request.method == 'POST':
data, mimetype, headers = fastdeploy_api_call(method, request.form) data, mimetype, headers = fastdeploy_api_call(
method, request.form)
else: else:
data, mimetype, headers = fastdeploy_api_call(method, request.args) data, mimetype, headers = fastdeploy_api_call(
method, request.args)
return make_response( return make_response(
Response(data, mimetype=mimetype, headers=headers)) Response(data, mimetype=mimetype, headers=headers))
@app.route( @app.route(
api_path + '/fastdeploy/fastdeploy_client', methods=["GET", "POST"]) api_path + '/fastdeploy/fastdeploy_client',
methods=["GET", "POST"])
def serve_fastdeploy_create_fastdeploy_client(): def serve_fastdeploy_create_fastdeploy_client():
try: try:
if request.method == 'POST': if request.method == 'POST':
fastdeploy_api_call('create_fastdeploy_client', request.form) fastdeploy_api_call('create_fastdeploy_client',
request.form)
request_args = request.form request_args = request.form
else: else:
fastdeploy_api_call('create_fastdeploy_client', request.args) fastdeploy_api_call('create_fastdeploy_client',
request.args)
request_args = request.args request_args = request.args
except Exception as e: except Exception as e:
error_msg = '{}'.format(e) error_msg = '{}'.format(e)
...@@ -189,7 +159,8 @@ def create_app(args): # noqa: C901 ...@@ -189,7 +159,8 @@ def create_app(args): # noqa: C901
if args: if args:
return redirect( return redirect(
api_path + "/fastdeploy/fastdeploy_client/app?{}".format(args), api_path +
"/fastdeploy/fastdeploy_client/app?{}".format(args),
code=302) code=302)
return redirect( return redirect(
api_path + "/fastdeploy/fastdeploy_client/app", code=302) api_path + "/fastdeploy/fastdeploy_client/app", code=302)
...@@ -263,35 +234,43 @@ def create_app(args): # noqa: C901 ...@@ -263,35 +234,43 @@ def create_app(args): # noqa: C901
try: try:
if request_args.get('lang', 'zh') == 'en': if request_args.get('lang', 'zh') == 'en':
server_addr_match = re.search( server_addr_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("server ip", format(
json.dumps(
"server ip",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not server_addr_match or server_addr_match.group( if not server_addr_match or server_addr_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
server_addr_match = re.search( server_addr_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("server ip", format(
json.dumps(
"server ip",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
default_server_addr = server_addr_match.group(0) default_server_addr = server_addr_match.group(
0)
if '"value": ""' in default_server_addr: if '"value": ""' in default_server_addr:
cur_server_addr = default_server_addr.replace( cur_server_addr = default_server_addr.replace(
'"value": ""', '"value": "localhost"') '"value": ""', '"value": "localhost"')
else: else:
cur_server_addr = default_server_addr.replace( cur_server_addr = default_server_addr.replace(
'"value":""', '"value": "localhost"') '"value":""', '"value": "localhost"')
content = content.replace(default_server_addr, content = content.replace(
cur_server_addr) default_server_addr, cur_server_addr)
http_port_match = re.search( http_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("server port", format(
json.dumps(
"server port",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not http_port_match or http_port_match.group( if not http_port_match or http_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
http_port_match = re.search( http_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
format(
json.dumps( json.dumps(
"server port", "server port",
ensure_ascii=True).replace( ensure_ascii=True).replace(
...@@ -307,22 +286,26 @@ def create_app(args): # noqa: C901 ...@@ -307,22 +286,26 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(http_port)) '"value": "{}"'.format(http_port))
if http_port: if http_port:
content = content.replace(default_http_port, content = content.replace(
cur_http_port) default_http_port, cur_http_port)
metrics_port_match = re.search( metrics_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("metrics port", format(
json.dumps(
"metrics port",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not metrics_port_match or metrics_port_match.group( if not metrics_port_match or metrics_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
metrics_port_match = re.search( metrics_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
format(
json.dumps( json.dumps(
"metrics port", "metrics port",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
default_metrics_port = metrics_port_match.group(0) default_metrics_port = metrics_port_match.group(
0)
if '"value": ""' in default_metrics_port: if '"value": ""' in default_metrics_port:
cur_metrics_port = default_metrics_port.replace( cur_metrics_port = default_metrics_port.replace(
'"value": ""', '"value": ""',
...@@ -332,17 +315,20 @@ def create_app(args): # noqa: C901 ...@@ -332,17 +315,20 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(metrics_port)) '"value": "{}"'.format(metrics_port))
if metrics_port: if metrics_port:
content = content.replace(default_metrics_port, content = content.replace(
cur_metrics_port) default_metrics_port, cur_metrics_port)
model_name_match = re.search( model_name_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("model name", format(
json.dumps(
"model name",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_name_match or model_name_match.group( if not model_name_match or model_name_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_name_match = re.search( model_name_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
format(
json.dumps( json.dumps(
"model name", "model name",
ensure_ascii=True).replace( ensure_ascii=True).replace(
...@@ -357,98 +343,117 @@ def create_app(args): # noqa: C901 ...@@ -357,98 +343,117 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(model_name)) '"value": "{}"'.format(model_name))
if model_name: if model_name:
content = content.replace(default_model_name, content = content.replace(
cur_model_name) default_model_name, cur_model_name)
model_version_match = re.search( model_version_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("model version", format(
json.dumps(
"model version",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_version_match or model_version_match.group( if not model_version_match or model_version_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_version_match = re.search( model_version_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
format(
json.dumps( json.dumps(
"model version", "model version",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
default_model_version = model_version_match.group(0) default_model_version = model_version_match.group(
0)
if '"value": ""' in default_model_version: if '"value": ""' in default_model_version:
cur_model_version = default_model_version.replace( cur_model_version = default_model_version.replace(
'"value": ""', '"value": "{}"'.format('1')) '"value": ""',
'"value": "{}"'.format('1'))
else: else:
cur_model_version = default_model_version.replace( cur_model_version = default_model_version.replace(
'"value":""', '"value": "{}"'.format('1')) '"value":""',
content = content.replace(default_model_version, '"value": "{}"'.format('1'))
cur_model_version) content = content.replace(
default_model_version, cur_model_version)
else: else:
server_addr_match = re.search( server_addr_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("服务ip", ensure_ascii=True).replace( format(
json.dumps("服务ip",
ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not server_addr_match or server_addr_match.group( if not server_addr_match or server_addr_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
server_addr_match = re.search( server_addr_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("服务ip", format(
json.dumps(
"服务ip",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not server_addr_match: if not server_addr_match:
server_addr_match = re.search( server_addr_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'. '"label":\\s*{}.*?"value":\\s*"".*?}}'
format( .format(
json.dumps("服务ip", json.dumps(
ensure_ascii=False).replace( "服务ip", ensure_ascii=False
'\\', '\\\\')), content) ).replace('\\',
'\\\\')), content)
if not server_addr_match or server_addr_match.group( if not server_addr_match or server_addr_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
server_addr_match = re.search( server_addr_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'. '"value":\\s*"".*?"label":\\s*{}.*?}}'
format( .format(
json.dumps( json.dumps(
"服务ip", "服务ip",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
default_server_addr = server_addr_match.group(0) default_server_addr = server_addr_match.group(
0)
if '"value": ""' in default_server_addr: if '"value": ""' in default_server_addr:
cur_server_addr = default_server_addr.replace( cur_server_addr = default_server_addr.replace(
'"value": ""', '"value": "localhost"') '"value": ""', '"value": "localhost"')
else: else:
cur_server_addr = default_server_addr.replace( cur_server_addr = default_server_addr.replace(
'"value":""', '"value": "localhost"') '"value":""', '"value": "localhost"')
content = content.replace(default_server_addr, content = content.replace(
cur_server_addr) default_server_addr, cur_server_addr)
http_port_match = re.search( http_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("推理服务端口", format(
json.dumps(
"推理服务端口",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not http_port_match or http_port_match.group( if not http_port_match or http_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
http_port_match = re.search( http_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("推理服务端口", format(
json.dumps(
"推理服务端口",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not http_port_match: if not http_port_match:
http_port_match = re.search( http_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'. '"label":\\s*{}.*?"value":\\s*"".*?}}'
format( .format(
json.dumps( json.dumps(
"推理服务端口", "推理服务端口",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
if not http_port_match or http_port_match.group( if not http_port_match or http_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
http_port_match = re.search( http_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'. '"value":\\s*"".*?"label":\\s*{}.*?}}'
format( .format(
json.dumps( json.dumps(
"推理服务端口", "推理服务端口",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
default_http_port = http_port_match.group(0) default_http_port = http_port_match.group(0)
if '"value": ""' in default_http_port: if '"value": ""' in default_http_port:
...@@ -460,38 +465,45 @@ def create_app(args): # noqa: C901 ...@@ -460,38 +465,45 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(http_port)) '"value": "{}"'.format(http_port))
if http_port: if http_port:
content = content.replace(default_http_port, content = content.replace(
cur_http_port) default_http_port, cur_http_port)
metrics_port_match = re.search( metrics_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("性能服务端口", format(
json.dumps(
"性能服务端口",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not metrics_port_match or metrics_port_match.group( if not metrics_port_match or metrics_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
metrics_port_match = re.search( metrics_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("性能服务端口", format(
json.dumps(
"性能服务端口",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not metrics_port_match: if not metrics_port_match:
metrics_port_match = re.search( metrics_port_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'. '"label":\\s*{}.*?"value":\\s*"".*?}}'
format( .format(
json.dumps( json.dumps(
"性能服务端口", "性能服务端口",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
if not metrics_port_match or metrics_port_match.group( if not metrics_port_match or metrics_port_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
metrics_port_match = re.search( metrics_port_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'. '"value":\\s*"".*?"label":\\s*{}.*?}}'
format( .format(
json.dumps( json.dumps(
"性能服务端口", "性能服务端口",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
default_metrics_port = metrics_port_match.group(0) '\\\\')), content)
default_metrics_port = metrics_port_match.group(
0)
if '"value": ""' in default_metrics_port: if '"value": ""' in default_metrics_port:
cur_metrics_port = default_metrics_port.replace( cur_metrics_port = default_metrics_port.replace(
'"value": ""', '"value": ""',
...@@ -501,35 +513,41 @@ def create_app(args): # noqa: C901 ...@@ -501,35 +513,41 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(metrics_port)) '"value": "{}"'.format(metrics_port))
if metrics_port: if metrics_port:
content = content.replace(default_metrics_port, content = content.replace(
cur_metrics_port) default_metrics_port, cur_metrics_port)
model_name_match = re.search( model_name_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("模型名称", ensure_ascii=True).replace( format(
json.dumps("模型名称",
ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_name_match or model_name_match.group( if not model_name_match or model_name_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_name_match = re.search( model_name_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("模型名称", format(
json.dumps(
"模型名称",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_name_match: if not model_name_match:
model_name_match = re.search( model_name_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'. '"label":\\s*{}.*?"value":\\s*"".*?}}'
format( .format(
json.dumps("模型名称", json.dumps(
ensure_ascii=False).replace( "模型名称", ensure_ascii=False
'\\', '\\\\')), content) ).replace('\\',
'\\\\')), content)
if not model_name_match or model_name_match.group( if not model_name_match or model_name_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_name_match = re.search( model_name_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'. '"value":\\s*"".*?"label":\\s*{}.*?}}'
format( .format(
json.dumps( json.dumps(
"模型名称", "模型名称",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
default_model_name = model_name_match.group(0) default_model_name = model_name_match.group(0)
if '"value": ""' in default_model_name: if '"value": ""' in default_model_name:
cur_model_name = default_model_name.replace( cur_model_name = default_model_name.replace(
...@@ -540,55 +558,125 @@ def create_app(args): # noqa: C901 ...@@ -540,55 +558,125 @@ def create_app(args): # noqa: C901
'"value":""', '"value":""',
'"value": "{}"'.format(model_name)) '"value": "{}"'.format(model_name))
if model_name: if model_name:
content = content.replace(default_model_name, content = content.replace(
cur_model_name) default_model_name, cur_model_name)
model_version_match = re.search( model_version_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'.format( '"label":\\s*{}.*?"value":\\s*"".*?}}'.
json.dumps("模型版本", ensure_ascii=True).replace( format(
json.dumps("模型版本",
ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_version_match or model_version_match.group( if not model_version_match or model_version_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_version_match = re.search( model_version_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'.format( '"value":\\s*"".*?"label":\\s*{}.*?}}'.
json.dumps("模型版本", format(
json.dumps(
"模型版本",
ensure_ascii=True).replace( ensure_ascii=True).replace(
'\\', '\\\\')), content) '\\', '\\\\')), content)
if not model_version_match: if not model_version_match:
model_version_match = re.search( model_version_match = re.search(
'"label":\\s*{}.*?"value":\\s*"".*?}}'. '"label":\\s*{}.*?"value":\\s*"".*?}}'
format( .format(
json.dumps("模型版本", json.dumps(
ensure_ascii=False).replace( "模型版本", ensure_ascii=False
'\\', '\\\\')), content) ).replace('\\',
'\\\\')), content)
if not model_version_match or model_version_match.group( if not model_version_match or model_version_match.group(
0).count('"label"') >= 2: 0).count('"label"') >= 2:
model_version_match = re.search( model_version_match = re.search(
'"value":\\s*"".*?"label":\\s*{}.*?}}'. '"value":\\s*"".*?"label":\\s*{}.*?}}'
format( .format(
json.dumps( json.dumps(
"模型版本", "模型版本",
ensure_ascii=False).replace( ensure_ascii=False).
'\\', '\\\\')), content) replace('\\',
'\\\\')), content)
default_model_version = model_version_match.group(0) default_model_version = model_version_match.group(
0)
if '"value": ""' in default_model_version: if '"value": ""' in default_model_version:
cur_model_version = default_model_version.replace( cur_model_version = default_model_version.replace(
'"value": ""', '"value": "{}"'.format('1')) '"value": ""',
'"value": "{}"'.format('1'))
else: else:
cur_model_version = default_model_version.replace( cur_model_version = default_model_version.replace(
'"value":""', '"value": "{}"'.format('1')) '"value":""',
content = content.replace(default_model_version, '"value": "{}"'.format('1'))
cur_model_version) content = content.replace(
default_model_version, cur_model_version)
except Exception: except Exception:
pass pass
finally: finally:
content = content.encode() content = content.encode()
else: else:
content = resp.content content = resp.content
headers = [(name, value) for (name, value) in resp.raw.headers.items()] headers = [(name, value)
for (name, value) in resp.raw.headers.items()]
response = Response(content, resp.status_code, headers) response = Response(content, resp.status_code, headers)
return response return response
def append_query_string(url):
query_string = ''
if request.query_string:
query_string = '?' + request.query_string.decode()
return url + query_string
if not args.api_only:
template = Template(
os.path.join(server_path, template_file_path),
PUBLIC_PATH=public_path,
BASE_URI=public_path,
API_URL=api_path,
TELEMETRY_ID='63a600296f8a71f576c4806376a9245b'
if args.telemetry else '',
THEME='' if args.theme is None else args.theme)
@app.route('/')
def base():
return redirect(append_query_string(public_path), code=302)
@app.route('/favicon.ico')
def favicon():
icon = os.path.join(template_file_path, 'favicon.ico')
if os.path.exists(icon):
return send_file(icon)
return 'file not found', 404
@app.route(public_path + '/')
def index():
return redirect(
append_query_string(public_path + '/index'), code=302)
@app.route(public_path + '/<path:filename>')
def serve_static(filename):
is_not_page_request = re.search(r'\..+$', filename)
response = template.render(
filename if is_not_page_request else 'index.html')
if not is_not_page_request:
response.set_cookie(
'vdl_lng',
get_locale(),
path='/',
samesite='Strict',
secure=False,
httponly=False)
return response
@app.route(api_path + '/<path:method>', methods=["GET", "POST"])
def serve_api(method):
data, mimetype, headers = api_call(method, request.args)
return make_response(
Response(data, mimetype=mimetype, headers=headers))
@app.route(api_path + '/profiler/<path:method>', methods=["GET", "POST"])
def serve_profiler_api(method):
data, mimetype, headers = profiler_api_call(method, request.args)
return make_response(
Response(data, mimetype=mimetype, headers=headers))
@app.route(api_path + '/component_tabs') @app.route(api_path + '/component_tabs')
def component_tabs(): def component_tabs():
data, mimetype, headers = get_component_tabs( data, mimetype, headers = get_component_tabs(
......
visualdl/version.py
浏览文件 @ 686cf212
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
# limitations under the License. # limitations under the License.
# ======================================================================= # =======================================================================
vdl_version = '2.5.2' vdl_version = '2.5.3'
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或