python-table-processor 0.3.6__tar.gz → 0.3.7__tar.gz

{python_table_processor-0.3.6 → python_table_processor-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-table-processor
-Version: 0.3.6
+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.6 → python_table_processor-0.3.7}/pyproject.toml

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

python_table_processor-0.3.7/table_processor/__init__.py

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

python_table_processor-0.3.7/table_processor/core/functions/set_nested_field_value.py

@@ -0,0 +1,41 @@
+'''
+Set the value of a field in a nested dictionary.
+'''
+
+from collections import OrderedDict
+from icecream import ic
+
+def set_nested_field_value(
+    data: OrderedDict | list,
+    field: str,
+    value: any,
+):
+    if isinstance(field, str) and  '.' in field:
+        field, rest = field.split('.', 1)
+        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):
+            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:
+            if isinstance(data, dict):
+                data[field] = value
+            elif isinstance(data, list):
+                data[int(field)] = value
+        except:
+            ic(data, field, value)
+            raise

{python_table_processor-0.3.6 → python_table_processor-0.3.7}/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

python_table_processor-0.3.6/table_processor/__init__.py

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

python_table_processor-0.3.6/table_processor/core/functions/set_nested_field_value.py

@@ -1,24 +0,0 @@
-'''
-Set the value of a field in a nested dictionary.
-'''
-
-from collections import OrderedDict
-from icecream import ic
-
-def set_nested_field_value(
-    data: OrderedDict,
-    field: str,
-    value: any,
-):
-    if isinstance(field, str) and  '.' in field:
-        field, rest = field.split('.', 1)
-        sub_data = data.get(field)
-        if not isinstance(sub_data, dict):
-            data[field] = OrderedDict()
-        set_nested_field_value(data[field], rest, value)
-    else:
-        try:
-            data[field] = value
-        except:
-            ic(data, field, value)
-            raise