minor: switch from usage_available_percentage to usage_limit_total (#1268)

Author: ciyer

components/renku_data_services/crc/api.spec.yaml

@@ -1231,8 +1231,8 @@ components:
           $ref: "#/components/schemas/NodeAffinityList"
         usage_available:
           $ref: "#/components/schemas/UsageAvailable"
-        usage_available_percentage:
-          $ref: "#/components/schemas/UsageAvailablePercentage"
+        usage_limit_total:
+          $ref: "#/components/schemas/UsageLimitTotal"
       required: ["cpu", "memory", "gpu", "max_storage", "name", "id", "default", "default_storage"]
       example:
         name: "resource class"
@@ -1707,13 +1707,12 @@ components:
       description: Amount of a resource available (in hours)
       example: 3.141
       minimum: 0
-    UsageAvailablePercentage:
+    UsageLimitTotal:
       type: number
-      format: float
-      description: Percentage of available resources based on quota
-      example: 75.5
+      format: double
+      description: Total number of a resources hours available to the user
+      example: 10
       minimum: 0
-      maximum: 100
       default: null
     ResourceUsage:
       type: number

components/renku_data_services/crc/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2026-03-30T15:58:30+00:00
+#   timestamp: 2026-04-21T07:48:24+00:00
 
 from __future__ import annotations
 
@@ -805,12 +805,11 @@ class ResourceClassWithIdFiltered(BaseAPISpec):
         examples=[3.141],
         ge=0.0,
     )
-    usage_available_percentage: Optional[float] = Field(
+    usage_limit_total: Optional[float] = Field(
         None,
-        description="Percentage of available resources based on quota",
-        examples=[75.5],
+        description="Total number of a resources hours available to the user",
+        examples=[10],
         ge=0.0,
-        le=100.0,
     )
 
 

components/renku_data_services/crc/core.py

@@ -653,18 +653,17 @@ async def calculate_available_usage(
     if available_quota <= 0:
         return None, None
 
-    resource_usage = resource_usage or 0
-    remaining_quota = available_quota - resource_usage
-
-    if remaining_quota <= 0:
-        return 0.0, 0.0
-
     resource_class_cost = await resource_requests_repo.find_resource_class_costs(resource_pool_id, resource_class_id)
-
     if not resource_class_cost or resource_class_cost.cost.value == 0:
         # NOTE: No cost is defined, so we cannot calculate remaining hours
         return None, None
 
+    total_hours = available_quota / resource_class_cost.cost.value
+    resource_usage = resource_usage or 0
+    remaining_quota = available_quota - resource_usage
+
+    if remaining_quota <= 0:
+        return 0.0, total_hours
+
     remaining_hours = remaining_quota / resource_class_cost.cost.value
-    remaining_percentage = (remaining_quota / available_quota) * 100.0
-    return remaining_hours, remaining_percentage
+    return remaining_hours, total_hours

components/renku_data_services/crc/db.py

@@ -315,13 +315,13 @@ async def filter_resource_pools(
                 if self.resource_requests_repo:
                     updated_classes = []
                     for resource_class in rp_model.classes:
-                        usage_available, usage_available_percentage = await calculate_available_usage(
+                        usage_available, usage_limit_total = await calculate_available_usage(
                             self.resource_requests_repo, rp.id, resource_class.id, resource_usage
                         )
                         updated_class = replace(
                             resource_class,
                             usage_available=usage_available,
-                            usage_available_percentage=usage_available_percentage,
+                            usage_limit_total=usage_limit_total,
                         )
                         updated_classes.append(updated_class)
 

components/renku_data_services/crc/models.py

@@ -111,7 +111,7 @@ class ResourceClass(ResourcesCompareMixin):
     tolerations: list[str] = field(default_factory=list)
     quota: str | None = None
     usage_available: float | None = None
-    usage_available_percentage: float | None = None
+    usage_limit_total: float | None = None
 
 
 @dataclass(frozen=True, eq=True, kw_only=True)

test/bases/renku_data_services/data_api/test_resource_pools.py

@@ -1724,7 +1724,8 @@ async def test_resource_pools_quota_with_partial_usage(
 
     # usage_available should be 3 hours which is 75 percent of the total 4 hours available
     assert resource_class["usage_available"] == 3.0
-    assert resource_class["usage_available_percentage"] == 75.0
+    # usage_limit_total should be 4 hours (200 credits total limit / 50 credits per hour)
+    assert resource_class["usage_limit_total"] == 4.0
 
 
 @pytest.mark.asyncio
@@ -1794,8 +1795,8 @@ async def test_resource_pools_quota_with_no_usage(
 
     # usage_available should be full quota: 200/50 = 4.0 hours
     assert resource_class["usage_available"] == 4.0
-    # usage_available_percentage should be 100%
-    assert resource_class["usage_available_percentage"] == 100.0
+    # usage_limit_total should be 4 hours (200 credits total limit / 50 credits per hour)
+    assert resource_class["usage_limit_total"] == 4.0
 
 
 @pytest.mark.asyncio
@@ -1877,8 +1878,8 @@ async def test_resource_pools_quota_exceeded(
 
     # usage_available should be 0 (quota exceeded)
     assert resource_class["usage_available"] == 0.0
-    # usage_available_percentage should be 0%
-    assert resource_class["usage_available_percentage"] == 0.0
+    # usage_limit_total should be 2.0 hours (50 credits/hour * 2 hours = 100 credits limit)
+    assert resource_class["usage_limit_total"] == 2.0
 
 
 @pytest.mark.asyncio
@@ -1952,8 +1953,8 @@ async def test_resource_pools_quota_with_no_limits(
 
     # usage_available should not exist in the response since it's None
     assert "usage_available" not in resource_class
-    # usage_available_percentage should not exist in the response since it's None
-    assert "usage_available_percentage" not in resource_class
+    # usage_limit_total should not exist in the response since it's None
+    assert "usage_limit_total" not in resource_class
 
 
 @pytest.mark.asyncio
@@ -2031,5 +2032,5 @@ async def test_resource_pools_quota_with_no_costs(
 
     # usage_available should not exist in the response since it's None
     assert "usage_available" not in resource_class
-    # usage_available_percentage should not exist in the response since it's None
-    assert "usage_available_percentage" not in resource_class
+    # usage_limit_total should not exist in the response since it's None
+    assert "usage_limit_total" not in resource_class