feat: add solve_task.py direct solver and fix MCP rate limit issues

- Add solve_task.py: fast direct solver (1 LLM call per task, no deepagents overhead)
- Add RetryOnRateLimitMiddleware: auto-retry on 429 from any tool
- Fix double MCP load: __init__.py cleared, pipeline reuses agent.py journal tools
- Fix proxy: add NO_PROXY for openrouter.ai, platform.brojs.ru, git.brojs.ru
- Add utility scripts: get_task_ids.py, read_tasks.py
- Update run_pipeline.py: TARGET_IDS support, unbuffered output

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-06-04 12:30:05 +03:00
parent 5f8b5b9144
commit 7804122b7e
10 changed files with 544 additions and 27 deletions
+2 -3
View File
@@ -1,3 +1,2 @@
from src.agent.agent import agent, homework_direct_agent, rework_agent
__all__ = ["agent", "homework_direct_agent", "rework_agent"]
# Намеренно пустой — предотвращает двойную загрузку MCP при импорте подмодулей.
# Импортируй напрямую: from src.agent.agent import agent
+3 -1
View File
@@ -12,7 +12,7 @@ from src.agent.constants import (
from src.agent.gitea_tools import GITEA_TOOLS
from src.agent.llm import llm
from src.agent.mcp_client import load_journal_toolsets
from src.agent.middlewares import SanitizeToolCallsMiddleware, ValidateJournalWorkflowMiddleware
from src.agent.middlewares import RetryOnRateLimitMiddleware, SanitizeToolCallsMiddleware, ValidateJournalWorkflowMiddleware
from src.agent.prompts import (
homework_doing_instructions,
main_agent_instructions,
@@ -129,6 +129,7 @@ homework_direct_agent = create_deep_agent(
system_prompt=homework_doing_instructions,
backend=_composite_backend,
middleware=[
RetryOnRateLimitMiddleware(),
SanitizeToolCallsMiddleware(known_tools=_subagent_tool_names["homework_doing"]),
ValidateJournalWorkflowMiddleware(),
],
@@ -144,6 +145,7 @@ rework_agent = create_deep_agent(
system_prompt=rework_instructions,
backend=_composite_backend,
middleware=[
RetryOnRateLimitMiddleware(),
SanitizeToolCallsMiddleware(known_tools=_subagent_tool_names["homework_doing"]),
ValidateJournalWorkflowMiddleware(),
],
+34 -12
View File
@@ -10,10 +10,10 @@ from typing import TypedDict
from langchain_core.messages import HumanMessage
from langgraph.graph import START, StateGraph
from src.agent.agent import homework_direct_agent, rework_agent
from src.agent.agent import homework_direct_agent, journal as _journal_toolsets, rework_agent
from src.agent.constants import COURSE_ID, GITEA_OWNER
from src.agent.gitea_tools import _get as gitea_get
from src.agent.mcp_client import JOURNAL_PREFIX, load_journal_toolsets
from src.agent.mcp_client import JOURNAL_PREFIX
# ---------------------------------------------------------------------------
# Типы состояния
@@ -36,11 +36,8 @@ class PipelineState(TypedDict):
# Вспомогательные функции
# ---------------------------------------------------------------------------
_journal = load_journal_toolsets()
def _get_journal_tool(suffix: str):
all_tools = _journal.courses_lessons_tools + _journal.tasks_submissions_tools
all_tools = _journal_toolsets.courses_lessons_tools + _journal_toolsets.tasks_submissions_tools
target = f"{JOURNAL_PREFIX}{suffix}"
for t in all_tools:
if t.name == target:
@@ -116,13 +113,13 @@ async def _force_submit(task_id: str) -> bool:
print(f"[pipeline] force_submit: инструменты не найдены")
return False
try:
await update_tool.ainvoke({
await _mcp_invoke(update_tool, {
"taskId": task_id,
"answerType": "link",
"content": repo_url,
"commit": {"repoUrl": repo_url, "branch": "main"},
})
await submit_tool.ainvoke({"taskId": task_id, "confirmSubmit": True})
await _mcp_invoke(submit_tool, {"taskId": task_id, "confirmSubmit": True})
print(f"[pipeline] Задание {task_id[:8]} — сабмит выполнен пайплайном ✓")
return True
except Exception as e:
@@ -137,12 +134,25 @@ async def _is_submitted(task_id: str) -> bool:
return status in ("ready_for_review", "done")
async def _mcp_invoke(tool, args: dict, retries: int = 5, pause: int = 30):
"""Вызывает MCP-инструмент с retry при 429."""
for attempt in range(1, retries + 1):
try:
return await tool.ainvoke(args)
except Exception as e:
if "429" in str(e) and attempt < retries:
print(f"[pipeline] MCP 429, жду {pause}с (попытка {attempt}/{retries})...")
await asyncio.sleep(pause)
else:
raise
async def _task_text(task_id: str) -> str:
tool = _get_journal_tool("task_text")
if not tool:
return ""
try:
return _parse_text(await tool.ainvoke({"taskId": task_id}))
return _parse_text(await _mcp_invoke(tool, {"taskId": task_id}))
except Exception:
return ""
@@ -152,7 +162,7 @@ async def _task_json(task_id: str) -> dict:
if not tool:
return {}
try:
raw = _parse_text(await tool.ainvoke({"taskId": task_id}))
raw = _parse_text(await _mcp_invoke(tool, {"taskId": task_id}))
return json.loads(raw)
except Exception:
return {}
@@ -276,6 +286,10 @@ async def process_one_task(state: PipelineState) -> dict:
results = list(state.get("results", []))
errors = list(state.get("errors", []))
# Пауза перед стартом — даём BroJS MCP сбросить rate limit после загрузки инструментов
print(f"[pipeline] Задание {task_id[:8]} — пауза 10с перед стартом...")
await asyncio.sleep(10)
repo_url = await _existing_repo_url(task_id)
is_rework = repo_url is not None
@@ -348,8 +362,16 @@ async def process_one_task(state: PipelineState) -> dict:
"retries": retries,
})
except Exception as e:
print(f"[pipeline] Задание {task_id[:8]} — ОШИБКА: {e}")
except BaseException as e:
import traceback
# Разворачиваем ExceptionGroup (Python 3.11+) чтобы увидеть реальные ошибки
if isinstance(e, ExceptionGroup):
for i, sub in enumerate(e.exceptions):
print(f"[pipeline] Задание {task_id[:8]} — под-ошибка {i+1}: {type(sub).__name__}: {sub}")
traceback.print_exception(type(sub), sub, sub.__traceback__)
else:
print(f"[pipeline] Задание {task_id[:8]} — ОШИБКА: {type(e).__name__}: {e}")
traceback.print_exc()
errors.append(f"Задание {task_id} ({'rework' if is_rework else 'new'}): {e}")
# Пауза между заданиями чтобы не перегружать rate limit
+2 -1
View File
@@ -1,4 +1,5 @@
from src.agent.middlewares.sanitize_tool_calls import SanitizeToolCallsMiddleware
from src.agent.middlewares.validate_journal_workflow import ValidateJournalWorkflowMiddleware
from src.agent.middlewares.retry_on_rate_limit import RetryOnRateLimitMiddleware
__all__ = ["SanitizeToolCallsMiddleware", "ValidateJournalWorkflowMiddleware"]
__all__ = ["SanitizeToolCallsMiddleware", "ValidateJournalWorkflowMiddleware", "RetryOnRateLimitMiddleware"]
@@ -0,0 +1,46 @@
"""Middleware: повторяет вызов инструмента при 429 Rate Limit."""
from __future__ import annotations
import asyncio
from typing import Any
from langchain.agents.middleware import AgentMiddleware, AgentState
from langchain_core.messages import ToolMessage
_PAUSE = 30 # секунд ожидания при 429
_TRIES = 5 # максимум попыток
def _is_429(exc: Exception) -> bool:
msg = str(exc)
return "429" in msg or "rate" in msg.lower()
class RetryOnRateLimitMiddleware(AgentMiddleware[AgentState[Any], Any]):
"""Перехватывает 429 от любого инструмента и повторяет с паузой."""
def wrap_tool_call(self, request, handler):
for attempt in range(1, _TRIES + 1):
try:
return handler(request)
except Exception as e:
if _is_429(e) and attempt < _TRIES:
name = request.tool_call.get("name", "")
print(f"[retry-mw] {name} → 429, жду {_PAUSE}с (попытка {attempt}/{_TRIES})...")
import time
time.sleep(_PAUSE)
else:
raise
async def awrap_tool_call(self, request, handler):
for attempt in range(1, _TRIES + 1):
try:
return await handler(request)
except Exception as e:
if _is_429(e) and attempt < _TRIES:
name = request.tool_call.get("name", "")
print(f"[retry-mw] {name} → 429, жду {_PAUSE}с (попытка {attempt}/{_TRIES})...")
await asyncio.sleep(_PAUSE)
else:
raise