04031530

models_processing/model_tf/tf_cnn_pre.py

@@ -13,6 +13,7 @@ from common.processing_data_common import missing_features, str_to_list
 from data_processing.data_operation.data_handler import DataHandler
 from threading import Lock
 import time, yaml, os
+from copy import deepcopy
 model_lock = Lock()
 from itertools import chain
 from common.logs import Log
@@ -23,34 +24,35 @@ np.random.seed(42)  # NumPy随机种子
 # tf.set_random_seed(42)  # TensorFlow随机种子
 app = Flask('tf_cnn_pre——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'cnn.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    cnn = CNNHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'cnn.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    if 'features' in args_dict:
-        args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    cnn.opt = opt
-    g.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.cnn = CNNHandler(logger, g.opt)
 
-@app.route('/nn_cnn_predict', methods=['POST'])
+@app.route('/tf_cnn_predict', methods=['POST'])
 def model_prediction_bp():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    cnn = g.cnn
+    args = g.opt.__dict__
+    logger.info("Program starts execution!")
     try:
         pre_data = get_data_from_mongo(args)
         if args.get('algorithm_test', 0):

models_processing/model_tf/tf_cnn_train.py

@@ -6,11 +6,12 @@
 # company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request
+from flask import Flask, request, g
 import traceback
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml
+from copy import deepcopy
 from models_processing.model_tf.tf_cnn import CNNHandler
 from common.database_dml_koi import *
 import matplotlib.pyplot as plt
@@ -20,32 +21,35 @@ logger = Log('tf_cnn').logger
 np.random.seed(42)  # NumPy随机种子
 app = Flask('tf_cnn_train——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'cnn.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    cnn = CNNHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'cnn.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    cnn.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.cnn = CNNHandler(logger, g.opt)
 
-@app.route('/nn_cnn_training', methods=['POST'])
+@app.route('/tf_cnn_training', methods=['POST'])
 def model_training_bp():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    cnn = g.cnn
+    args = deepcopy(g.opt.__dict__)
+    logger.info("Program starts execution!")
     try:
         # ------------ 获取数据，预处理训练数据 ------------
         train_data = get_data_from_mongo(args)

models_processing/model_tf/tf_lstm_pre.py

@@ -13,6 +13,7 @@ from common.processing_data_common import missing_features, str_to_list
 from data_processing.data_operation.data_handler import DataHandler
 from threading import Lock
 import time, yaml
+from copy import deepcopy
 model_lock = Lock()
 from itertools import chain
 from common.logs import Log
@@ -23,34 +24,35 @@ np.random.seed(42)  # NumPy随机种子
 # tf.set_random_seed(42)  # TensorFlow随机种子
 app = Flask('tf_lstm_pre——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'lstm.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    ts = TSHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'lstm.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    if 'features' in args_dict:
-        args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    ts.opt = opt
-    g.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.ts = TSHandler(logger, g.opt)
 
-@app.route('/nn_lstm_predict', methods=['POST'])
+@app.route('/tf_lstm_predict', methods=['POST'])
 def model_prediction_bp():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    ts = g.ts
+    args = g.opt.__dict__
+    logger.info("Program starts execution!")
     try:
         pre_data = get_data_from_mongo(args)
         if args.get('algorithm_test', 0):

models_processing/model_tf/tf_lstm_train.py

@@ -6,11 +6,12 @@
 # @Company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request, jsonify
+from flask import Flask, request, jsonify, g
 import traceback, uuid
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml, threading
+from copy import deepcopy
 from models_processing.model_tf.tf_lstm import TSHandler
 from common.database_dml_koi import *
 from common.logs import Log
@@ -18,32 +19,36 @@ logger = Log('tf_ts').logger
 np.random.seed(42)  # NumPy随机种子
 app = Flask('tf_lstm_train——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'lstm.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    ts = TSHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'lstm.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    ts.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.ts = TSHandler(logger, g.opt)
 
-@app.route('/nn_lstm_training', methods=['POST'])
+
+@app.route('/tf_lstm_training', methods=['POST'])
 def model_training_bp():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    ts = g.ts
+    args = deepcopy(g.opt.__dict__)
+    logger.info("Program starts execution!")
     try:
         # ------------ 获取数据，预处理训练数据 ------------
         train_data = get_data_from_mongo(args)

models_processing/model_tf/tf_test_pre.py

@@ -13,6 +13,7 @@ from common.processing_data_common import missing_features, str_to_list
 from data_processing.data_operation.data_handler import DataHandler
 from threading import Lock
 import time, yaml
+from copy import deepcopy
 model_lock = Lock()
 from itertools import chain
 from common.logs import Log
@@ -23,34 +24,35 @@ np.random.seed(42)  # NumPy随机种子
 # tf.set_random_seed(42)  # TensorFlow随机种子
 app = Flask('tf_test_pre——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'test.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    ts = TSHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'test.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    if 'features' in args_dict:
-        args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    ts.opt = opt
-    g.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.ts = TSHandler(logger, g.opt)
 
-@app.route('/nn_test_predict', methods=['POST'])
+@app.route('/tf_test_predict', methods=['POST'])
 def model_prediction_test():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    ts = g.ts
+    args = g.opt.__dict__
+    logger.info("Program starts execution!")
     try:
         pre_data = get_data_from_mongo(args)
         if args.get('algorithm_test', 0):

models_processing/model_tf/tf_test_train.py

@@ -6,11 +6,12 @@
 # @Company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request, jsonify
+from flask import Flask, request, jsonify, g
 import traceback, uuid
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml, threading
+from copy import deepcopy
 from models_processing.model_tf.tf_test import TSHandler
 from common.database_dml_koi import *
 from common.logs import Log
@@ -18,32 +19,35 @@ logger = Log('tf_test').logger
 np.random.seed(42)  # NumPy随机种子
 app = Flask('tf_test_train——service')
 
-with app.app_context():
-    current_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(current_dir, 'test.yaml'), 'r', encoding='utf-8') as f:
-        args = yaml.safe_load(f)
-
-    dh = DataHandler(logger, args)
-    ts = TSHandler(logger, args)
+current_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(current_dir, 'test.yaml'), 'r', encoding='utf-8') as f:
+    global_config = yaml.safe_load(f)  # 只读的全局配置
 
 @app.before_request
 def update_config():
     # ------------ 整理参数，整合请求参数 ------------
-    args_dict = request.values.to_dict()
-    args_dict['features'] = args_dict['features'].split(',')
-    args.update(args_dict)
-    opt = argparse.Namespace(**args)
-    dh.opt = opt
-    ts.opt = opt
-    logger.info(args)
+    # 深拷贝全局配置 + 合并请求参数
+    current_config = deepcopy(global_config)
+    request_args = request.values.to_dict()
+    # features参数规则：1.有传入，解析，覆盖 2. 无传入，不覆盖，原始值
+    request_args['features'] = request_args['features'].split(',') if 'features' in request_args else current_config['features']
+    current_config.update(request_args)
+
+    # 存储到请求上下文
+    g.opt = argparse.Namespace(**current_config)
+    g.dh = DataHandler(logger, g.opt)  # 每个请求独立实例
+    g.ts = TSHandler(logger, g.opt)
 
-@app.route('/nn_test_training', methods=['POST'])
+@app.route('/tf_test_training', methods=['POST'])
 def model_training_test():
     # 获取程序开始时间
     start_time = time.time()
     result = {}
     success = 0
-    print("Program starts execution!")
+    dh = g.dh
+    ts = g.ts
+    args = deepcopy(g.opt.__dict__)
+    logger.info("Program starts execution!")
     try:
         # ------------ 获取数据，预处理训练数据 ------------
         train_data = get_data_from_mongo(args)