do not define gt it is weird for resources

Author: sanderegg

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

@@ -44,35 +44,31 @@ def create_as_empty(cls) -> "Resources":
         return cls(cpus=0, ram=ByteSize(0))
 
     def __ge__(self, other: "Resources") -> bool:
+        """operator for >= comparison
+        if self has greater or equal 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 or equal
+        """
+
         if not (self.cpus >= other.cpus and self.ram >= other.ram):
             return False
-        # ensure all numeric generic resources in `other` are satisfied by `self`
-        for k, v in other.generic_resources.items():
-            if isinstance(v, int | float):
-                lhs_val = self.generic_resources.get(k, 0)
-                if not isinstance(lhs_val, int | float) or lhs_val < v:
+
+        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 so that non-existing keys are considered equal
+            if isinstance(a, int | float) and isinstance(b, int | float):
+                if not (a >= b):
                     return False
-                continue
-            # non-numeric must be equal and present
-            if k not in self.generic_resources or self.generic_resources[k] != v:
+            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:
-        if self.cpus > other.cpus or self.ram > other.ram:
-            return True
-        for k, v in other.generic_resources.items():
-            lhs_val = self.generic_resources.get(k)
-            if (
-                isinstance(v, int | float)
-                and isinstance(lhs_val, int | float)
-                and lhs_val > v
-            ):
-                return True
-            if not isinstance(v, int | float) and lhs_val is not None and lhs_val != v:
-                return True
-        return False
-
     def __add__(self, other: "Resources") -> "Resources":
         """operator for adding two Resources
         Note that only numeric generic resources are added

packages/aws-library/tests/test_ec2_models.py

@@ -37,46 +37,57 @@
             Resources(cpus=0.1, ram=ByteSize(1)),
             False,
         ),
-    ],
-)
-def test_resources_ge_operator(
-    a: Resources, b: Resources, a_greater_or_equal_than_b: bool
-):
-    assert (a >= b) is a_greater_or_equal_than_b
-
-
-@pytest.mark.parametrize(
-    "a,b,a_greater_than_b",
-    [
         (
-            Resources(cpus=0.2, ram=ByteSize(0)),
-            Resources(cpus=0.1, ram=ByteSize(0)),
+            Resources(cpus=0.1, ram=ByteSize(0), generic_resources={"GPU": 1}),
+            Resources(cpus=0.1, ram=ByteSize(1)),
+            False,  # ram is not enough
+        ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
+            Resources(cpus=0.1, ram=ByteSize(1)),
             True,
         ),
         (
-            Resources(cpus=0.1, ram=ByteSize(0)),
-            Resources(cpus=0.1, ram=ByteSize(0)),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
+            True,
+        ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
             False,
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1)),
-            Resources(cpus=0.1, ram=ByteSize(0)),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
+            False,
+        ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": "2"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
+            False,
+        ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            Resources(cpus=0.1, ram=ByteSize(1)),
             True,
         ),
         (
-            Resources(cpus=0.05, ram=ByteSize(1)),
-            Resources(cpus=0.1, ram=ByteSize(0)),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
             True,
         ),
         (
-            Resources(cpus=0.1, ram=ByteSize(0)),
             Resources(cpus=0.1, ram=ByteSize(1)),
+            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):
-    assert (a > b) is a_greater_than_b
+def test_resources_ge_operator(
+    a: Resources, b: Resources, a_greater_or_equal_than_b: bool
+):
+    assert (a >= b) is a_greater_or_equal_than_b
 
 
 @pytest.mark.parametrize(

services/autoscaling/src/simcore_service_autoscaling/models.py

@@ -23,6 +23,9 @@ def assign_task(self, task, task_resources: Resources) -> None:
     def has_resources_for_task(self, task_resources: Resources) -> bool:
         return bool(self.available_resources >= task_resources)
 
+    def has_assigned_tasks(self) -> bool:
+        return len(self.assigned_tasks) > 0
+
 
 @dataclass(frozen=True, kw_only=True, slots=True)
 class AssignedTasksToInstanceType(_TaskAssignmentMixin):
@@ -37,9 +40,6 @@ def __post_init__(self) -> None:
         if self.available_resources == Resources.create_as_empty():
             object.__setattr__(self, "available_resources", self.ec2_instance.resources)
 
-    def has_assigned_tasks(self) -> bool:
-        return bool(self.available_resources < self.ec2_instance.resources)
-
 
 @dataclass(frozen=True, kw_only=True, slots=True)
 class AssociatedInstance(_BaseInstance):

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_provider_computational.py

@@ -88,6 +88,9 @@ async def list_unrunnable_tasks(self, app: FastAPI) -> list[DaskTask]:
 
     def get_task_required_resources(self, task) -> Resources:
         assert self  # nosec
+        # NOTE: a dask worker can take a task if it has a free thread, regardless of its resources
+        #       so we need to be careful when interpreting the resources, adding the thread here will mimick this
+
         return utils.resources_from_dask_task(task)
 
     async def get_task_defined_instance(