执行逻辑调整

main_yuanyou.py

@@ -516,23 +516,23 @@ def predict_main():
     model_results3 = model_losss(sqlitedb, end_time=end_time)
     logger.info('训练数据绘图end')
 
-    # # 模型报告
-    # logger.info('制作报告ing')
-    # title = f'{settings}--{end_time}-预测报告'  # 报告标题
-    # reportname = f'Brent原油大模型日度预测--{end_time}.pdf'  # 报告文件名
-    # reportname = reportname.replace(':', '-')  # 替换冒号
-    # brent_export_pdf(dataset=dataset,
-    #                  num_models=5 if is_fivemodels else 22, time=end_time,
-    #                  reportname=reportname,
-    #                  inputsize=global_config['horizon'],
-    #                  sqlitedb=sqlitedb
-    #                  ),
+    # 模型报告
+    logger.info('制作报告ing')
+    title = f'{settings}--{end_time}-预测报告'  # 报告标题
+    reportname = f'Brent原油大模型日度预测--{end_time}.pdf'  # 报告文件名
+    reportname = reportname.replace(':', '-')  # 替换冒号
+    brent_export_pdf(dataset=dataset,
+                     num_models=5 if is_fivemodels else 22, time=end_time,
+                     reportname=reportname,
+                     inputsize=global_config['horizon'],
+                     sqlitedb=sqlitedb
+                     ),
 
-    # logger.info('制作报告end')
-    # logger.info('模型训练完成')
+    logger.info('制作报告end')
+    logger.info('模型训练完成')
 
-    # push_market_value()
-    # sql_inset_predict(global_config)
+    push_market_value()
+    sql_inset_predict(global_config)
 
     # # LSTM 单变量模型
     # ex_Lstm(df,input_seq_len=input_size,output_seq_len=horizon,is_debug=is_debug,dataset=dataset)
@@ -563,6 +563,5 @@ if __name__ == '__main__':
     #     end_time = i_time.strftime('%Y-%m-%d')
     #     predict_main()
 
-    # predict_main()
+    predict_main()
     # push_market_value()
-    sql_inset_predict(global_config)

main_yuanyou_yuedu.py

@@ -473,6 +473,8 @@ def predict_main():
     logger.info('制作报告end')
     logger.info('模型训练完成')
 
+    sql_inset_predict(global_config)
+
     # # LSTM 单变量模型
     # ex_Lstm(df,input_seq_len=input_size,output_seq_len=horizon,is_debug=is_debug,dataset=dataset)
 
@@ -506,5 +508,4 @@ if __name__ == '__main__':
     #         logger.info(f'预测失败：{e}')
     #         continue
 
-    # predict_main()
-    sql_inset_predict(global_config)
+    predict_main()

main_yuanyou_zhoudu.py

@@ -452,6 +452,7 @@ def predict_main():
     logger.info('模型训练完成')
 
     push_market_value()
+    sql_inset_predict(global_config)
 
     # 发送邮件
     # m = SendMail(
@@ -477,5 +478,4 @@ if __name__ == '__main__':
     #         logger.info(f'预测失败：{e}')
     #         continue
 
-    # predict_main()
-    sql_inset_predict(global_config)
+    predict_main()