python-table-processor 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

{python_table_processor-0.3.0.dist-info → python_table_processor-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-table-processor
-Version: 0.3.0
+Version: 0.3.2
 Summary: A table data processor
 Home-page: https://github.com/akivajp/python-table-processor
 License: MIT

{python_table_processor-0.3.0.dist-info → python_table_processor-0.3.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-table_processor/__init__.py,sha256=gybnWB0ziz1cPSSQQek-Mj66Zh8ogh_WyQsnqrNmZ3g,52
+table_processor/__init__.py,sha256=TQqqDugVb2WjmgqPXyxUA42oi3QOxyPDqpr09kjKGlk,52
 table_processor/cli.py,sha256=uluf_VsBzq3Ldxh3ePGseSrv8--lI7huu-6RjDaHPPg,2170
 table_processor/commands/convert_tables.py,sha256=j25KL0zRl5ikrBk73jAkKn4rPmDq7SecChZxecDpILQ,2123
 table_processor/commands/merge_tables.py,sha256=Uu-hjfPh69Of0_OZrY8sY0oscpLSdK4jwJ_t1qgfPMg,1485
-table_processor/core/actions.py,sha256=tZeStD07jRC_q-2r5dKXtN4wIE52JO82TTrUyHR-ias,18645
-table_processor/core/config.py,sha256=iiHAcJlO4RyXyrXFAd2ZRU3bJBnJIFM79AdfcEMMI5o,11903
+table_processor/core/actions.py,sha256=iCBm-tj_gTxeHxPaBSILdYAe8-75XaDtsCOTJp1jGfA,20264
+table_processor/core/config.py,sha256=Z1s2r3y4oQXdbDCwIY_hYzoq6VRv7Sb3oUlfBCu13Lc,11646
 table_processor/core/constants.py,sha256=w-1TxtpXywb6Qh8M4YWuzcCHUvCjy5zJYxaXC3RQS6A,158
-table_processor/core/convert.py,sha256=SbDMJnXuXKuZ-7PBSqWl7pVsaBOforXQlRekq4XYKbY,12536
+table_processor/core/convert.py,sha256=cibzqJ5hHsfX_7qUz4kE2Gi-WH4UMqecBl3kSb4IVsY,11140
 table_processor/core/functions/assign_id.py,sha256=dA-wgZA7E01gbx8qGvo1PeMd3aq9PhMdyITzr3BKXIE,4204
 table_processor/core/functions/flatten_row.py,sha256=2l-s4YXgBM58IthpfVzd7L4EGUCekSi7ss5CaM_3MUU,686
 table_processor/core/functions/get_nested_field_value.py,sha256=vF4pH6nxR3-2bDfAvrMfHcPFNiS4MnGkXL8FdcScdIw,685
@@ -15,9 +15,9 @@ table_processor/core/functions/set_flat_field_value.py,sha256=7-BgD2yEUGyBaFaIJ1
 table_processor/core/functions/set_nested_field_value.py,sha256=csO0v_nW94q-M9bNL91xR-TLHPXDDxnLK8gN-0LLd6k,595
 table_processor/core/functions/set_row_value.py,sha256=wlF_nVGZY74XCzd6pBJJyti62m6y0s1kc5Q6uq9jn8o,641
 table_processor/core/merge.py,sha256=Yc5OV9n1xV9QtgY4srl6Susd5cOKbuYseEtYuBampDw,4672
-table_processor/core/types.py,sha256=pQrNtf5pt5Unn3x8WK6ZtDpMhU9r8iYRAucToZQEBh0,2391
-python_table_processor-0.3.0.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_processor-0.3.0.dist-info/METADATA,sha256=7j1SD0x8oegMJFKwjnraXyMoN_WQMhIFzCCPD14yXDc,1098
-python_table_processor-0.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_processor-0.3.0.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
-python_table_processor-0.3.0.dist-info/RECORD,,
+table_processor/core/types.py,sha256=rxmiWsUCEBkjveO84tbMJ1kVn_P13Ywl89wDHMWEej0,2580
+python_table_processor-0.3.2.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_processor-0.3.2.dist-info/METADATA,sha256=PCCGEqAansu5aIrmLu4eaFl3HhD2DCbDuDt2ru0-nRs,1098
+python_table_processor-0.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_processor-0.3.2.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
+python_table_processor-0.3.2.dist-info/RECORD,,

table_processor/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.0"
-__version_tuple__ = (0, 3, 0)
+__version__ = "0.3.2"
+__version_tuple__ = (0, 3, 2)

table_processor/core/actions.py

@@ -28,12 +28,14 @@ from . types import (
     AssignConstantConfig,
     AssignFormatConfig,
     AssignIdConfig,
+    AssignLengthConfig,
     FilterConfig,
     GlobalStatus,
     JoinConfig,
     OmitConfig,
     ParseConfig,
     PickConfig,
+    PushConfig,
     SplitConfig,
     Row,
 )
@@ -139,6 +141,12 @@ def setup_actions_with_args(
                     reverse = reverse,
                 ))
                 continue
+            if action_name == 'assign-length':
+                config.actions.append(AssignLengthConfig(
+                    target = target,
+                    source = source,
+                ))
+                continue
             if action_name == 'filter-empty':
                 config.actions.append(FilterConfig(
                     field = target,
@@ -189,6 +197,14 @@ def setup_actions_with_args(
                     required = required,
                 ))
                 continue
+            if action_name == 'push':
+                condition = options.get('condition', None)
+                config.actions.append(PushConfig(
+                    target = target,
+                    source = source,
+                    condition = condition,
+                ))
+                continue
             if action_name == 'split':
                 delimiter = options.get('delimiter', None)
                 if delimiter == '\\n':
@@ -294,6 +310,8 @@ def do_action(
         return assign_format(row, action)
     if isinstance(action, AssignIdConfig):
         return assign_id(status.id_context_map, row, action)
+    if isinstance(action, AssignLengthConfig):
+        return assign_length(row, action)
     if isinstance(action, FilterConfig):
         if filter_row(row, action):
             return row
@@ -304,6 +322,8 @@ def do_action(
         return parse(row, action)
     if isinstance(action, OmitConfig):
         return omit_field(row, action)
+    if isinstance(action, PushConfig):
+        return push_field(row, action)
     if isinstance(action, SplitConfig):
         return split_field(row, action)
     raise ValueError(
@@ -602,3 +622,34 @@ def parse(
             parsed = value
         set_row_staging_value(row, config.target, parsed)
     return row
+
+def push_field(
+    row: Row,
+    config: PushConfig,
+):
+    source_value, found = search_column_value(row.nested, config.source)
+    do_append = False
+    if config.condition is None:
+        do_append = True
+    else:
+        condition_value, found = search_column_value(row.nested, config.condition)
+        if condition_value:
+            do_append = True
+    if do_append:
+        target_value, found = search_column_value(row.nested, config.target)
+        if found:
+            array = target_value
+        else:
+            array = []
+            set_row_staging_value(row, config.target, array)
+        array.append(source_value)
+    return row
+
+def assign_length(
+    row: Row,
+    config: AssignLengthConfig,
+):
+    value, found = search_column_value(row.nested, config.source)
+    if found:
+        set_row_staging_value(row, config.target, len(value))
+    return row

table_processor/core/config.py

@@ -31,17 +31,9 @@ class AssignArrayConfig:
     field: str
     optional: bool = True
 
-@dataclasses.dataclass
-class PushConfig:
-    target: str
-    source: str
-    condition: str | None = None
-
 @dataclasses.dataclass
 class ProcessConfig:
     assign_array: Mapping[str, list[AssignArrayConfig]] = dataclasses.field(default_factory=OrderedDict)
-    assign_length: FlatFieldMap = dataclasses.field(default_factory=OrderedDict)
-    push: list[PushConfig] = dataclasses.field(default_factory=list)
 
     def __setitem__(self, key, value):
         setattr(self, key, value)

table_processor/core/convert.py

@@ -20,7 +20,6 @@ import pandas as pd
 
 from . config import (
     AssignArrayConfig,
-    PushConfig,
     setup_config,
     setup_pick_with_args,
 )
@@ -264,39 +263,6 @@ def search_column_value_from_nested(
     return None, False
 
 
-def push_fields(
-    row: OrderedDict,
-    list_config: list[PushConfig],
-):
-    nested_row = nest(row)
-    for config in list_config:
-        target_value, found = search_column_value_from_nested(nested_row, config.target)
-        if found:
-            array = target_value
-        else:
-            array = []
-            #set_field_value(nested_row, f'{STAGING_FIELD}.{config.target}', array)
-            set_row_staging_value(nested_row, config.target, array)
-        source_value, found = search_column_value_from_nested(nested_row, config.source)
-        if config.condition is None:
-            array.append(source_value)
-            continue
-        condition_value, found = search_column_value_from_nested(nested_row, config.condition)
-        if condition_value:
-            array.append(source_value)
-    return flatten_row(nested_row)
-
-def assign_length(
-    row: OrderedDict,
-    dict_fields: OrderedDict,
-):
-    new_row = OrderedDict(row)
-    for key, field in dict_fields.items():
-        value, found = search_column_value(row, field)
-        if found:
-            new_row[f'{STAGING_FIELD}.{key}'] = len(value)
-    return new_row
-
 def convert(
     input_files: list[str],
     output_file: str | None = None,
@@ -371,10 +337,6 @@ def convert(
                 set_row_staging_value(row, INPUT_FIELD, orig_row.nested)
             if config.process.assign_array:
                 row.flat= assign_array(row.flat, config.process.assign_array)
-            if config.process.push:
-                row.flat = push_fields(row.flat, config.process.push)
-            if config.process.assign_length:
-                row.flat = assign_length(row.flat, config.process.assign_length)
             if config.actions:
                 try:
                     new_row = do_actions(global_status, row, config.actions)

table_processor/core/types.py

@@ -46,6 +46,11 @@ class AssignIdConfig:
     context: list[str] | None = None
     reverse: bool = False
 
+@dataclasses.dataclass
+class AssignLengthConfig:
+    target: str
+    source: str
+
 @dataclasses.dataclass
 class FilterConfig:
     field: str
@@ -77,6 +82,12 @@ class PickConfig:
     target: str
     source: str
 
+@dataclasses.dataclass
+class PushConfig:
+    target: str
+    source: str
+    condition: str | None = None
+
 @dataclasses.dataclass
 class SplitConfig:
     target: str