expr-codegen 0.10.9__tar.gz → 0.10.11__tar.gz

{expr_codegen-0.10.9 → expr_codegen-0.10.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: expr_codegen
-Version: 0.10.9
+Version: 0.10.11
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License

expr_codegen-0.10.11/expr_codegen/_version.py

@@ -0,0 +1 @@
+__version__ = "0.10.11"

{expr_codegen-0.10.9 → expr_codegen-0.10.11}/expr_codegen/pandas/template.py.j2

@@ -63,6 +63,6 @@ def main(df: pd.DataFrame) -> pd.DataFrame:
 
     return df
 
-if __name__ in ("__main__", "builtins"):
-    # TODO: 数据加载或外部传入
-    df_output = main(df_input)
+# if __name__ in ("__main__", "builtins"):
+#     # TODO: 数据加载或外部传入
+#     df_output = main(df_input)

{expr_codegen-0.10.9/expr_codegen/polars_over → expr_codegen-0.10.11/expr_codegen/polars_group}/template.py.j2

@@ -78,6 +78,6 @@ def main(df: DataFrame) -> DataFrame:
 
     return df
 
-if __name__ in ("__main__", "builtins"):
-    # TODO: 数据加载或外部传入
-    df_output = main(df_input)
+# if __name__ in ("__main__", "builtins"):
+#     # TODO: 数据加载或外部传入
+#     df_output = main(df_input)

{expr_codegen-0.10.9/expr_codegen/polars_group → expr_codegen-0.10.11/expr_codegen/polars_over}/template.py.j2

@@ -78,6 +78,6 @@ def main(df: DataFrame) -> DataFrame:
 
     return df
 
-if __name__ in ("__main__", "builtins"):
-    # TODO: 数据加载或外部传入
-    df_output = main(df_input)
+# if __name__ in ("__main__", "builtins"):
+#     # TODO: 数据加载或外部传入
+#     df_output = main(df_input)

{expr_codegen-0.10.9 → expr_codegen-0.10.11}/expr_codegen/tool.py

@@ -257,6 +257,8 @@ class ExprTool:
                         extra_codes=extra_codes,
                         **kwargs)
 
+        logger.info(f'code is generated')
+
         if format:
             # 格式化。在遗传算法中没有必要
             codes = format_str(codes, mode=Mode(line_length=600, magic_trailing_comma=True))
@@ -299,25 +301,30 @@ class ExprTool:
         return code
 
 
-def _exec_code(code: str, df_input):
-    globals_ = {'df_input': df_input}
+@lru_cache(maxsize=64, typed=True)
+def _get_func_from_code(code: str):
+    logger.info(f'get func from code')
+    globals_ = {}
     exec(code, globals_)
-    return globals_['df_output']
-
-
-def _exec_file(file, df_input):
-    file = pathlib.Path(file)
-    logger.info(f'run file "{file.absolute()}"')
-    with open(file, 'r', encoding='utf-8') as f:
-        code = f.read()
-        return _exec_code(code, df_input)
+    return globals_['main']
 
 
-def _exec_module(module: str, df_input):
+@lru_cache(maxsize=64, typed=True)
+def _get_func_from_module(module: str):
     """"可下断点调试"""
     m = __import__(module, fromlist=['*'])
-    logger.info(f'run module {m}')
-    return m.main(df_input)
+    logger.info(f'get func from module {m}')
+    return m.main
+
+
+@lru_cache(maxsize=64, typed=True)
+def _get_func_from_file(file: str):
+    file = pathlib.Path(file)
+    logger.info(f'get func from file "{file.absolute()}"')
+    with open(file, 'r', encoding='utf-8') as f:
+        globals_ = {}
+        exec(f.read(), globals_)
+        return globals_['main']
 
 
 _TOOL_ = ExprTool()
@@ -347,7 +354,7 @@ def codegen_exec(df: Optional[DataFrame],
     output_file: str| TextIOBase
         保存生成的目标代码到文件中
     run_file: bool or str
-        是否不生成脚本，直接运行代码。
+        是否不生成脚本，直接运行代码。注意：带缓存功能，多次调用不重复生成
         - 如果是True，会自动从output_file中读取代码
         - 如果是字符串，会自动从run_file中读取代码
         - 如果是模块名，会自动从模块中读取代码(可调试)
@@ -374,17 +381,25 @@ def codegen_exec(df: Optional[DataFrame],
     -------
     DataFrame
 
+    Notes
+    -----
+    处处都有缓存，所以在公式研发阶段要留意日志输出。以免一直调试的旧公式
+
+    1. 确保重新生成了代码  `code is generated`
+    2. 通过代码得到了函数 `get func from code`
+
     """
     if df is not None:
+        # 以下代码都带缓存功能
         if run_file is True:
             assert output_file is not None, 'output_file is required'
-            return _exec_file(output_file, df)
+            return _get_func_from_file(output_file)(df)
         if run_file is not False:
             run_file = str(run_file)
             if run_file.endswith('.py'):
-                return _exec_file(run_file, df)
+                return _get_func_from_file(run_file)(df)
             else:
-                return _exec_module(run_file, df)  # 可断点调试
+                return _get_func_from_module(run_file)(df)  # 可断点调试
 
     # 此代码来自于sympy.var
     frame = inspect.currentframe().f_back
@@ -407,4 +422,5 @@ def codegen_exec(df: Optional[DataFrame],
     if df is None:
         return None
     else:
-        return _exec_code(code, df)
+        # 代码一样时就从缓存中取出函数
+        return _get_func_from_code(code)(df)

{expr_codegen-0.10.9 → expr_codegen-0.10.11}/expr_codegen.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: expr_codegen
-Version: 0.10.9
+Version: 0.10.11
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License

expr_codegen-0.10.9/expr_codegen/_version.py

@@ -1 +0,0 @@
-__version__ = "0.10.9"