PR review: dstack run|fleet get --json

Updated how UUID format errors are handled

Author: peterschmidt85

src/dstack/_internal/cli/commands/fleet.py

@@ -140,9 +140,15 @@ def _delete(self, args: argparse.Namespace):
 
     def _get(self, args: argparse.Namespace):
         # TODO: Implement non-json output format
+        fleet_id = None
+        if args.id:
+            try:
+                fleet_id = UUID(args.id)
+            except ValueError:
+                raise CLIError(f"Invalid UUID format: {args.id}")
+
         try:
             if args.id:
-                fleet_id = UUID(args.id)
                 fleet = self.api.client.fleets.get(
                     project_name=self.api.project, fleet_id=fleet_id
                 )
@@ -151,7 +157,5 @@ def _get(self, args: argparse.Namespace):
         except ResourceNotExistsError:
             console.print(f"Fleet [code]{args.name or args.id}[/] not found")
             exit(1)
-        except ValueError:
-            raise CLIError(f"Invalid UUID format: {args.id}")
 
         print(pydantic_orjson_dumps_with_indent(fleet.dict(), default=None))

src/dstack/_internal/cli/commands/run.py

@@ -50,16 +50,20 @@ def _command(self, args: argparse.Namespace):
 
     def _get(self, args: argparse.Namespace):
         # TODO: Implement non-json output format
+        run_id = None
+        if args.id:
+            try:
+                run_id = UUID(args.id)
+            except ValueError:
+                raise CLIError(f"Invalid UUID format: {args.id}")
+
         try:
             if args.id:
-                run_id = UUID(args.id)
                 run = self.api.client.runs.get(project_name=self.api.project, run_id=run_id)
             else:
                 run = self.api.client.runs.get(project_name=self.api.project, run_name=args.name)
         except ResourceNotExistsError:
             console.print(f"Run [code]{args.name or args.id}[/] not found")
             exit(1)
-        except ValueError:
-            raise CLIError(f"Invalid UUID format: {args.id}")
 
         print(pydantic_orjson_dumps_with_indent(run.dict(), default=None))