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

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

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

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

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

python_table_converter-0.2.2/table_converter/__init__.py

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

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

@@ -10,10 +10,18 @@ import yaml
 type FlatFieldMap = Mapping[str, str]
 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: OrderedDict|None = dataclasses.field(default_factory=lambda: None)
-    map: FieldMap|None = dataclasses.field(default_factory=lambda: None)
+    map: FieldMap = dataclasses.field(default_factory=OrderedDict)
+    process: ProcessConfig = dataclasses.field(default_factory=ProcessConfig)
 
 def flatten(
     mapping: FieldMap,
@@ -33,6 +41,7 @@ def flatten(
 def setup_config(
     config_path: str | None = None,
 ):
+    config = Config()
     if config_path:
         if config_path.endswith('.yaml'):
             yaml.add_constructor(
@@ -40,17 +49,22 @@ def setup_config(
                 lambda loader, node: OrderedDict(loader.construct_pairs(node)),
             )
             with open(config_path, 'r') as f:
-                data = yaml.load(f, yaml.Loader)
-                #ic(data)
-                config = Config(
-                    #**data,
-                    map = flatten(data.get('map', {})),
-                )
+                loaded = yaml.load(f, yaml.Loader)
         else:
             raise ValueError(
                 'Only YAML configuration files are supported.'
             )
-    else:
-        config = 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',
+                '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.0 → python_table_converter-0.2.2}/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
 
@@ -247,7 +253,6 @@ def convert(
     df_list = []
     dict_constants: OrderedDict | None = None
     dict_formats: OrderedDict | None = None
-    dict_split_by_newline: OrderedDict | None = None
     dict_assign_ids= None
     root_id_stat = create_id_stat_node()
     config = setup_config(config_path)
@@ -271,23 +276,19 @@ def convert(
             else:
                 raise ValueError(f'Invalid template assignment: {field}')
     if pickup_columns:
-        if config.map is None:
-            config.map = OrderedDict()
         fields = pickup_columns.split(',')
         for field in fields:
             if '=' in field:
                 dst, value = field.split('=')
-                set_field_value(config.map, dst, value)
+                config.map[dst] = value
             else:
-                set_field_value(config.map, field, field)
+                config.map[field] = field
     if fields_to_split_by_newline:
-        #list_fields_to_split_by_newline = fields_to_split_by_newline.split(',')
-        dict_split_by_newline = OrderedDict()
         fields = fields_to_split_by_newline.split(',')
         for field in fields:
             if '=' in field:
                 dst, src = field.split('=')
-                dict_split_by_newline[dst] = src
+                config.process.split_by_newline[dst] = src
             else:
                 raise ValueError(f'Invalid split by newline: {field}')
     if fields_to_assign_ids:
@@ -330,8 +331,8 @@ def convert(
                 new_row = map_constants(new_row, dict_constants)
             if config.map:
                 new_row = remap_columns(new_row, config.map)
-            if dict_split_by_newline:
-                new_row = apply_fields_split_by_newline(new_row, dict_split_by_newline)
+            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:

python_table_converter-0.2.0/table_converter/__init__.py

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