Add debug statements to docker command execution

Author: davidkopp

dependency_resolver/__init__.py

@@ -28,7 +28,7 @@ def resolve_host_dependencies(
     Returns:
         JSON string containing all discovered dependencies
     """
-    executor = HostExecutor()
+    executor = HostExecutor(debug=debug)
     orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
     dependencies = orchestrator.resolve_dependencies(executor, working_dir)
     formatter = OutputFormatter(debug=debug)
@@ -59,7 +59,7 @@ def resolve_docker_dependencies(
     Returns:
         JSON string containing all discovered dependencies
     """
-    executor = DockerExecutor(container_identifier)
+    executor = DockerExecutor(container_identifier, debug=debug)
     orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
     dependencies = orchestrator.resolve_dependencies(executor, working_dir, only_container_info)
     formatter = OutputFormatter(debug=debug)
@@ -98,7 +98,7 @@ def resolve_docker_dependencies_as_dict(
     if not container_identifier:
         raise ValueError("Container identifier is required")
 
-    executor = DockerExecutor(container_identifier)
+    executor = DockerExecutor(container_identifier, debug=debug)
     orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
     return orchestrator.resolve_dependencies(executor, working_dir, only_container_info)
 
@@ -129,11 +129,11 @@ def resolve_dependencies_as_dict(
     """
     executor: EnvironmentExecutor
     if environment_type == "host":
-        executor = HostExecutor()
+        executor = HostExecutor(debug=debug)
     elif environment_type == "docker":
         if not environment_identifier:
             raise ValueError("Docker environment requires container identifier")
-        executor = DockerExecutor(environment_identifier)
+        executor = DockerExecutor(environment_identifier, debug=debug)
     else:
         raise ValueError(f"Unsupported environment type: {environment_type}")
 

dependency_resolver/__main__.py

@@ -97,15 +97,17 @@ def validate_arguments(
         sys.exit(1)
 
 
-def create_executor(environment_type: str, environment_identifier: str | None) -> EnvironmentExecutor:
+def create_executor(
+    environment_type: str, environment_identifier: str | None, debug: bool = False
+) -> EnvironmentExecutor:
     """Create executor based on environment type."""
     if environment_type == "host":
-        return HostExecutor()
+        return HostExecutor(debug=debug)
     elif environment_type == "docker":
         if environment_identifier is None:
             print("Error: Docker environment requires container identifier", file=sys.stderr)
             sys.exit(1)
-        return DockerExecutor(environment_identifier)
+        return DockerExecutor(environment_identifier, debug=debug)
     else:
         print(f"Error: Unsupported environment type: {environment_type}", file=sys.stderr)
         sys.exit(1)
@@ -118,7 +120,7 @@ def main() -> None:
     validate_arguments(args.environment_type, args.environment_identifier, args.only_container_info)
 
     try:
-        executor = create_executor(args.environment_type, args.environment_identifier)
+        executor = create_executor(args.environment_type, args.environment_identifier, debug=args.debug)
         orchestrator = Orchestrator(
             debug=args.debug, skip_system_scope=args.skip_system_scope, venv_path=args.venv_path
         )

dependency_resolver/detectors/pip_detector.py

@@ -166,7 +166,7 @@ def _find_venv_path(self, executor: EnvironmentExecutor, working_dir: Optional[s
         # Fallback: System-wide search (only in container environments)
         if not isinstance(executor, HostExecutor):
             if self.debug:
-                print("DEBUG: pip_detector performing system-wide pyvenv.cfg search in container environment")
+                print("pip_detector performing system-wide pyvenv.cfg search in container environment")
 
             stdout, _, exit_code = executor.execute_command(
                 "find /opt /home /usr/local -name 'pyvenv.cfg' -type f 2>/dev/null | head -1"
@@ -176,12 +176,14 @@ def _find_venv_path(self, executor: EnvironmentExecutor, working_dir: Optional[s
                 pyvenv_cfg_path = stdout.strip()
                 venv_path = os.path.dirname(pyvenv_cfg_path)
                 if self.debug:
-                    print(f"DEBUG: pip_detector found pyvenv.cfg at {pyvenv_cfg_path}, venv_path: {venv_path}")
+                    print(f"pip_detector found pyvenv.cfg at {pyvenv_cfg_path}, venv_path: {venv_path}")
                 self._cached_venv_path = venv_path
                 self._venv_path_searched = True
                 return venv_path
 
         # No venv found
+        if self.debug:
+            print("pip_detector did not found any venv location!")
         self._cached_venv_path = None
         self._venv_path_searched = True
         return None

dependency_resolver/executors/docker_executor.py

@@ -16,13 +16,15 @@ class DockerExecutor(EnvironmentExecutor):
     preserving original exceptions with 'from' clause for debugging.
     """
 
-    def __init__(self, container_identifier: str):
+    def __init__(self, container_identifier: str, debug: bool = False):
         """Initialize Docker executor."""
         if docker is None:
             raise ImportError(
                 "Docker package is required for Docker functionality. Please install it with: pip install docker"
             )
 
+        self.debug = debug
+
         try:
             self.client = docker.from_env()
             self.container = self.client.containers.get(container_identifier)
@@ -32,6 +34,9 @@ def __init__(self, container_identifier: str):
                     f"Container '{container_identifier}' is not running (status: {self.container.status})"
                 )
 
+            if self.debug:
+                print(f"Connected to Docker container: {container_identifier}")
+
         except docker.errors.NotFound as exc:
             raise RuntimeError(f"Container '{container_identifier}' not found") from exc
         except docker.errors.APIError as e:
@@ -42,6 +47,10 @@ def execute_command(self, command: str, working_dir: Optional[str] = None) -> tu
 
         Returns actual command exit code on success, or 1 for execution environment failures.
         """
+        if self.debug:
+            workdir_info = f" (workdir: {working_dir})" if working_dir else ""
+            print(f"Executing docker command: sh -c '{command}'{workdir_info}")
+
         try:
             # First, try with sh
             result = self.container.exec_run(
@@ -50,6 +59,9 @@ def execute_command(self, command: str, working_dir: Optional[str] = None) -> tu
             stdout = result.output.decode("utf-8") if result.output else ""
             stderr = ""
 
+            if self.debug:
+                print(f"Docker command exit code: {result.exit_code}")
+
             return stdout, stderr, result.exit_code
 
         except docker.errors.APIError as e:
@@ -63,16 +75,26 @@ def execute_command(self, command: str, working_dir: Optional[str] = None) -> tu
 
     def _execute_command_direct(self, command: str, working_dir: Optional[str] = None) -> tuple[str, str, int]:
         """Fallback: execute simple commands directly without shell."""
+        if self.debug:
+            workdir_info = f" (workdir: {working_dir})" if working_dir else ""
+            print(f"Fallback: executing docker command directly: {command}{workdir_info}")
+
         try:
             # Handle only the simple cases we actually use
             cmd_parts = DockerExecutor._parse_simple_command(command)
             if not cmd_parts:
                 return "", f"Command too complex for direct execution (no shell available): {command}", 1
 
+            if self.debug:
+                print(f"Parsed command parts: {cmd_parts}")
+
             result = self.container.exec_run(cmd=cmd_parts, stdout=True, stderr=True, tty=False, workdir=working_dir)
             stdout = result.output.decode("utf-8") if result.output else ""
             stderr = ""
 
+            if self.debug:
+                print(f"Direct execution exit code: {result.exit_code}")
+
             return stdout, stderr, result.exit_code
 
         except docker.errors.APIError as e:

dependency_resolver/executors/host_executor.py

@@ -8,6 +8,10 @@
 class HostExecutor(EnvironmentExecutor):
     """Executor for running commands on the host system."""
 
+    def __init__(self, debug: bool = False):
+        """Initialize Host executor."""
+        self.debug = debug
+
     def execute_command(self, command: str, working_dir: Optional[str] = None) -> tuple[str, str, int]:
         """Execute a command on the host system.