Fix redis version comparison

Author: Peter-Sh

src/redis_release/models.py

@@ -143,7 +143,7 @@ def is_eol(self) -> bool:
     @property
     def is_rc(self) -> bool:
         """Check if this version is a release candidate."""
-        return self.suffix.lower().startswith("rc")
+        return self.suffix.lower().startswith("-rc")
 
     @property
     def is_ga(self) -> bool:
@@ -153,24 +153,33 @@ def is_ga(self) -> bool:
     @property
     def is_internal(self) -> bool:
         """Check if this version is an internal release."""
-        return self.suffix.lower().startswith("int")
+        return bool(re.search(r"-int\d*$", self.suffix.lower()))
 
     @property
     def mainline_version(self) -> str:
         """Get the mainline version string (major.minor)."""
         return f"{self.major}.{self.minor}"
 
     @property
-    def sort_key(self) -> str:
-        suffix_weight = 0
-        if self.suffix.startswith("rc"):
-            suffix_weight = 100
-        elif self.suffix.startswith("m"):
-            suffix_weight = 50
+    def suffix_weight(self) -> str:
+        # warning: using lexicographic order, letters doesn't have any meaning except for ordering
+        suffix_weight = ""
+        if self.is_ga:
+            suffix_weight = "QQ"
+        if self.is_rc:
+            suffix_weight = "LL"
+        elif self.suffix.startswith("-m"):
+            suffix_weight = "II"
+
+        # internal versions are always lower than their GA/rc/m counterparts
+        if self.is_internal:
+            suffix_weight = suffix_weight[0] + "E"
+
+        return suffix_weight
 
-        return (
-            f"{self.major}.{self.minor}.{self.patch or 0}.{suffix_weight}.{self.suffix}"
-        )
+    @property
+    def sort_key(self) -> str:
+        return f"{self.major}.{self.minor}.{self.patch or 0}.{self.suffix_weight}{self.suffix}"
 
     def __str__(self) -> str:
         """String representation of the version."""
@@ -184,21 +193,7 @@ def __lt__(self, other: "RedisVersion") -> bool:
         if not isinstance(other, RedisVersion):
             return NotImplemented
 
-        # Compare major.minor.patch first
-        self_tuple = (self.major, self.minor, self.patch or 0)
-        other_tuple = (other.major, other.minor, other.patch or 0)
-
-        if self_tuple != other_tuple:
-            return self_tuple < other_tuple
-
-        # If numeric parts are equal, compare suffixes
-        # Empty suffix (GA) comes after suffixes (milestones)
-        if not self.suffix and other.suffix:
-            return False
-        if self.suffix and not other.suffix:
-            return True
-
-        return self.suffix < other.suffix
+        return self.sort_key < other.sort_key
 
     def __le__(self, other: "RedisVersion") -> bool:
         """Less than or equal comparison."""