python-table-processor 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

{python_table_processor-0.3.6.dist-info → python_table_processor-0.3.8.dist-info}/METADATA

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

{python_table_processor-0.3.6.dist-info → python_table_processor-0.3.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
-table_processor/__init__.py,sha256=NnfhwEniUS8sdLDZO-0YfiWrkT_whyk4dJmhf1LDoHs,52
+table_processor/__init__.py,sha256=2aCcYBh8v0QBhm77EG8Rb7HSYaY18N0gWeE08uXri3o,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=jryGU3gUx2TlGrI6FozGS_aJQvJQFco2LKwun6Uo9KY,1719
-table_processor/core/actions.py,sha256=GKUKzoPxUEuWSeuY-HsqFoS5Bdm99bjkRhuBgG1s_uk,23658
+table_processor/core/actions.py,sha256=BNXf9iptGl9xV2itNK4bVx1jjVHCiRgTIFlZyULe6Dc,23695
 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
@@ -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=Sqnr-d7XCkRHvypExsHLboJBKxemPWnLNhKB0CuCPN8,5157
+table_processor/core/merge.py,sha256=5U6fvofaMq6yvllB24M6Pf3uG7Hz17aLKM47NmWHJBc,5027
 table_processor/core/types.py,sha256=xNvy1vL1ei87kt-MgSfRJSllYrNKRo23pHtJA15DyLQ,2895
-python_table_processor-0.3.6.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_processor-0.3.6.dist-info/METADATA,sha256=TgRGjK9lb7EFMdnyoZMffMiOz16SR2HEzc7w442DtvE,1098
-python_table_processor-0.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_processor-0.3.6.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
-python_table_processor-0.3.6.dist-info/RECORD,,
+python_table_processor-0.3.8.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_processor-0.3.8.dist-info/METADATA,sha256=JbejFTK1nVvFUQuI4XfO9ei02fdigXsBujLnQNAKges,1098
+python_table_processor-0.3.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_processor-0.3.8.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
+python_table_processor-0.3.8.dist-info/RECORD,,

table_processor/__init__.py

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

table_processor/core/actions.py

@@ -486,9 +486,9 @@ def search_with_operator(
     row: Row,
     source: str,
 ):
-    or_operator = '\|\|'
-    null_or_operator = '\?\?'
-    operator_group = f'{or_operator}|{null_or_operator}'
+    or_operator = '||'
+    null_or_operator = '??'
+    operator_group = f'{re.escape(or_operator)}|{re.escape(null_or_operator)}'
     matched = re.split(f'({operator_group})', source, 1)
     #ic(source, matched)
     if len(matched) == 1:
@@ -496,10 +496,10 @@ def search_with_operator(
     matched = map(str.strip, matched)
     left, operator, rest = matched
     value, found = search_column_value(row.nested, left)
-    if operator == '||':
+    if operator == or_operator:
         if bool(value):
             return value, found
-    if operator == '??':
+    if operator == null_or_operator:
         if found and value is not None:
             return value, found
     return search_with_operator(row, rest)

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

@@ -85,7 +85,7 @@ 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_base_rows.append(row)
     for modification_file in modification_files:
@@ -134,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