ygo 1.0.7__tar.gz → 1.0.9__tar.gz

{ygo-1.0.7/ygo.egg-info → ygo-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.0.7
+Version: 1.0.9
 Project-URL: homepage, https://github.com/link-yundi/ygo
 Project-URL: repository, https://github.com/link-yundi/ygo
 Requires-Python: >=3.8

{ygo-1.0.7 → ygo-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ygo"
-version = "1.0.7"
+version = "1.0.9"
 description = ""
 readme = "README.md"
 requires-python = ">=3.8"

{ygo-1.0.7 → ygo-1.0.9}/qdf/qdf.py

@@ -56,6 +56,7 @@ class QDF:
         self.failed = list()
         self._expr_cache = dict()  # type: dict[Expr, str]
         self._cur_expr_cache = dict()
+        self._data_: pl.LazyFrame = None
 
     def __str__(self):
         return self.data.__str__()
@@ -110,15 +111,15 @@ class QDF:
                     else:
                         args.append(arg)  # or args.append(pl.lit(arg))
                 try:
-                    expr_pl: pl.Expr = func(*args, **kwargs).alias(alias_)
+                    expr_pl: pl.Expr = func(*args, **kwargs)
+                    self._data_ = self._data_.with_columns(expr_pl.alias(alias_))
                     self._cur_expr_cache[expr_] = alias_
-                    return expr_pl
+                    return pl.col(alias_)
                 except Exception as e:
                     raise CompileError(message=f"{expr_.fn_name}({', '.join([str(arg) for arg in args])})\n{e}") from e
 
             return recur_compile(expr_parsed), alias
         except (CalculateError, CompileError, PolarsError) as e:
-            # 已经是你自己的错误类
             raise e
         except Exception as e:
             # 所有未处理的错误统一抛出为 CompileError
@@ -143,7 +144,7 @@ class QDF:
         exprs_to_add = list()
         exprs_select = list()
         self._cur_expr_cache = {}
-        data = self.data.lazy()
+        self._data_ = self.data.lazy()
 
         for expr in exprs:
             try:
@@ -155,12 +156,11 @@ class QDF:
                 self.failed.append(FailError(expr, e))
         if self.failed:
             ylog.warning(f"QDF.sql 失败：{len(self.failed)}/{len(exprs)}: \n {self.failed}")
-        for expr in exprs_to_add:
-            data = data.with_columns(expr).fill_nan(None)
+        self._data_ = self._data_.with_columns(*exprs_to_add).fill_nan(None)
         new_expr_cache = dict()
         try:
-            self.data = data.collect()
-            final_df = self.data.select(*self.index, *exprs_to_add)
+            self.data = self._data_.collect()
+            final_df = self.data.select(*self.index, *exprs_select)
             current_cols = set(self.data.columns)
             # 缓存整理：只保留当前表达式的缓存
             self._expr_cache.update(self._cur_expr_cache)

{ygo-1.0.7 → ygo-1.0.9/ygo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.0.7
+Version: 1.0.9
 Project-URL: homepage, https://github.com/link-yundi/ygo
 Project-URL: repository, https://github.com/link-yundi/ygo
 Requires-Python: >=3.8