04031350

app/predict/main.py

@@ -90,7 +90,7 @@ def main():
     # 创建
     # 添加参数
     parser.add_argument("input_file", help="输入文件路径")    # 第一个位置参数
-    parser.add_argument("model_name", default="cnn", help='选择短期模型')  # 第二个位置参数
+    parser.add_argument("--model_name", default="cnn", help='选择短期模型')  # 第二个位置参数（可选）
     # 解析参数
     args = parser.parse_args()
 

app/predict/tf_cnn_pre.py

@@ -29,7 +29,6 @@ mgUtils = MongoUtils(logger)
 def model_prediction(pre_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     print("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -70,13 +69,7 @@ def model_prediction(pre_data, input_file, cap):
         result['msg'] = my_exception
         logger.info("算法状态异常：{}".format(my_exception))
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = params
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("cnn预测任务：用了 %s 秒 " % (end_time - start_time))
 
 
 if __name__ == "__main__":

app/predict/tf_fmi_pre.py

@@ -29,7 +29,6 @@ mgUtils = MongoUtils(logger)
 def model_prediction(pre_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     print("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -70,13 +69,7 @@ def model_prediction(pre_data, input_file, cap):
         result['msg'] = my_exception
         logger.info("算法状态异常：{}".format(my_exception))
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = args
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("fmi预测任务：用了 %s 秒 " % (end_time - start_time))
 
 
 if __name__ == "__main__":

app/predict/tf_lstm_pre.py

@@ -29,7 +29,6 @@ mgUtils = MongoUtils(logger)
 def model_prediction(pre_data, input_file, cap):
     # 获取程序开始时间
     start_time = time.time()
-    result = {}
     success = 0
     print("Program starts execution!")
     farm_id = input_file.split('/')[-2]
@@ -70,13 +69,7 @@ def model_prediction(pre_data, input_file, cap):
         result['msg'] = my_exception
         logger.info("算法状态异常：{}".format(my_exception))
     end_time = time.time()
-
-    result['success'] = success
-    result['args'] = args
-    result['start_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time))
-    result['end_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(end_time))
-    print("Program execution ends!")
-    return result
+    logger.info("lstm预测任务：用了 %s 秒 " % (end_time - start_time))
 
 
 if __name__ == "__main__":