python-table-converter 0.2.1__tar.gz → 0.2.3__tar.gz

{python_table_converter-0.2.1 → python_table_converter-0.2.3}/PKG-INFO

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

{python_table_converter-0.2.1 → python_table_converter-0.2.3}/pyproject.toml

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

python_table_converter-0.2.3/table_converter/__init__.py

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

{python_table_converter-0.2.1 → python_table_converter-0.2.3}/table_converter/core/config.py

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

{python_table_converter-0.2.1 → python_table_converter-0.2.3}/table_converter/core/convert.py

@@ -147,15 +147,21 @@ def map_formats(
     new_row = OrderedDict(row)
     for column in dict_formats.keys():
         template = dict_formats[column]
-        try:
-            params = {}
-            params.update(row['__debug__'])
-            params.update(row)
-            formatted = template.format(**params)
-        except KeyError as e:
-            ic(e)
-            formatted = template
-            raise e
+        params = {}
+        params.update(row['__debug__'])
+        params.update(row)
+        formatted = None
+        while formatted is None:
+            try:
+                formatted = template.format(**params)
+            except KeyError as e:
+                #ic(e)
+                #ic(e.args)
+                #ic(e.args[0])
+                key = e.args[0]
+                params[key] = '__undefined__'
+            except:
+                raise
         set_field_value(new_row, f'__debug__.{column}', formatted)
     return new_row
 
@@ -245,19 +251,17 @@ 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:
@@ -321,8 +325,8 @@ 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:

python_table_converter-0.2.1/table_converter/__init__.py

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