ygo 1.0.6b0__py3-none-any.whl → 1.0.8__py3-none-any.whl

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__()
@@ -111,6 +112,7 @@ class QDF:
                         args.append(arg)  # or args.append(pl.lit(arg))
                 try:
                     expr_pl: pl.Expr = func(*args, **kwargs).alias(alias_)
+                    self._data_ = self._data_.with_columns(expr_pl)
                     self._cur_expr_cache[expr_] = alias_
                     return expr_pl
                 except Exception as e:
@@ -118,7 +120,6 @@ class QDF:
 
             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,27 @@ 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)
+        # 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)
+            for k, v in self._expr_cache.items():
+                if v in current_cols:
+                    new_expr_cache[k] = v
+            self._expr_cache = new_expr_cache
             return final_df
         except Exception as e:
+            current_cols = set(self.data.columns)
+            # 缓存整理：只保留当前表达式的缓存
+            for k, v in self._expr_cache.items():
+                if v in current_cols:
+                    new_expr_cache[k] = v
+            self._expr_cache = new_expr_cache
             raise PolarsError(message=f"LazyFrame.collect() 阶段出错\n{e}") from e
+

{ygo-1.0.6b0.dist-info → ygo-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygo
-Version: 1.0.6b0
+Version: 1.0.8
 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.6b0.dist-info → ygo-1.0.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 qdf/__init__.py,sha256=XwH17ae6kX5Grhb_odgDqkNf6N-ambTVi3LoGzq1Fmc,7519
 qdf/errors.py,sha256=lJhhjDRdQOOKUFGlLQ9ELK4AexXBwYQSYus_V-kc5K8,1180
 qdf/expr.py,sha256=ck_BHMCV29Q8-szci1_v4ud964QI7JoRRcmA0ppupsc,8454
-qdf/qdf.py,sha256=mMNr6fn6oak1R2_LBGKcWvPdbmM6avxFHXI9lJmzXNU,6641
+qdf/qdf.py,sha256=X3n2eB9C2Jm7dP4d_j-P9QvL5DJ9X1fe7GZfn3afxeU,7411
 qdf/udf/__init__.py,sha256=DdrSGaCB__5C1YL0vd_5rjIB3KLrAKn3h3k9k50L0jA,313
 qdf/udf/base_udf.py,sha256=6VDaCIGNLJxZ7UsoIDWtTH6PzUDj89b8FiwN-TEat2g,3437
 qdf/udf/cs_udf.py,sha256=HT3EKBwAhOxOFDQnpfwb4YcMTT3-lqFXkdysdn5_FI4,3179
@@ -16,10 +16,10 @@ ycat/yck.py,sha256=FlGMBuKEngB4TwFXMp4P3dLg9IfFmUg3eDqXzQ0kQoI,2738
 ygo/__init__.py,sha256=FMN06Tfa8_oV26eklBZCtGTyHZ6MghHxHj4PS_FSXCA,222
 ygo/exceptions.py,sha256=4Kd92kpwpsXHJJkSv4OqcN--PEEvIGGvDDgOOsk68gg,385
 ygo/ygo.py,sha256=vCMUur_41yY0QB4gj8K5wBZHql_cbmANhI8QwPRCTmo,11613
-ygo-1.0.6b0.dist-info/licenses/LICENSE,sha256=6AKUWQ1xe-jwPSFv_H6FMQLNNWb7AYqzuEUTwlP2S8M,1067
+ygo-1.0.8.dist-info/licenses/LICENSE,sha256=6AKUWQ1xe-jwPSFv_H6FMQLNNWb7AYqzuEUTwlP2S8M,1067
 ylog/__init__.py,sha256=2sIp4PHNoQMCi0QtIarTI4raACd7SdRHNY7fY5hKYwc,397
 ylog/core.py,sha256=jmz9JhklbVCQz-zahEXV6P-LEHnqU6opnY4CUEyo8Ss,7924
-ygo-1.0.6b0.dist-info/METADATA,sha256=1aSVsl0EZMP7YzHEW1omgNvKY6TE3QbW_rOhnNqBIFU,2078
-ygo-1.0.6b0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-ygo-1.0.6b0.dist-info/top_level.txt,sha256=FGbsOtsHgqWzZ9mGRSTCg0pLZEErR1lq5TFQSy2TL1w,18
-ygo-1.0.6b0.dist-info/RECORD,,
+ygo-1.0.8.dist-info/METADATA,sha256=21pVOKJzFEmudbQyApruzgFa0O2PymVE5c5m06fNrzM,2076
+ygo-1.0.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+ygo-1.0.8.dist-info/top_level.txt,sha256=FGbsOtsHgqWzZ9mGRSTCg0pLZEErR1lq5TFQSy2TL1w,18
+ygo-1.0.8.dist-info/RECORD,,