Skip to content
Merged
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
12 changes: 6 additions & 6 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "scrapybara"

[tool.poetry]
name = "scrapybara"
version = "2.5.0"
version = "2.5.1"
description = ""
readme = "README.md"
authors = []
Expand Down
12 changes: 10 additions & 2 deletions reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,14 @@ client.instance.bash(
<dl>
<dd>

**session:** `typing.Optional[int]`

</dd>
</dl>

<dl>
<dd>

**restart:** `typing.Optional[bool]`

</dd>
Expand All @@ -466,15 +474,15 @@ client.instance.bash(
<dl>
<dd>

**get_background_processes:** `typing.Optional[bool]`
**list_sessions:** `typing.Optional[bool]`

</dd>
</dl>

<dl>
<dd>

**kill_pid:** `typing.Optional[int]`
**check_session:** `typing.Optional[int]`

</dd>
</dl>
Expand Down
20 changes: 12 additions & 8 deletions src/scrapybara/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -883,17 +883,19 @@ def bash(
self,
*,
command: Optional[str] = OMIT,
session: Optional[int] = OMIT,
restart: Optional[bool] = OMIT,
get_background_processes: Optional[bool] = OMIT,
kill_pid: Optional[int] = OMIT,
list_sessions: Optional[bool] = OMIT,
check_session: Optional[int] = OMIT,
request_options: Optional[RequestOptions] = None,
) -> Optional[Any]:
return self._client.instance.bash(
self.id,
command=command,
session=session,
restart=restart,
get_background_processes=get_background_processes,
kill_pid=kill_pid,
list_sessions=list_sessions,
check_session=check_session,
request_options=request_options
)

Expand Down Expand Up @@ -1405,17 +1407,19 @@ async def bash(
self,
*,
command: Optional[str] = OMIT,
session: Optional[int] = OMIT,
restart: Optional[bool] = OMIT,
get_background_processes: Optional[bool] = OMIT,
kill_pid: Optional[int] = OMIT,
list_sessions: Optional[bool] = OMIT,
check_session: Optional[int] = OMIT,
request_options: Optional[RequestOptions] = None,
) -> Optional[Any]:
return await self._client.instance.bash(
self.id,
command=command,
session=session,
restart=restart,
get_background_processes=get_background_processes,
kill_pid=kill_pid,
list_sessions=list_sessions,
check_session=check_session,
request_options=request_options
)

Expand Down
2 changes: 1 addition & 1 deletion src/scrapybara/core/client_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_headers(self) -> typing.Dict[str, str]:
headers: typing.Dict[str, str] = {
"X-Fern-Language": "Python",
"X-Fern-SDK-Name": "scrapybara",
"X-Fern-SDK-Version": "2.5.0",
"X-Fern-SDK-Version": "2.5.1",
}
headers["x-api-key"] = self.api_key
return headers
Expand Down
32 changes: 20 additions & 12 deletions src/scrapybara/instance/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,10 @@ def bash(
instance_id: str,
*,
command: typing.Optional[str] = OMIT,
session: typing.Optional[int] = OMIT,
restart: typing.Optional[bool] = OMIT,
get_background_processes: typing.Optional[bool] = OMIT,
kill_pid: typing.Optional[int] = OMIT,
list_sessions: typing.Optional[bool] = OMIT,
check_session: typing.Optional[int] = OMIT,
request_options: typing.Optional[RequestOptions] = None,
) -> BashResponse:
"""
Expand All @@ -225,11 +226,13 @@ def bash(

command : typing.Optional[str]

session : typing.Optional[int]

restart : typing.Optional[bool]

get_background_processes : typing.Optional[bool]
list_sessions : typing.Optional[bool]

kill_pid : typing.Optional[int]
check_session : typing.Optional[int]

request_options : typing.Optional[RequestOptions]
Request-specific configuration.
Expand All @@ -255,9 +258,10 @@ def bash(
method="POST",
json={
"command": command,
"session": session,
"restart": restart,
"get_background_processes": get_background_processes,
"kill_pid": kill_pid,
"list_sessions": list_sessions,
"check_session": check_session,
},
headers={
"content-type": "application/json",
Expand Down Expand Up @@ -980,9 +984,10 @@ async def bash(
instance_id: str,
*,
command: typing.Optional[str] = OMIT,
session: typing.Optional[int] = OMIT,
restart: typing.Optional[bool] = OMIT,
get_background_processes: typing.Optional[bool] = OMIT,
kill_pid: typing.Optional[int] = OMIT,
list_sessions: typing.Optional[bool] = OMIT,
check_session: typing.Optional[int] = OMIT,
request_options: typing.Optional[RequestOptions] = None,
) -> BashResponse:
"""
Expand All @@ -992,11 +997,13 @@ async def bash(

command : typing.Optional[str]

session : typing.Optional[int]

restart : typing.Optional[bool]

get_background_processes : typing.Optional[bool]
list_sessions : typing.Optional[bool]

kill_pid : typing.Optional[int]
check_session : typing.Optional[int]

request_options : typing.Optional[RequestOptions]
Request-specific configuration.
Expand Down Expand Up @@ -1030,9 +1037,10 @@ async def main() -> None:
method="POST",
json={
"command": command,
"session": session,
"restart": restart,
"get_background_processes": get_background_processes,
"kill_pid": kill_pid,
"list_sessions": list_sessions,
"check_session": check_session,
},
headers={
"content-type": "application/json",
Expand Down
10 changes: 6 additions & 4 deletions src/scrapybara/tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,10 @@ class BashToolParameters(BaseModel):
"""Parameters for bash command execution."""

command: Optional[str] = Field(description="The bash command to execute")
session: Optional[int] = Field(None, description="Session ID to run the command in")
restart: Optional[bool] = Field(False, description="Whether to restart the shell")
get_background_processes: Optional[bool] = Field(None, description="Retrieve information (pid, status, command) about background processes")
kill_pid: Optional[int] = Field(None, description="Process ID to kill")
list_sessions: Optional[bool] = Field(None, description="Whether to list all bash sessions")
check_session: Optional[int] = Field(None, description="Session ID to check status")


class BashTool(Tool):
Expand All @@ -189,8 +190,9 @@ def __call__(self, **kwargs: Any) -> Any:
params = BashToolParameters.model_validate(kwargs)
return self._instance.bash(
command=params.command,
session=params.session,
restart=params.restart,
get_background_processes=params.get_background_processes,
kill_pid=params.kill_pid
list_sessions=params.list_sessions,
check_session=params.check_session
)

Loading