mirror of
https://github.com/imartinez/privateGPT.git
synced 2026-07-17 01:48:03 +00:00
* feat: add bundle to remove * fix: spaces * feat: add xml render as skill spec * feat: add skill volume root to cache * fix: deduplicate values * fix: change the mount path to skill_id * fix: use different paths * feat: add principal (cherry picked from commit 5db64fe721d5706440ce9f342b1388ffe742bc16) # Conflicts: # private_gpt/components/code_execution/base.py # private_gpt/components/code_execution/code_execution_component.py # private_gpt/components/code_execution/local.py # private_gpt/components/environment/manager.py # private_gpt/components/tools/builders/bash_tool_builder.py # private_gpt/components/tools/builders/text_editor_tool_builder.py # private_gpt/components/tools/processors/bash_processor.py * fix: mypy ... * fix: config * fix: sandbox config * feat: add forward cookies * fix: loop * feat: add present server * feat: add feature flag for tools * refactor: move principal to another better place * feat: add api key principal * docs: fix docs * docs: add present server * fix: principal * fix: mypy * fix: avoid to block the loop * fix: blocks in expansion * fix: remove maximum concurrent users ... * fix: multiplexer * fix: readers * fix: more fixes ... * fix: impl * feat: tool scheduler * feat: add adaptative * feat: add chat worker * fix: config * fix: max * feat: add chat/tools workers * fix: mypy * feat: add generic scheduler * fix: get result * feat: do serializable the tool executor * fix: tools * fix: config * fix: config * fix: args * fix: config * fix: serializer * Revert "fix: blocks in expansion" This reverts commita2110f94a8. * fix: unify all logic * feat: add ingestion scheduler * fix: settings * fix: config * feat: add arq worker to chat * fix: arq worker * fix: add nest * fix: mypy * fix: await * fix: script stress * fix: tokenizer * fix: chat scheduler * fix: mypy * fix: add async tokenizer * fix: improve condense * fix: tool scheduler * feat: add initial real async chat worker * fix: mypy * fix: do resumable local executor ... ... ... fix: revert usleess changes fix: remove parent chat job fix: refactor fix: loop ref: rename models fix: chat engine fix: mypy ... ... ... fix: fix deps * fix: tests * fix: tests * ... * fix: stream * fix: config * fix: scheduler * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Handle PGPT_WORKER_MODE=celery in health check worker status * fix: cancel * fix: arch * fix: test ingestion * fix: deserialization of chat messages * fix: broken results * fix: mypy * fix: test * fix: config * fix: remove arq tool worker * fix: output cls * fix: preserve early resumable tool callbacks * fix: preserve async tool result order * refactor: address worker PR review comments * fix: mypy * test: colocate ARQ chat enqueue coverage * fix: remove redis from tests * fix: mypy * fix: tests * test: isolate chat mocks and cancellation timing * fix: tests * fix: tests * fix: test (cherry picked from commitf8ee460af2) * fix: worker config * test: remove flaky chat cancellation assertion (cherry picked from commit1115ff2349) # Conflicts: # tests/server/chat/test_chat_routes.py * fix: emit chat pings from stream listeners * fix: don't duplciate the output * fix: rss memory ... * fix: pass the args * fix: threads * fix: websearch --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
92 lines
3.0 KiB
Python
92 lines
3.0 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING, Any, cast
|
|
|
|
from injector import inject, singleton
|
|
|
|
from private_gpt.components.chat.models.chat_config_models import (
|
|
ToolRequirements,
|
|
ToolSpec,
|
|
)
|
|
from private_gpt.components.code_execution.code_execution_component import (
|
|
CodeExecutionComponent,
|
|
)
|
|
from private_gpt.components.tools.remote_execution import build_rebuild_metadata
|
|
from private_gpt.components.tools.tool_names import BASH_TOOL_NAME
|
|
from private_gpt.components.tools.tool_placeholders import BASH_TOOL_FN
|
|
from private_gpt.components.tools.utils import truncate_output
|
|
from private_gpt.di import get_global_injector
|
|
from private_gpt.events.models import TextBlock
|
|
from private_gpt.settings.settings import Settings
|
|
|
|
if TYPE_CHECKING:
|
|
from private_gpt.components.code_execution.base import CodeExecutionSessionConfig
|
|
from private_gpt.events.models import ResultContentBlockType
|
|
|
|
|
|
@singleton
|
|
class BashToolBuilder:
|
|
@inject
|
|
def __init__(
|
|
self,
|
|
code_execution_component: CodeExecutionComponent,
|
|
settings: Settings,
|
|
) -> None:
|
|
self._component = code_execution_component
|
|
self._settings = settings
|
|
|
|
async def build_tool(
|
|
self,
|
|
config: CodeExecutionSessionConfig,
|
|
name: str = BASH_TOOL_NAME,
|
|
type: str = BASH_TOOL_NAME + "_v1",
|
|
description: str = BASH_TOOL_FN.metadata.description,
|
|
) -> ToolSpec:
|
|
async def run_bash(
|
|
command: str,
|
|
timeout: int | None = None,
|
|
restart: bool = False,
|
|
) -> list[ResultContentBlockType]:
|
|
session = await self._component.get_or_create_session(config)
|
|
if session is None:
|
|
raise ValueError("code_execution provider is not configured.")
|
|
|
|
result = await session.execute_bash(
|
|
command,
|
|
timeout=timeout,
|
|
restart=restart,
|
|
)
|
|
sections = [f"exit_code: {result.exit_code}"]
|
|
if result.stdout:
|
|
sections.append(f"stdout:\n{result.stdout}")
|
|
if result.stderr:
|
|
sections.append(f"stderr:\n{result.stderr}")
|
|
output = truncate_output(
|
|
"\n\n".join(sections),
|
|
self._settings.code_execution.max_output_bytes,
|
|
)
|
|
return [TextBlock(text=output)]
|
|
|
|
return ToolSpec.from_defaults(
|
|
name=name,
|
|
type=type,
|
|
runtime="server",
|
|
description=description,
|
|
async_fn=run_bash,
|
|
requirements=[ToolRequirements.SANDBOX],
|
|
execution_metadata=build_rebuild_metadata(
|
|
rebuild_bash_tool,
|
|
{
|
|
"config": config,
|
|
"name": name,
|
|
"type": type,
|
|
"description": description,
|
|
},
|
|
),
|
|
)
|
|
|
|
|
|
async def rebuild_bash_tool(**kwargs: Any) -> ToolSpec:
|
|
builder = get_global_injector().get(BashToolBuilder)
|
|
return await builder.build_tool(**cast(Any, kwargs))
|