styling and commands cleanup

Author: Yasen Trahnov

pulp-glue-console/pulp_glue/console/context.py

@@ -12,7 +12,7 @@ class PulpVulnerabilityReportContext(PulpEntityContext):
     ID_PREFIX = "vuln_report"
     HREF = "service_vulnerability_report_href"
 
-    def upload(self, file: t.IO[bytes], chunk_size: int = 1000000) -> dict:
+    def upload(self, file: t.IO[bytes], chunk_size: int = 1000000) -> t.Dict[str, t.Any]:
         """Upload a vulnerability report from a JSON file.
 
         Args:
@@ -30,4 +30,4 @@ def upload(self, file: t.IO[bytes], chunk_size: int = 1000000) -> dict:
             body={"package_json": file_content},
             validate_body=False,
         )
-        return response
+        return t.cast(t.Dict[str, t.Any], response)

pulpcore/cli/console/__init__.py

@@ -5,12 +5,14 @@
 from pulp_glue.common.openapi import OpenAPI, _Response
 
 
-def mount(main: click.Group, **kwargs) -> None:
+def mount(main: click.Group, **kwargs: t.Any) -> None:
     # Store the original _parse_response method
     original_parse_response = OpenAPI._parse_response
 
     # Define our custom implementation that handles 202 responses (Original one throws an error)
-    def custom_parse_response(self, method_spec: t.Dict[str, t.Any], response: _Response) -> t.Any:
+    def custom_parse_response(
+        self: OpenAPI, method_spec: t.Dict[str, t.Any], response: _Response
+    ) -> t.Any:
         # Handle 202 responses directly
         if response.status_code == 202:
             content_type = response.headers.get("content-type")
@@ -21,15 +23,14 @@ def custom_parse_response(self, method_spec: t.Dict[str, t.Any], response: _Resp
         # For all other responses, use the original implementation
         return original_parse_response(self, method_spec, response)
 
-    # Apply the patch
-    OpenAPI._parse_response = custom_parse_response
+    setattr(OpenAPI, "_parse_response", custom_parse_response)
 
     # Continue with normal mounting
     from pulpcore.cli.console.vulnerability import attach_vulnerability_commands
 
     @main.group()
-    def console():
+    def console() -> None:
         """Pulp Console commands."""
         pass
 
-    attach_vulnerability_commands(console)
+    attach_vulnerability_commands(console)  # type: ignore

pulpcore/cli/console/vulnerability.py

@@ -1,11 +1,12 @@
 import click
 from pulp_glue.common.context import PulpContext
 from pulp_glue.console.context import PulpVulnerabilityReportContext
+from typing import IO, Any, Optional
 
 from pulpcore.cli.common.generic import (
     PulpCLIContext,
+    PulpEntityContext,
     chunk_size_option,
-    create_command,
     destroy_command,
     href_option,
     list_command,
@@ -15,7 +16,7 @@
 )
 
 
-def attach_vulnerability_commands(console_group):
+def attach_vulnerability_commands(console_group: click.Group) -> None:
     @console_group.group()
     @pass_pulp_context
     @click.pass_context
@@ -28,8 +29,7 @@ def vulnerability(ctx: click.Context, pulp_ctx: PulpContext, /) -> None:
     # Add commands to the vulnerability group
     vulnerability.add_command(list_command())
     vulnerability.add_command(show_command(decorators=lookup_options))
-    vulnerability.add_command(destroy_command())
-    vulnerability.add_command(create_command())
+    vulnerability.add_command(upload())
 
     @vulnerability.command()
     @click.option(
@@ -40,11 +40,12 @@ def vulnerability(ctx: click.Context, pulp_ctx: PulpContext, /) -> None:
     @pass_pulp_context
     def upload(
         pulp_ctx: PulpCLIContext,
-        vulnerability_ctx: PulpVulnerabilityReportContext,
+        vulnerability_ctx: PulpEntityContext, 
         /,
-        file: click.File,
+        file: IO[bytes],
         chunk_size: int,
     ) -> None:
         """Upload a vulnerability report JSON file."""
+        assert isinstance(vulnerability_ctx, PulpVulnerabilityReportContext)
         result = vulnerability_ctx.upload(file, chunk_size)
         pulp_ctx.output_result(result)