Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/swerex/deployment/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ async def _wait_until_alive(self, timeout: float = 10.0):
def _get_token(self) -> str:
return str(uuid.uuid4())

def _get_swerex_start_cmd(self, token: str) -> list[str]:
rex_args = f"--auth-token {token}"
def _get_swerex_start_cmd(self, token: str, port: int) -> list[str]:
rex_args = f"--auth-token {token} --port {port}"
pipx_install = "python3 -m pip install pipx && python3 -m pipx ensurepath"
if self._config.python_standalone_dir:
cmd = f"{self._config.python_standalone_dir}/python3.11/bin/{REMOTE_EXECUTABLE_NAME} {rex_args}"
Expand Down Expand Up @@ -253,13 +253,13 @@ async def start(self):
"run",
*rm_arg,
"-p",
f"{self._config.port}:8000",
f"{self._config.port}:{self._config.port}",
*platform_arg,
*self._config.docker_args,
"--name",
self._container_name,
image_id,
*self._get_swerex_start_cmd(token),
*self._get_swerex_start_cmd(token, self._config.port),
]
cmd_str = shlex.join(cmds)
self.logger.info(
Expand Down
12 changes: 6 additions & 6 deletions src/swerex/runtime/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
__all__ = ["LocalRuntime", "BashSession"]


def _split_bash_command(inpt: str) -> list[str]:
def _split_bash_command(input: str) -> list[str]:
r"""Split a bash command with linebreaks, escaped newlines, and heredocs into a list of
individual commands.

Args:
inpt: The input string to split into commands.
input: The input string to split into commands.
Returns:
A list of commands as strings.

Expand All @@ -70,11 +70,11 @@ def _split_bash_command(inpt: str) -> list[str]:
"cmd1\\\n asdf" is one command (because the linebreak is escaped)
"cmd1<<EOF\na\nb\nEOF" is one command (because of the heredoc)
"""
inpt = inpt.strip()
if not inpt or all(l.strip().startswith("#") for l in inpt.splitlines()):
input = input.strip()
if not input or all(l.strip().startswith("#") for l in input.splitlines()):
# bashlex can't deal with empty strings or the like :/
return []
parsed = bashlex.parse(inpt)
parsed = bashlex.parse(input)
cmd_strings = []

def find_range(cmd: bashlex.ast.node) -> tuple[int, int]:
Expand All @@ -88,7 +88,7 @@ def find_range(cmd: bashlex.ast.node) -> tuple[int, int]:

for cmd in parsed:
start, end = find_range(cmd)
cmd_strings.append(inpt[start:end])
cmd_strings.append(input[start:end])
return cmd_strings


Expand Down