python-table-processor 0.3.1__tar.gz → 0.3.3__tar.gz

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/PKG-INFO

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

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/pyproject.toml

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

python_table_processor-0.3.3/table_processor/__init__.py

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

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/table_processor/core/actions.py

@@ -28,6 +28,7 @@ from . types import (
     AssignConstantConfig,
     AssignFormatConfig,
     AssignIdConfig,
+    AssignLengthConfig,
     FilterConfig,
     GlobalStatus,
     JoinConfig,
@@ -140,6 +141,12 @@ def setup_actions_with_args(
                     reverse = reverse,
                 ))
                 continue
+            if action_name == 'assign-length':
+                config.actions.append(AssignLengthConfig(
+                    target = target,
+                    source = source,
+                ))
+                continue
             if action_name == 'filter-empty':
                 config.actions.append(FilterConfig(
                     field = target,
@@ -170,15 +177,26 @@ def setup_actions_with_args(
             if action_name == 'parse':
                 as_type = options.get('as', 'literal')
                 required = options.get('required', False)
-                if as_type not in ['json', 'literal']:
+                if as_type in ['boolean']:
+                    as_type = 'bool'
+                if as_type not in ['bool', 'json', 'literal']:
                     raise ValueError(
                         f'Unsupported as type: {as_type}'
                     )
+                assign_default = False
+                default_value = None
+                if 'default' in options:
+                    assign_default = True
+                    default_value = options['default']
+                    if default_value in ['None', 'none', 'Null', 'null']:
+                        default_value = None
                 config.actions.append(ParseConfig(
                     target = target,
                     source = source,
                     as_type = as_type,
                     required = required,
+                    assign_default = assign_default,
+                    default_value = default_value,
                 ))
                 continue
             if action_name == 'parse-json':
@@ -303,6 +321,8 @@ def do_action(
         return assign_format(row, action)
     if isinstance(action, AssignIdConfig):
         return assign_id(status.id_context_map, row, action)
+    if isinstance(action, AssignLengthConfig):
+        return assign_length(row, action)
     if isinstance(action, FilterConfig):
         if filter_row(row, action):
             return row
@@ -590,27 +610,48 @@ def parse(
                 f'Required field not found, field: {config.source}'
             )
     if found:
-        if type(value) == str:
-            if config.as_type == 'literal':
-                try:
+        if config.as_type == 'literal':
+            try:
+                if type(value) is str:
                     parsed = ast.literal_eval(value)
-                except:
-                    raise ValueError(
-                        f'Failed to parse literal: {value}'
-                    )
-            elif config.as_type == 'json':
-                try:
+                else:
+                    parsed = value
+            except:
+                raise ValueError(
+                    f'Failed to parse literal: {value}'
+                )
+        elif config.as_type == 'json':
+            try:
+                if type(value) is str:
                     parsed = json.loads(value)
-                except:
+                else:
+                    parsed = value
+            except:
+                raise ValueError(
+                    f'Failed to parse JSON: {value}'
+                )
+        elif config.as_type == 'bool':
+            if config.assign_default and value in [None, '']:
+                value = config.default_value
+            if type(value) is bool:
+                parsed = value
+            elif type(value) is str:
+                if value.lower() in ['true', 'yes', 'on', '1']:
+                    parsed = True
+                elif value.lower() in ['false', 'no', 'off', '0']:
+                    parsed = False
+                else:
                     raise ValueError(
-                        f'Failed to parse JSON: {value}'
+                        f'Failed to parse bool: {value}'
                     )
             else:
                 raise ValueError(
-                    f'Unsupported as type: {config.as_type}'
+                    f'Failed to parse bool: {value}'
                 )
         else:
-            parsed = value
+            raise ValueError(
+                f'Unsupported as type: {config.as_type}'
+            )
         set_row_staging_value(row, config.target, parsed)
     return row
 
@@ -635,3 +676,12 @@ def push_field(
             set_row_staging_value(row, config.target, array)
         array.append(source_value)
     return row
+
+def assign_length(
+    row: Row,
+    config: AssignLengthConfig,
+):
+    value, found = search_column_value(row.nested, config.source)
+    if found:
+        set_row_staging_value(row, config.target, len(value))
+    return row

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/table_processor/core/config.py

@@ -34,7 +34,6 @@ class AssignArrayConfig:
 @dataclasses.dataclass
 class ProcessConfig:
     assign_array: Mapping[str, list[AssignArrayConfig]] = dataclasses.field(default_factory=OrderedDict)
-    assign_length: FlatFieldMap = dataclasses.field(default_factory=OrderedDict)
 
     def __setitem__(self, key, value):
         setattr(self, key, value)

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/table_processor/core/convert.py

@@ -263,17 +263,6 @@ def search_column_value_from_nested(
     return None, False
 
 
-def assign_length(
-    row: OrderedDict,
-    dict_fields: OrderedDict,
-):
-    new_row = OrderedDict(row)
-    for key, field in dict_fields.items():
-        value, found = search_column_value(row, field)
-        if found:
-            new_row[f'{STAGING_FIELD}.{key}'] = len(value)
-    return new_row
-
 def convert(
     input_files: list[str],
     output_file: str | None = None,
@@ -348,8 +337,6 @@ def convert(
                 set_row_staging_value(row, INPUT_FIELD, orig_row.nested)
             if config.process.assign_array:
                 row.flat= assign_array(row.flat, config.process.assign_array)
-            if config.process.assign_length:
-                row.flat = assign_length(row.flat, config.process.assign_length)
             if config.actions:
                 try:
                     new_row = do_actions(global_status, row, config.actions)

{python_table_processor-0.3.1 → python_table_processor-0.3.3}/table_processor/core/types.py

@@ -46,6 +46,11 @@ class AssignIdConfig:
     context: list[str] | None = None
     reverse: bool = False
 
+@dataclasses.dataclass
+class AssignLengthConfig:
+    target: str
+    source: str
+
 @dataclasses.dataclass
 class FilterConfig:
     field: str
@@ -69,8 +74,12 @@ class OmitConfig:
 class ParseConfig:
     target: str
     source: str
-    as_type: Literal['json', 'literal']
+    as_type: Literal[
+        'bool', 'json', 'literal'
+    ]
     required: bool = False
+    assign_default: bool = False
+    default_value: Any = None
 
 @dataclasses.dataclass
 class PickConfig:

python_table_processor-0.3.1/table_processor/__init__.py

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