优化交互，重构代码
This commit is contained in:
zhiyang7
parent
63efc96eac
commit
ef440bb065
383
main.py
383
main.py
|
|
@ -1,12 +1,15 @@
|
|||
import sys, os
|
||||
import getopt
|
||||
import pandas as pd
|
||||
import re
|
||||
import math
|
||||
import json
|
||||
from flask import Flask, jsonify, request, render_template
|
||||
import math
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import traceback
|
||||
|
||||
import pandas as pd
|
||||
from flask import Flask, jsonify, render_template, request
|
||||
from flask_cors import CORS
|
||||
from pypinyin import pinyin, lazy_pinyin, Style, style
|
||||
from pypinyin import Style, lazy_pinyin, style
|
||||
|
||||
app = Flask(__name__)
|
||||
app.config['JSON_AS_ASCII'] = False
|
||||
|
|
@ -39,37 +42,6 @@ def compute_pinyin(s, style=None):
|
|||
else:
|
||||
return ' '.join(lazy_pinyin(s, style=style))
|
||||
|
||||
def main(argv):
|
||||
# mode = '0'
|
||||
# parameter = '3323'
|
||||
# mode = '1'
|
||||
# parameter = 'bai vvv vv vvv,012 000 00 000;bai tou er xin,012 010 10 001'
|
||||
# mode = '2'
|
||||
# parameter = '2134'
|
||||
mode = '3'
|
||||
parameter = '行之有效 2134,00 11 10 00 0100 1101;各执一词 4212,00 11 12 22 0010 1022'
|
||||
num = 6
|
||||
try:
|
||||
opts, args = getopt.getopt(argv, "hm:p:n:", ["mode=", "parameter=", "num="])
|
||||
except getopt.GetoptError:
|
||||
print('test.py -m <mode> -p <parameter> -n <num>')
|
||||
sys.exit(2)
|
||||
for opt, arg in opts:
|
||||
if opt == '-h':
|
||||
print('test.py -i <mode> -o <parameter>')
|
||||
sys.exit()
|
||||
elif opt in ("-m", "--mode"):
|
||||
mode = arg
|
||||
elif opt in ("-p", "--parameter"):
|
||||
parameter = arg
|
||||
elif opt in ("-n", "--num"):
|
||||
num = int(arg)
|
||||
all_idiom, group = filter_logic(mode, parameter)
|
||||
if all_idiom is not None and len(group) > 0:
|
||||
print_max_group(all_idiom, group, num)
|
||||
else:
|
||||
print('未找到匹配项')
|
||||
|
||||
all_idiom = None
|
||||
|
||||
def init():
|
||||
|
|
@ -89,158 +61,15 @@ def init():
|
|||
all_idiom['pinyin_finals'] = all_idiom.apply(lambda x: ','.join(list(lazy_pinyin(x['word'], style=Style.FINALS, strict=False))), axis=1)
|
||||
all_idiom.to_csv("all_idiom.csv")
|
||||
|
||||
def filter_logic(mode, parameter):
|
||||
global all_idiom
|
||||
if mode == '0':
|
||||
groups = all_idiom.groupby(by='pinyin_rt')
|
||||
group = groups.get_group(int(parameter)).copy()
|
||||
return all_idiom, group
|
||||
elif mode == '1':
|
||||
parameter_rst = parameter.split(';', 1)
|
||||
if len(parameter_rst) > 1:
|
||||
parameter_rst = parameter_rst[1]
|
||||
else:
|
||||
parameter_rst = ''
|
||||
parameter = parameter.split(';')[0]
|
||||
def fetch_next_input(parameter):
|
||||
parameter_rst = parameter.split(';', 1)
|
||||
if len(parameter_rst) > 1:
|
||||
parameter_rst = parameter_rst[1]
|
||||
else:
|
||||
parameter_rst = ''
|
||||
parameter = parameter.split(';')[0]
|
||||
return parameter,parameter_rst
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = trim_space(parameter.split(',')[0])
|
||||
|
||||
count = ''.join([str(len(x)) for x in hits.split()])
|
||||
groups = all_idiom.groupby(by='pinyin_rt')
|
||||
group = groups.get_group(int(count)).copy()
|
||||
|
||||
while(True):
|
||||
group = filter_group_mode1(parameter, group, hits)
|
||||
if(len(group) > 1 and len(parameter_rst) > 0):
|
||||
parameter = parameter_rst.split(';')[0]
|
||||
parameter_rst = parameter_rst.split(';', 1)
|
||||
if len(parameter_rst) > 1:
|
||||
parameter_rst = parameter_rst[1]
|
||||
else:
|
||||
parameter_rst = ''
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = trim_space(parameter.split(',')[0])
|
||||
elif len(group) <= 0:
|
||||
break
|
||||
else:
|
||||
break
|
||||
return all_idiom, group
|
||||
elif mode == '2':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['pinyin_tone'].str.startswith(parameter)].copy()
|
||||
return four_idiom, group
|
||||
elif mode == '3':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
parameter_rst = parameter.split(';', 1)
|
||||
if len(parameter_rst) > 1:
|
||||
parameter_rst = parameter_rst[1]
|
||||
else:
|
||||
parameter_rst = ''
|
||||
parameter = parameter.split(';')[0]
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = parameter.split(',')[0]
|
||||
tones = parameter[-4:]
|
||||
tone_hits=hits[-4:]
|
||||
word_hits=hits[-9:-5]
|
||||
parameter = parameter[:-5]
|
||||
hits=hits[:-10]
|
||||
|
||||
group = four_idiom.copy()
|
||||
while(True):
|
||||
group = filter_group_model2(parameter, group, hits, tones, tone_hits, word_hits)
|
||||
if(len(group) > 1 and len(parameter_rst) > 0):
|
||||
parameter = parameter_rst.split(';')[0]
|
||||
parameter_rst = parameter_rst.split(';', 1)
|
||||
if len(parameter_rst) > 1:
|
||||
parameter_rst = parameter_rst[1]
|
||||
else:
|
||||
parameter_rst = ''
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = parameter.split(',')[0]
|
||||
tones = parameter[-4:]
|
||||
tone_hits=hits[-4:]
|
||||
word_hits=hits[-9:-5]
|
||||
parameter = parameter[:-5]
|
||||
hits=hits[:-10]
|
||||
elif len(group) <= 0:
|
||||
break
|
||||
else:
|
||||
break
|
||||
return four_idiom, group
|
||||
elif mode == '4':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['word'].str.count(parameter) > 0].copy()
|
||||
return four_idiom, group
|
||||
elif mode == '5':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['pinyin_r'].str.count(parameter) > 0].copy()
|
||||
return four_idiom, group
|
||||
return None, None
|
||||
|
||||
def filter_group_model2(parameter, group, hits, tones, tone_hits, word_hits):
|
||||
group = filter_with_target_field(group, 'pinyin_tone', tones, tone_hits)
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
group = filter_with_target_field(group, 'word', parameter, word_hits)
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
hits = hits.split()
|
||||
for i in range(4):
|
||||
target = parameter[i]
|
||||
targets = list()
|
||||
targets.append(lazy_pinyin(target, style=Style.INITIALS, strict=False)[0])
|
||||
targets.append(lazy_pinyin(target, style=Style.FINALS, strict=False)[0])
|
||||
pinyin_hit = hits[i]
|
||||
for j,name in enumerate(['initials', 'finals']):
|
||||
key = 'pinyin_%s' % name
|
||||
if pinyin_hit[j] == '0':
|
||||
group = group[group[key].str.count('(^|[,])%s([,]|$)' + targets[j]) == 0]
|
||||
elif pinyin_hit[j] == '1':
|
||||
group = group[(group[key].str.count('(^|[,])%s([,]|$)' % targets[j]) > 0) & (group[key].str.count(('^(\w*,){%d}%s([,]|$)' % (i, targets[j]))) == 0)]
|
||||
elif pinyin_hit[j] == '2':
|
||||
group = group[group[key].str.count(('^(\w*,){%d}%s([,]|$)' % (i, targets[j]))) > 0]
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
return group
|
||||
|
||||
def filter_with_target_field(group, field_name, values, value_hits):
|
||||
includes_value = set()
|
||||
for i in range(4):
|
||||
if value_hits[i] == '2':
|
||||
includes_value.add(values[i])
|
||||
for i in range(4):
|
||||
if value_hits[i] == '0' and values[i] not in includes_value:
|
||||
group = group[~group[field_name].str.contains(values[i], regex=False, case=True, na=False)]
|
||||
elif value_hits[i] == '1':
|
||||
group = group[(group[field_name].str[i] != values[i]) & group[field_name].str.contains(values[i], regex=False, case=True, na=False)]
|
||||
includes_value.add(values[i])
|
||||
elif value_hits[i] == '2':
|
||||
group = group[group[field_name].str[i] == values[i]]
|
||||
if len(group) <= 1:
|
||||
break
|
||||
return group
|
||||
|
||||
def print_max_group(all_idiom, group, num):
|
||||
for item in get_max_group(all_idiom, group, num):
|
||||
print(item)
|
||||
|
||||
def get_max_group(all_idiom, group, num):
|
||||
result = list()
|
||||
if(len(group) == 0):
|
||||
return result
|
||||
group['pinyin_c'] = group.apply(lambda x: (math.log(x['frequency'], 2)/16 + 1) * len(set(trim_space(x['pinyin_r']))), axis=1)
|
||||
ret_list = group.nlargest(num, ['pinyin_c', 'frequency']).index.tolist()
|
||||
for i in ret_list:
|
||||
result.append(json.loads(all_idiom.loc[i].to_json(orient = 'index',force_ascii=False)))
|
||||
return result
|
||||
|
||||
'''
|
||||
parameter: xxx xx xx xxx
|
||||
hits: 010 02 22 001
|
||||
'''
|
||||
def filter_group_mode1(parameter, group, hits):
|
||||
for i in range(len(parameter)):
|
||||
key0 = 'pinyin0_%d' % i
|
||||
|
|
@ -269,20 +98,184 @@ def filter_group_mode1(parameter, group, hits):
|
|||
break
|
||||
return group
|
||||
|
||||
def filter_with_target_field(group, field_name, values, value_hits):
|
||||
includes_value = set()
|
||||
for i in range(4):
|
||||
if value_hits[i] == '2':
|
||||
includes_value.add(values[i])
|
||||
for i in range(4):
|
||||
if value_hits[i] == '0' and values[i] not in includes_value:
|
||||
group = group[~group[field_name].str.contains(values[i], regex=False, case=True, na=False)]
|
||||
elif value_hits[i] == '1':
|
||||
group = group[(group[field_name].str[i] != values[i]) & group[field_name].str.contains(values[i], regex=False, case=True, na=False)]
|
||||
includes_value.add(values[i])
|
||||
elif value_hits[i] == '2':
|
||||
group = group[group[field_name].str[i] == values[i]]
|
||||
if len(group) <= 1:
|
||||
break
|
||||
return group
|
||||
|
||||
def filter_group_model2(parameter, group, hits, tones, tone_hits, word_hits):
|
||||
group = filter_with_target_field(group, 'pinyin_tone', tones, tone_hits)
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
group = filter_with_target_field(group, 'word', parameter, word_hits)
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
hits = hits.split()
|
||||
for i in range(4):
|
||||
target = parameter[i]
|
||||
targets = list()
|
||||
targets.append(lazy_pinyin(target, style=Style.INITIALS, strict=False)[0])
|
||||
targets.append(lazy_pinyin(target, style=Style.FINALS, strict=False)[0])
|
||||
pinyin_hit = hits[i]
|
||||
for j,name in enumerate(['initials', 'finals']):
|
||||
key = 'pinyin_%s' % name
|
||||
if pinyin_hit[j] == '0':
|
||||
group = group[group[key].str.count('(^|[,])%s([,]|$)' + targets[j]) == 0]
|
||||
elif pinyin_hit[j] == '1':
|
||||
group = group[(group[key].str.count('(^|[,])%s([,]|$)' % targets[j]) > 0) & (group[key].str.count(('^(\w*,){%d}%s([,]|$)' % (i, targets[j]))) == 0)]
|
||||
elif pinyin_hit[j] == '2':
|
||||
group = group[group[key].str.count(('^(\w*,){%d}%s([,]|$)' % (i, targets[j]))) > 0]
|
||||
if len(group) <= 1:
|
||||
return group
|
||||
return group
|
||||
|
||||
def filter_logic(mode, parameter):
|
||||
global all_idiom
|
||||
if mode == '0':
|
||||
groups = all_idiom.groupby(by='pinyin_rt')
|
||||
group = groups.get_group(int(parameter)).copy()
|
||||
return all_idiom, group
|
||||
elif mode == '1':
|
||||
parameter, parameter_rst = fetch_next_input(parameter)
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = trim_space(parameter.split(',')[0])
|
||||
|
||||
count = ''.join([str(len(x)) for x in hits.split()])
|
||||
groups = all_idiom.groupby(by='pinyin_rt')
|
||||
group = groups.get_group(int(count)).copy()
|
||||
|
||||
while(True):
|
||||
group = filter_group_mode1(parameter, group, hits)
|
||||
if(len(group) > 1 and len(parameter_rst) > 0):
|
||||
parameter, parameter_rst = fetch_next_input(parameter)
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = trim_space(parameter.split(',')[0])
|
||||
elif len(group) <= 0:
|
||||
break
|
||||
else:
|
||||
break
|
||||
return all_idiom, group
|
||||
elif mode == '2':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['pinyin_tone'].str.startswith(parameter)].copy()
|
||||
return four_idiom, group
|
||||
elif mode == '3':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
|
||||
parameter, parameter_rst = fetch_next_input(parameter)
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = parameter.split(',')[0]
|
||||
tones = ''.join(lazy_pinyin(parameter, style="TONE_ONLY"))
|
||||
tone_hits=hits[-4:]
|
||||
word_hits=hits[-9:-5]
|
||||
hits=hits[:-10]
|
||||
|
||||
group = four_idiom.copy()
|
||||
while(True):
|
||||
group = filter_group_model2(parameter, group, hits, tones, tone_hits, word_hits)
|
||||
if(len(group) > 1 and len(parameter_rst) > 0):
|
||||
parameter, parameter_rst = fetch_next_input(parameter)
|
||||
|
||||
hits = parameter.split(',')[1]
|
||||
parameter = parameter.split(',')[0]
|
||||
tones = ''.join(lazy_pinyin(parameter, style="TONE_ONLY"))
|
||||
tone_hits=hits[-4:]
|
||||
word_hits=hits[-9:-5]
|
||||
hits=hits[:-10]
|
||||
elif len(group) <= 0:
|
||||
break
|
||||
else:
|
||||
break
|
||||
return four_idiom, group
|
||||
elif mode == '4':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['word'].str.count(parameter) > 0].copy()
|
||||
return four_idiom, group
|
||||
elif mode == '5':
|
||||
four_idiom = all_idiom[all_idiom['word'].str.len() == 4]
|
||||
group = four_idiom[four_idiom['pinyin_r'].str.count(parameter) > 0].copy()
|
||||
return four_idiom, group
|
||||
return None, None
|
||||
|
||||
def print_max_group(all_idiom, group, num):
|
||||
for item in get_max_group(all_idiom, group, num):
|
||||
print(item)
|
||||
|
||||
def get_max_group(all_idiom, group, num):
|
||||
result = list()
|
||||
if(len(group) == 0):
|
||||
return result
|
||||
group['pinyin_c'] = group.apply(lambda x: (math.log(x['frequency'], 2)/16 + 1) * len(set(trim_space(x['pinyin_r']))), axis=1)
|
||||
ret_list = group.nlargest(num, ['pinyin_c', 'frequency']).index.tolist()
|
||||
for i in ret_list:
|
||||
result.append(json.loads(all_idiom.loc[i].to_json(orient = 'index',force_ascii=False)))
|
||||
return result
|
||||
|
||||
@app.route('/predict', methods=['GET'])
|
||||
def predict():
|
||||
mode = request.args.get('mode')
|
||||
parameter = request.args.get('parameter')
|
||||
if len(trim_space(parameter)) == 0:
|
||||
return jsonify({'status': 1, 'message': '请输入参数', 'result': []})
|
||||
all_idiom, group = filter_logic(mode, parameter)
|
||||
result = get_max_group(all_idiom, group, 6)
|
||||
return jsonify({'status': 0, 'message': 'success', 'result': result})
|
||||
try:
|
||||
mode = request.args.get('mode')
|
||||
parameter = request.args.get('parameter')
|
||||
if len(trim_space(parameter)) == 0:
|
||||
return jsonify({'status': 1, 'message': '请输入参数', 'result': []})
|
||||
all_idiom, group = filter_logic(mode, parameter)
|
||||
result = get_max_group(all_idiom, group, 6)
|
||||
return jsonify({'status': 0, 'message': 'success', 'result': result})
|
||||
except:
|
||||
traceback.print_exc()
|
||||
return jsonify({'status': 2, 'message': '执行出错', 'result': []})
|
||||
|
||||
|
||||
@app.route('/', methods=['GET'])
|
||||
def index():
|
||||
return render_template('index.html')
|
||||
|
||||
def main(argv):
|
||||
# mode = '0'
|
||||
# parameter = '3323'
|
||||
# mode = '1'
|
||||
# parameter = 'bai vvv vv vvv,012 000 00 000;bai tou er xin,012 010 10 001'
|
||||
# mode = '2'
|
||||
# parameter = '2134'
|
||||
mode = '3'
|
||||
parameter = '行之有效,00 11 10 00 0100 1101;各执一词,00 11 12 22 0010 1022'
|
||||
num = 6
|
||||
try:
|
||||
opts, args = getopt.getopt(argv, "hm:p:n:", ["mode=", "parameter=", "num="])
|
||||
except getopt.GetoptError:
|
||||
print('test.py -m <mode> -p <parameter> -n <num>')
|
||||
sys.exit(2)
|
||||
for opt, arg in opts:
|
||||
if opt == '-h':
|
||||
print('test.py -i <mode> -o <parameter>')
|
||||
sys.exit()
|
||||
elif opt in ("-m", "--mode"):
|
||||
mode = arg
|
||||
elif opt in ("-p", "--parameter"):
|
||||
parameter = arg
|
||||
elif opt in ("-n", "--num"):
|
||||
num = int(arg)
|
||||
all_idiom, group = filter_logic(mode, parameter)
|
||||
if all_idiom is not None and len(group) > 0:
|
||||
print_max_group(all_idiom, group, num)
|
||||
else:
|
||||
print('未找到匹配项')
|
||||
|
||||
if __name__ == '__main__':
|
||||
current_work_dir = os.path.dirname(__file__)
|
||||
os.chdir(current_work_dir)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,15 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container alert alert-success" role="alert">
|
||||
<h4 class="alert-heading">使用说明</h4>
|
||||
<hr>
|
||||
<p>英文逗号分割输入和命中结果,多次尝试使用分号分割;0: 未命中,1: 部分命中, 2: 精确命中</p>
|
||||
<hr>
|
||||
<p>参数说明: </p>
|
||||
<p>拼音1 - 4个数字，表示每个字的拼音位数; 拼音2: 输入尝试状态和结果</p>
|
||||
<p>汉兜1 - 4个数字，表示每个字的拼音声调; 汉兜2: 输入尝试状态和结果, 命中结果输入顺序(拼音声母韵母,汉字位置,汉字声调)</p>
|
||||
</div>
|
||||
<form id="para" class="form-horizontal container">
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-2 col-form-label">模式</label>
|
||||
|
|
@ -84,7 +93,7 @@
|
|||
$("#parameter").attr('placeholder', '2134')
|
||||
break
|
||||
case '3':
|
||||
$("#parameter").attr('placeholder', '各执一词 4212,00 11 12 22 0010 1022')
|
||||
$("#parameter").attr('placeholder', '各执一词,00 11 12 22 0010 1022')
|
||||
break
|
||||
case '4':
|
||||
$("#parameter").attr('placeholder', '^..之急$')
|
||||
|
|
@ -115,7 +124,7 @@
|
|||
$('#result').val(result.message)
|
||||
}
|
||||
},
|
||||
error: function(){
|
||||
error: function () {
|
||||
$('#result').val('出错了，请检查参数')
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue