05201119

app/common/config.py

@@ -10,9 +10,7 @@
 """
 import os, threading
 import argparse, yaml
-
-
-
+from app.common.logs import Log
 
 class myargparse(argparse.ArgumentParser):
     _save_lock = threading.Lock()
@@ -80,7 +78,11 @@ class myargparse(argparse.ArgumentParser):
             with open(file_path, mode='w', encoding='utf-8') as f:
                 yaml.safe_dump(vars(opt), f)
 
+# -------------- 设置全局对象 --------------
+# 创建日志对象
+logger = Log().logger
+# 创建解析器对象
+parser = myargparse(description='南网竞赛算法', add_help=False)
 
 if __name__ == '__main__':
-    args = myargparse(discription="场站端配置", add_help=False)
-    opt = args.parse_args_and_yaml()
+    pass

app/common/data_cleaning.py

@@ -6,7 +6,7 @@
 # company: shenyang JY
 import numpy as np
 import pandas as pd
-from app.common.logs import logger
+from app.common.config import logger, parser
 np.random.seed(42)
 
 def clean_power(power, env, plant_id):

app/common/logs.py

@@ -18,7 +18,6 @@ from logging.handlers import BaseRotatingHandler
 current_dir = os.path.dirname(os.path.abspath(__file__))
 
 
-
 class DailyRotatingFileHandler(BaseRotatingHandler):
     """
     同`logging.TimedRotatingFileHandler`类似，不过这个handler：
@@ -198,8 +197,6 @@ class Log(object):
         return lib_path / 'south_forecast_link.log'
 
 
-logger = Log().logger
-
 if __name__ == "__main__":
     logger = Log()
     logger.info("this is info")

app/model/main.py

@@ -13,7 +13,7 @@ import pandas as pd
 from pathlib import Path
 from functools import partial
 from concurrent.futures import ProcessPoolExecutor
-from app.common.config import myargparse
+from app.common.config import parser, logger
 from app.model.resource_manager import ResourceController
 from app.model.task_worker import station_task
 """"
@@ -33,13 +33,11 @@ from app.model.task_worker import station_task
 
 def main():
     # ---------------------------- 解析参数 ----------------------------
-    # 创建解析器对象
-    parser = myargparse(description='算法', add_help=False)
     # 解析参数，将固定参数和任务参数合并
     opt = parser.parse_args_and_yaml()
     config = opt.__dict__
     # 打印参数
-    print(f"文件: {opt.input_file}")
+    logger.info(f"输入文件目录: {opt.input_file}")
 
     # ---------------------------- 配置计算资源和任务 ----------------------------
     # 初始化资源管理器

app/model/tf_model_train.py

@@ -16,7 +16,7 @@ from typing import Dict, Any
 from app.common.tf_lstm import TSHandler
 from app.common.dbmg import MongoUtils
 from app.common.data_handler import DataHandler, write_number_to_file
-from app.common.logs import logger
+from app.common.config import logger
 
 mgUtils = MongoUtils(logger)