Merge branch 'release/1.2.0.3' into main

Author: dotchetter

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Pyttman Changelog
 
+# V 1.2.0.3
+This is a hotfix release, fixing an issue with default values in 
+TextEntityFields, causing a crash if it was combined with `as_list=True`, and
+`valid_strings`.
+
+
+### **🐛 Splatted bugs and corrected issues** 
+* **Fixes [#68](https://github.com/dotchetter/Pyttman/issues/68)**
+    
+
+
 
 # V 1.2.0.2
 

pyttman/core/entity_parsing/parsers.py

@@ -133,11 +133,17 @@ def parse_message(self, message: MessageMixin,
 
             if self.value:
                 entity = self.value
+                if entity.value == self.default:
+                    return
                 if isinstance(entity.value, list):
-                    [message.content.remove(i) for i in entity.value]
+                    words_to_remove_from_message = entity.value
                     entity.index_in_message += len(entity.value)
                 elif isinstance(entity.value, str):
-                    message.content.remove(self.value)
+                    words_to_remove_from_message = [entity.value]
+
+                self._remove_words_from_message_unless_default(
+                    message,
+                    *words_to_remove_from_message)
             return
 
         if self.truncates_message_in_parsing is False:
@@ -154,6 +160,23 @@ def parse_message(self, message: MessageMixin,
             else:
                 self.reset()
 
+    def _remove_words_from_message_unless_default(
+            self,
+            message,
+            *words_to_remove_from_message) -> None:
+        """
+        Removes elements from message.content, if they're present
+        in the message, unless a word or other object happens to
+        equal the 'self.default' property on the instance.
+        """
+        for word in words_to_remove_from_message:
+            if word == self.default:
+                continue
+            try:
+                message.content.remove(word)
+            except ValueError:
+                continue
+
     def _validate_message_with_affixes(self,
                                        affixes: tuple[str],
                                        message: MessageMixin,

pyttman/version.py

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

tests/core/entity_parsing/test_entity_fields/test_entity_parsing.py

@@ -345,3 +345,22 @@ class IntentClass(ImplementedTestIntent):
 
         is_break = BoolEntityField(message_contains=("break",))
         is_workshift = BoolEntityField(message_contains=("workshift",))
+
+
+class PyttmanIntentInternalTestTextEntityDefault(
+    PyttmanInternalTestBaseCase
+):
+    mock_message = Message("I would like the blue cheese, please.")
+    process_message = True
+    expected_entities = {
+        "cheese_type": ["blue"],
+    }
+
+    class IntentClass(ImplementedTestIntent):
+        """
+        Tests that the 'workshift' from 'lead' is not removed
+        from parsing, and can be used as entities.
+        """
+        cheese_type = StringEntityField(valid_strings=("blue", "yellow"),
+                                        default="blue",
+                                        as_list=True)