python-table-processor 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

{python_table_processor-0.3.9.dist-info → python_table_processor-0.3.11.dist-info}/METADATA

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

{python_table_processor-0.3.9.dist-info → python_table_processor-0.3.11.dist-info}/RECORD

@@ -1,11 +1,11 @@
-table_processor/__init__.py,sha256=sA4b5QjPy1l9_d8B5UqNxW9ElcTD5ccsduZThd_EcI0,52
+table_processor/__init__.py,sha256=VGVBf0Tvu9kKvvklW4UI-fweoMZobinpwjqSjD7Hm30,54
 table_processor/cli.py,sha256=uluf_VsBzq3Ldxh3ePGseSrv8--lI7huu-6RjDaHPPg,2170
 table_processor/commands/convert_tables.py,sha256=w4IZftSlrbt-BMPjldULT_616LSiNE3h7GmrFF7K5OM,2276
-table_processor/commands/merge_tables.py,sha256=GHz3uBj_yeQzBr1_2b2ua8EUr0_B3_M-33CSdTD_wUc,1974
-table_processor/core/actions.py,sha256=BNXf9iptGl9xV2itNK4bVx1jjVHCiRgTIFlZyULe6Dc,23695
+table_processor/commands/merge_tables.py,sha256=fIk3e-Qbdj3QtOXetC4ItbJs9NfBHVsraRhdfnpy2RQ,2194
+table_processor/core/actions.py,sha256=3yjSW1CKXPn49BNHx0HbjkU5gp8266s5iun57snXqlc,23815
 table_processor/core/config.py,sha256=Z1s2r3y4oQXdbDCwIY_hYzoq6VRv7Sb3oUlfBCu13Lc,11646
 table_processor/core/constants.py,sha256=w-1TxtpXywb6Qh8M4YWuzcCHUvCjy5zJYxaXC3RQS6A,158
-table_processor/core/convert.py,sha256=dzGcpBwJ5omiE8Pw-VmHnGoOqDyh1Rip6BiLdvdf3V8,11561
+table_processor/core/convert.py,sha256=yF_ypp0WCdyavhLldP_dQE9aw9Bm5bS8DQgsCQTTT2E,11562
 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=ZEJi8XtDONoYmhPoqYpVZRGtEWvsfAksV4FXtkMAaq8,946
@@ -14,10 +14,10 @@ table_processor/core/functions/search_column_value.py,sha256=GscwLaMTORHFDhdCdjz
 table_processor/core/functions/set_flat_field_value.py,sha256=7-BgD2yEUGyBaFaIJ18bYv82Qdy0CN8NiC5ZtsAdv44,531
 table_processor/core/functions/set_nested_field_value.py,sha256=351AoyL8-dT9I4eBKYlxUME03ACiMjDukebzmhOBaks,1308
 table_processor/core/functions/set_row_value.py,sha256=wlF_nVGZY74XCzd6pBJJyti62m6y0s1kc5Q6uq9jn8o,641
-table_processor/core/merge.py,sha256=mP-DR7Hb6RJcqXEyEgk33AWUYlOgdcvLVYY-IsMKr9A,5361
-table_processor/core/types.py,sha256=xNvy1vL1ei87kt-MgSfRJSllYrNKRo23pHtJA15DyLQ,2895
-python_table_processor-0.3.9.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_processor-0.3.9.dist-info/METADATA,sha256=RsoTUywEZBrBs1_XiEJO05LVNHHJaEnxVyzekwfLC_0,1098
-python_table_processor-0.3.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_processor-0.3.9.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
-python_table_processor-0.3.9.dist-info/RECORD,,
+table_processor/core/merge.py,sha256=gcMQ5LgBssGBZ0CuSPN0ddslNuLznxwh024kRiGOFLM,5800
+table_processor/core/types.py,sha256=76Fn1PQgO03Swe7E_zFLjusbQ6w9sfxzsL08uHS21hE,2919
+python_table_processor-0.3.11.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_processor-0.3.11.dist-info/METADATA,sha256=scfDAfEQ1Gm7-BmJgJEC_XeGzjGAP87OmyQV5aADoko,1099
+python_table_processor-0.3.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_processor-0.3.11.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
+python_table_processor-0.3.11.dist-info/RECORD,,

table_processor/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.9"
-__version_tuple__ = (0, 3, 9)
+__version__ = "0.3.11"
+__version_tuple__ = (0, 3, 11)

table_processor/commands/merge_tables.py

@@ -18,6 +18,7 @@ def run(
         output_base_data_file=args.output_base_data_file,
         output_modified_data_file=args.output_modified_data_file,
         output_remaining_data_file=args.output_remaining_data_file,
+        merge_fields=args.merge_fields,
     )
 
 def setup_parser(
@@ -66,4 +67,10 @@ def setup_parser(
         required=False,
         help='Path to output remaining data file',
     )
+    parser.add_argument(
+        '--merge-fields', '--merge-field', '--merge-keys', '--merge-key',
+        nargs='+',
+        required=False,
+        help='Fields to merge',
+    )
     parser.set_defaults(handler=run)

table_processor/core/actions.py

@@ -196,8 +196,10 @@ def setup_actions_with_args(
                 ))
                 continue
             if action_name == 'omit':
+                purge = options.get('purge', False)
                 config.actions.append(OmitConfig(
                     field = target,
+                    purge = purge,
                 ))
                 continue
             if action_name == 'parse':
@@ -607,8 +609,9 @@ def omit_field(
     value, found = pop_row_value(row, config.field)
     if not found:
         return row
-    if f'{STAGING_FIELD}.{config.field}' not in row.flat:
-        set_row_staging_value(row, config.field, value)
+    if not config.purge:
+        if f'{STAGING_FIELD}.{config.field}' not in row.flat:
+            set_row_staging_value(row, config.field, value)
     return row
 
 def join_field(

table_processor/core/convert.py

@@ -391,7 +391,7 @@ def convert(
     #ic(all_df.columns)
     #ic(all_df.iloc[0])
     if output_file:
-        ic('Saing to: ', output_file)
+        ic('Saving to: ', output_file)
         saver(all_df, output_file)
     else:
         ic(all_df)

table_processor/core/merge.py

@@ -61,6 +61,7 @@ def merge(
     output_base_data_file: str | None = None,
     output_modified_data_file: str | None = None,
     output_remaining_data_file: str | None = None,
+    merge_fields: list[str] | None = None,
 ):
     ic.enable()
     ic()
@@ -132,12 +133,18 @@ def merge(
             all_modified_rows.append(previous_row)
             #ic(previous_row)
             #ic(previous_row.flat)
-            for key, value in row.flat.items():
-                if key.startswith('__staging__.'):
-                    continue
+            if merge_fields is None:
+                merge_fields = []
+                for field in row.flat.keys():
+                    if field.startswith('__staging__.'):
+                        continue
+                    merge_fields.append(field)
+            for field in merge_fields:
+                value, found = search_column_value(row.flat, field)
                 #ic(key)
                 #ic(key, value)
-                set_row_value(previous_row, key, value)
+                if found:
+                    set_row_value(previous_row, field, value)
             #ic(previous_row)
             #ic(previous_row.flat)
             #raise
@@ -152,6 +159,9 @@ def merge(
         ic('Saving to: ', output_base_data_file)
         save(all_df, output_base_data_file)
     if output_modified_data_file:
+        #all_modified_rows = []
+        #for key in set_modified_keys:
+        #    all_modified_rows.append(dict_key_to_row[key])
         all_df = pd.DataFrame([row.flat for row in all_modified_rows])
         ic('Saving to: ', output_modified_data_file)
         save(all_df, output_modified_data_file)

table_processor/core/types.py

@@ -80,6 +80,7 @@ class JoinConfig:
 @dataclasses.dataclass
 class OmitConfig:
     field: str
+    purge: bool = False
 
 @dataclasses.dataclass
 class ParseConfig: