python-table-converter 0.2.5__tar.gz → 0.2.7__tar.gz

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/PKG-INFO

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

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/pyproject.toml

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

python_table_converter-0.2.7/table_converter/__init__.py

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

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/table_converter/cli.py

@@ -41,6 +41,10 @@ def command_convert_tables(
 
 def main():
     parser = argparse.ArgumentParser(description='Table Data Converter')
+    parser.add_argument(
+        '--verbose', '-v',
+        action='store_true',
+    )
     parser.set_defaults(handler=None)
     subparsers = parser.add_subparsers(dest='command')
 

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/table_converter/commands/convert_tables.py

@@ -24,10 +24,6 @@ def run(
 def setup_parser(
     parser: argparse.ArgumentParser,
 ):
-    parser.add_argument(
-        '--verbose', '-v',
-        action='store_true',
-    )
     parser.add_argument(
         'input_files',
         metavar='INPUT_FILE',

python_table_converter-0.2.7/table_converter/core/constants.py

@@ -0,0 +1,3 @@
+FILE_FIELD = '__file__'
+INPUT_FIELD = '__input__'
+STAGING_FIELD = '__staging__'

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/table_converter/core/convert.py

@@ -14,6 +14,11 @@ import pandas as pd
 # local
 
 from . config import setup_config
+from . constants import (
+    FILE_FIELD,
+    INPUT_FIELD,
+    STAGING_FIELD,
+)
 from . functions.assign_id import (
     assign_id,
     create_id_context_map,
@@ -96,12 +101,12 @@ def search_column_value(
     row: OrderedDict,
     column: str,
 ):
-    if '__debug__' in row:
-        value, found = get_field_value(row['__debug__'], column)
+    if STAGING_FIELD in row:
+        value, found = get_field_value(row[STAGING_FIELD], column)
         if found:
             return value, True
-    value, found = get_field_value(row['__debug__'], column)
-    original, found = get_field_value(row, '__debug__.__original__')
+    value, found = get_field_value(row[STAGING_FIELD], column)
+    original, found = get_field_value(row, f'{STAGING_FIELD}.{INPUT_FIELD}')
     if found:
         value, found = get_field_value(original, column)
         if found:
@@ -119,7 +124,7 @@ def map_constants(
     new_row = OrderedDict(row)
     for column in dict_constants.keys():
         #set_field_value(new_row, column, dict_constants[column])
-        set_field_value(new_row, f'__debug__.{column}', dict_constants[column])
+        set_field_value(new_row, f'{STAGING_FIELD}.{column}', dict_constants[column])
     return new_row
 
 def map_formats(
@@ -130,7 +135,7 @@ def map_formats(
     for column in dict_formats.keys():
         template = dict_formats[column]
         params = {}
-        params.update(row['__debug__'])
+        params.update(row[STAGING_FIELD])
         params.update(row)
         formatted = None
         while formatted is None:
@@ -144,7 +149,7 @@ def map_formats(
                 params[key] = f'__{key}__undefined__'
             except:
                 raise
-        set_field_value(new_row, f'__debug__.{column}', formatted)
+        set_field_value(new_row, f'{STAGING_FIELD}.{column}', formatted)
     return new_row
 
 def remap_columns(
@@ -157,7 +162,7 @@ def remap_columns(
         if found:
             set_field_value(new_row, column, value)
     for column in row.keys():
-        if column == '__debug__':
+        if column == STAGING_FIELD:
             # NOTE: Ignore debug fields
             set_field_value(new_row, column, row[column])
     return new_row
@@ -173,9 +178,9 @@ def apply_fields_split_by_newline(
         if found:
             if isinstance(value, str):
                 new_value = value.split('\n')
-                set_field_value(new_row, f'__debug__.{column}', new_value)
+                set_field_value(new_row, f'{STAGING_FIELD}.{column}', new_value)
             else:
-                set_field_value(new_row, f'__debug__.{column}', value)
+                set_field_value(new_row, f'{STAGING_FIELD}.{column}', value)
     return new_row
 
 def convert(
@@ -256,8 +261,8 @@ def convert(
         for index, row in df.iterrows():
             orig = OrderedDict(row)
             new_row = OrderedDict(row)
-            set_field_value(new_row, '__debug__.__original__', orig)
-            set_field_value(new_row, '__debug__.__file__', input_file)
+            set_field_value(new_row, f'{STAGING_FIELD}.{INPUT_FIELD}', orig)
+            set_field_value(new_row, f'{STAGING_FIELD}.{FILE_FIELD}', input_file)
             if config.process.assign_constants:
                 new_row = map_constants(new_row, config.process.assign_constants)
             if config.map:
@@ -271,7 +276,7 @@ def convert(
             if config.map:
                 new_row = remap_columns(new_row, config.map)
             if not output_debug:
-                new_row.pop('__debug__', None)
+                new_row.pop(STAGING_FIELD, None)
             new_rows.append(new_row)
         new_df = pd.DataFrame(new_rows)
         df_list.append(new_df)

{python_table_converter-0.2.5 → python_table_converter-0.2.7}/table_converter/core/functions/search_column_value.py

@@ -2,6 +2,8 @@
 This function is used to search for a column value in a row. It will first search in the '__debug__' field, then in the '__debug__.__original__' field, and finally in the row itself. If the value is found, it will be set in the row and returned.
 '''
 
+from .. constants import STAGING_FIELD
+
 from collections import OrderedDict
 
 from . get_field_value import get_field_value
@@ -11,12 +13,12 @@ def search_column_value(
     row: OrderedDict,
     column: str,
 ):
-    if '__debug__' in row:
-        value, found = get_field_value(row['__debug__'], column)
+    if STAGING_FIELD in row:
+        value, found = get_field_value(row[STAGING_FIELD], column)
         if found:
             return value, True
-    value, found = get_field_value(row['__debug__'], column)
-    original, found = get_field_value(row, '__debug__.__original__')
+    value, found = get_field_value(row[STAGING_FIELD], column)
+    original, found = get_field_value(row, f'{STAGING_FIELD}.__original__')
     if found:
         value, found = get_field_value(original, column)
         if found:

python_table_converter-0.2.5/table_converter/__init__.py

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