Tests in

Author: aelaguiz

langdspy/data_helper.py

@@ -0,0 +1,2 @@
+def normalize_enum_value(val: str) -> str:
+    return val.replace(" ", "_").replace("-", "_").upper()

langdspy/transformers.py

@@ -3,6 +3,7 @@
 from enum import Enum
 from langchain_core.documents import Document
 import re
+from .data_helper import normalize_enum_value
 
 def as_bool(value: str, kwargs: Dict[str, Any]) -> bool:
     value = re.sub(r'[^\w\s]', '', value)
@@ -16,9 +17,6 @@ def as_json_list(val: str, kwargs: Dict[str, Any]) -> List[Dict[str, Any]]:
 def as_json(val: str, kwargs: Dict[str, Any]) -> Any:
     return json.loads(val)
 
-def normalize_enum_value(val: str) -> str:
-    return val.replace(" ", "_").replace("-", "_").upper()
-
 def as_enum(val: str, kwargs: Dict[str, Any]) -> Enum:
     enum_class = kwargs['enum']
     normalized_val = normalize_enum_value(val)

langdspy/validators.py

@@ -1,6 +1,6 @@
 import json
 import logging
-
+from .data_helper import normalize_enum_value
 
 logger = logging.getLogger("langdspy")
 
@@ -34,8 +34,8 @@ def is_one_of(input, output_val, kwargs) -> bool:
 
     try:
         if not kwargs.get('case_sensitive', False):
-            choices = [c.lower().replace("_", " ") for c in kwargs['choices']]
-            output_val = output_val.lower().replace("_", " ")
+            choices = [normalize_enum_value(c) for c in kwargs['choices']]
+            output_val = normalize_enum_value (output_val)
 
         # logger.debug(f"Checking if {output_val} is one of {choices}")
         for choice in choices:
@@ -61,8 +61,8 @@ def is_subset_of(input, output_val, kwargs) -> bool:
     try:
         values = [v.strip() for v in output_val.split(",")]
         if not kwargs.get('case_sensitive', False):
-            choices = [c.lower().replace("_", " ") for c in kwargs['choices']]
-            values = [v.lower().replace("_", " ") for v in values]
+            choices = [normalize_enum_value(c) for c in kwargs['choices']]
+            values = [normalize_enum_value(v) for v in values]
         for value in values:
             if value not in choices:
                 return False

tests/test_transformers.py

@@ -22,22 +22,31 @@ def test_as_enum():
     class Fruit(Enum):
         APPLE = 1
         BANANA = 2
+        CHERRY_PIE = 3
+        DURIAN_FRUIT = 4
 
     assert transformers.as_enum("APPLE", {"enum": Fruit}) == Fruit.APPLE
     assert transformers.as_enum("BANANA", {"enum": Fruit}) == Fruit.BANANA
+    assert transformers.as_enum("cherry pie", {"enum": Fruit}) == Fruit.CHERRY_PIE
+    assert transformers.as_enum("Durian-Fruit", {"enum": Fruit}) == Fruit.DURIAN_FRUIT
+    assert transformers.as_enum("Durian_Fruit", {"enum": Fruit}) == Fruit.DURIAN_FRUIT
+    assert transformers.as_enum("Durian Fruit", {"enum": Fruit}) == Fruit.DURIAN_FRUIT
 
     with pytest.raises(ValueError):
-        transformers.as_enum("CHERRY", {"enum": Fruit})
+        transformers.as_enum("MANGO", {"enum": Fruit})
 
 def test_as_enum_list():
     class Fruit(Enum):
         APPLE = 1
         BANANA = 2
-        CHERRY = 3
+        CHERRY_PIE = 3
+        DURIAN_FRUIT = 4
 
     assert transformers.as_enum_list("APPLE", {"enum": Fruit}) == [Fruit.APPLE]
-    assert transformers.as_enum_list("BANANA, CHERRY", {"enum": Fruit}) == [Fruit.BANANA, Fruit.CHERRY]
-    assert transformers.as_enum_list("APPLE,BANANA,CHERRY", {"enum": Fruit}) == [Fruit.APPLE, Fruit.BANANA, Fruit.CHERRY]
+    assert transformers.as_enum_list("BANANA, CHERRY PIE", {"enum": Fruit}) == [Fruit.BANANA, Fruit.CHERRY_PIE]
+    assert transformers.as_enum_list("APPLE,BANANA,CHERRY PIE", {"enum": Fruit}) == [Fruit.APPLE, Fruit.BANANA, Fruit.CHERRY_PIE]
+    assert transformers.as_enum_list("Durian-Fruit, cherry pie", {"enum": Fruit}) == [Fruit.DURIAN_FRUIT, Fruit.CHERRY_PIE]
+    assert transformers.as_enum_list("Durian Fruit, cherry_pie", {"enum": Fruit}) == [Fruit.DURIAN_FRUIT, Fruit.CHERRY_PIE]
 
     with pytest.raises(ValueError):
-        transformers.as_enum_list("DURIAN", {"enum": Fruit})
+        transformers.as_enum_list("MANGO", {"enum": Fruit})

tests/test_validators.py

@@ -12,24 +12,27 @@ def test_is_one_of():
     assert validators.is_one_of({}, 'cherry', {'choices': ['apple', 'banana']}) == False
     assert validators.is_one_of({}, 'APPLE', {'choices': ['apple', 'banana'], 'case_sensitive': False}) == True
     assert validators.is_one_of({}, 'none', {'choices': ['apple', 'banana'], 'none_ok': True}) == True
+    assert validators.is_one_of({}, 'apple pie', {'choices': ['apple_pie', 'banana split'], 'case_sensitive': False}) == True
+    assert validators.is_one_of({}, 'Apple-Pie', {'choices': ['apple_pie', 'banana-split'], 'case_sensitive': False}) == True
 
     with pytest.raises(ValueError):
         validators.is_one_of({}, 'apple', {})
 
 def test_is_subset_of():
-    choices = ["apple", "banana", "cherry"]
+    choices = ["apple", "banana", "cherry_pie", "durian-fruit"]
 
     assert validators.is_subset_of({}, "apple", {"choices": choices}) == True
     assert validators.is_subset_of({}, "apple,banana", {"choices": choices}) == True
-    assert validators.is_subset_of({}, "apple, banana, cherry", {"choices": choices}) == True
+    assert validators.is_subset_of({}, "apple, banana, cherry_pie", {"choices": choices}) == True
     assert validators.is_subset_of({}, "APPLE", {"choices": choices, "case_sensitive": False}) == True
     assert validators.is_subset_of({}, "APPLE,BANANA", {"choices": choices, "case_sensitive": False}) == True
+    assert validators.is_subset_of({}, "Durian-Fruit, Cherry Pie", {"choices": choices, "case_sensitive": False}) == True
 
-    assert validators.is_subset_of({}, "durian", {"choices": choices}) == False
-    assert validators.is_subset_of({}, "apple,durian", {"choices": choices}) == False
+    assert validators.is_subset_of({}, "mango", {"choices": choices}) == False
+    assert validators.is_subset_of({}, "apple,mango", {"choices": choices}) == False
 
     assert validators.is_subset_of({}, "none", {"choices": choices, "none_ok": True}) == True
     assert validators.is_subset_of({}, "apple,none", {"choices": choices, "none_ok": True}) == False
 
     with pytest.raises(ValueError):
-        validators.is_subset_of({}, "apple", {})
+        validators.is_subset_of({}, "apple", {})