add start and end time options for get exporters CLI

add "--with start_time" and "--with end_time" to "get exporters" CLI output. They imply "--with leases".
Default "--with leases" behavior was changed to only show the lease status

Author: michalskrivanek

packages/jumpstarter-cli/jumpstarter_cli/get.py

@@ -21,18 +21,27 @@ def get():
 @opt_output_all
 @opt_comma_separated(
     "with",
-    {"leases", "online"},
-    help_text="Include fields: leases, online (comma-separated or repeated)"
+    {"leases", "online", "start_time", "end_time"},
+    help_text="Include fields: leases, online, start_time, end_time (comma-separated or repeated)"
 )
 @handle_exceptions_with_reauthentication(relogin_client)
 def get_exporters(config, selector: str | None, output: OutputType, with_options: list[str]):
     """
     Display one or many exporters
     """
 
-    include_leases = "leases" in with_options
+    include_start_time = "start_time" in with_options
+    include_end_time = "end_time" in with_options
+    # Implicitly enable leases if start_time or end_time is specified
+    include_leases = "leases" in with_options or include_start_time or include_end_time
     include_online = "online" in with_options
-    exporters = config.list_exporters(filter=selector, include_leases=include_leases, include_online=include_online)
+    exporters = config.list_exporters(
+        filter=selector,
+        include_leases=include_leases,
+        include_online=include_online,
+        include_start_time=include_start_time,
+        include_end_time=include_end_time,
+    )
 
     model_print(exporters, output)
 

packages/jumpstarter-cli/jumpstarter_cli/get_test.py

@@ -14,7 +14,7 @@ class TestParseWith:
     @property
     def allowed_values(self):
         """Allowed values for --with option"""
-        return {"leases", "online"}
+        return {"leases", "online", "start_time", "end_time"}
 
     def test_single_option(self):
         """Test parsing a single option"""
@@ -40,13 +40,19 @@ def test_invalid_options_raise_error(self):
         """Test that invalid options raise click.BadParameter"""
         with pytest.raises(
             click.BadParameter,
-            match="Invalid value\\(s\\) \\['unknown', 'invalid'\\]. Allowed values are: leases, online"
+            match=(
+                "Invalid value\\(s\\) \\['unknown', 'invalid'\\]. "
+                "Allowed values are: end_time, leases, online, start_time"
+            ),
         ):
             parse_comma_separated(None, None, "unknown,online,invalid", self.allowed_values)
 
         with pytest.raises(
             click.BadParameter,
-            match="Invalid value\\(s\\) \\['invalid'\\]. Allowed values are: leases, online"
+            match=(
+                "Invalid value\\(s\\) \\['invalid'\\]. "
+                "Allowed values are: end_time, leases, online, start_time"
+            ),
         ):
             parse_comma_separated(None, None, "online,invalid", self.allowed_values)
 
@@ -180,6 +186,51 @@ def test_with_options_parsing_empty(self):
         assert include_leases is False
         assert include_online is False
 
+    def test_with_options_start_time_implies_leases(self):
+        """Test that 'start_time' in with_options implicitly enables leases"""
+        with_options = ("start_time",)
+
+        include_start_time = "start_time" in with_options
+        include_end_time = "end_time" in with_options
+        # Implicitly enable leases if start_time or end_time is specified
+        include_leases = "leases" in with_options or include_start_time or include_end_time
+        include_online = "online" in with_options
+
+        assert include_leases is True
+        assert include_start_time is True
+        assert include_end_time is False
+        assert include_online is False
+
+    def test_with_options_end_time_implies_leases(self):
+        """Test that 'end_time' in with_options implicitly enables leases"""
+        with_options = ("end_time",)
+
+        include_start_time = "start_time" in with_options
+        include_end_time = "end_time" in with_options
+        # Implicitly enable leases if start_time or end_time is specified
+        include_leases = "leases" in with_options or include_start_time or include_end_time
+        include_online = "online" in with_options
+
+        assert include_leases is True
+        assert include_start_time is False
+        assert include_end_time is True
+        assert include_online is False
+
+    def test_with_options_both_times_implies_leases(self):
+        """Test that both time options implicitly enable leases"""
+        with_options = ("start_time", "end_time")
+
+        include_start_time = "start_time" in with_options
+        include_end_time = "end_time" in with_options
+        # Implicitly enable leases if start_time or end_time is specified
+        include_leases = "leases" in with_options or include_start_time or include_end_time
+        include_online = "online" in with_options
+
+        assert include_leases is True
+        assert include_start_time is True
+        assert include_end_time is True
+        assert include_online is False
+
     def test_with_options_parsing_unknown(self):
         """Test that the parse_with function now validates and rejects unknown options"""
         # This test verifies that the new parse_with function would reject unknown options

packages/jumpstarter-cli/jumpstarter_cli/login.py

@@ -149,6 +149,7 @@ async def relogin_client(config: ClientConfigV1Alpha1):
     try:
         oidc = Config(issuer=issuer, client_id=client_id)
         tokens = await oidc.authorization_code_grant()
+        print(tokens)
         config.token = tokens["access_token"]
         ClientConfigV1Alpha1.save(config) # ty: ignore[invalid-argument-type]
     except Exception as e:

packages/jumpstarter/jumpstarter/client/grpc.py

@@ -20,6 +20,8 @@
 class WithOptions:
     show_online: bool = False
     show_leases: bool = False
+    show_start_time: bool = False
+    show_end_time: bool = False
 
 
 def add_display_columns(table, options: WithOptions = None):
@@ -32,10 +34,15 @@ 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("START TIME")
+        if options.show_start_time:
+            table.add_column("START TIME")
+        if options.show_end_time:
+            table.add_column("END TIME")
 
 
-def add_exporter_row(table, exporter, options: WithOptions = None, lease_info: tuple[str, str, str] | None = None):
+def add_exporter_row(
+    table, exporter, options: WithOptions = None, lease_info: tuple[str, str, str, str] | None = None
+):
     if options is None:
         options = WithOptions()
     row_data = []
@@ -45,10 +52,15 @@ def add_exporter_row(table, exporter, options: WithOptions = None, lease_info: t
     row_data.append(",".join(("{}={}".format(k, v) for k, v in sorted(exporter.labels.items()))))
     if options.show_leases:
         if lease_info:
-            lease_client, lease_status, start_time = lease_info
+            lease_client, lease_status, start_time, end_time = lease_info
         else:
-            lease_client, lease_status, start_time = "", "Available", ""
-        row_data.extend([lease_client, lease_status, start_time])
+            lease_client, lease_status, start_time, end_time = "", "Available", "", ""
+        lease_row = [lease_client, lease_status]
+        if options.show_start_time:
+            lease_row.append(start_time)
+        if options.show_end_time:
+            lease_row.append(end_time)
+        row_data.extend(lease_row)
 
     table.add_row(*row_data)
 
@@ -98,11 +110,14 @@ def rich_add_rows(self, table, options: WithOptions = None):
             lease_client = self.lease.client
             lease_status = self.lease.get_status()
             start_time = ""
-            if self.lease.effective_begin_time:
+            if options.show_start_time and self.lease.effective_begin_time:
                 start_time = self.lease.effective_begin_time.strftime("%Y-%m-%d %H:%M:%S")
-            lease_info = (lease_client, lease_status, start_time)
+            end_time = ""
+            if options.show_end_time and self.lease.effective_end_time:
+                end_time = self.lease.effective_end_time.strftime("%Y-%m-%d %H:%M:%S")
+            lease_info = (lease_client, lease_status, start_time, end_time)
         elif options and options.show_leases:
-            lease_info = ("", "Available", "")
+            lease_info = ("", "Available", "", "")
         add_exporter_row(table, self, options, lease_info)
 
     def rich_add_names(self, names):
@@ -118,6 +133,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,
@@ -144,6 +160,12 @@ def from_protobuf(cls, data: client_pb2.Lease) -> Lease:
                 tzinfo=datetime.now().astimezone().tzinfo,
             )
 
+        effective_end_time = None
+        if data.effective_end_time:
+            effective_end_time = data.effective_end_time.ToDatetime(
+                tzinfo=datetime.now().astimezone().tzinfo,
+            )
+
         return cls(
             namespace=namespace,
             name=name,
@@ -152,6 +174,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,
         )
 
@@ -197,6 +220,8 @@ class ExporterList(BaseModel):
     next_page_token: str | None = Field(exclude=True)
     include_online: bool = Field(default=False, exclude=True)
     include_leases: bool = Field(default=False, exclude=True)
+    include_start_time: bool = Field(default=False, exclude=True)
+    include_end_time: bool = Field(default=False, exclude=True)
 
     @classmethod
     def from_protobuf(cls, data: client_pb2.ListExportersResponse) -> ExporterList:
@@ -206,11 +231,21 @@ def from_protobuf(cls, data: client_pb2.ListExportersResponse) -> ExporterList:
         )
 
     def rich_add_columns(self, table):
-        options = WithOptions(show_online=self.include_online, show_leases=self.include_leases)
+        options = WithOptions(
+            show_online=self.include_online,
+            show_leases=self.include_leases,
+            show_start_time=self.include_start_time,
+            show_end_time=self.include_end_time,
+        )
         Exporter.rich_add_columns(table, options)
 
     def rich_add_rows(self, table):
-        options = WithOptions(show_online=self.include_online, show_leases=self.include_leases)
+        options = WithOptions(
+            show_online=self.include_online,
+            show_leases=self.include_leases,
+            show_start_time=self.include_start_time,
+            show_end_time=self.include_end_time,
+        )
         for exporter in self.exporters:
             exporter.rich_add_rows(table, options)