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 13:33:55 +03:00
parent 8a3f3c749f
commit 2fa151345f
9 changed files with 842 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
llm/agent.py
+61 -65
View File
@@ -18,41 +18,22 @@ from .schemas import TOOLS_SCHEMA
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 process_chat_message(user_id: int, user_message: str, chat_history: List[Dict[str, Any]] = None) -> Tuple[str, List[Dict[str, Any]]]:
if chat_history is None:
chat_history = []
current_now = datetime.now().strftime("%Y-%m-%d %H:%M")
user_lower = user_message.lower().strip()
# Быстрый прямой ответ для списка задач текущего пользователя
if any(phrase in user_lower for phrase in ["все задачи", "покажи задачи", "список задач", "реестр задач"]):
tasks = db_get_tasks(user_id)
if not tasks:
formatted_text = "Ваш список задач пуст."
else:
def get_task_num(t):
tid = str(t.get("task_id", ""))
try:
return int(tid.upper().replace("TASK-", "").strip())
except ValueError:
return 0
tasks_sorted = sorted(tasks, key=get_task_num, reverse=True)
lines = [f"📋 Ваш реестр задач ({len(tasks_sorted)}):\n"]
for t in tasks_sorted:
tid = t.get('task_id', '')
title = t.get('title', 'Без названия')
lines.append(f"• {tid}: {title}")
formatted_text = "\n".join(lines)
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
if any(phrase in user_lower for phrase in ["системный промпт", "покажи промпт", "промпт системы"]):
prompt_text = db_get_active_system_prompt()
formatted_text = f"⚙️ Актуальный системный промпт ИИ:\n\n{prompt_text}"
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
# Запрос к локальной модели Qwen (полный цикл Function Calling)
dynamic_prompt_text = db_get_active_system_prompt()
system_prompt = {
"role": "system",
@@ -69,63 +50,78 @@ def process_chat_message(user_id: int, user_message: str, chat_history: List[Dic
"options": {"num_predict": 2048, "num_ctx": 8192, "temperature": 0.1}
}
req = urllib.request.Request(
OLLAMA_URL,
data=json.dumps(payload).encode("utf-8"),
headers={"Content-Type": "application/json"}
)
try:
req = urllib.request.Request(
OLLAMA_URL,
data=json.dumps(payload).encode("utf-8"),
headers={"Content-Type": "application/json"}
)
with urllib.request.urlopen(req) as response:
res_data = json.loads(response.read().decode("utf-8"))
msg = res_data.get("message", {})
tool_calls = msg.get("tool_calls", [])
content_str = msg.get("content", "").strip().replace("**", "")
if tool_calls:
messages.append(msg)
for tool in tool_calls:
fn_name = tool["function"]["name"]
fn_args = tool["function"].get("arguments", {})
tool_result_content = ""
if fn_name == "db_get_tasks":
tasks = db_get_tasks(user_id)
if not tasks:
formatted_text = "Ваш список задач пуст."
else:
def get_task_num(t):
tid = str(t.get("task_id", ""))
try:
return int(tid.upper().replace("TASK-", "").strip())
except ValueError:
return 0
tool_result_content = json.dumps(tasks, ensure_ascii=False)
tasks_sorted = sorted(tasks, key=get_task_num, reverse=True)
lines = [f"📋 Ваш реестр задач ({len(tasks_sorted)}):\n"]
for t in tasks_sorted:
tid = t.get('task_id', '')
title = t.get('title', 'Без названия')
lines.append(f"• {tid}: {title}")
formatted_text = "\n".join(lines)
elif fn_name in ["db_get_system_prompt", "db_get_system_prompts"]:
tool_result_content = db_get_active_system_prompt()
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
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)
elif fn_name == "db_get_rules":
tool_result_content = json.dumps(db_get_rules(), ensure_ascii=False)
elif fn_name == "db_add_task":
res = db_add_task(user_id=user_id, module=fn_args.get("module", "general"), title=fn_args.get("title"), priority=fn_args.get("priority", "MEDIUM"), due_date=fn_args.get("due_date"))
formatted_text = f"[✓] Задача {res.get('task_id', 'TASK')} успешно создана!" if "status" in res else f"❌ Ошибка: {res.get('error')}"
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
tool_result_content = json.dumps(res, ensure_ascii=False)
elif fn_name == "db_update_task_status":
res = db_update_task_status(user_id=user_id, task_id=fn_args.get("task_id"), status=fn_args.get("status"), due_date=fn_args.get("due_date"))
formatted_text = f"[✓] Статус задачи {fn_args.get('task_id')} обновлен!" if "status" in res else f"❌ Ошибка: {res.get('error')}"
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
res = db_update_task_status(user_id=user_id, task_id=str(fn_args.get("task_id")), status=fn_args.get("status", "COMPLETED"), due_date=fn_args.get("due_date"))
tool_result_content = json.dumps(res, ensure_ascii=False)
elif fn_name == "db_delete_task":
task_id_to_del = fn_args.get("task_id", "").upper()
res = db_delete_task(user_id=user_id, task_id=task_id_to_del)
formatted_text = f"[✓] Задача {task_id_to_del} успешно удалена из вашей базы!" if "status" in res else f"❌ Ошибка: {res.get('error')}"
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
res = db_delete_task(user_id=user_id, task_id=str(fn_args.get("task_id", "")).upper())
tool_result_content = json.dumps(res, ensure_ascii=False)
return content_str, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": content_str}]
messages.append({
"role": "tool",
"content": tool_result_content
})
# Вторичный запрос модели для формирования итогового ответа оператору
second_payload = {
"model": MODEL_NAME,
"messages": messages,
"stream": False,
"options": {"num_predict": 2048, "num_ctx": 8192, "temperature": 0.1}
}
sec_req = urllib.request.Request(
OLLAMA_URL,
data=json.dumps(second_payload).encode("utf-8"),
headers={"Content-Type": "application/json"}
)
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("**", "")
return final_content, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": final_content}]
content_str = 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
return f"Ошибка связи с Ollama ({OLLAMA_URL}): {e}", chat_history
llm/db_tools.py
+43 -16
View File
@@ -8,6 +8,16 @@ def get_db_connection():
conn.row_factory = sqlite3.Row
return conn
def normalize_task_id(task_id_input: str) -> str:
"""Преобразует 6, '6', 'task-6' в красивый формат TASK-06 или TASK-006"""
if not task_id_input:
return ""
clean_id = str(task_id_input).strip().upper().replace("TASK-", "").replace("TASK", "")
if clean_id.isdigit():
num = int(clean_id)
return f"TASK-{num:02d}" if num < 100 else f"TASK-{num:03d}"
return f"TASK-{clean_id}"
# === ЗАДАЧИ С ФИЛЬТРАЦИЕЙ ПО USER_ID ===
def db_get_tasks(user_id: int) -> List[Dict[str, Any]]:
@@ -40,47 +50,51 @@ def db_add_task(user_id: int, module: str, title: str, priority: str = "MEDIUM",
conn.close()
return {"status": "success", "task_id": new_task_id, "message": f"Задача {new_task_id} создана"}
def db_update_task_status(user_id: int, task_id: str, status: str, due_date: Optional[str] = None) -> Dict[str, Any]:
def db_update_task_status(user_id: int, task_id: str, status: str = "COMPLETED", due_date: Optional[str] = None) -> Dict[str, Any]:
conn = get_db_connection()
cursor = conn.cursor()
task_id_upper = task_id.upper().strip()
formatted_id = normalize_task_id(task_id)
if due_date:
cursor.execute("""
UPDATE tasks
SET status = ?, due_date = ?
WHERE UPPER(task_id) = ? AND user_id = ?
""", (status.upper(), due_date, task_id_upper, user_id))
WHERE (UPPER(task_id) = ? OR task_id LIKE ?) AND user_id = ?
""", (status.upper(), due_date, formatted_id, f"%{task_id.strip()}", user_id))
else:
cursor.execute("""
UPDATE tasks
SET status = ?
WHERE UPPER(task_id) = ? AND user_id = ?
""", (status.upper(), task_id_upper, user_id))
WHERE (UPPER(task_id) = ? OR task_id LIKE ?) AND user_id = ?
""", (status.upper(), formatted_id, f"%{task_id.strip()}", user_id))
if cursor.rowcount == 0:
conn.close()
return {"error": f"Задача {task_id_upper} не найдена или принадлежит другому пользователю"}
return {"error": f"Задача {task_id} не найдена или принадлежит другому пользователю"}
conn.commit()
conn.close()
return {"status": "success", "message": f"Статус {task_id_upper} обновлен"}
return {"status": "success", "message": f"Статус задачи {formatted_id} обновлен на {status.upper()}"}
def db_delete_task(user_id: int, task_id: str) -> Dict[str, Any]:
conn = get_db_connection()
cursor = conn.cursor()
task_id_upper = task_id.upper().strip()
cursor.execute("DELETE FROM tasks WHERE UPPER(task_id) = ? AND user_id = ?", (task_id_upper, user_id))
formatted_id = normalize_task_id(task_id)
cursor.execute("""
DELETE FROM tasks
WHERE (UPPER(task_id) = ? OR task_id LIKE ?) AND user_id = ?
""", (formatted_id, f"%{task_id.strip()}", user_id))
if cursor.rowcount == 0:
conn.close()
return {"error": f"Задача {task_id_upper} не найдена или принадлежит другому пользователю"}
return {"error": f"Задача {task_id} не найдена"}
conn.commit()
conn.close()
return {"status": "success", "message": f"Задача {task_id_upper} удалена"}
return {"status": "success", "message": f"Задача {formatted_id} удалена"}
# === ОБЩИЕ СИСТЕМНЫЕ РЕСУРСЫ ===
@@ -95,11 +109,24 @@ def db_get_active_system_prompt() -> str:
def db_add_system_prompt(name: str, prompt_text: str) -> Dict[str, Any]:
conn = get_db_connection()
cursor = conn.cursor()
cursor.execute("UPDATE system_prompts SET is_active = 0")
cursor.execute("INSERT INTO system_prompts (name, prompt_text, is_active) VALUES (?, ?, 1)", (name, prompt_text))
# Проверяем наличие промпта с таким именем, чтобы не плодить мусор
cursor.execute("SELECT id FROM system_prompts WHERE name = ?", (name,))
existing = cursor.fetchone()
if existing:
cursor.execute("""
UPDATE system_prompts
SET prompt_text = ?, updated_at = CURRENT_TIMESTAMP, is_active = 1
WHERE name = ?
""", (prompt_text, name))
else:
cursor.execute("UPDATE system_prompts SET is_active = 0")
cursor.execute("INSERT INTO system_prompts (name, prompt_text, is_active) VALUES (?, ?, 1)", (name, prompt_text))
conn.commit()
conn.close()
return {"status": "success", "message": "Системный промпт обновлен"}
return {"status": "success", "message": "Системный промпт успешно обновлен"}
def db_get_rules() -> List[Dict[str, Any]]:
conn = get_db_connection()
@@ -107,4 +134,4 @@ def db_get_rules() -> List[Dict[str, Any]]:
cursor.execute("SELECT id, rule_text FROM ai_knowledge_base ORDER BY id ASC")
rows = cursor.fetchall()
conn.close()
return [dict(r) for r in rows]
return [dict(r) for r in rows]
llm/schemas.py
+2 -2
View File
@@ -35,11 +35,11 @@ TOOLS_SCHEMA = [
"type": "function",
"function": {
"name": "db_add_system_prompt",
"description": "Обновить или добавить системный промпт ИИ в базу данных. Вызывай при командах 'задай системный промпт', 'измени промпт', 'обнови системный промпт'.",
"description": "Изменить, записать или добавить новый системный промпт ассистента в базу данных. Вызывай этот инструмент ВСЕГДА, когда пользователь просит 'добавь системный промпт', 'запиши промпт', 'измени инструкции ИИ'.",
"parameters": {
"type": "object",
"properties": {
"prompt_text": {"type": "string", "description": "Полный новый текст системного промпта"},
"prompt_text": {"type": "string", "description": "Полный текст нового системного промпта"},
"name": {"type": "string", "description": "Имя промпта, по умолчанию main_agent"}
},
"required": ["prompt_text"]