fixing review items

Author: mrm9084

featuremanagement/_defaultfilters.py

@@ -23,10 +23,10 @@
 
 # Time Window Exceptions
 TIME_WINDOW_FILTER_INVALID = (
-    "%s: The %s feature filter is not valid for feature %s. It must specify either %s, $s, or both."
+    "{}: The {} feature filter is not valid for feature {}. It must specify either {}, {}, or both."
 )
 TIME_WINDOW_FILTER_INVALID_RECURRENCE = (
-    "%s: The %s feature filter is not valid for feature %s. It must specify both %s and $s when Recurrence is not None."
+    "{}: The {} feature filter is not valid for feature {}. It must specify both {} and {} when Recurrence is not None."
 )
 
 # Targeting kwargs
@@ -106,6 +106,7 @@ def evaluate(self, context: Mapping[Any, Any], **kwargs: Any) -> bool:
 
         return (start_time is None or start_time <= current_time) and (end_time is None or current_time < end_time)
 
+
 @FeatureFilter.alias("Microsoft.Targeting")
 class TargetingFilter(FeatureFilter):
     """

featuremanagement/_time_window_filter/_models.py

@@ -4,8 +4,8 @@
 # license information.
 # -------------------------------------------------------------------------
 from enum import Enum
+from typing import Dict, Any
 from datetime import datetime
-from typing import Self
 from dataclasses import dataclass
 from email.utils import parsedate_to_datetime
 
@@ -18,7 +18,16 @@ class RecurrencePatternType(str, Enum):
     DAILY = "Daily"
     WEEKLY = "Weekly"
 
-    def from_str(value: str) -> Self:
+    @staticmethod
+    def from_str(value: str) -> "RecurrencePatternType":
+        """
+        Get the RecurrencePatternType from the string value.
+
+        :param value: The string value.
+        :type value: str
+        :return: The RecurrencePatternType.
+        :rtype: RecurrencePatternType
+        """
         if value == "Daily":
             return RecurrencePatternType.DAILY
         if value == "Weekly":
@@ -35,7 +44,16 @@ class RecurrenceRangeType(str, Enum):
     END_DATE = "EndDate"
     NUMBERED = "Numbered"
 
-    def from_str(value: str) -> Self:
+    @staticmethod
+    def from_str(value: str) -> "RecurrenceRangeType":
+        """
+        Get the RecurrenceRangeType from the string value.
+
+        :param value: The string value.
+        :type value: str
+        :return: The RecurrenceRangeType.
+        :rtype: RecurrenceRangeType
+        """
         if value == "NoEnd":
             return RecurrenceRangeType.NO_END
         if value == "EndDate":
@@ -44,36 +62,40 @@ def from_str(value: str) -> Self:
             return RecurrenceRangeType.NUMBERED
         raise ValueError(f"Invalid value: {value}")
 
-class RecurrencePattern:
+
+class RecurrencePattern:  # pylint: disable=too-few-public-methods
     """
     The recurrence pattern settings.
     """
 
-    def __init__(self, pattern_data: dict[str: any]):
+    def __init__(self, pattern_data: Dict[str, Any]):
         self.type = RecurrencePatternType.from_str(pattern_data.get("Type", "Daily"))
         self.interval = pattern_data.get("Interval", 1)
         self.days_of_week = pattern_data.get("DaysOfWeek", [])
         self.first_day_of_week = pattern_data.get("FirstDayOfWeek", 7)
 
-class RecurrenceRange:
+
+class RecurrenceRange:  # pylint: disable=too-few-public-methods
     """
     The recurrence range settings.
     """
 
-    def __init__(self, range_data: dict[str: any]):
+    def __init__(self, range_data: Dict[str, Any]):
         self.type = RecurrenceRangeType.from_str(range_data.get("Type", "NoEnd"))
-        if range_data.get("EndDate"):
-            self.end_date = parsedate_to_datetime(range_data.get("EndDate"))
+        if range_data.get("EndDate") and isinstance(range_data.get("EndDate"), str):
+            end_date_str = range_data.get("EndDate", "")
+            self.end_date = parsedate_to_datetime(end_date_str) if end_date_str else None
         self.num_of_occurrences = range_data.get("NumberOfOccurrences")
 
-class Recurrence:
+
+class Recurrence:  # pylint: disable=too-few-public-methods
     """
     The recurrence settings.
     """
 
-    def __init__(self, recurrence_data: dict[str: any]):
-        self.pattern = RecurrencePattern(recurrence_data.get("Pattern"))
-        self.range = RecurrenceRange(recurrence_data.get("Range"))
+    def __init__(self, recurrence_data: Dict[str, Any]):
+        self.pattern = RecurrencePattern(recurrence_data.get("Pattern", {}))
+        self.range = RecurrenceRange(recurrence_data.get("Range", {}))
 
 
 @dataclass

featuremanagement/_time_window_filter/_recurrence_evaluator.py

@@ -41,14 +41,18 @@ def _get_previous_occurrence(settings: TimeWindowFilterSettings, now: datetime)
 
     recurrence_range = settings.recurrence.range
     range_type = recurrence_range.type
+    previous_occurrence = occurrence_info.previous_occurrence
+    end_date = recurrence_range.end_date
     if (
         range_type == RecurrenceRangeType.END_DATE
-        and occurrence_info.previous_occurrence
-        and occurrence_info.previous_occurrence > recurrence_range.end_date
+        and previous_occurrence is not None
+        and end_date is not None
+        and previous_occurrence > end_date
     ):
         return None
     if (
         range_type == RecurrenceRangeType.NUMBERED
+        and recurrence_range.num_of_occurrences is not None
         and occurrence_info.num_of_occurrences > recurrence_range.num_of_occurrences
     ):
         return None

featuremanagement/_time_window_filter/_recurrence_validator.py

@@ -109,7 +109,8 @@ def _validate_days_of_week(settings: TimeWindowFilterSettings) -> None:
 
 
 def _validate_end_date(settings: TimeWindowFilterSettings) -> None:
-    if settings.recurrence.range.end_date < settings.start:
+    end_date = settings.recurrence.range.end_date
+    if end_date and end_date < settings.start:
         raise ValueError("The Recurrence.Range.EndDate should be after the Start")