python-table-processor 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

{python_table_processor-0.3.2.dist-info → python_table_processor-0.3.4.dist-info}/METADATA

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

{python_table_processor-0.3.2.dist-info → python_table_processor-0.3.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-table_processor/__init__.py,sha256=TQqqDugVb2WjmgqPXyxUA42oi3QOxyPDqpr09kjKGlk,52
+table_processor/__init__.py,sha256=7OSG5h81lLUUtcYTKQ2mDbsjJLsWCC6uFVXVJlfe8FE,52
 table_processor/cli.py,sha256=uluf_VsBzq3Ldxh3ePGseSrv8--lI7huu-6RjDaHPPg,2170
 table_processor/commands/convert_tables.py,sha256=j25KL0zRl5ikrBk73jAkKn4rPmDq7SecChZxecDpILQ,2123
 table_processor/commands/merge_tables.py,sha256=Uu-hjfPh69Of0_OZrY8sY0oscpLSdK4jwJ_t1qgfPMg,1485
-table_processor/core/actions.py,sha256=iCBm-tj_gTxeHxPaBSILdYAe8-75XaDtsCOTJp1jGfA,20264
+table_processor/core/actions.py,sha256=GKUKzoPxUEuWSeuY-HsqFoS5Bdm99bjkRhuBgG1s_uk,23658
 table_processor/core/config.py,sha256=Z1s2r3y4oQXdbDCwIY_hYzoq6VRv7Sb3oUlfBCu13Lc,11646
 table_processor/core/constants.py,sha256=w-1TxtpXywb6Qh8M4YWuzcCHUvCjy5zJYxaXC3RQS6A,158
 table_processor/core/convert.py,sha256=cibzqJ5hHsfX_7qUz4kE2Gi-WH4UMqecBl3kSb4IVsY,11140
@@ -15,9 +15,9 @@ table_processor/core/functions/set_flat_field_value.py,sha256=7-BgD2yEUGyBaFaIJ1
 table_processor/core/functions/set_nested_field_value.py,sha256=csO0v_nW94q-M9bNL91xR-TLHPXDDxnLK8gN-0LLd6k,595
 table_processor/core/functions/set_row_value.py,sha256=wlF_nVGZY74XCzd6pBJJyti62m6y0s1kc5Q6uq9jn8o,641
 table_processor/core/merge.py,sha256=Yc5OV9n1xV9QtgY4srl6Susd5cOKbuYseEtYuBampDw,4672
-table_processor/core/types.py,sha256=rxmiWsUCEBkjveO84tbMJ1kVn_P13Ywl89wDHMWEej0,2580
-python_table_processor-0.3.2.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
-python_table_processor-0.3.2.dist-info/METADATA,sha256=PCCGEqAansu5aIrmLu4eaFl3HhD2DCbDuDt2ru0-nRs,1098
-python_table_processor-0.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_table_processor-0.3.2.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
-python_table_processor-0.3.2.dist-info/RECORD,,
+table_processor/core/types.py,sha256=xNvy1vL1ei87kt-MgSfRJSllYrNKRo23pHtJA15DyLQ,2895
+python_table_processor-0.3.4.dist-info/LICENSE,sha256=1_Gn0I1neLPxDLfLiHEyxjDg-pbAra1p2iHEqutGS_c,1068
+python_table_processor-0.3.4.dist-info/METADATA,sha256=c9BCBmEomxvkfcU2FpuhGvFT2TM183wdYiCcDy4yQQA,1098
+python_table_processor-0.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_table_processor-0.3.4.dist-info/entry_points.txt,sha256=lq97F6m51yZ93qmVIqkUHJfbILZuYLxrMWXSqrP4JpM,118
+python_table_processor-0.3.4.dist-info/RECORD,,

table_processor/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.2"
-__version_tuple__ = (0, 3, 2)
+__version__ = "0.3.4"
+__version_tuple__ = (0, 3, 4)

table_processor/core/actions.py

@@ -29,6 +29,7 @@ from . types import (
     AssignFormatConfig,
     AssignIdConfig,
     AssignLengthConfig,
+    CastConfig,
     FilterConfig,
     GlobalStatus,
     JoinConfig,
@@ -147,6 +148,31 @@ def setup_actions_with_args(
                     source = source,
                 ))
                 continue
+            if action_name == 'cast':
+                required = options.get('required', False)
+                as_type = options.get('as', 'literal')
+                if as_type in ['boolean']:
+                    as_type = 'bool'
+                if as_type not in ['bool', 'int', 'float', 'str']:
+                    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(CastConfig(
+                    target = target,
+                    source = source,
+                    as_type = as_type,
+                    required = required,
+                    assign_default = assign_default,
+                    default_value = default_value,
+                ))
+                continue
             if action_name == 'filter-empty':
                 config.actions.append(FilterConfig(
                     field = target,
@@ -177,15 +203,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':
@@ -312,6 +349,8 @@ def do_action(
         return assign_id(status.id_context_map, row, action)
     if isinstance(action, AssignLengthConfig):
         return assign_length(row, action)
+    if isinstance(action, CastConfig):
+        return cast(row, action)
     if isinstance(action, FilterConfig):
         if filter_row(row, action):
             return row
@@ -599,27 +638,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
 
@@ -653,3 +713,37 @@ def assign_length(
     if found:
         set_row_staging_value(row, config.target, len(value))
     return row
+
+def cast(
+    row: Row,
+    config: CastConfig,
+):
+    value, found = search_column_value(row.nested, config.source)
+    if config.required:
+        if not found:
+            raise ValueError(
+                f'Required field not found, field: {config.source}'
+            )
+    if config.as_type == 'bool':
+        cast_func = bool
+    elif config.as_type == 'int':
+        cast_func = int
+    elif config.as_type == 'float':
+        cast_func = float
+    elif config.as_type == 'str':
+        cast_func = str
+    else:
+        raise ValueError(
+            f'Unsupported as type: {config.as_type}'
+        )
+    try:
+        casted = cast_func(value)
+    except:
+        if config.assign_default:
+            casted = config.default_value
+        else:
+            raise ValueError(
+                f'Failed to cast: {value}'
+            )
+    set_row_staging_value(row, config.target, casted)
+    return row

table_processor/core/types.py

@@ -51,6 +51,17 @@ class AssignLengthConfig:
     target: str
     source: str
 
+@dataclasses.dataclass
+class CastConfig:
+    target: str
+    source: str
+    as_type: Literal[
+        'bool', 'int', 'float', 'str'
+    ]
+    required: bool = False
+    assign_default: bool = False
+    default_value: Any = None
+
 @dataclasses.dataclass
 class FilterConfig:
     field: str
@@ -74,8 +85,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: