python-table-processor 0.3.8__tar.gz → 0.3.10__tar.gz

{python_table_processor-0.3.8 → python_table_processor-0.3.10}/PKG-INFO

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

{python_table_processor-0.3.8 → python_table_processor-0.3.10}/pyproject.toml

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

python_table_processor-0.3.10/table_processor/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.3.10"
+__version_tuple__ = (0, 3, 10)

{python_table_processor-0.3.8 → python_table_processor-0.3.10}/table_processor/commands/merge_tables.py

@@ -17,6 +17,8 @@ def run(
         ignore_not_found=args.ignore_not_found,
         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(
@@ -60,4 +62,15 @@ def setup_parser(
         required=False,
         help='Path to output modified data file',
     )
+    parser.add_argument(
+        '--output-remaining-data-file', '--output-remaining', '--output-remain',
+        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.8 → python_table_processor-0.3.10}/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.8 → python_table_processor-0.3.10}/table_processor/core/merge.py

@@ -39,6 +39,19 @@ from . convert import (
     save,
 )
 
+def get_primary_key(
+    row: Mapping,
+    keys: list[str],
+):
+    list_keys = []
+    for key in keys:
+        value, found = search_column_value(row, key)
+        if not found:
+            raise KeyError(f'Column not found: {key}, existing columns: {row.keys()}')
+        list_keys.append(value)
+    primary_key = tuple(list_keys)
+    return primary_key
+
 def merge(
     previous_files: list[str],
     modification_files: list[str],
@@ -47,13 +60,17 @@ def merge(
     ignore_not_found: bool = False,
     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()
     ic(previous_files)
     ic(modification_files)
     ic(keys)
-    dict_key_to_row = {}
+    #dict_key_to_row = {}
+    dict_key_to_row = OrderedDict()
+    set_modified_keys = set()
     all_base_rows = []
     all_modified_rows = []
     list_ignored_keys = []
@@ -74,13 +91,7 @@ def merge(
             total=len(df),
         ):
             row = prepare_row(flat_row)
-            list_keys = []
-            for key in keys:
-                value, found = search_column_value(row.nested, key)
-                if not found:
-                    raise KeyError(f'Column not found: {key}, existing columns: {row.flat.keys()}')
-                list_keys.append(value)
-            primary_key = tuple(list_keys)
+            primary_key = get_primary_key(row.flat, keys)
             #ic(key)
             if not allow_duplicate_keys:
                 if primary_key in dict_key_to_row:
@@ -104,13 +115,7 @@ def merge(
             total=len(df),
         ):
             row = prepare_row(flat_row)
-            list_keys = []
-            for key in keys:
-                value, found = search_column_value(row.nested, key)
-                if not found:
-                    raise KeyError(f'Column not found: {key}, existing columns: {row.flat.keys()}')
-                list_keys.append(value)
-            primary_key = tuple(list_keys)
+            primary_key = get_primary_key(row.flat, keys)
             #ic(key)
             #if key not in dict_key_to_row:
             #    dict_key_to_row[key] = row
@@ -128,15 +133,22 @@ 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
+            set_modified_keys.add(primary_key)
             num_modified += 1
     ic(num_modified)
     if ignore_not_found:
@@ -147,6 +159,17 @@ 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)
+    if output_remaining_data_file:
+        remaining_rows = []
+        for key, row in dict_key_to_row.items():
+            if key not in set_modified_keys:
+                remaining_rows.append(row)
+        all_df = pd.DataFrame([row.flat for row in remaining_rows])
+        ic('Saving to: ', output_remaining_data_file)
+        save(all_df, output_remaining_data_file)

{python_table_processor-0.3.8 → python_table_processor-0.3.10}/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.8/table_processor/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.3.8"
-__version_tuple__ = (0, 3, 8)