Add additional output to show command to match pip implementation

Author: kirkbrauer

packages/jumpstarter-cli-pkg/jumpstarter_cli_pkg/commands/show.py

@@ -6,76 +6,87 @@
 from ..repository import LocalDriverRepository, V1Alpha1DriverPackage
 
 
-def print_package_info(package: V1Alpha1DriverPackage):
+def print_package_info(package: V1Alpha1DriverPackage, verbose: bool):
     """Print basic package information."""
+    dist = package.get_distribution()
     click.echo("Name: " + package.name)
     click.echo("Version: " + package.version)
     click.echo("Summary: " + (package.summary if package.summary else ""))
-    click.echo("Categories: " + ", ".join(package.categories))
+    click.echo("Home-page: " + dist.metadata.get("Home-Page", ""))
+    click.echo("Author: " + dist.metadata.get("Author", ""))
+    click.echo("Author-email: " + dist.metadata.get("Author-email", ""))
     click.echo("License: " + (package.license if package.license else ""))
+    click.echo("Location: " + dist.metadata.get("Location", ""))
+    click.echo("Requires: " + dist.metadata.get("Requires", ""))
+    click.echo("Metadata-Version: " + dist.metadata.get("Metadata-Version", ""))
+    # Only show installer and classifiers for verbose output
+    if verbose:
+        click.echo("Installer: " + dist.metadata.get("Installer", ""))
+        click.echo("Classifiers: " + dist.metadata.get("Classifiers", ""))
+    click.echo("Categories: " + ", ".join(package.categories))
 
 
 def print_drivers(package: V1Alpha1DriverPackage, inspect: bool):
     """Print drivers information."""
     click.echo("Drivers:")
     for driver in package.drivers.items:
-        click.echo(f"  {driver.name}:")
-        click.echo(f"    Module: {driver.module}")
-        click.echo(f"    Class: {driver.class_name}")
-        click.echo(f"    Type: {driver.type}")
+        click.echo(f"   {driver.name}:")
+        click.echo(f"      Module: {driver.module}")
+        click.echo(f"      Class: {driver.class_name}")
+        click.echo(f"      Type: {driver.type}")
 
         client_type_out = driver.client_type if driver.client_type else "(not available)"
         if not inspect:
             client_type_out = "(run this command with --inspect to see the client type)"
-        click.echo(f"    Client: {client_type_out}")
+        click.echo(f"      Client: {client_type_out}")
 
         summary_out = driver.summary if driver.summary else "(not available)"
         if not inspect:
             summary_out = "(run this command with --inspect to see the summary)"
-        click.echo(f"    Summary: {summary_out}")
+        click.echo(f"      Summary: {summary_out}")
 
 
 def print_driver_clients(package: V1Alpha1DriverPackage, inspect: bool):
     """Print driver clients information."""
-    click.echo("Driver Clients:")
+    click.echo("Driver-Clients:")
     for driver_client in package.driver_clients.items:
-        click.echo(f"  {driver_client.name}:")
-        click.echo(f"    Module: {driver_client.module}")
-        click.echo(f"    Class: {driver_client.class_name}")
-        click.echo(f"    Type: {driver_client.type}")
+        click.echo(f"   {driver_client.name}:")
+        click.echo(f"      Module: {driver_client.module}")
+        click.echo(f"      Class: {driver_client.class_name}")
+        click.echo(f"      Type: {driver_client.type}")
 
         summary_out = driver_client.summary if driver_client.summary else "(not available)"
         if not inspect:
             summary_out = "(run this command with --inspect to see the summary)"
-        click.echo(f"    Summary: {summary_out}")
+        click.echo(f"      Summary: {summary_out}")
         cli_out = "Yes" if driver_client.cli else "No"
         if not inspect:
             cli_out = "(run this command with --inspect to check if a CLI is available)"
-        click.echo(f"    Has CLI: {cli_out}")
+        click.echo(f"      Has-CLI: {cli_out}")
 
 
 def print_adapters(package: V1Alpha1DriverPackage, inspect: bool):
     """Print adapters information."""
     click.echo("Adapters:")
     for adapter in package.adapters.items:
-        click.echo(f"  {adapter.name}:")
-        click.echo(f"    Module: {adapter.module}")
-        click.echo(f"    Function: {adapter.function_name}")
-        click.echo(f"    Type: {adapter.type}")
+        click.echo(f"   {adapter.name}:")
+        click.echo(f"      Module: {adapter.module}")
+        click.echo(f"      Function: {adapter.function_name}")
+        click.echo(f"      Type: {adapter.type}")
         summary_out = adapter.summary if adapter.summary else "(not available)"
         if not inspect:
             summary_out = "(run this command with --inspect to see the summary)"
-        click.echo(f"    Summary: {summary_out}")
+        click.echo(f"      Summary: {summary_out}")
 
 
 def print_package_details(
-    package: V1Alpha1DriverPackage, drivers: bool, driver_clients: bool, adapters: bool, inspect: bool
+    package: V1Alpha1DriverPackage, drivers: bool, driver_clients: bool, adapters: bool, inspect: bool, verbose: bool
 ):
     """Print package details based on the specified flags."""
     flag_sum = sum([drivers, driver_clients, adapters])
 
     if flag_sum == 0:
-        print_package_info(package)
+        print_package_info(package, verbose)
 
     if flag_sum == 0 or drivers:
         print_drivers(package, inspect)
@@ -94,8 +105,11 @@ def print_package_details(
 @opt_adapters
 @opt_inspect
 @opt_output_all
+@click.option("--verbose", "-v", is_flag=True, help="Show verbose output.")
 @handle_exceptions
-def show(package: str, drivers: bool, driver_clients: bool, adapters: bool, output: OutputType, inspect: bool):
+def show(
+    package: str, drivers: bool, driver_clients: bool, adapters: bool, output: OutputType, inspect: bool, verbose: bool
+):
     """
     Show a Jumpstarter plugin package details.
     """
@@ -126,4 +140,4 @@ def show(package: str, drivers: bool, driver_clients: bool, adapters: bool, outp
             else:
                 click.echo(local_package.dump_yaml())
         case _:
-            print_package_details(local_package, drivers, driver_clients, adapters, inspect)
+            print_package_details(local_package, drivers, driver_clients, adapters, inspect, verbose)

packages/jumpstarter-cli-pkg/jumpstarter_cli_pkg/repository/entry_points.py

@@ -132,15 +132,16 @@ def from_entry_point(ep: EntryPoint, should_inspect: bool = False):
         value_split = ep.value.split(":")
         module = value_split[0]
         function_name = value_split[1]
-        return V1Alpha1AdapterEntryPoint(
-            _entry_point=ep,
+        adapter = V1Alpha1AdapterEntryPoint(
             name=ep.name,
             module=module,
             function_name=function_name,
             type=ep.value.replace(":", "."),
             package=ep.dist.name,
             summary=summary,
         )
+        adapter._entry_point = ep
+        return adapter
 
 
 class V1Alpha1DriverClientEntryPoint(JsonBaseModel):
@@ -173,8 +174,7 @@ def from_entry_point(ep: EntryPoint, should_inspect: bool = False):
         value_split = ep.value.split(":")
         module = value_split[0]
         class_name = value_split[1]
-        return V1Alpha1DriverClientEntryPoint(
-            _entry_point=ep,
+        driver_client = V1Alpha1DriverClientEntryPoint(
             name=ep.name,
             module=module,
             class_name=class_name,
@@ -183,6 +183,8 @@ def from_entry_point(ep: EntryPoint, should_inspect: bool = False):
             summary=summary,
             cli=cli,
         )
+        driver_client._entry_point = ep
+        return driver_client
 
 
 class V1Alpha1DriverEntryPoint(JsonBaseModel):
@@ -226,8 +228,7 @@ def from_entry_point(ep: EntryPoint, should_inspect: bool = False):
         value_split = ep.value.split(":")
         module = value_split[0]
         class_name = value_split[1]
-        return V1Alpha1DriverEntryPoint(
-            _entry_point=ep,
+        driver = V1Alpha1DriverEntryPoint(
             name=ep.name,
             module=module,
             class_name=class_name,
@@ -236,6 +237,8 @@ def from_entry_point(ep: EntryPoint, should_inspect: bool = False):
             summary=summary,
             client_type=client_type,
         )
+        driver._entry_point = ep
+        return driver
 
 
 class V1Alpha1AdapterEntryPointList(ListBaseModel[V1Alpha1AdapterEntryPoint]):

packages/jumpstarter-cli-pkg/jumpstarter_cli_pkg/repository/package.py

@@ -109,8 +109,7 @@ def from_distribution(dist: Distribution, should_inspect: bool):
         if len(drivers) + len(driver_clients) + len(adapters) == 0:
             raise JumpstarterException(f"No valid Jumpstarter entry points found for package '{dist.name}'")
         # Return the completed driver package
-        return V1Alpha1DriverPackage(
-            _distribution=dist,
+        package = V1Alpha1DriverPackage(
             name=dist.name,
             categories=V1Alpha1DriverPackage.requires_dist_to_categories(
                 dist.name, dist.metadata.get_all("Requires-Dist")
@@ -122,6 +121,12 @@ def from_distribution(dist: Distribution, should_inspect: bool):
             driver_clients=V1Alpha1DriverClientEntryPointList(items=driver_clients),
             adapters=V1Alpha1AdapterEntryPointList(items=adapters),
         )
+        # Set hidden property for distribution
+        package._distribution = dist
+        return package
+
+    def get_distribution(self) -> Distribution:
+        return self._distribution
 
     def list_drivers(self) -> V1Alpha1DriverEntryPointList:
         return self.drivers