mirror of
https://github.com/imartinez/privateGPT.git
synced 2026-07-17 01:48:03 +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>
78 lines
2.1 KiB
Python
78 lines
2.1 KiB
Python
import uuid
|
|
from abc import ABC, abstractmethod
|
|
|
|
from private_gpt.components.chat.models.chat_config_models import (
|
|
ResolvedChatRequest,
|
|
ToolSpec,
|
|
_dummy_tool_async_fn,
|
|
)
|
|
from private_gpt.components.tools.tool_names import resolve_internal_tool_name
|
|
from private_gpt.server.utils.artifact_input import ArtifactType
|
|
|
|
|
|
class ToolProcessor(ABC):
|
|
"""Interceptors may edit the request tool list in place."""
|
|
|
|
@abstractmethod
|
|
async def intercept(self, request: ResolvedChatRequest) -> bool:
|
|
"""Return True when the request was modified."""
|
|
|
|
|
|
def _get_tool_context(
|
|
request: ResolvedChatRequest,
|
|
tool: ToolSpec,
|
|
) -> list[ArtifactType]:
|
|
if tool.context is not None:
|
|
return tool.context
|
|
return request.tool_context or []
|
|
|
|
|
|
def _session_id(request: ResolvedChatRequest) -> str:
|
|
return (
|
|
request.context.container
|
|
or request.context.user_id
|
|
or request.context.correlation_id
|
|
or str(uuid.uuid4())
|
|
)
|
|
|
|
|
|
def _tool_matches(tool: ToolSpec, *tool_names: str) -> bool:
|
|
# Only match on the versioned type (e.g. semantic_search_v1 → semantic_search).
|
|
# Name-based matching would cause external tools that share a name with an internal
|
|
# tool to be incorrectly resolved by internal processors.
|
|
resolved_type = resolve_internal_tool_name(tool.type)
|
|
return resolved_type is not None and resolved_type in tool_names
|
|
|
|
|
|
def _is_unresolved_tool(tool: ToolSpec) -> bool:
|
|
return tool.async_fn is _dummy_tool_async_fn
|
|
|
|
|
|
def _wrapper_tool(
|
|
name: str,
|
|
description: str | None = None,
|
|
tool_type: str | None = None,
|
|
) -> ToolSpec:
|
|
return ToolSpec(
|
|
name=name,
|
|
description=description or None,
|
|
type=tool_type or f"{name}_v1",
|
|
)
|
|
|
|
|
|
def _replace_tool(
|
|
request: ResolvedChatRequest,
|
|
original: ToolSpec,
|
|
replacements: list[ToolSpec],
|
|
) -> bool:
|
|
tools = request.tool_config.tools
|
|
for index, candidate in enumerate(tools):
|
|
if candidate is original:
|
|
request.tool_config.tools = [
|
|
*tools[:index],
|
|
*replacements,
|
|
*tools[index + 1 :],
|
|
]
|
|
return True
|
|
return False
|