mirror of
https://github.com/imartinez/privateGPT.git
synced 2026-07-17 11:29:56 +00:00
* 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: 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> * 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 * test: isolate chat mocks and cancellation timing * fix: tests (cherry picked from commit218b599c66) # Conflicts: # tests/server/chat/anthropic/test_anthropic_client.py # tests/server/chat/anthropic/test_langchain_anthropic.py # tests/server/chat/test_chat_knowledge_revamp.py # tests/server/chat/test_chat_routes.py # tests/server/chat/test_chat_routes_skills_integration.py * fix: tests (cherry picked from commitfc5ec0f72a) * fix: ruff * fix: test * fix: worker config (cherry picked from commit1371c275a1) * fix: principal * test: remove flaky chat cancellation assertion --------- 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>
133 lines
4.2 KiB
Python
133 lines
4.2 KiB
Python
import logging
|
|
from collections.abc import Iterator
|
|
from dataclasses import dataclass
|
|
from typing import Any
|
|
|
|
from private_gpt.server.ingest.ingest_router import DeleteIngestedDocumentAsyncBody
|
|
from private_gpt.settings.settings import settings
|
|
|
|
logger = logging.getLogger(__name__)
|
|
logger.setLevel(logging.DEBUG if settings().server.debug_mode else logging.INFO)
|
|
|
|
|
|
class TaskInfoStatus:
|
|
ACTIVE = "ACTIVE"
|
|
PENDING = "PENDING"
|
|
|
|
|
|
@dataclass
|
|
class TaskInfo:
|
|
task_id: str
|
|
name: str
|
|
status: str
|
|
args: tuple[Any] | None
|
|
|
|
|
|
def find_tasks(
|
|
celery_app: Any, task_name: str, task_status: str | None = None
|
|
) -> Iterator[TaskInfo]:
|
|
"""Find task matching name and predicate in active tasks."""
|
|
inspector = celery_app.control.inspect()
|
|
|
|
if task_status is None or task_status == TaskInfoStatus.ACTIVE:
|
|
active_tasks = inspector.active() or {}
|
|
for worker_tasks in active_tasks.values():
|
|
for task in worker_tasks:
|
|
if task["name"] != task_name:
|
|
continue
|
|
|
|
yield TaskInfo(
|
|
task_id=task["id"],
|
|
status=TaskInfoStatus.ACTIVE,
|
|
name=task["name"],
|
|
args=task.get("args", None),
|
|
)
|
|
|
|
if task_status is None or task_status == TaskInfoStatus.PENDING:
|
|
pending_tasks = inspector.reserved() or {}
|
|
for worker_tasks in pending_tasks.values():
|
|
for task in worker_tasks:
|
|
if task["name"] != task_name:
|
|
continue
|
|
|
|
yield TaskInfo(
|
|
task_id=task["id"],
|
|
status=TaskInfoStatus.PENDING,
|
|
name=task["name"],
|
|
args=task.get("args", None),
|
|
)
|
|
|
|
|
|
def revoke_task(celery_app: Any, task_id: str) -> None:
|
|
"""Revoke task by ID."""
|
|
celery_app.control.revoke(task_id, terminate=True)
|
|
logger.info(f"Revoked task {task_id}")
|
|
|
|
|
|
class IngestionTaskHelper:
|
|
@staticmethod
|
|
def is_ingestion_cancel_task_scheduled(
|
|
celery_app: Any, collection: str, artifact: str
|
|
) -> bool:
|
|
from private_gpt.celery.tasks.ingestion.delete_tasks import (
|
|
DELETE_INGESTED_TASK_NAME,
|
|
)
|
|
|
|
for task in find_tasks(celery_app, task_name=DELETE_INGESTED_TASK_NAME):
|
|
if not task.args or not isinstance(
|
|
task.args[0], DeleteIngestedDocumentAsyncBody
|
|
):
|
|
continue
|
|
|
|
task_body: DeleteIngestedDocumentAsyncBody = task.args[0]
|
|
if (
|
|
task_body.delete_body.collection == collection
|
|
and task_body.delete_body.artifact == artifact
|
|
):
|
|
return True
|
|
|
|
return False
|
|
|
|
@staticmethod
|
|
def revoke_ingestion_task(celery_app: Any, collection: str, artifact: str) -> bool:
|
|
from private_gpt.celery.tasks.ingestion.extraction_tasks import (
|
|
VECTOR_INDEX_TASK_NAME,
|
|
)
|
|
from private_gpt.server.ingest.ingest_router import IngestAsyncBody
|
|
|
|
for task in find_tasks(celery_app, task_name=VECTOR_INDEX_TASK_NAME):
|
|
if not task.args or not isinstance(task.args[0], IngestAsyncBody):
|
|
continue
|
|
|
|
task_body = task.args[0]
|
|
if (
|
|
task_body.ingest_body.collection == collection
|
|
and task_body.ingest_body.artifact == artifact
|
|
):
|
|
revoke_task(celery_app, task.task_id)
|
|
return True
|
|
|
|
return False
|
|
|
|
@staticmethod
|
|
def revoke_deletion_task(celery_app: Any, collection: str, artifact: str) -> bool:
|
|
from private_gpt.celery.tasks.ingestion.delete_tasks import (
|
|
DELETE_INGESTED_TASK_NAME,
|
|
)
|
|
|
|
for task in find_tasks(celery_app, task_name=DELETE_INGESTED_TASK_NAME):
|
|
if not task.args or not isinstance(
|
|
task.args[0], DeleteIngestedDocumentAsyncBody
|
|
):
|
|
continue
|
|
|
|
task_body: DeleteIngestedDocumentAsyncBody = task.args[0]
|
|
if (
|
|
task_body.delete_body.collection == collection
|
|
and task_body.delete_body.artifact == artifact
|
|
):
|
|
revoke_task(celery_app, task.task_id)
|
|
return True
|
|
|
|
return False
|