Merge branch 'release/1.2.0.2' into main

Author: dotchetter

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Pyttman Changelog
 
+
+# V 1.2.0.2
+
+This is a hotfix release, fixing an issue with EntityFields with `valid_strings` 
+configured combined with 'suffixes' and/or 'prefixes', 
+where the 'prefixes' and/or 'suffixes' were ignored, if an entity matched 
+a string mentioned in 'valid_strings'.
+
+
+
 # V 1.2.0.1
 
 This is a hotfix release, fixing an issue with EntityFields with `as_list` 

pyttman/core/entity_parsing/parsers.py

@@ -86,16 +86,11 @@ def _prepare_params(self):
                                  f"Don't forget the trailing comma, "
                                  f"example: '(1,)' instead of '(1)'.")
 
-        if (
-            self.valid_strings is not None
-        ) and (
-            isinstance(self.valid_strings, typing.Sequence) is False
-        ):
+        if self.valid_strings is not None and not isinstance(self.valid_strings, typing.Sequence):
             raise AttributeError("'valid_strings' must be a collection of "
                                  f"strings, got: '{self.valid_strings}'")
         else:
-            self.valid_strings = tuple(
-                [i.casefold() for i in self.valid_strings])
+            self.valid_strings = tuple([i.casefold() for i in self.valid_strings])
 
     def reset(self) -> None:
         """
@@ -134,6 +129,8 @@ def parse_message(self, message: MessageMixin,
             else:
                 self.value = Entity(self.default, is_fallback_default=True)
 
+            self._validate_prefixes_suffixes(message)
+
             if self.value:
                 entity = self.value
                 if isinstance(entity.value, list):
@@ -157,6 +154,35 @@ def parse_message(self, message: MessageMixin,
             else:
                 self.reset()
 
+    def _validate_message_with_affixes(self,
+                                       affixes: tuple[str],
+                                       message: MessageMixin,
+                                       comparator: callable):
+        entity = self.value
+        if not (common_strings := set(affixes).intersection(message.content)):
+            entity.value = self.default
+            return
+        for string in common_strings:
+            if not comparator(message.content.index(string), entity.index_in_message):
+                entity.value = self.default
+
+    def _validate_prefixes_suffixes(self, message: MessageMixin):
+        """
+        Check 'prefixes' and 'suffixes' for Entity values to make sure
+        that they comply
+        :return:
+        """
+        if self.prefixes:
+            self._validate_message_with_affixes(
+                self.prefixes,
+                message,
+                lambda affix_index, value_index: affix_index < value_index)
+        if self.suffixes:
+            self._validate_message_with_affixes(
+                self.suffixes,
+                message,
+                lambda affix_index, value_index: affix_index > value_index)
+
     def _identify_value(self, message: MessageMixin,
                         start_index: int = 0) -> Union[None, Entity]:
         """

pyttman/version.py

@@ -1,2 +1,2 @@
 
-__version__ = "1.2.0.1"
+__version__ = "1.2.0.2a"

setup.py

@@ -20,6 +20,7 @@
     author="Simon Olofsson",
     project_urls={
         "Bug Tracker": "https://github.com/dotchetter/Pyttman/issues",
+        "Changelog": "https://github.com/dotchetter/Pyttman/blob/main/CHANGELOG.md"
     },
     author_email="simon@dotchetter.se",
     license="MIT",

tests/core/entity_parsing/test_entity_fields/test_entity_parsing.py

@@ -68,6 +68,37 @@ class IntentClass(ImplementedTestIntent):
         grass_color = TextEntityField(suffixes=("grass",))
 
 
+class PyttmanIntentInternalEntityParserTestTwoTextFieldsWithPrefixes(
+    PyttmanInternalTestBaseCase
+):
+    process_message = True
+    mock_message = Message("Adam and Eve were out walking on green grass")
+    expected_entities = {
+        "person_one_fail": None,
+        "person_one": "Adam",
+        "person_two": "Eve",
+        "grass_color": "green"
+    }
+
+    class IntentClass(ImplementedTestIntent):
+        """
+        Test a combination of custom Identifier class for a TextEntityField
+        with valid_strings, message_contains all in combinations.
+        prefixed should denote that the entity isn't found.
+        """
+        valid_strings = ("Adam", "Eve")
+        lead = ("walking",)
+        person_one_fail = TextEntityField(identifier=CapitalizedIdentifier,
+                                          valid_strings=valid_strings,
+                                          prefixes=("_prefix_",))
+        person_one = TextEntityField(identifier=CapitalizedIdentifier,
+                                     valid_strings=valid_strings)
+        person_two = TextEntityField(identifier=CapitalizedIdentifier,
+                                     valid_strings=valid_strings,
+                                     suffixes=("were",))
+        grass_color = TextEntityField(suffixes=("grass",))
+
+
 class PyttmanIntentInternalEntityParserTestBookKeeperApp(
     PyttmanInternalTestBaseCase
 ):