python-table-processor 0.3.9__tar.gz → 0.3.11__tar.gz

{python_table_processor-0.3.9 → python_table_processor-0.3.11}/PKG-INFO

@@ -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 → python_table_processor-0.3.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-table-processor"
-version = "0.3.9"
+version = "0.3.11"
 description = "A table data processor"
 authors = ["Akiva Miura <akiva.miura@gmail.com>"]
 license = "MIT"

python_table_processor-0.3.11/table_processor/__init__.py

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

{python_table_processor-0.3.9 → python_table_processor-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)

{python_table_processor-0.3.9 → python_table_processor-0.3.11}/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(

{python_table_processor-0.3.9 → python_table_processor-0.3.11}/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)

{python_table_processor-0.3.9 → python_table_processor-0.3.11}/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)

{python_table_processor-0.3.9 → python_table_processor-0.3.11}/table_processor/core/types.py

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

python_table_processor-0.3.9/table_processor/__init__.py

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