python-table-processor 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

{python_table_processor-0.3.5.dist-info → python_table_processor-0.3.7.dist-info}/METADATA

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

{python_table_processor-0.3.5.dist-info → python_table_processor-0.3.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-table_processor/__init__.py,sha256=gtxdmTbOklsCYOkQEth0hoRHsSwKt1ixChUIQPBOStA,52
+table_processor/__init__.py,sha256=voNuwez5LsM9NyDZcQEcA5N7Cg-32xrD7xSIGlYyf6U,52
 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=Uu-hjfPh69Of0_OZrY8sY0oscpLSdK4jwJ_t1qgfPMg,1485
+table_processor/commands/merge_tables.py,sha256=jryGU3gUx2TlGrI6FozGS_aJQvJQFco2LKwun6Uo9KY,1719
 table_processor/core/actions.py,sha256=GKUKzoPxUEuWSeuY-HsqFoS5Bdm99bjkRhuBgG1s_uk,23658
 table_processor/core/config.py,sha256=Z1s2r3y4oQXdbDCwIY_hYzoq6VRv7Sb3oUlfBCu13Lc,11646
 table_processor/core/constants.py,sha256=w-1TxtpXywb6Qh8M4YWuzcCHUvCjy5zJYxaXC3RQS6A,158
@@ -12,12 +12,12 @@ table_processor/core/functions/get_nested_field_value.py,sha256=ZEJi8XtDONoYmhPo
 table_processor/core/functions/nest_row.py,sha256=b5AKfxE39g-NOLranQRy0dfTZq-27Or8ZlgCB8N5kFs,640
 table_processor/core/functions/search_column_value.py,sha256=GscwLaMTORHFDhdCdjzdoy46UGyFHrGwDQA2b_tZhsQ,740
 table_processor/core/functions/set_flat_field_value.py,sha256=7-BgD2yEUGyBaFaIJ18bYv82Qdy0CN8NiC5ZtsAdv44,531
-table_processor/core/functions/set_nested_field_value.py,sha256=csO0v_nW94q-M9bNL91xR-TLHPXDDxnLK8gN-0LLd6k,595
+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=NoxVfhpOr7oxfmMZt1Xqx94fkIhAJQcYuYzR3XcJsns,4809
+table_processor/core/merge.py,sha256=5U6fvofaMq6yvllB24M6Pf3uG7Hz17aLKM47NmWHJBc,5027
 table_processor/core/types.py,sha256=xNvy1vL1ei87kt-MgSfRJSllYrNKRo23pHtJA15DyLQ,2895
-python_table_processor-0.3.5.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_processor-0.3.5.dist-info/METADATA,sha256=MA1YvRPDWpWhbua0uFd5AOyFJ7EtxUYJ9XV3bYyr2S8,1098
-python_table_processor-0.3.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_processor-0.3.5.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
-python_table_processor-0.3.5.dist-info/RECORD,,
+python_table_processor-0.3.7.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_processor-0.3.7.dist-info/METADATA,sha256=GTh1Nm6ViWpYlbeO36ncPeJDe35Q8jrClH-xnhEPoRs,1098
+python_table_processor-0.3.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_processor-0.3.7.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
+python_table_processor-0.3.7.dist-info/RECORD,,

table_processor/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.5"
-__version_tuple__ = (0, 3, 5)
+__version__ = "0.3.7"
+__version_tuple__ = (0, 3, 7)

table_processor/commands/merge_tables.py

@@ -15,7 +15,8 @@ def run(
         keys=args.keys,
         allow_duplicate_keys=args.allow_duplicate_keys,
         ignore_not_found=args.ignore_not_found,
-        output_file=args.output_file,
+        output_base_data_file=args.output_base_data_file,
+        output_modified_data_file=args.output_modified_data_file,
     )
 
 def setup_parser(
@@ -50,9 +51,13 @@ def setup_parser(
         help='Ignore not found',
     )
     parser.add_argument(
-        '--output-file', '--output', '-o',
-        metavar='OUTPUT_FILE',
+        '--output-base-data-file', '--output-base',
         required=False,
-        help='Path to the output file.',
+        help='Path to output base data file',
+    )
+    parser.add_argument(
+        '--output-modified-data-file', '--output-modified',
+        required=False,
+        help='Path to output modified data file',
     )
     parser.set_defaults(handler=run)

table_processor/core/functions/set_nested_field_value.py

@@ -6,19 +6,36 @@ from collections import OrderedDict
 from icecream import ic
 
 def set_nested_field_value(
-    data: OrderedDict,
+    data: OrderedDict | list,
     field: str,
     value: any,
 ):
     if isinstance(field, str) and  '.' in field:
         field, rest = field.split('.', 1)
-        sub_data = data.get(field)
+        if isinstance(data, dict):
+            sub_data = data.get(field)
+        elif isinstance(data, list):
+            field = int(field)
+            if field < len(data):
+                sub_data = data[field]
+            else:
+                sub_data = None
         if not isinstance(sub_data, dict):
-            data[field] = OrderedDict()
+            do_create_dict = True
+            if isinstance(sub_data, list):
+                # NOTE: 続くフィールド文字列が数字の場合は、リストの要素として扱う
+                field2 = rest.split('.', 1)[0]
+                if field2.isdigit():
+                    do_create_dict = False
+            if do_create_dict:
+                data[field] = OrderedDict()
         set_nested_field_value(data[field], rest, value)
     else:
         try:
-            data[field] = value
+            if isinstance(data, dict):
+                data[field] = value
+            elif isinstance(data, list):
+                data[int(field)] = value
         except:
             ic(data, field, value)
             raise

table_processor/core/merge.py

@@ -45,7 +45,8 @@ def merge(
     keys: list[str],
     allow_duplicate_keys: bool = False,
     ignore_not_found: bool = False,
-    output_file: str | None = None,
+    output_base_data_file: str | None = None,
+    output_modified_data_file: str | None = None,
 ):
     ic.enable()
     ic()
@@ -53,7 +54,8 @@ def merge(
     ic(modification_files)
     ic(keys)
     dict_key_to_row = {}
-    all_rows = []
+    all_base_rows = []
+    all_modified_rows = []
     list_ignored_keys = []
     num_modified = 0
     for previous_file in previous_files:
@@ -83,9 +85,9 @@ def merge(
             if not allow_duplicate_keys:
                 if primary_key in dict_key_to_row:
                     ic(index)
-                    raise ValueError(f'Duplicate key: {key}')
+                    raise ValueError(f'Duplicate key: {primary_key}')
             dict_key_to_row[primary_key] = row
-            all_rows.append(row)
+            all_base_rows.append(row)
     for modification_file in modification_files:
         if not os.path.exists(modification_file):
             raise FileNotFoundError(f'File not found: {modification_file}')
@@ -123,6 +125,7 @@ def merge(
                 ic(index)
                 raise ValueError(f'Key not found: {primary_key}')
             previous_row = dict_key_to_row[primary_key]
+            all_modified_rows.append(previous_row)
             #ic(previous_row)
             #ic(previous_row.flat)
             for key, value in row.flat.items():
@@ -131,8 +134,6 @@ def merge(
                 #ic(key)
                 #ic(key, value)
                 set_row_value(previous_row, key, value)
-                #set_row_value(previous_row, '指示追従性？', 'test')
-                #set_row_value(previous_row, 'modified', True)
             #ic(previous_row)
             #ic(previous_row.flat)
             #raise
@@ -141,8 +142,11 @@ def merge(
     if ignore_not_found:
         ic(len(list_ignored_keys))
         ic(list_ignored_keys)
-    if output_file:
-        #all_df = pd.DataFrame(all_rows)
-        all_df = pd.DataFrame([row.flat for row in all_rows])
-        ic('Saving to: ', output_file)
-        save(all_df, output_file)
+    if output_base_data_file:
+        all_df = pd.DataFrame([row.flat for row in all_base_rows])
+        ic('Saving to: ', output_base_data_file)
+        save(all_df, output_base_data_file)
+    if output_modified_data_file:
+        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)