didericis
a430bac1bf
Main code fixes: - Remove unused Iterator import from local_registry.py - Fix signal handler signature in pty_resize.py (correct parameters for signal.signal) - Add type annotations for screen parameters in tui.py (use Any for curses types) - Fix missing tty_fd type annotation in tui.py - Remove unused old_term variable in tui.py - Fix tty_fd FileIO wrapping for TextIOWrapper initialization - Add type: ignore for curses._CursesWindow attributes in supervise.py - Add type: ignore for BaseServer attributes in git_http_backend.py - Fix HTTPRequestHandler.log_message parameter name mismatch - Cast _agent_prompt_mode to PromptMode in bottle.py files - Fix Popen[bytes] generic type annotations in sidecar_init.py - Add type: ignore for dynamic prompt_file attribute access in agent_provider.py Configuration: - pyrightconfig.json now suppresses third-party library unknowns - Remaining test errors are mostly in test suites Fixes 23 errors in main code, reduces total from 985 → 240 (75% reduction from initial ~1,200) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
86 lines
2.7 KiB
Python
86 lines
2.7 KiB
Python
"""DockerBottle — concrete Bottle handle yielded by DockerBottleBackend."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
from typing import Callable
|
|
|
|
from typing import cast
|
|
|
|
from ...agent_provider import PromptMode, prompt_args
|
|
from .. import Bottle, ExecResult
|
|
|
|
|
|
class DockerBottle(Bottle):
|
|
"""Concrete Bottle for Docker."""
|
|
|
|
def __init__(
|
|
self,
|
|
container: str,
|
|
teardown: Callable[[], None],
|
|
prompt_path_in_container: str | None,
|
|
*,
|
|
agent_command: str = "claude",
|
|
agent_prompt_mode: PromptMode = "append_file",
|
|
):
|
|
self.name = container
|
|
self._teardown = teardown
|
|
self.prompt_path = prompt_path_in_container
|
|
self._agent_prompt_mode = agent_prompt_mode
|
|
self.agent_command = agent_command
|
|
self.agent_provider_template = (
|
|
"codex" if agent_command == "codex" else "claude"
|
|
)
|
|
self._closed = False
|
|
|
|
def agent_argv(
|
|
self, argv: list[str], *, tty: bool = True,
|
|
) -> list[str]:
|
|
full_argv = list(argv)
|
|
full_argv.extend(
|
|
prompt_args(cast(PromptMode, self._agent_prompt_mode), self.prompt_path, argv=full_argv)
|
|
)
|
|
cmd = ["docker", "exec"]
|
|
if tty:
|
|
cmd.append("-it")
|
|
cmd.extend([self.name, self.agent_command, *full_argv])
|
|
return cmd
|
|
|
|
def exec_agent(self, argv: list[str], *, tty: bool = True) -> int:
|
|
return subprocess.run(
|
|
self.agent_argv(argv, tty=tty), check=False,
|
|
).returncode
|
|
|
|
def exec(self, script: str, *, user: str = "node") -> ExecResult:
|
|
# Pipe via stdin to `sh -s` so the caller never has to worry
|
|
# about quoting; the script source lands inside the container
|
|
# without crossing argv. `-u <user>` overrides the image's
|
|
# default USER — defaults to `node` which is already the
|
|
# image's USER, so the explicit flag is a no-op there but
|
|
# keeps the cross-backend contract uniform.
|
|
result = subprocess.run(
|
|
["docker", "exec", "-u", user, "-i", self.name, "sh", "-s"],
|
|
input=script,
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
return ExecResult(
|
|
returncode=result.returncode,
|
|
stdout=result.stdout,
|
|
stderr=result.stderr,
|
|
)
|
|
|
|
def cp_in(self, host_path: str, container_path: str) -> None:
|
|
subprocess.run(
|
|
["docker", "cp", host_path, f"{self.name}:{container_path}"],
|
|
stdout=subprocess.DEVNULL,
|
|
check=True,
|
|
)
|
|
|
|
def close(self) -> None:
|
|
if self._closed:
|
|
return
|
|
self._closed = True
|
|
self._teardown()
|