|
@@ -3,6 +3,7 @@ import sys
|
|
|
from flask import Flask, request, jsonify
|
|
|
|
|
|
from commonUtil import fill_template, fill_template_auto
|
|
|
+from responseUtil import *
|
|
|
from similarity_answer_json import *
|
|
|
from util import *
|
|
|
import os
|
|
@@ -40,8 +41,9 @@ def process_query_route():
|
|
|
data = request.get_json()
|
|
|
query = data.get("query")
|
|
|
if not query:
|
|
|
- return jsonify({"error": "Query cannot be empty"}), 400
|
|
|
-
|
|
|
+ # return jsonify({"error": "Query cannot be empty"}), 400
|
|
|
+ # return jsonify({"error": "Query cannot be empty"}), 400
|
|
|
+ return jsonify(error_response("Query cannot be empty"))
|
|
|
try:
|
|
|
result = process_query(query, template_dict, TEMPLATE_FOLDER)
|
|
|
|
|
@@ -55,7 +57,8 @@ def process_query_route():
|
|
|
"name": result["name"],
|
|
|
"play": result["play"]
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
# 查询类问题:
|
|
|
if result['type'] == 'query':
|
|
|
if result["flag"]:
|
|
@@ -75,7 +78,8 @@ def process_query_route():
|
|
|
"play": result["play"],
|
|
|
"unit": result["unit"],
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
# 计算类问题
|
|
|
elif result['type'] == 'calculate':
|
|
|
conditions = result["conditions"]
|
|
@@ -95,7 +99,8 @@ def process_query_route():
|
|
|
"play": result["play"],
|
|
|
"unit": result["unit"],
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
# 最值类问题
|
|
|
elif result['type'] == 'compare_max_min':
|
|
|
find_max = str(result['find_max']).lower() == 'true'
|
|
@@ -117,7 +122,8 @@ def process_query_route():
|
|
|
"play": result["play"],
|
|
|
"unit": result["unit"],
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
# TopN
|
|
|
elif result['type'] == 'topN':
|
|
|
topN = result["conditions"]['rank']
|
|
@@ -143,7 +149,8 @@ def process_query_route():
|
|
|
"play": result["play"],
|
|
|
"unit": result["unit"],
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
# TopN
|
|
|
elif result['type'] == 'rank':
|
|
|
rank = result["conditions"]['rank2']
|
|
@@ -174,9 +181,11 @@ def process_query_route():
|
|
|
"qcode": result["qcode"],
|
|
|
"unit": result["unit"],
|
|
|
}
|
|
|
- return jsonify(response)
|
|
|
+ # return jsonify(response)
|
|
|
+ return jsonify(success_response(data=response))
|
|
|
except Exception as e:
|
|
|
- return jsonify({"error": str(e)}), 500
|
|
|
+ # return jsonify({"error": str(e)}), 500
|
|
|
+ return jsonify(error_response(data=str(e)))
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|