适配expr_codegen 0.10.10

wukan1986 · wukan1986 · commit 09815937494c · 2025-01-11T12:10:40.000+08:00
diff --git a/gp_base_cs/helper.py b/gp_base_cs/helper.py
@@ -98,9 +98,9 @@ def batched_exprs(batch_id, exprs_dict, gen, label, split_date, df_input):
     logger.info("{}代{}批 代码 开始执行。共 {} 条 表达式", gen, batch_id, cnt)
     tic = time.perf_counter()
 
-    globals_ = {'df_input': df_input}
+    globals_ = {}
     exec(codes, globals_)
-    df_output = globals_['df_output']
+    df_output = globals_['main'](df_input)
 
     elapsed_time = time.perf_counter() - tic
     logger.info("{}代{}批 因子 计算完成。共用时 {:.3f} 秒，平均 {:.3f} 秒/条，或 {:.3f} 条/秒", gen, batch_id, elapsed_time, elapsed_time / cnt, cnt / elapsed_time)
diff --git a/gp_base_ts/helper.py b/gp_base_ts/helper.py
@@ -93,9 +93,9 @@ def batched_exprs(batch_id, exprs_dict, gen, label, split_date, df_input):
     logger.info("{}代{}批 代码 开始执行。共 {} 条 表达式", gen, batch_id, cnt)
     tic = time.perf_counter()
 
-    globals_ = {'df_input': df_input}
+    globals_ = {}
     exec(codes, globals_)
-    df_output = globals_['df_output']
+    df_output = globals_['main'](df_input)
 
     elapsed_time = time.perf_counter() - tic
     logger.info("{}代{}批 因子 计算完成。共用时 {:.3f} 秒，平均 {:.3f} 秒/条，或 {:.3f} 条/秒", gen, batch_id, elapsed_time, elapsed_time / cnt, cnt / elapsed_time)
