fix?

Author: sanderegg

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

@@ -46,37 +46,43 @@ def create_as_empty(cls) -> "Resources":
     def __ge__(self, other: "Resources") -> bool:
         """operator for >= comparison
         if self has greater or equal resources than other, returns True
+        This will return True only if any of the resources in self is greater or equal to other
+
         Note that generic_resources are compared only if they are numeric
         Non-numeric generic resources must be equal in both or only defined in self
         to be considered greater or equal
         """
+        if self == other:
+            return True
+        return self > other
+
+    def __gt__(self, other: "Resources") -> bool:
+        """operator for > comparison
+        if self has any resources gretaer than other, returns True (even if different resource types are smaller)
 
-        if not (self.cpus >= other.cpus and self.ram >= other.ram):
-            return False
+        Note that generic_resources are compared only if they are numeric
+        Non-numeric generic resources must be equal in both or only defined in self
+        to be considered greater
+        """
+        if (self.cpus > other.cpus) or (self.ram > other.ram):
+            return True
 
         keys = set(self.generic_resources) | set(other.generic_resources)
         for k in keys:
             a = self.generic_resources.get(k)
-            b = other.generic_resources.get(
-                k, a
-            )  # NOTE: get from other, default to "a" resources so that non-existing keys can be compared as equal
+            b = other.generic_resources.get(k)
+            if a is None:
+                continue
+            if b is None:
+                return True
             if isinstance(a, int | float) and isinstance(b, int | float):
-                if a < b:
-                    return False
+                if a > b:
+                    return True
             elif a != b:
                 assert isinstance(a, str | None)  # nosec
                 assert isinstance(b, int | float | str | None)  # nosec
-                return False
-        return True
-
-    def __gt__(self, other: "Resources") -> bool:
-        """operator for > comparison
-        if self has greater resources than other, returns True
-        Note that generic_resources are compared only if they are numeric
-        Non-numeric generic resources must be equal in both or only defined in self
-        to be considered greater
-        """
-        return self >= other and self != other
+                return True
+        return False
 
     def __add__(self, other: "Resources") -> "Resources":
         """operator for adding two Resources

packages/aws-library/tests/test_ec2_models.py

@@ -36,7 +36,7 @@
         (
             Resources(cpus=0.05, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(0)),
-            False,
+            True,  # ram is larger
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(0)),
@@ -46,7 +46,7 @@
         (
             Resources(cpus=0.1, ram=ByteSize(0), generic_resources={"GPU": 1}),
             Resources(cpus=0.1, ram=ByteSize(1)),
-            False,  # ram is not enough
+            True,  # GPU is larger
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
@@ -71,7 +71,7 @@
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": "2"}),
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
-            False,
+            True,  # string resrouces are not comparable so "2" is considered larger
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
@@ -117,7 +117,7 @@ def test_resources_ge_operator(
         (
             Resources(cpus=0.05, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(0)),
-            False,
+            True,
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(0)),
@@ -127,7 +127,7 @@ def test_resources_ge_operator(
         (
             Resources(cpus=0.1, ram=ByteSize(0), generic_resources={"GPU": 1}),
             Resources(cpus=0.1, ram=ByteSize(1)),
-            False,  # ram is not enough
+            True,  # ram is not enough
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
@@ -152,7 +152,7 @@ def test_resources_ge_operator(
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": "2"}),
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
-            False,
+            True,  # string resources are not comparable, so a > b
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),

services/autoscaling/tests/unit/test_modules_cluster_scaling_computational.py

@@ -934,7 +934,6 @@ async def test_cluster_does_not_scale_up_if_defined_instance_is_not_fitting_reso
         [InstanceTypeType | None, Resources], DaskTaskResources
     ],
     ec2_client: EC2Client,
-    faker: Faker,
     caplog: pytest.LogCaptureFixture,
 ):
     # we have nothing running now