allow for single output processor

Author: SimonLangerQC

src/datajudge/constraints/base.py

@@ -1,7 +1,7 @@
 import abc
 from dataclasses import dataclass, field
 from functools import lru_cache
-from typing import Any, Callable, Collection, List, Optional, Tuple, TypeVar
+from typing import Any, Callable, Collection, List, Optional, Tuple, TypeVar, Union
 
 import sqlalchemy as sa
 
@@ -120,7 +120,9 @@ def __init__(
         ref2=None,
         ref_value: Any = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         self._check_if_valid_between_or_within(ref2, ref_value)
         self.ref = ref
@@ -131,6 +133,11 @@ def __init__(
         self.target_selections: OptionalSelections = None
         self.factual_queries: Optional[List[str]] = None
         self.target_queries: Optional[List[str]] = None
+
+        if (output_processors is not None) and (
+            not isinstance(output_processors, list)
+        ):
+            output_processors = [output_processors]
         self.output_processors = output_processors
 
     def _check_if_valid_between_or_within(

src/datajudge/constraints/uniques.py

@@ -102,7 +102,9 @@ def __init__(
         self,
         ref: DataReference,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
         *,
         ref2: DataReference = None,
         uniques: Collection = None,

src/datajudge/requirements.py

@@ -263,7 +263,9 @@ def add_uniques_equality_constraint(
         filter_func: Callable[[List[T]], List[T]] = None,
         map_func: Callable[[T], T] = None,
         reduce_func: Callable[[Collection], Collection] = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
         condition: Condition = None,
         name: str = None,
     ):
@@ -311,7 +313,9 @@ def add_uniques_superset_constraint(
         reduce_func: Callable[[Collection], Collection] = None,
         condition: Condition = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         """Check if unique values of columns are contained in the reference data.
 
@@ -365,7 +369,9 @@ def add_uniques_subset_constraint(
         reduce_func: Callable[[Collection], Collection] = None,
         condition: Condition = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         """Check if the data's unique values are contained in a given set of values.
 
@@ -867,7 +873,9 @@ def add_functional_dependency_constraint(
         value_columns: List[str],
         condition: Condition = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         """
         Expresses a functional dependency, a constraint where the `value_columns` are uniquely determined by the `key_columns`.
@@ -1464,7 +1472,9 @@ def add_uniques_equality_constraint(
         filter_func: Callable[[List[T]], List[T]] = None,
         map_func: Callable[[T], T] = None,
         reduce_func: Callable[[Collection], Collection] = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
         condition1: Condition = None,
         condition2: Condition = None,
         name: str = None,
@@ -1515,7 +1525,9 @@ def add_uniques_superset_constraint(
         condition1: Condition = None,
         condition2: Condition = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         """Check if unique values of columns are contained in the reference data.
 
@@ -1572,7 +1584,9 @@ def add_uniques_subset_constraint(
         condition1: Condition = None,
         condition2: Condition = None,
         name: str = None,
-        output_processors: List[OutputProcessor] = None,
+        output_processors: Optional[
+            Union[OutputProcessor, List[OutputProcessor]]
+        ] = None,
     ):
         """Check if the given columns's unique values in are contained in reference data.
 

tests/integration/test_integration.py

@@ -321,7 +321,7 @@ def test_uniques_equality_within(engine, unique_table1, data):
             [(0, "hi0"), (1, "hi0")],
             filternull_element_or_tuple_any,
             None,
-            [output_processor_sort],
+            output_processor_sort,
             None,
             "column(s) 'col_int', 'col_varchar' has the excess element(s) '[(1, 'hi1'), (2, 'hi1'), (3, 'hi2'), (4, 'hi2'), (4, 'hi3'), (5, 'hi3'), (6, 'hi4'), (7, 'hi4'), (7, 'hi5'), (8, 'hi5'), (9, 'hi6'), (10, 'hi6'), (10, 'hi7'), (11, 'hi7'), (12, 'hi8'), (13, 'hi8'), (13, 'hi9'), (14, 'hi9'), (15, 'hi10'), (16, 'hi10'), (16, 'hi11'), (17, 'hi11'), (18, 'hi12'), (19, 'hi12'), (19, 'hi13'), (20, 'hi13'), (21, 'hi14'), (22, 'hi14'), (22, 'hi15'), (23, 'hi15'), (24, 'hi16'), (25, 'hi16'), (25, 'hi17'), (26, 'hi17'), (27, 'hi18'), (28, 'hi18'), (28, 'hi19'), (29, 'hi19')]' when compared with the reference values. ",
         ),