use effective_end_time for lease calculations when available

this accounts for ended leases as well. If present it has the actual end time of the lease.
change column to RELEASE TIME to make sense for ended leases as well

(cherry picked from commit 3abd886)

Author: michalskrivanek

packages/jumpstarter/jumpstarter/client/grpc.py

@@ -32,7 +32,7 @@ def add_display_columns(table, options: WithOptions = None):
     if options.show_leases:
         table.add_column("LEASED BY")
         table.add_column("LEASE STATUS")
-        table.add_column("EXPECTED RELEASE")
+        table.add_column("RELEASE TIME")
 
 
 def add_exporter_row(table, exporter, options: WithOptions = None, lease_info: tuple[str, str, str] | None = None):
@@ -97,15 +97,19 @@ def rich_add_rows(self, table, options: WithOptions = None):
         if options and options.show_leases and self.lease:
             lease_client = self.lease.client
             lease_status = self.lease.get_status()
-            expected_release = ""
-            if self.lease.effective_begin_time and self.lease.effective_duration:
-                release_time = self.lease.effective_begin_time + self.lease.effective_duration
-                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            release_time = ""
+            if self.lease.effective_end_time:
+                # Ended: use actual end time
+                release_time = self.lease.effective_end_time.strftime("%Y-%m-%d %H:%M:%S")
+            elif self.lease.effective_begin_time:
+                # Active: calculate expected end
+                release_time = self.lease.effective_begin_time + self.lease.duration
+                release_time = release_time.strftime("%Y-%m-%d %H:%M:%S")
             elif self.lease.begin_time:
-                dur = self.lease.effective_duration or self.lease.duration
-                release_time = self.lease.begin_time + dur
-                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
-            lease_info = (lease_client, lease_status, expected_release)
+                # Scheduled: calculate expected end
+                release_time = self.lease.begin_time + self.lease.duration
+                release_time = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            lease_info = (lease_client, lease_status, release_time)
         elif options and options.show_leases:
             lease_info = ("", "Available", "")
         add_exporter_row(table, self, options, lease_info)
@@ -125,6 +129,7 @@ class Lease(BaseModel):
     exporter: str
     conditions: list[kubernetes_pb2.Condition]
     effective_begin_time: datetime | None = None
+    effective_end_time: datetime | None = None
 
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
@@ -161,6 +166,12 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
                 tzinfo=datetime.now().astimezone().tzinfo,
             )
 
+        effective_end_time = None
+        if data.HasField("effective_end_time"):
+            effective_end_time = data.effective_end_time.ToDatetime(
+                tzinfo=datetime.now().astimezone().tzinfo,
+            )
+
         return cls(
             namespace=namespace,
             name=name,
@@ -171,6 +182,7 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
             client=client,
             exporter=exporter,
             effective_begin_time=effective_begin_time,
+            effective_end_time=effective_end_time,
             conditions=data.conditions,
         )
 
@@ -191,12 +203,8 @@ def rich_add_rows(self, table):
         elif self.begin_time:
             begin_time = self.begin_time.strftime("%Y-%m-%d %H:%M:%S")
 
-        # Show effective_duration if available, otherwise show requested duration
-        duration = ""
-        if self.effective_duration:
-            duration = str(self.effective_duration)
-        elif self.duration:
-            duration = str(self.duration)
+        # Show actual duration for ended leases, requested duration otherwise
+        duration = str(self.effective_duration if self.effective_end_time else self.duration or "")
 
         table.add_row(
             self.name,
@@ -212,6 +220,10 @@ def rich_add_names(self, names):
 
     def get_status(self) -> str:
         """Get the lease status based on conditions"""
+        # Check if lease has ended (effective_end_time is set)
+        if self.effective_end_time:
+            return "Ended"
+
         if not self.conditions:
             return "Unknown"
 

packages/jumpstarter/jumpstarter/client/grpc_test.py

@@ -48,15 +48,15 @@ def test_with_leases_columns(self):
         add_display_columns(table, options)
 
         columns = [col.header for col in table.columns]
-        assert columns == ["NAME", "LABELS", "LEASED BY", "LEASE STATUS", "EXPECTED RELEASE"]
+        assert columns == ["NAME", "LABELS", "LEASED BY", "LEASE STATUS", "RELEASE TIME"]
 
     def test_with_all_columns(self):
         table = Table()
         options = WithOptions(show_online=True, show_leases=True)
         add_display_columns(table, options)
 
         columns = [col.header for col in table.columns]
-        assert columns == ["NAME", "ONLINE", "LABELS", "LEASED BY", "LEASE STATUS", "EXPECTED RELEASE"]
+        assert columns == ["NAME", "ONLINE", "LABELS", "LEASED BY", "LEASE STATUS", "RELEASE TIME"]
 
 
 class TestAddExporterRow:
@@ -91,7 +91,7 @@ def test_row_with_lease_info(self):
         add_exporter_row(table, exporter, options, lease_info)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
 
     def test_row_with_lease_info_available(self):
         table = Table()
@@ -115,21 +115,23 @@ def test_row_with_all_options(self):
         add_exporter_row(table, exporter, options, lease_info)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
 
 
 class TestExporterList:
     def create_test_lease(self, client="test-client", status="Active",
                           effective_begin_time=datetime(2023, 1, 1, 10, 0, 0),
                           effective_duration=timedelta(hours=1),
-                          begin_time=None, duration=timedelta(hours=1)):
+                          begin_time=None, duration=timedelta(hours=1),
+                          effective_end_time=None):
         lease = Mock(spec=Lease)
         lease.client = client
         lease.get_status.return_value = status
         lease.effective_begin_time = effective_begin_time
         lease.effective_duration = effective_duration
         lease.begin_time = begin_time
         lease.duration = duration
+        lease.effective_end_time = effective_end_time
         return lease
 
     def test_exporter_without_lease(self):
@@ -181,7 +183,7 @@ def test_exporter_with_lease_display(self):
         exporter.rich_add_rows(table, options)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=120)
@@ -209,7 +211,7 @@ def test_exporter_without_lease_but_show_leases(self):
         exporter.rich_add_rows(table, options)
 
         assert len(table.rows) == 1
-        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 5  # NAME, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=120)
@@ -291,7 +293,7 @@ def test_exporter_all_features_display(self):
         exporter_offline_no_lease.rich_add_rows(table, options)
 
         assert len(table.rows) == 2
-        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        assert len(table.columns) == 6  # NAME, ONLINE, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
 
         # Test actual table content by rendering it
         console = Console(file=StringIO(), width=150)
@@ -312,7 +314,11 @@ def test_exporter_all_features_display(self):
 
     def test_exporter_lease_info_extraction(self):
         """Test that lease information is correctly extracted from lease objects"""
-        lease = self.create_test_lease(client="my-client", status="Expired")
+        lease = self.create_test_lease(
+            client="my-client",
+            status="Expired",
+            effective_end_time=datetime(2023, 1, 1, 11, 0, 0)  # Ended after 1 hour
+        )
         exporter = Exporter(
             namespace="default",
             name="test-exporter",
@@ -332,8 +338,16 @@ def test_exporter_lease_info_extraction(self):
             lease_client = exporter.lease.client
             lease_status = exporter.lease.get_status()
             expected_release = ""
-            if exporter.lease.effective_begin_time and exporter.lease.effective_duration:
-                release_time = exporter.lease.effective_begin_time + exporter.lease.effective_duration
+            if exporter.lease.effective_end_time:
+                # Ended: use actual end time
+                expected_release = exporter.lease.effective_end_time.strftime("%Y-%m-%d %H:%M:%S")
+            elif exporter.lease.effective_begin_time:
+                # Active: calculate expected end
+                release_time = exporter.lease.effective_begin_time + exporter.lease.duration
+                expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
+            elif exporter.lease.begin_time:
+                # Scheduled: calculate expected end
+                release_time = exporter.lease.begin_time + exporter.lease.duration
                 expected_release = release_time.strftime("%Y-%m-%d %H:%M:%S")
             lease_info = (lease_client, lease_status, expected_release)
 
@@ -384,7 +398,7 @@ def test_exporter_scheduled_lease_expected_release(self):
         Exporter.rich_add_columns(table, options)
         exporter.rich_add_rows(table, options)
 
-        # Should have 5 columns: NAME, LABELS, LEASED BY, LEASE STATUS, EXPECTED RELEASE
+        # Should have 5 columns: NAME, LABELS, LEASED BY, LEASE STATUS, RELEASE TIME
         assert len(table.columns) == 5
         assert len(table.rows) == 1
 

packages/jumpstarter/jumpstarter/client/lease.py

@@ -252,7 +252,10 @@ async def _monitor():
             while True:
                 lease = await self.get()
                 if lease.effective_begin_time and lease.effective_duration:
-                    end_time = lease.effective_begin_time + lease.effective_duration
+                    if lease.effective_end_time: # already ended
+                        end_time = lease.effective_end_time
+                    else:
+                        end_time = lease.effective_begin_time + lease.duration
                     remain = end_time - datetime.now().astimezone()
                     if remain < timedelta(0):
                         # lease already expired, stopping monitor