03051525

models_processing/model_koi/tf_bp_pre.py

@@ -6,7 +6,7 @@
 # @Company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request
+from flask import Flask, request, g
 import logging, argparse, traceback
 from common.database_dml_koi import *
 from common.processing_data_common import missing_features, str_to_list
@@ -39,6 +39,7 @@ def update_config():
     opt = argparse.Namespace(**args)
     dh.opt = opt
     bp.opt = opt
+    g.opt = opt
     logger.info(args)
 
 @app.route('/nn_bp_predict', methods=['POST'])
@@ -65,7 +66,7 @@ def model_prediction_bp():
         pre_data = pre_data[['date_time', 'power_forecast', 'farm_id', 'cdq', 'dq', 'zq']]
 
         pre_data['power_forecast'] = pre_data['power_forecast'].round(2)
-        pre_data.loc[pre_data['power_forecast'] > opt.cap, 'power_forecast'] = opt.cap
+        pre_data.loc[pre_data['power_forecast'] > g.opt.cap, 'power_forecast'] = g.opt.cap
         pre_data.loc[pre_data['power_forecast'] < 0, 'power_forecast'] = 0
 
         insert_data_into_mongo(pre_data, args)

models_processing/model_koi/tf_cnn_pre.py

@@ -6,7 +6,7 @@
 # @Company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request
+from flask import Flask, request, g
 import logging, argparse, traceback
 from common.database_dml import *
 from common.processing_data_common import missing_features, str_to_list
@@ -29,7 +29,6 @@ with app.app_context():
 
     dh = DataHandler(logger, args)
     cnn = CNNHandler(logger, args)
-    global opt
 
 @app.before_request
 def update_config():
@@ -40,6 +39,7 @@ def update_config():
     opt = argparse.Namespace(**args)
     dh.opt = opt
     cnn.opt = opt
+    g.opt = opt
     logger.info(args)
 
 @app.route('/nn_cnn_predict', methods=['POST'])
@@ -65,7 +65,7 @@ def model_prediction_bp():
         pre_data = pre_data[['date_time', 'power_forecast', 'farm_id', 'cdq', 'dq', 'zq']]
 
         pre_data['power_forecast'] = pre_data['power_forecast'].round(2)
-        pre_data.loc[pre_data['power_forecast'] > opt.cap, 'power_forecast'] = opt.cap
+        pre_data.loc[pre_data['power_forecast'] > g.opt.cap, 'power_forecast'] = g.opt.cap
         pre_data.loc[pre_data['power_forecast'] < 0, 'power_forecast'] = 0
 
         insert_data_into_mongo(pre_data, args)

models_processing/model_koi/tf_lstm_pre.py

@@ -6,9 +6,9 @@
 # @Company: shenyang JY
 import json, copy
 import numpy as np
-from flask import Flask, request
+from flask import Flask, request, g
 import logging, argparse, traceback
-from common.database_dml import *
+from common.database_dml_koi import *
 from common.processing_data_common import missing_features, str_to_list
 from data_processing.data_operation.data_handler import DataHandler
 from threading import Lock
@@ -29,7 +29,6 @@ with app.app_context():
 
     dh = DataHandler(logger, args)
     ts = TSHandler(logger, args)
-    global opt
 
 @app.before_request
 def update_config():
@@ -40,6 +39,7 @@ def update_config():
     opt = argparse.Namespace(**args)
     dh.opt = opt
     ts.opt = opt
+    g.opt = opt
     logger.info(args)
 
 @app.route('/nn_lstm_predict', methods=['POST'])
@@ -65,7 +65,7 @@ def model_prediction_bp():
         pre_data = pre_data[['date_time', 'power_forecast', 'farm_id', 'cdq', 'dq', 'zq']]
 
         pre_data['power_forecast'] = pre_data['power_forecast'].round(2)
-        pre_data.loc[pre_data['power_forecast'] > opt.cap, 'power_forecast'] = opt.cap
+        pre_data.loc[pre_data['power_forecast'] > g.opt.cap, 'power_forecast'] = g.opt.cap
         pre_data.loc[pre_data['power_forecast'] < 0, 'power_forecast'] = 0
 
         insert_data_into_mongo(pre_data, args)