expr-codegen 0.10.1__tar.gz → 0.10.3__tar.gz

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: expr_codegen
-Version: 0.10.1
+Version: 0.10.3
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License
@@ -119,6 +119,8 @@ df = codegen_exec(df, _code_block_1, _code_block_2, output_file=sys.stdout)  #
 df = codegen_exec(df, _code_block_1, _code_block_2, output_file="output.py")  # 保存到文件
 df = codegen_exec(df, _code_block_1, _code_block_2)  # 只执行，不保存代码
 
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect()  # Lazy CPU
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect(engine="gpu")  # Lazy GPU
 ```
 
 ## 目录结构

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/README.md

@@ -69,6 +69,8 @@ df = codegen_exec(df, _code_block_1, _code_block_2, output_file=sys.stdout)  #
 df = codegen_exec(df, _code_block_1, _code_block_2, output_file="output.py")  # 保存到文件
 df = codegen_exec(df, _code_block_1, _code_block_2)  # 只执行，不保存代码
 
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect()  # Lazy CPU
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect(engine="gpu")  # Lazy GPU
 ```
 
 ## 目录结构

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/expr_codegen/__init__.py

@@ -1 +1,2 @@
 from expr_codegen._version import __version__
+from expr_codegen.tool import codegen_exec

expr_codegen-0.10.3/expr_codegen/_version.py

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

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/expr_codegen/codes.py

@@ -2,7 +2,7 @@ import ast
 import re
 from ast import expr
 
-from sympy import Add, Mul, Pow, Eq
+from sympy import Add, Mul, Pow, Eq, Not, Xor
 
 from expr_codegen.expr import register_symbols, dict_to_exprs
 
@@ -372,6 +372,8 @@ def _add_default_type(globals_):
     globals_['Mul'] = Mul
     globals_['Pow'] = Pow
     globals_['Eq'] = Eq
+    globals_['Not'] = Not
+    globals_['Xor'] = Xor
     return globals_
 
 

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/expr_codegen/expr.py

@@ -1,6 +1,6 @@
 from functools import reduce
 
-from sympy import Mul, preorder_traversal, symbols, Function, simplify, Add, Basic, Symbol, sympify
+from sympy import Mul, preorder_traversal, symbols, Function, simplify, Add, Basic, Symbol, sympify, FunctionClass
 
 # 预定义前缀，算子用前缀进行区分更方便。
 # 当然也可以用是否在某容器中进行分类
@@ -23,6 +23,9 @@ def is_symbol(x, globals_):
     if type(s) is type:
         # Eq
         return issubclass(s, Basic)
+    if isinstance(s, FunctionClass):
+        # Not
+        return True
     return False
 
 

{expr_codegen-0.10.1/expr_codegen/polars_over → expr_codegen-0.10.3/expr_codegen/polars_group}/template.py.j2

@@ -1,13 +1,13 @@
 # this code is auto generated by the expr_codegen
 # https://github.com/wukan1986/expr_codegen
 # 此段代码由 expr_codegen 自动生成，欢迎提交 issue 或 pull request
+from typing import TypeVar
 
-import numpy as np  # noqa
-import pandas as pd  # noqa
 import polars as pl  # noqa
 import polars.selectors as cs  # noqa
-from loguru import logger  # noqa
-
+# from loguru import logger  # noqa
+from polars import DataFrame as _pl_DataFrame
+from polars import LazyFrame as _pl_LazyFrame
 # ===================================
 # 导入优先级，例如：ts_RSI在ta与talib中都出现了，优先使用ta
 # 运行时，后导入覆盖前导入，但IDE智能提示是显示先导入的
@@ -18,6 +18,7 @@ from polars_ta.prefix.ta import *  # noqa
 from polars_ta.prefix.wq import *  # noqa
 from polars_ta.prefix.cdl import *  # noqa
 
+DataFrame = TypeVar('DataFrame', _pl_LazyFrame, _pl_DataFrame)
 # ===================================
 
 {{ syms1 }}
@@ -38,7 +39,7 @@ def unpack(x: Expr, idx: int = 0) -> Expr:
 {% endfor %}
 
 {% for key, value in funcs.items() %}
-def {{ key }}(df: pl.DataFrame) -> pl.DataFrame:
+def {{ key }}(df: DataFrame) -> DataFrame:
 {{ value }}
     return df
 {% endfor %}
@@ -56,7 +57,7 @@ def {{ key }}(df: pl.DataFrame) -> pl.DataFrame:
 """
 
 
-def main(df: pl.DataFrame) -> pl.DataFrame:
+def main(df: DataFrame) -> DataFrame:
     # logger.info("start...")
     {% for key, value in groupbys.items() %}
     {{ value-}}
@@ -68,7 +69,7 @@ def main(df: pl.DataFrame) -> pl.DataFrame:
 
     # shrink
     df = df.select(cs.all().shrink_dtype())
-    df = df.shrink_to_fit()
+    # df = df.shrink_to_fit()
 
     # logger.info('done')
 

{expr_codegen-0.10.1/expr_codegen/polars_group → expr_codegen-0.10.3/expr_codegen/polars_over}/template.py.j2

@@ -1,13 +1,13 @@
 # this code is auto generated by the expr_codegen
 # https://github.com/wukan1986/expr_codegen
 # 此段代码由 expr_codegen 自动生成，欢迎提交 issue 或 pull request
+from typing import TypeVar
 
-import numpy as np  # noqa
-import pandas as pd  # noqa
 import polars as pl  # noqa
 import polars.selectors as cs  # noqa
-from loguru import logger  # noqa
-
+# from loguru import logger  # noqa
+from polars import DataFrame as _pl_DataFrame
+from polars import LazyFrame as _pl_LazyFrame
 # ===================================
 # 导入优先级，例如：ts_RSI在ta与talib中都出现了，优先使用ta
 # 运行时，后导入覆盖前导入，但IDE智能提示是显示先导入的
@@ -18,6 +18,7 @@ from polars_ta.prefix.ta import *  # noqa
 from polars_ta.prefix.wq import *  # noqa
 from polars_ta.prefix.cdl import *  # noqa
 
+DataFrame = TypeVar('DataFrame', _pl_LazyFrame, _pl_DataFrame)
 # ===================================
 
 {{ syms1 }}
@@ -38,7 +39,7 @@ def unpack(x: Expr, idx: int = 0) -> Expr:
 {% endfor %}
 
 {% for key, value in funcs.items() %}
-def {{ key }}(df: pl.DataFrame) -> pl.DataFrame:
+def {{ key }}(df: DataFrame) -> DataFrame:
 {{ value }}
     return df
 {% endfor %}
@@ -56,7 +57,7 @@ def {{ key }}(df: pl.DataFrame) -> pl.DataFrame:
 """
 
 
-def main(df: pl.DataFrame) -> pl.DataFrame:
+def main(df: DataFrame) -> DataFrame:
     # logger.info("start...")
     {% for key, value in groupbys.items() %}
     {{ value-}}
@@ -68,7 +69,7 @@ def main(df: pl.DataFrame) -> pl.DataFrame:
 
     # shrink
     df = df.select(cs.all().shrink_dtype())
-    df = df.shrink_to_fit()
+    # df = df.shrink_to_fit()
 
     # logger.info('done')
 

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/expr_codegen/tool.py

@@ -19,10 +19,12 @@ except ImportError:
 
 try:
     from polars import DataFrame as _pl_DataFrame
+    from polars import LazyFrame as _pl_LazyFrame
 except ImportError:
     _pl_DataFrame = None
+    _pl_LazyFrame = None
 
-DataFrame = TypeVar('DataFrame', _pl_DataFrame, _pd_DataFrame)
+DataFrame = TypeVar('DataFrame', _pl_LazyFrame, _pl_DataFrame, _pd_DataFrame)
 
 # ===============================
 # TypeError: expecting bool or Boolean, not `ts_delay(X, 3)`.
@@ -127,11 +129,12 @@ class ExprTool:
 
         exprs_dict = {}
 
-        # 不做改动，直接生成
+        # cse前简化一次，cse后不再简化
+        # (~开盘涨停 & 昨收涨停) | (~收盘涨停 & 最高涨停)
         for variable, expr in repl:
-            exprs_dict[variable] = simplify2(expr)
+            exprs_dict[variable] = expr
         for variable, expr in redu:
-            exprs_dict[variable] = simplify2(expr)
+            exprs_dict[variable] = expr
 
         return exprs_dict
 
@@ -322,6 +325,8 @@ def codegen_exec(df: Optional[DataFrame],
         ^ 转成异或还是乘方
     style: str
         代码风格。可选值 'pandas', 'polars_group', 'polars_over'
+        - polars_group: 不支持Lazy
+        - pandas: 不支持struct
     template_file: str
         代码模板
     date: str

{expr_codegen-0.10.1 → expr_codegen-0.10.3}/expr_codegen.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: expr_codegen
-Version: 0.10.1
+Version: 0.10.3
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License
@@ -119,6 +119,8 @@ df = codegen_exec(df, _code_block_1, _code_block_2, output_file=sys.stdout)  #
 df = codegen_exec(df, _code_block_1, _code_block_2, output_file="output.py")  # 保存到文件
 df = codegen_exec(df, _code_block_1, _code_block_2)  # 只执行，不保存代码
 
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect()  # Lazy CPU
+df = codegen_exec(df.lazy(), _code_block_1, _code_block_2).collect(engine="gpu")  # Lazy GPU
 ```
 
 ## 目录结构

expr_codegen-0.10.1/expr_codegen/_version.py

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