updates to Validators + priority based validators

validators.py

@@ -3,6 +3,8 @@ from abc import ABC, abstractmethod
 
 class Validator(ABC):
     """Abstract base class for a validator."""
+    priority = 100  # Default priority
+
     @abstractmethod
     def can_handle(self, task_description: str) -> bool:
         """Whether this validator can handle the given task."""
@@ -15,6 +17,8 @@ class Validator(ABC):
 
 class PunctuationValidator(Validator):
     """Validator to remove trailing punctuation."""
+    priority = 999 # Should run last
+
     def can_handle(self, task_description: str) -> bool:
         """This validator can handle any task."""
         return True
@@ -25,41 +29,40 @@ class PunctuationValidator(Validator):
 
 class BotanyValidator(Validator):
     """Validator for the botany question."""
+    priority = 10 # High priority for content-specific validation
+
     def can_handle(self, task_description: str) -> bool:
         """Handles the botany question about fruits and vegetables."""
         return "botany" in task_description.lower() and "vegetable" in task_description.lower()
 
     def validate(self, answer: str) -> str:
         """Ensures no botanical fruits are in the vegetable list."""
-        # List of common botanical fruits often mistaken for vegetables
         botanical_fruits = [
             "corn", "zucchini", "green beans", "bell pepper", "tomato", 
             "pepper", "cucumber", "beans", "peas", "okra", "eggplant", "acorns"
         ]
-        
-        # Split the answer string into a list of items
         vegetables = [veg.strip().lower() for veg in answer.split(',')]
-        
-        # Filter out the botanical fruits
         final_vegetables = [veg for veg in vegetables if veg not in botanical_fruits]
-        
-        # Return the alphabetized, comma-separated string
         return ", ".join(sorted(final_vegetables))
 
 class CaseValidator(Validator):
-    """Validator to capitalize single-word answers."""
+    """Validator to capitalize single-word, all-lowercase answers."""
+    priority = 900 # Low priority, but before final punctuation strip
+
     def can_handle(self, task_description: str) -> bool:
-        """Handles tasks that expect a single-word capitalized answer."""
-        return "etisoppo" in task_description # A simple heuristic for the reversed sentence task
+        """This validator can handle any task."""
+        return True
 
     def validate(self, answer: str) -> str:
-        """Capitalizes the answer if it's a single word."""
-        if len(answer.split()) == 1:
+        """Capitalizes the answer if it's a single, all-lowercase word."""
+        if len(answer.split()) == 1 and answer.islower():
             return answer.capitalize()
         return answer
 
 class NumericValidator(Validator):
     """Validator to ensure numeric answers are just numbers."""
+    priority = 50 # Medium priority
+
     def can_handle(self, task_description: str) -> bool:
         """Handles tasks that ask 'how many'."""
         return "how many" in task_description.lower()
@@ -77,11 +80,12 @@ class ValidatorRegistry:
         self.validators = []
 
     def register(self, validator: Validator):
-        """Register a validator."""
+        """Register a validator and maintain sorted order by priority."""
         self.validators.append(validator)
+        self.validators.sort(key=lambda v: v.priority)
 
     def process(self, task_description: str, answer: str) -> str:
-        """Process the answer through all applicable validators."""
+        """Process the answer through all applicable validators in order of priority."""
         processed_answer = answer
         for validator in self.validators:
             if validator.can_handle(task_description):
@@ -93,4 +97,4 @@ validator_registry = ValidatorRegistry()
 validator_registry.register(PunctuationValidator())
 validator_registry.register(BotanyValidator())
 validator_registry.register(CaseValidator())
-validator_registry.register(NumericValidator())
+validator_registry.register(NumericValidator())