refactor: support format choice

Signed-off-by: thxCode <[email protected]>

Author: thxCode

gpustack_runtime/cmds/deployer.py

@@ -396,7 +396,7 @@ class GetWorkloadSubCommand(SubCommand):
     """
 
     name: str
-    json: bool = False
+    format: str = "table"
     watch: int = 0
 
     @staticmethod
@@ -413,9 +413,11 @@ def register(parser: _SubParsersAction):
         )
 
         get_parser.add_argument(
-            "--json",
-            action="store_true",
-            help="output in JSON format",
+            "--format",
+            type=str,
+            choices=["table", "json"],
+            default="table",
+            help="output format",
         )
 
         get_parser.add_argument(
@@ -429,7 +431,7 @@ def register(parser: _SubParsersAction):
 
     def __init__(self, args: Namespace):
         self.name = args.name
-        self.json = args.json
+        self.format = args.format
         self.watch = args.watch
 
         if not self.name:
@@ -441,10 +443,11 @@ def run(self):
             while True:
                 sts: list[WorkloadStatus] = [get_workload(self.name)]
                 print("\033[2J\033[H", end="")
-                if self.json:
-                    print(format_workloads_json(sts))
-                else:
-                    print(format_workloads_table(sts))
+                match self.format.lower():
+                    case "json":
+                        print(format_workloads_json(sts))
+                    case _:
+                        print(format_workloads_table(sts))
                 if not self.watch:
                     break
                 time.sleep(self.watch)
@@ -458,7 +461,7 @@ class ListWorkloadsSubCommand(SubCommand):
     """
 
     labels: dict[str, str] | None = None
-    json: bool = False
+    format: str = "table"
     watch: int = 0
 
     @staticmethod
@@ -476,9 +479,11 @@ def register(parser: _SubParsersAction):
         )
 
         list_parser.add_argument(
-            "--json",
-            action="store_true",
-            help="output in JSON format",
+            "--format",
+            type=str,
+            choices=["table", "json"],
+            default="table",
+            help="output format",
         )
 
         list_parser.add_argument(
@@ -492,18 +497,19 @@ def register(parser: _SubParsersAction):
 
     def __init__(self, args: Namespace):
         self.labels = args.labels
-        self.json = args.json
+        self.format = args.format
         self.watch = args.watch
 
     def run(self):
         try:
             while True:
                 sts: list[WorkloadStatus] = list_workloads(self.labels)
                 print("\033[2J\033[H", end="")
-                if self.json:
-                    print(format_workloads_json(sts))
-                else:
-                    print(format_workloads_table(sts))
+                match self.format.lower():
+                    case "json":
+                        print(format_workloads_json(sts))
+                    case _:
+                        print(format_workloads_table(sts))
                 if not self.watch:
                     break
                 time.sleep(self.watch)
@@ -570,7 +576,7 @@ def run(self):
 
 
 def format_workloads_json(sts: list[WorkloadStatus]) -> str:
-    return json.dumps([st.to_dict() for st in sts], indent=2)
+    return json.dumps([st.__dict__ for st in sts], indent=2)
 
 
 def format_workloads_table(sts: list[WorkloadStatus], width: int = 100) -> str:

gpustack_runtime/cmds/detector.py

@@ -17,7 +17,7 @@ class DetectDevicesSubCommand(SubCommand):
     Command to detect GPUs and their properties.
     """
 
-    json: bool = False
+    format: str = "table"
     watch: int = 0
 
     @staticmethod
@@ -28,10 +28,11 @@ def register(parser: _SubParsersAction):
         )
 
         detect_parser.add_argument(
-            "--json",
-            "-j",
-            action="store_true",
-            help="output in JSON format",
+            "--format",
+            type=str,
+            choices=["table", "json"],
+            default="table",
+            help="output format",
         )
 
         detect_parser.add_argument(
@@ -44,18 +45,19 @@ def register(parser: _SubParsersAction):
         detect_parser.set_defaults(func=DetectDevicesSubCommand)
 
     def __init__(self, args: Namespace):
-        self.json = args.json
+        self.format = args.format
         self.watch = args.watch
 
     def run(self):
         try:
             while True:
                 devs: Devices = detect_devices()
                 print("\033[2J\033[H", end="")
-                if self.json:
-                    print(format_devices_json(devs))
-                else:
-                    print(format_devices_table(devs))
+                match self.format.lower():
+                    case "json":
+                        print(format_devices_json(devs))
+                    case _:
+                        print(format_devices_table(devs))
                 if not self.watch:
                     break
                 time.sleep(self.watch)