@pcrespov review: add some more string comparisons

Author: sanderegg

packages/aws-library/src/aws_library/ec2/_models.py

@@ -1,3 +1,4 @@
+import contextlib
 import datetime
 import re
 import tempfile
@@ -17,6 +18,8 @@
     StrictFloat,
     StrictInt,
     StringConstraints,
+    TypeAdapter,
+    ValidationError,
     field_validator,
 )
 from pydantic.config import JsonDict
@@ -82,8 +85,15 @@ def __gt__(self, other: "Resources") -> bool:
                     return False
             else:
                 # remaining options is a is str and b is str or mixed types
+                # NOTE: we cannot compare strings unless they are equal or some kind of boolean (e.g. "true", "false", "yes", "no", "1", "0")
                 assert isinstance(a, str)  # nosec
                 assert isinstance(b, int | float | str)  # nosec
+                # let's try to get a boolean out of the values to compare them
+                with contextlib.suppress(ValidationError):
+                    a_as_boolean = TypeAdapter(bool).validate_python(a)
+                    b_as_boolean = TypeAdapter(bool).validate_python(b)
+                    if not a_as_boolean and b_as_boolean:
+                        return False
 
         # here we have either everything greater or equal or non-comparable strings
 

packages/aws-library/tests/test_ec2_models.py

@@ -83,6 +83,16 @@
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
             True,
         ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "no"}),
+            True,
+        ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "no"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            False,
+        ),
         (
             Resources(cpus=0.1, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
@@ -179,6 +189,11 @@ def test_resources_ge_operator(
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "no"}),
             True,
         ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "no"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            False,
+        ),
     ],
 )
 def test_resources_gt_operator(a: Resources, b: Resources, a_greater_than_b: bool):