mirror of
https://github.com/imartinez/privateGPT.git
synced 2026-07-17 11:29:56 +00:00
* fix: ensure that the publisher is ready to publish new messages * fix: dockerfile * fix: clones (cherry picked from commitbc0a77e050) * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * feat: M3 persistent sessions + M4 isolated bash + OpenSandbox provider Introduces mount-aware sessions with canonical path abstraction: - ContentBundle / SessionMount abstraction for skill/plugin mounting - PathTranslator: rewrites commands and scrubs output (canonical ↔ real paths) - LocalMount + ReadOnlyMount: local FS-backed mounts; read-only cache shared across sessions - BashExecutor: asyncio subprocess with setsid + setrlimit isolation + killpg on timeout - SkillLoader: downloads skill files from object storage as ContentBundles - LocalCodeExecutionProvider: rewritten to use mounts, TTL reaper, BashExecutor - OpenSandboxCodeExecutionProvider: new Docker/K8s backend via opensandbox SDK - Async cascade: create_session / get_or_create_session / build_tool all async - ObjectStorage.list_files() added to ABC + both implementations - New settings: session_ttl_seconds, bash rlimit fields, OpenSandboxSettings Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: generic ContentBundle with BundledFile, remove skill_filter from code_execution layer - Replace ContentBundle/dataclass with pydantic BaseModel; add BundledFile with path, content, permissions - Update ReadOnlyMount to use list[BundledFile] with per-file chmod - Remove skill_filter and SkillLoader from create_session() in base, local, and code_execution_component - Move skill-to-bundle resolution into BashToolBuilder (inject SkillLoader there) - Update SkillLoader.load() to return list[BundledFile] objects Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove opensandbox * feat: use sandbox inside of code executor * fix: mypy * feat: add workspace manager * feat: improvements * feat: add env abstraction * feat: remove leftovers * feat: improve skill content * fix: macos * fix: mypy * feat: add code executor prompt * feat: add content bundle in stack * fix: mypy * fix: layout * feat: add skill prompt * fix: order * feat: allow to present final files * feat: add container block * fix: remove default config * fix: session pers * fix: do lazy env * fix: mounter * feat: refactor mounter * fix: container * feat: add requirements * fix: add container registry * fix: move to be lazy * fix: mypy * fix: current folder * fix: stop sandbox in tabular * fi: ensure to use absolute paths in bash & text editor * feat: add files router * feat: simplify * feat: update present files * fix: download files * fix: mypy * fix: tests * fix: tests * fix: bash executor in linux * Revert "fix: bash executor in linux" This reverts commit483e208a96. * Revert "fix: tests" This reverts commit50d9288f5e. * test: remove test in ci --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
102 lines
3.3 KiB
Python
102 lines
3.3 KiB
Python
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
|
|
from private_gpt.components.code_execution.base import (
|
|
BashExecutionResult,
|
|
FileOperationResult,
|
|
)
|
|
from private_gpt.components.tools.builders.bash_tool_builder import BashToolBuilder
|
|
from private_gpt.components.tools.builders.text_editor_tool_builder import (
|
|
TextEditorToolBuilder,
|
|
)
|
|
from private_gpt.settings.settings import unsafe_typed_settings
|
|
|
|
|
|
def _settings():
|
|
settings = unsafe_typed_settings.model_copy(deep=True)
|
|
settings.code_execution.max_output_bytes = 10_000
|
|
return settings
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_bash_tool_builder_executes_session_command() -> None:
|
|
session = SimpleNamespace(
|
|
execute_bash=AsyncMock(
|
|
return_value=BashExecutionResult(
|
|
success=True,
|
|
stdout="ok",
|
|
stderr="",
|
|
exit_code=0,
|
|
)
|
|
)
|
|
)
|
|
builder = BashToolBuilder(
|
|
code_execution_component=SimpleNamespace(
|
|
get_or_create_session=AsyncMock(return_value=session)
|
|
),
|
|
settings=_settings(),
|
|
)
|
|
|
|
tool = await builder.build_tool("corr-1")
|
|
result = await tool.async_fn(command="echo ok")
|
|
|
|
session.execute_bash.assert_awaited_once_with(
|
|
"echo ok",
|
|
timeout=None,
|
|
restart=False,
|
|
)
|
|
assert result[0].text == "exit_code: 0\n\nstdout:\nok"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_text_editor_tool_builder_wraps_file_operations() -> None:
|
|
session = SimpleNamespace(
|
|
view=AsyncMock(
|
|
return_value=FileOperationResult(success=True, output="1: line")
|
|
),
|
|
str_replace=AsyncMock(
|
|
return_value=FileOperationResult(success=True, output="Updated file.txt")
|
|
),
|
|
create=AsyncMock(
|
|
return_value=FileOperationResult(success=False, error="exists")
|
|
),
|
|
insert=AsyncMock(
|
|
return_value=FileOperationResult(success=True, output="Updated file.txt")
|
|
),
|
|
)
|
|
builder = TextEditorToolBuilder(
|
|
code_execution_component=SimpleNamespace(
|
|
get_or_create_session=AsyncMock(return_value=session)
|
|
),
|
|
settings=_settings(),
|
|
)
|
|
|
|
view_tool = await builder.build_view_tool("corr-2")
|
|
replace_tool = await builder.build_str_replace_tool("corr-2")
|
|
create_tool = await builder.build_create_tool("corr-2")
|
|
insert_tool = await builder.build_insert_tool("corr-2")
|
|
|
|
view_result = await view_tool.async_fn(path="file.txt", view_range=[1, 1])
|
|
replace_result = await replace_tool.async_fn(
|
|
path="file.txt",
|
|
old_str="old",
|
|
new_str="new",
|
|
)
|
|
create_result = await create_tool.async_fn(path="file.txt", file_text="body")
|
|
insert_result = await insert_tool.async_fn(
|
|
path="file.txt",
|
|
insert_line=1,
|
|
new_str="extra",
|
|
)
|
|
|
|
session.view.assert_awaited_once_with("file.txt", view_range=(1, 1))
|
|
session.str_replace.assert_awaited_once_with("file.txt", "old", "new")
|
|
session.create.assert_awaited_once_with("file.txt", "body")
|
|
session.insert.assert_awaited_once_with("file.txt", 1, "extra")
|
|
assert view_result[0].text == "1: line"
|
|
assert replace_result[0].text == "Updated file.txt"
|
|
assert create_result[0].text == "Error: exists"
|
|
assert insert_result[0].text == "Updated file.txt"
|