chore(lint): Fix mypy static check issues

Signed-off-by: Helio Chissini de Castro <[email protected]>

Author: heliocastro

src/orthw/commands/package_config/find.py

@@ -26,7 +26,7 @@
 from orthw.utils.required import require_initialized
 
 
-def find(package_id: str) -> int:
+def find(package_id: str) -> None:
     require_initialized()
 
     ort_config_package_configurations_dir: Path = config.ort_config_package_configurations_dir

src/orthw/commands/scan.py

@@ -19,7 +19,6 @@
 from pathlib import Path
 
 import click
-from docker.models.containers import Container
 
 from orthw.utils import logging
 from orthw.utils.cmdgroups import command_group
@@ -31,7 +30,7 @@ def scan(
     output_dir: str | None = None,
     format_: str = "JSON",
     docker: bool = False,
-) -> int | Container:
+) -> int:
     """Runs ORT Scanner on given source code directory to detect licenses and copyrights
 
     Args:

src/orthw/orthw.py

@@ -20,6 +20,7 @@
 import pkgutil
 import sys
 from pathlib import Path
+from typing import Any
 
 import click
 
@@ -42,7 +43,7 @@ def __init__(self) -> None:
 
         for module in pkgutil.iter_modules():
             if module.name.startswith("orthw") and hasattr(module.module_finder, "path"):
-                path = Path(module.module_finder.path) / module.name / "commands"
+                path = Path(module.module_finder.path) / module.name / "commands"  # pyright: ignore
                 self.module_import(path)
 
     def module_import(self, path: Path) -> None:
@@ -76,7 +77,7 @@ def run(self) -> int:
             return 1
 
     @property
-    def commands(self) -> list[click.MultiCommand] | None:
+    def commands(self) -> Any:
         """Return the dynamic commands from plugins"""
         return command_group().commands()
 

src/orthw/utils/process.py

@@ -34,7 +34,7 @@ def run(
     workdir: Path | None = None,
     output_dir: Path | None = None,
     is_docker: bool = False,
-) -> int | Container:
+) -> int:
     """Run a process with defined arguments in the proper setting for bare metal or docker
 
     Args:
@@ -68,12 +68,15 @@ def run(
                 sys.exit(1)
 
     if is_docker:
-        return _run_in_docker(
+        container: Container = _run_in_docker(
             args,
             console_output=console_output,
             workdir=workdir,
             output_dir=output_dir,
         )
+        result = container.wait()  # Wait for the container to finish
+        exit_code: int = result.get("StatusCode", 1)  # Get the exit code, default to 1 on error
+        return exit_code
     else:
         return __run_host(
             args,
@@ -100,7 +103,7 @@ def __run_host(
         workdir (Path | None, optional): Work directory.
         output_dir (Path | None, optional): Output dir is necessary to pass along.
     Returns:
-        int: _description_
+        int: Run status code
     """
     if admin():
         logging.error("This script is not allowed to run as admin.")