mirror of
https://github.com/imartinez/privateGPT.git
synced 2026-07-17 11:29:56 +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>
75 lines
2.6 KiB
Python
75 lines
2.6 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
from typing import TYPE_CHECKING
|
|
|
|
from injector import inject, singleton
|
|
|
|
from private_gpt.components.code_execution.registry import CodeExecutionProviderRegistry
|
|
from private_gpt.components.container_registry import ContainerRegistry
|
|
from private_gpt.settings.settings import Settings
|
|
|
|
if TYPE_CHECKING:
|
|
from private_gpt.components.code_execution.base import (
|
|
CodeExecutionProvider,
|
|
CodeExecutionSession, # noqa: TC004
|
|
CodeExecutionSessionConfig,
|
|
)
|
|
from private_gpt.components.sandbox.base import SandboxLink
|
|
|
|
|
|
@singleton
|
|
class CodeExecutionComponent:
|
|
@inject
|
|
def __init__(
|
|
self, settings: Settings, container_registry: ContainerRegistry
|
|
) -> None:
|
|
self._settings = settings
|
|
self._registry = CodeExecutionProviderRegistry(settings)
|
|
self._container_registry = container_registry
|
|
self._sessions: dict[str, CodeExecutionSession] = {}
|
|
self._lock = asyncio.Lock()
|
|
|
|
def _get_code_execution_provider(self) -> CodeExecutionProvider | None:
|
|
provider_name = self._settings.code_execution.provider
|
|
return self._registry.get_provider(provider_name) if provider_name else None
|
|
|
|
async def get_or_create_session(
|
|
self,
|
|
config: CodeExecutionSessionConfig,
|
|
) -> CodeExecutionSession | None:
|
|
provider = self._get_code_execution_provider()
|
|
if not provider:
|
|
return None
|
|
|
|
async with self._lock:
|
|
session = await provider.create_session(config)
|
|
self._sessions[config.session_id] = session
|
|
self._container_registry.register(
|
|
config.session_id, self._settings.code_execution.session_ttl_seconds
|
|
)
|
|
return session
|
|
|
|
async def get_session_endpoint(
|
|
self, session_id: str, port: int
|
|
) -> SandboxLink | None:
|
|
from private_gpt.components.code_execution.sandbox_session import (
|
|
SandboxCodeExecutionSession,
|
|
)
|
|
|
|
session = self._sessions.get(session_id)
|
|
if not isinstance(session, SandboxCodeExecutionSession):
|
|
return None
|
|
return await session.get_endpoint(port)
|
|
|
|
async def delete_session(self, session_id: str) -> None:
|
|
provider = self._get_code_execution_provider()
|
|
if not provider:
|
|
return None
|
|
|
|
async with self._lock:
|
|
session = self._sessions.pop(session_id, None)
|
|
self._container_registry.unregister(session_id)
|
|
if session is not None:
|
|
provider.delete_session(session)
|