manoraga/scud_context_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

налажена работа с системными промптами (добавление, изменение, удаление). Восстановлена работа с задачами.

Browse Source
This commit is contained in:
manoraga
2026-08-09 22:06:04 +03:00
parent 2fa151345f
commit 286355e4c0
5 changed files with 258 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
llm/agent.py
+71 -26
View File
@@ -1,6 +1,7 @@
import json
import urllib.request
import urllib.error
import logging
from typing import List, Dict, Any, Tuple
from datetime import datetime
@@ -11,33 +12,48 @@ from .db_tools import (
db_update_task_status,
db_delete_task,
db_add_task,
db_get_rules
db_get_rules,
db_set_session_state,
db_get_session_state,
db_clear_session_state,
get_db_connection
)
from .schemas import TOOLS_SCHEMA
logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(message)s")
logger = logging.getLogger("SCUD_AGENT")
OLLAMA_URL = "http://192.168.11.3:11434/api/chat"
MODEL_NAME = "qwen2.5:14b"
def format_rules_output(rules: List[Dict[str, Any]]) -> str:
if not rules:
return "База знаний пока пуста."
lines = [f"📚 База знаний и правила арбитража ({len(rules)}):\n"]
for idx, r in enumerate(rules, 1):
rule_text = r.get("rule_text", "").strip()
lines.append(f"{idx}. {rule_text}\n")
return "\n".join(lines).strip()
def clean_output(text: str) -> str:
if not text:
return text
artifacts = ["почемучто", "почто", "почему что"]
lower_text = text.lower()
for art in artifacts:
if lower_text.startswith(art):
text = text[len(art):].lstrip(",.!?:; -")
return text.strip()
def process_chat_message(user_id: int, user_message: str, chat_history: List[Dict[str, Any]] = None) -> Tuple[str, List[Dict[str, Any]]]:
def process_chat_message(user_id: int, user_message: str, chat_history: List[Dict[str, Any]] = None, session_id: str = "web_session_main") -> Tuple[str, List[Dict[str, Any]]]:
if chat_history is None:
chat_history = []
current_now = datetime.now().strftime("%Y-%m-%d %H:%M")
logger.info(f"Получено сообщение от user_id={user_id}, session_id={session_id}: {user_message}")
# Запрос к локальной модели Qwen (полный цикл Function Calling)
current_now = datetime.now().strftime("%Y-%m-%d %H:%M")
dynamic_prompt_text = db_get_active_system_prompt()
session_state = db_get_session_state(session_id)
preview_status_note = ""
if session_state and session_state["state_type"] == "PROMPT_PREVIEW":
preview_status_note = "\n\n[АКТИВНО ПРЕВЬЮ ПРОМПТА: Ожидается подтверждение или отмена изменений пользователем]."
system_prompt = {
"role": "system",
"content": f"Текущая дата и время сервера: {current_now}.\n\n{dynamic_prompt_text}"
"content": f"Текущая дата и время сервера: {current_now}.\n\nТЕКУЩИЙ АКТИВНЫЙ СИСТЕМНЫЙ ПРОМПТ:\n{dynamic_prompt_text}{preview_status_note}"
}
messages = [system_prompt] + chat_history + [{"role": "user", "content": user_message}]
@@ -47,7 +63,7 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
"messages": messages,
"tools": TOOLS_SCHEMA,
"stream": False,
"options": {"num_predict": 2048, "num_ctx": 8192, "temperature": 0.1}
"options": {"num_predict": 8192, "num_ctx": 8192, "temperature": 0.1}
}
try:
@@ -60,6 +76,7 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
res_data = json.loads(response.read().decode("utf-8"))
msg = res_data.get("message", {})
tool_calls = msg.get("tool_calls", [])
logger.info(f"Ответ от Ollama получен. Tool calls: {bool(tool_calls)}")
if tool_calls:
messages.append(msg)
@@ -67,6 +84,7 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
for tool in tool_calls:
fn_name = tool["function"]["name"]
fn_args = tool["function"].get("arguments", {})
logger.info(f"Вызов функции (Tool): {fn_name} с аргументами: {fn_args}")
tool_result_content = ""
if fn_name == "db_get_tasks":
@@ -74,14 +92,41 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
tool_result_content = json.dumps(tasks, ensure_ascii=False)
elif fn_name in ["db_get_system_prompt", "db_get_system_prompts"]:
tool_result_content = db_get_active_system_prompt()
prompt_content = db_get_active_system_prompt()
tool_result_content = json.dumps({"system_prompt": prompt_content}, ensure_ascii=False)
elif fn_name == "db_preview_prompt_merge":
proposed_text = fn_args.get("proposed_prompt", "")
if proposed_text:
# Фиксируем превью в сессии и сразу возвращаем текст пользователю на экран
db_set_session_state(session_id, "PROMPT_PREVIEW", proposed_text)
preview_reply = f"Ваше изменение успешно предпросмотрено. Полный обновленный системный промпт теперь выглядит так:\n\n{proposed_text}\n\nДля применения изменений подтвердите действие («подтверждаю») или отмените («отмена»)."
return preview_reply, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": preview_reply}]
else:
tool_result_content = json.dumps({"status": "error", "message": "Текст превью пуст."}, ensure_ascii=False)
elif fn_name == "db_confirm_prompt_preview":
if session_state and session_state["state_type"] == "PROMPT_PREVIEW":
pending_text = session_state["pending_data"]
res = db_add_system_prompt("main_agent", pending_text)
db_clear_session_state(session_id)
tool_result_content = json.dumps(res, ensure_ascii=False)
else:
tool_result_content = json.dumps({"status": "error", "message": "Нет активного превью для подтверждения."}, ensure_ascii=False)
elif fn_name == "db_cancel_prompt_preview":
db_clear_session_state(session_id)
tool_result_content = json.dumps({"status": "success", "message": "Превью отменено."}, ensure_ascii=False)
elif fn_name == "db_add_system_prompt":
res = db_add_system_prompt(
name=fn_args.get("name", "main_agent"),
prompt_text=fn_args.get("prompt_text")
)
tool_result_content = json.dumps(res, ensure_ascii=False)
try:
prompt_text = fn_args.get("prompt_text") if isinstance(fn_args, dict) else str(fn_args)
name = fn_args.get("name", "main_agent") if isinstance(fn_args, dict) else "main_agent"
res = db_add_system_prompt(name=name, prompt_text=prompt_text)
db_clear_session_state(session_id)
tool_result_content = json.dumps(res, ensure_ascii=False)
except Exception as e:
tool_result_content = json.dumps({"status": "error", "error": str(e)}, ensure_ascii=False)
elif fn_name == "db_get_rules":
tool_result_content = json.dumps(db_get_rules(), ensure_ascii=False)
@@ -103,12 +148,11 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
"content": tool_result_content
})
# Вторичный запрос модели для формирования итогового ответа оператору
second_payload = {
"model": MODEL_NAME,
"messages": messages,
"stream": False,
"options": {"num_predict": 2048, "num_ctx": 8192, "temperature": 0.1}
"options": {"num_predict": 8192, "num_ctx": 8192, "temperature": 0.1}
}
sec_req = urllib.request.Request(
OLLAMA_URL,
@@ -117,11 +161,12 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
)
with urllib.request.urlopen(sec_req) as sec_response:
sec_res_data = json.loads(sec_response.read().decode("utf-8"))
final_content = sec_res_data.get("message", {}).get("content", "").strip().replace("**", "")
final_content = clean_output(sec_res_data.get("message", {}).get("content", "").strip().replace("**", ""))
return final_content, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": final_content}]
content_str = msg.get("content", "").strip().replace("**", "")
content_str = clean_output(msg.get("content", "").strip().replace("**", ""))
return content_str or "Запрос обработан.", chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": content_str}]
except urllib.error.URLError as e:
return f"Ошибка связи с Ollama ({OLLAMA_URL}): {e}", chat_history
except Exception as ex:
logger.exception(f"Непредвиденная ошибка: {ex}")
return f"Внутренняя ошибка сервера: {ex}", chat_history