rebuild recheck

Author: JohnMount

build/lib/data_algebra/pandas_base.py

@@ -105,8 +105,8 @@ def extend_step(self, op, *, data_map, eval_env, narrow):
         data_algebra_temp_cols = {}
         if not window_situation:
             for (k, opk) in op.ops.items():
+                # TODO: execute expression recursively to keep eval() calls nearly trivial
                 if isinstance(opk, data_algebra.user_fn.FnTerm):
-                    # res[k] = opk.value(*[res[nm.column_name] for nm in opk.args])
                     pe = self.pandas_eval_env.copy()
                     pe[opk.name] = opk.pandas_fn
                     op_src = (

coverage.txt

@@ -2,7 +2,7 @@
 platform darwin -- Python 3.9.4, pytest-6.2.3, py-1.10.0, pluggy-0.13.1
 rootdir: /Users/johnmount/Documents/work/data_algebra
 plugins: anyio-2.2.0, cov-2.11.1
-collected 171 items
+collected 172 items
 
 tests/test_OrderedSet.py .                                               [  0%]
 tests/test_agg.py ..                                                     [  1%]
@@ -11,7 +11,7 @@ tests/test_arith.py .                                                    [  2%]
 tests/test_arrow1.py ...                                                 [  4%]
 tests/test_bigquery.py ..............                                    [ 12%]
 tests/test_calc_issue.py .                                               [ 13%]
-tests/test_calc_warnings_errors.py .                                     [ 14%]
+tests/test_calc_warnings_errors.py .                                     [ 13%]
 tests/test_cc.py ......                                                  [ 17%]
 tests/test_cdata1.py ....                                                [ 19%]
 tests/test_cdata_convenience.py .                                        [ 20%]
@@ -22,44 +22,44 @@ tests/test_cross_product_join.py .                                       [ 23%]
 tests/test_db_model.py .                                                 [ 24%]
 tests/test_degenerate_project.py .                                       [ 25%]
 tests/test_drop_columns.py .                                             [ 25%]
-tests/test_exampe1.py ....                                               [ 28%]
+tests/test_exampe1.py ....                                               [ 27%]
 tests/test_exp.py .                                                      [ 28%]
 tests/test_expr_parse.py .                                               [ 29%]
-tests/test_extend.py .....                                               [ 32%]
+tests/test_extend.py .....                                               [ 31%]
 tests/test_extend_order.py .                                             [ 32%]
 tests/test_flow_text.py .                                                [ 33%]
 tests/test_forbidden_calculation.py ..                                   [ 34%]
-tests/test_ghost_col_issue.py .                                          [ 35%]
-tests/test_idioms.py ............                                        [ 42%]
+tests/test_ghost_col_issue.py .                                          [ 34%]
+tests/test_idioms.py ............                                        [ 41%]
 tests/test_if_else.py ...                                                [ 43%]
 tests/test_incomplete_agg.py .                                           [ 44%]
-tests/test_join_check.py .                                               [ 45%]
+tests/test_join_check.py .                                               [ 44%]
 tests/test_join_effects.py .                                             [ 45%]
-tests/test_join_opt.py .                                                 [ 46%]
-tests/test_lark_parser.py .....                                          [ 49%]
+tests/test_join_opt.py .                                                 [ 45%]
+tests/test_lark_parser.py .....                                          [ 48%]
 tests/test_math.py .                                                     [ 49%]
 tests/test_minimum.py .                                                  [ 50%]
 tests/test_narrow.py .                                                   [ 50%]
 tests/test_natural_join.py .                                             [ 51%]
-tests/test_neg.py .                                                      [ 52%]
+tests/test_neg.py .                                                      [ 51%]
 tests/test_null_bad.py .                                                 [ 52%]
-tests/test_ops.py .                                                      [ 53%]
+tests/test_ops.py .                                                      [ 52%]
 tests/test_ops_eq.py .                                                   [ 53%]
 tests/test_or.py .....                                                   [ 56%]
-tests/test_ordered_agg_group.py .                                        [ 57%]
-tests/test_parse.py ......................                               [ 70%]
-tests/test_project.py .....                                              [ 73%]
+tests/test_ordered_agg_group.py .                                        [ 56%]
+tests/test_parse.py ......................                               [ 69%]
+tests/test_project.py .....                                              [ 72%]
 tests/test_ranked_example.py .                                           [ 73%]
 tests/test_ref_detect.py ..                                              [ 74%]
 tests/test_rename.py .                                                   [ 75%]
-tests/test_round.py ...                                                  [ 77%]
+tests/test_round.py ...                                                  [ 76%]
 tests/test_scatter_example.py .                                          [ 77%]
-tests/test_scoring_example.py .                                          [ 78%]
+tests/test_scoring_example.py .                                          [ 77%]
 tests/test_select.py ..                                                  [ 79%]
-tests/test_select_stacking.py .                                          [ 80%]
-tests/test_set_quoting.py ..                                             [ 81%]
+tests/test_select_stacking.py .                                          [ 79%]
+tests/test_set_quoting.py ..                                             [ 80%]
 tests/test_shorten.py .                                                  [ 81%]
-tests/test_sign_parse.py .                                               [ 82%]
+tests/test_sign_parse.py ..                                              [ 82%]
 tests/test_simple.py ....                                                [ 84%]
 tests/test_spark_sql.py .                                                [ 85%]
 tests/test_sqlite.py ....                                                [ 87%]
@@ -108,4 +108,4 @@ data_algebra/util.py                      28      4    86%
 TOTAL                                   4340    983    77%
 
 
-============================= 171 passed in 10.08s =============================
+============================= 172 passed in 10.13s =============================

data_algebra/pandas_base.py

@@ -105,8 +105,8 @@ def extend_step(self, op, *, data_map, eval_env, narrow):
         data_algebra_temp_cols = {}
         if not window_situation:
             for (k, opk) in op.ops.items():
+                # TODO: execute expression recursively to keep eval() calls nearly trivial
                 if isinstance(opk, data_algebra.user_fn.FnTerm):
-                    # res[k] = opk.value(*[res[nm.column_name] for nm in opk.args])
                     pe = self.pandas_eval_env.copy()
                     pe[opk.name] = opk.pandas_fn
                     op_src = (

dist/data_algebra-0.6.3-py3-none-any.whl

@@ -616,7 +616,7 @@ <h5>Inherited Members</h5>
     *,
     db_model=BigQueryModel,
     conn,
-    fns={&#39;as_int64&#39;: &lt;function as_int64 at 0x7fc6d90a0c10&gt;, &#39;trimstr&#39;: &lt;function trimstr at 0x7fc6d90a0ca0&gt;, &#39;coalesce_0&#39;: &lt;function coalesce_0 at 0x7fc6d90a0f70&gt;, &#39;coalesce&#39;: &lt;function coalesce at 0x7fc6d907c280&gt;, &#39;datetime_to_date&#39;: &lt;function datetime_to_date at 0x7fc6d907c160&gt;, &#39;parse_datetime&#39;: &lt;function parse_datetime at 0x7fc69830cee0&gt;, &#39;parse_date&#39;: &lt;function parse_date at 0x7fc698311b80&gt;, &#39;format_datetime&#39;: &lt;function format_datetime at 0x7fc698311c10&gt;, &#39;format_date&#39;: &lt;function format_date at 0x7fc698311ca0&gt;, &#39;dayofweek&#39;: &lt;function dayofweek at 0x7fc698311d30&gt;, &#39;dayofyear&#39;: &lt;function dayofyear at 0x7fc698311dc0&gt;, &#39;dayofmonth&#39;: &lt;function dayofmonth at 0x7fc698311ee0&gt;, &#39;weekofyear&#39;: &lt;function weekofyear at 0x7fc698311e50&gt;, &#39;month&#39;: &lt;function month at 0x7fc698311f70&gt;, &#39;quarter&#39;: &lt;function quarter at 0x7fc698318040&gt;, &#39;year&#39;: &lt;function year at 0x7fc6983180d0&gt;, &#39;timestamp_diff&#39;: &lt;function timestamp_diff at 0x7fc698318160&gt;, &#39;date_diff&#39;: &lt;function date_diff at 0x7fc6983181f0&gt;, &#39;base_Sunday&#39;: &lt;function base_Sunday at 0x7fc698318280&gt;}
+    fns={&#39;as_int64&#39;: &lt;function as_int64 at 0x7fafe9680c10&gt;, &#39;trimstr&#39;: &lt;function trimstr at 0x7fafe9680ca0&gt;, &#39;coalesce_0&#39;: &lt;function coalesce_0 at 0x7fafe9680f70&gt;, &#39;coalesce&#39;: &lt;function coalesce at 0x7fafe9657280&gt;, &#39;datetime_to_date&#39;: &lt;function datetime_to_date at 0x7fafe9657160&gt;, &#39;parse_datetime&#39;: &lt;function parse_datetime at 0x7fafe9eaaee0&gt;, &#39;parse_date&#39;: &lt;function parse_date at 0x7fafe9eb0b80&gt;, &#39;format_datetime&#39;: &lt;function format_datetime at 0x7fafe9eb0c10&gt;, &#39;format_date&#39;: &lt;function format_date at 0x7fafe9eb0ca0&gt;, &#39;dayofweek&#39;: &lt;function dayofweek at 0x7fafe9eb0d30&gt;, &#39;dayofyear&#39;: &lt;function dayofyear at 0x7fafe9eb0dc0&gt;, &#39;dayofmonth&#39;: &lt;function dayofmonth at 0x7fafe9eb0ee0&gt;, &#39;weekofyear&#39;: &lt;function weekofyear at 0x7fafe9eb0e50&gt;, &#39;month&#39;: &lt;function month at 0x7fafe9eb0f70&gt;, &#39;quarter&#39;: &lt;function quarter at 0x7fafe9eb7040&gt;, &#39;year&#39;: &lt;function year at 0x7fafe9eb70d0&gt;, &#39;timestamp_diff&#39;: &lt;function timestamp_diff at 0x7fafe9eb7160&gt;, &#39;date_diff&#39;: &lt;function date_diff at 0x7fafe9eb71f0&gt;, &#39;base_Sunday&#39;: &lt;function base_Sunday at 0x7fafe9eb7280&gt;}
 )</span>
     </div>
 

dist/data_algebra-0.6.3.tar.gz

@@ -221,8 +221,8 @@ <h1 class="modulename">
         <span class="n">data_algebra_temp_cols</span> <span class="o">=</span> <span class="p">{}</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="n">window_situation</span><span class="p">:</span>
             <span class="k">for</span> <span class="p">(</span><span class="n">k</span><span class="p">,</span> <span class="n">opk</span><span class="p">)</span> <span class="ow">in</span> <span class="n">op</span><span class="o">.</span><span class="n">ops</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
+                <span class="c1"># TODO: execute expression recursively to keep eval() calls nearly trivial</span>
                 <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">opk</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">user_fn</span><span class="o">.</span><span class="n">FnTerm</span><span class="p">):</span>
-                    <span class="c1"># res[k] = opk.value(*[res[nm.column_name] for nm in opk.args])</span>
                     <span class="n">pe</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">pandas_eval_env</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
                     <span class="n">pe</span><span class="p">[</span><span class="n">opk</span><span class="o">.</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">opk</span><span class="o">.</span><span class="n">pandas_fn</span>
                     <span class="n">op_src</span> <span class="o">=</span> <span class="p">(</span>
@@ -658,8 +658,8 @@ <h1 class="modulename">
         <span class="n">data_algebra_temp_cols</span> <span class="o">=</span> <span class="p">{}</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="n">window_situation</span><span class="p">:</span>
             <span class="k">for</span> <span class="p">(</span><span class="n">k</span><span class="p">,</span> <span class="n">opk</span><span class="p">)</span> <span class="ow">in</span> <span class="n">op</span><span class="o">.</span><span class="n">ops</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
+                <span class="c1"># TODO: execute expression recursively to keep eval() calls nearly trivial</span>
                 <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">opk</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">user_fn</span><span class="o">.</span><span class="n">FnTerm</span><span class="p">):</span>
-                    <span class="c1"># res[k] = opk.value(*[res[nm.column_name] for nm in opk.args])</span>
                     <span class="n">pe</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">pandas_eval_env</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
                     <span class="n">pe</span><span class="p">[</span><span class="n">opk</span><span class="o">.</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">opk</span><span class="o">.</span><span class="n">pandas_fn</span>
                     <span class="n">op_src</span> <span class="o">=</span> <span class="p">(</span>
@@ -1231,8 +1231,8 @@ <h1 class="modulename">
         <span class="n">data_algebra_temp_cols</span> <span class="o">=</span> <span class="p">{}</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="n">window_situation</span><span class="p">:</span>
             <span class="k">for</span> <span class="p">(</span><span class="n">k</span><span class="p">,</span> <span class="n">opk</span><span class="p">)</span> <span class="ow">in</span> <span class="n">op</span><span class="o">.</span><span class="n">ops</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
+                <span class="c1"># TODO: execute expression recursively to keep eval() calls nearly trivial</span>
                 <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">opk</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">user_fn</span><span class="o">.</span><span class="n">FnTerm</span><span class="p">):</span>
-                    <span class="c1"># res[k] = opk.value(*[res[nm.column_name] for nm in opk.args])</span>
                     <span class="n">pe</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">pandas_eval_env</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
                     <span class="n">pe</span><span class="p">[</span><span class="n">opk</span><span class="o">.</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">opk</span><span class="o">.</span><span class="n">pandas_fn</span>
                     <span class="n">op_src</span> <span class="o">=</span> <span class="p">(</span>