Przeglądaj źródła

修改了数据库的冲突

yangtaodemon 5 miesięcy temu
rodzic
commit
42caae28a3
3 zmienionych plików z 6 dodań i 8 usunięć
  1. BIN
      api/SoilAcidification.db
  2. 1 3
      api/app/model.py
  3. 5 5
      api/app/routes.py

BIN
api/SoilAcidification.db


+ 1 - 3
api/app/model.py

@@ -43,7 +43,6 @@ def train_and_save_model(dataset_id, model_type, model_name, model_description):
     return saved_model, mse
 
 
-
 if __name__ == '__main__':
     # 反酸模型预测
     # 测试 predict 函数
@@ -64,7 +63,6 @@ if __name__ == '__main__':
     Acid_reflux_result = predict(input_data, model_name)
     print("Acid_reflux_result:", Acid_reflux_result)  # 预测结果
 
-
     # 降酸模型预测
     # 测试 predict 函数
     input_data = pd.DataFrame([{
@@ -77,4 +75,4 @@ if __name__ == '__main__':
 
     model_name = 'rf_model_1214_1008'
     Acid_reduce_result = predict(input_data, model_name)
-    print("Acid_reduce_result:", Acid_reduce_result)  # 预测结果
+    print("Acid_reduce_result:", Acid_reduce_result)  # 预测结果

+ 5 - 5
api/app/routes.py

@@ -13,6 +13,7 @@ from sqlalchemy.orm import sessionmaker
 # 创建蓝图 (Blueprint),用于分离路由
 bp = Blueprint('routes', __name__)
 
+
 @bp.route('/upload-dataset', methods=['POST'])
 def upload_dataset():
     try:
@@ -113,6 +114,7 @@ def list_tables():
     table_names = inspector.get_table_names()  # 获取所有表名
     return jsonify(table_names)  # 以 JSON 形式返回表名列表
 
+
 @bp.route('/models/<int:model_id>', methods=['GET'])
 def get_model(model_id):
     try:
@@ -130,6 +132,7 @@ def get_model(model_id):
     except Exception as e:
         return jsonify({'error': 'Internal server error', 'message': str(e)}), 500
 
+
 @bp.route('/models', methods=['GET'])
 def get_all_models():
     try:
@@ -151,6 +154,7 @@ def get_all_models():
     except Exception as e:
         return jsonify({'error': 'Internal server error', 'message': str(e)}), 500
 
+
 @bp.route('/model-parameters', methods=['GET'])
 def get_all_model_parameters():
     try:
@@ -171,6 +175,7 @@ def get_all_model_parameters():
     except Exception as e:
         return jsonify({'error': 'Internal server error', 'message': str(e)}), 500
 
+
 @bp.route('/models/<int:model_id>/parameters', methods=['GET'])
 def get_model_parameters(model_id):
     try:
@@ -223,7 +228,6 @@ def add_item():
     尝试将数据插入到指定的表中。
     :return:
     """
-    db = get_db()
     try:
         # 确保请求体是JSON格式
         data = request.get_json()
@@ -284,7 +288,6 @@ def delete_item():
             "message": "条件格式错误,应为 'key=value'"
         }), 400
 
-    db = get_db()
     cur = db.cursor()
 
     try:
@@ -333,7 +336,6 @@ def update_record():
     record_id = item[id_key]
     updates = {key: value for key, value in item.items() if key != id_key}  # 排除 ID
 
-    db = get_db()
     cur = db.cursor()
 
     try:
@@ -388,7 +390,6 @@ def sql_search():
         Id = data['id']
 
         # 连接到数据库
-        db = get_db()
         cur = db.cursor()
 
         # 构造查询语句
@@ -434,7 +435,6 @@ def get_table():
     if not table_name:
         return jsonify({'error': '需要表名'}), 400
 
-    db = get_db()
     try:
         cur = db.cursor()
         cur.execute(f"SELECT * FROM {table_name}")