python-table-converter 0.2.2__tar.gz → 0.2.4__tar.gz

{python_table_converter-0.2.2 → python_table_converter-0.2.4}/PKG-INFO

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

{python_table_converter-0.2.2 → python_table_converter-0.2.4}/pyproject.toml

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

python_table_converter-0.2.4/table_converter/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.2.4"
+__version_tuple__ = (0, 2, 4)

{python_table_converter-0.2.2 → python_table_converter-0.2.4}/table_converter/core/config.py

@@ -13,6 +13,7 @@ type FieldMap = Mapping[str, str|FieldMap]
 @dataclasses.dataclass
 class ProcessConfig:
     assign_constants: FlatFieldMap = dataclasses.field(default_factory=OrderedDict)
+    assign_formats: FlatFieldMap = dataclasses.field(default_factory=OrderedDict)
     split_by_newline: FlatFieldMap = dataclasses.field(default_factory=OrderedDict)
 
     def __setitem__(self, key, value):
@@ -57,11 +58,11 @@ def setup_config(
         ic(loaded)
         if 'map' in loaded:
             config.map = flatten(loaded['map'])
-        #if 'process' in loaded:
         dict_process = loaded.get('process')
         if isinstance(dict_process, Mapping):
             for process_key in [
                 'assign_constants',
+                'assign_formats',
                 'split_by_newline',
             ]:
                 dict_subprocess = dict_process.get(process_key)

{python_table_converter-0.2.2 → python_table_converter-0.2.4}/table_converter/core/convert.py

@@ -251,28 +251,24 @@ def convert(
     ic()
     ic(input_files)
     df_list = []
-    dict_constants: OrderedDict | None = None
-    dict_formats: OrderedDict | None = None
     dict_assign_ids= None
     root_id_stat = create_id_stat_node()
     config = setup_config(config_path)
     ic(config)
     if assign_constants:
-        dict_constants = OrderedDict()
         fields = assign_constants.split(',')
         for field in fields:
             if '=' in field:
                 dst, src = field.split('=')
-                dict_constants[dst] = src
+                config.process.assign_constants[dst] = src
             else:
                 raise ValueError(f'Invalid constant assignment: {field}')
     if assign_formats:
-        dict_formats = OrderedDict()
         fields = assign_formats.split(',')
         for field in fields:
             if '=' in field:
                 dst, src = field.split('=')
-                dict_formats[dst] = src
+                config.process.assign_formats[dst] = src
             else:
                 raise ValueError(f'Invalid template assignment: {field}')
     if pickup_columns:
@@ -306,6 +302,7 @@ def convert(
             raise ValueError(f'Unsupported file type: {ext}')
         saver = dict_savers[ext]
     ic(config)
+    #return # debug return
     for input_file in input_files:
         ic(input_file)
         if not os.path.exists(input_file):
@@ -327,16 +324,16 @@ def convert(
             new_row = OrderedDict(row)
             set_field_value(new_row, '__debug__.__original__', orig)
             set_field_value(new_row, '__debug__.__file__', input_file)
-            if dict_constants:
-                new_row = map_constants(new_row, dict_constants)
+            if config.process.assign_constants:
+                new_row = map_constants(new_row, config.process.assign_constants)
             if config.map:
                 new_row = remap_columns(new_row, config.map)
             if config.process.split_by_newline:
                 new_row = apply_fields_split_by_newline(new_row, config.process.split_by_newline)
             if dict_assign_ids:
                 new_row = assign_id(new_row, dict_assign_ids, root_id_stat)
-            if dict_formats:
-                new_row = map_formats(new_row, dict_formats)
+            if config.process.assign_formats:
+                new_row = map_formats(new_row, config.process.assign_formats)
             if config.map:
                 new_row = remap_columns(new_row, config.map)
             if not output_debug:

python_table_converter-0.2.2/table_converter/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.2.2"
-__version_tuple__ = (0, 2, 2)