python-table-converter 0.2.11__tar.gz → 0.2.12__tar.gz

{python_table_converter-0.2.11 → python_table_converter-0.2.12}/PKG-INFO

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

{python_table_converter-0.2.11 → python_table_converter-0.2.12}/pyproject.toml

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

python_table_converter-0.2.12/table_converter/__init__.py

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

{python_table_converter-0.2.11 → python_table_converter-0.2.12}/table_converter/core/config.py

@@ -24,8 +24,9 @@ class AssignIdConfig:
 @dataclasses.dataclass
 class FilterConfig:
     field: str
-    operator: Literal['==', '!=', '>', '>=', '<', '<=']
-    value: str
+    operator: Literal['==', '!=', '>', '>=', '<', '<=', 'not-in']
+    #value: str
+    value: str | list[str]
 
 @dataclasses.dataclass
 class SplitConfig:
@@ -87,6 +88,7 @@ def setup_process_config(
             if isinstance(dict_subprocess, Mapping):
                 config.process[process_key] = flatten(loaded['process'][process_key])
         setup_process_assign_ids_config(config, dict_process)
+        setup_process_filter_config(config, dict_process)
         setup_process_split_config(config, dict_process)
 
 def setup_process_assign_ids_config(
@@ -126,6 +128,54 @@ def setup_process_assign_ids_config(
                     f'Unsupported assign_ids value type: {type(value)}'
                 )
 
+def setup_process_filter_config(
+    config: Config,
+    dict_process: Mapping,
+):
+    list_subprocess = dict_process.get('filter')
+    if not isinstance(list_subprocess, list):
+        raise ValueError(
+            'Filter must be a list.'
+        )
+    for item in list_subprocess:
+        if isinstance(item, Mapping):
+            field = item.get('field')
+            if not field:
+                ic.enable()
+                ic(item)
+                ic(item.get('field'))
+                raise ValueError(
+                    'Field is required for filter.'
+                )
+            operator = item.get('operator')
+            if not operator:
+                ic.enable()
+                ic(item)
+                ic(item.get('operator'))
+                raise ValueError(
+                    'Operator is required for filter.'
+                )
+            value = item.get('value')
+            if not value:
+                ic.enable()
+                ic(item)
+                ic(item.get('value'))
+                raise ValueError(
+                    'Value is required for filter.'
+                )
+            config.process.filter.append(FilterConfig(
+                field = field,
+                operator = operator,
+                value = value,
+            ))
+        else:
+            ic.enable()
+            ic(item)
+            ic(type(item))
+            raise ValueError(
+                f'Unsupported filter item type: {type(item)}'
+            )
+
 def setup_process_split_config(
     config: Config,
     dict_process: Mapping,

{python_table_converter-0.2.11 → python_table_converter-0.2.12}/table_converter/core/convert.py

@@ -221,11 +221,19 @@ def filter_row(
         if config.operator == '==':
             if not found:
                 return False
-            if str(value) != str(config.value):
+            if value != config.value and str(value) != str(config.value):
                 return False
         elif config.operator == '!=':
-            if str(value) == str(config.value):
+            if str(value) == str(config.value) or value == config.value:
                 return False
+        elif config.operator == 'not-in':
+            if isinstance(config.value, list):
+                if value in config.value:
+                    return False
+                if str(value) in config.value:
+                    return False
+            else:
+                raise ValueError(f'Unsupported filter value type: type{config.value}')
         else:
             raise ValueError(f'Unsupported operator: {config.operator}')
     return True

python_table_converter-0.2.11/table_converter/__init__.py

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