Dedup output mode handling

Author: NickCao

packages/jumpstarter-cli-common/jumpstarter_cli_common/opt.py

@@ -2,6 +2,8 @@
 
 import asyncclick as click
 
+from jumpstarter.common.pydantic import OutputMode
+
 opt_log_level = click.option(
     "--log-level",
     "log_level",
@@ -20,15 +22,6 @@
 opt_labels = click.option("-l", "--label", "labels", type=(str, str), multiple=True, help="Labels")
 
 
-class OutputMode(str):
-    JSON = "json"
-    YAML = "yaml"
-    NAME = "name"
-    PATH = "path"
-
-
-OutputType = Optional[OutputMode]
-
 opt_output_all = click.option(
     "-o",
     "--output",

packages/jumpstarter-cli/jumpstarter_cli/create.py

@@ -55,10 +55,8 @@ async def create_lease(config, selector: str, duration: timedelta, output: Outpu
     lease = config.create_lease(selector=selector, duration=duration)
 
     match output:
-        case OutputMode.JSON:
-            click.echo(lease.dump_json())
-        case OutputMode.YAML:
-            click.echo(lease.dump_yaml())
+        case OutputMode.JSON | OutputMode.YAML:
+            click.echo(lease.dump(output))
         case OutputMode.NAME:
             click.echo(lease.name)
         case _:

packages/jumpstarter-cli/jumpstarter_cli/get.py

@@ -25,10 +25,8 @@ def get_exporters(config, selector: str | None, output: OutputType):
     exporters = config.list_exporters(filter=selector)
 
     match output:
-        case OutputMode.JSON:
-            click.echo(exporters.dump_json())
-        case OutputMode.YAML:
-            click.echo(exporters.dump_yaml())
+        case OutputMode.JSON | OutputMode.YAML:
+            click.echo(exporters.dump(output))
         case OutputMode.NAME:
             for exporter in exporters.exporters:
                 click.echo(exporter.name)
@@ -57,10 +55,8 @@ def get_leases(config, selector: str | None, output: OutputType):
     leases = config.list_leases(filter=selector)
 
     match output:
-        case OutputMode.JSON:
-            click.echo(leases.dump_json())
-        case OutputMode.YAML:
-            click.echo(leases.dump_yaml())
+        case OutputMode.JSON | OutputMode.YAML:
+            click.echo(leases.dump(output))
         case OutputMode.NAME:
             for lease in leases.leases:
                 click.echo(lease.name)

packages/jumpstarter-cli/jumpstarter_cli/update.py

@@ -28,10 +28,8 @@ async def update_lease(config, name: str, duration: timedelta, output: OutputTyp
     lease = config.update_lease(name, duration)
 
     match output:
-        case OutputMode.JSON:
-            click.echo(lease.dump_json())
-        case OutputMode.YAML:
-            click.echo(lease.dump_yaml())
+        case OutputMode.JSON | OutputMode.YAML:
+            click.echo(lease.dump(output))
         case OutputMode.NAME:
             click.echo(lease.name)
         case _:

packages/jumpstarter/jumpstarter/common/pydantic.py

@@ -2,7 +2,26 @@
 from pydantic import BaseModel
 
 
+class OutputMode(str):
+    JSON = "json"
+    YAML = "yaml"
+    NAME = "name"
+    PATH = "path"
+
+
+OutputType = OutputMode | None
+
+
 class SerializableBaseModel(BaseModel):
+    def dump(self, mode: OutputType = None):
+        match mode:
+            case OutputMode.JSON:
+                return self.dump_json()
+            case OutputMode.YAML:
+                return self.dump_yaml()
+            case _:
+                raise NotImplementedError("unimplemented output mode: {}".format(mode))
+
     def dump_json(self):
         return self.model_dump_json(indent=4, by_alias=True)