feat: полноценный мультипользовательский режим (users, JWT, изолированные задачи)
This commit is contained in:
+44
-43
@@ -18,21 +18,39 @@ from .schemas import TOOLS_SCHEMA
|
||||
OLLAMA_URL = "http://192.168.11.3:11434/api/chat"
|
||||
MODEL_NAME = "qwen2.5:14b"
|
||||
|
||||
def process_chat_message(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) -> 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 ["системный промпт", "покажи промпт", "промпт системы", "промпт из базы"]):
|
||||
prompt_text = db_get_active_system_prompt()
|
||||
formatted_text = f"⚙️ Актуальный системный промпт ИИ (из базы SQLite):\n\n{prompt_text}"
|
||||
# Быстрый прямой ответ для списка задач текущего пользователя
|
||||
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 ["базу знаний", "база знаний", "покажи правила", "инструкции ии"]):
|
||||
rules = db_get_rules()
|
||||
formatted_text = "🧠 База знаний ИИ (ai_knowledge_base):\n\n" + "\n\n".join([f"• {r.get('id')}. {r.get('rule_text')}" for r in rules]) if rules else "База знаний пуста."
|
||||
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}]
|
||||
|
||||
dynamic_prompt_text = db_get_active_system_prompt()
|
||||
@@ -64,64 +82,47 @@ def process_chat_message(user_message: str, chat_history: List[Dict[str, Any]] =
|
||||
tool_calls = msg.get("tool_calls", [])
|
||||
content_str = msg.get("content", "").strip().replace("**", "")
|
||||
|
||||
if not tool_calls and "name" in content_str and "db_" in content_str:
|
||||
try:
|
||||
start_idx = content_str.find("{")
|
||||
end_idx = content_str.rfind("}") + 1
|
||||
if start_idx != -1 and end_idx != -1:
|
||||
parsed = json.loads(content_str[start_idx:end_idx])
|
||||
if "name" in parsed:
|
||||
tool_calls = [{"function": parsed}]
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if tool_calls:
|
||||
for tool in tool_calls:
|
||||
fn_name = tool["function"]["name"]
|
||||
fn_args = tool["function"].get("arguments", {})
|
||||
|
||||
if fn_name == "db_get_tasks":
|
||||
tasks = db_get_tasks()
|
||||
tasks = db_get_tasks(user_id)
|
||||
if not tasks:
|
||||
formatted_text = "Список задач пуст."
|
||||
formatted_text = "Ваш список задач пуст."
|
||||
else:
|
||||
tasks_sorted = sorted(tasks, key=lambda x: x.get('task_id', ''), reverse=True)
|
||||
formatted_text = f"📋 Реестр задач SCUD Orion AI (Всего: {len(tasks_sorted)}):\n\n"
|
||||
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:
|
||||
due = f" (до {t['due_date']})" if t.get('due_date') else ""
|
||||
formatted_text += f"• {t.get('task_id')} — {t.get('title')}\n"
|
||||
formatted_text += f" - Приоритет: {t.get('priority') or 'MEDIUM'} | Статус: {t.get('status') or 'BACKLOG'} | Модуль: {t.get('module') or 'general'}{due}\n\n"
|
||||
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
|
||||
tid = t.get('task_id', '')
|
||||
title = t.get('title', 'Без названия')
|
||||
lines.append(f"• {tid}: {title}")
|
||||
formatted_text = "\n".join(lines)
|
||||
|
||||
elif fn_name == "db_get_rules":
|
||||
rules = db_get_rules()
|
||||
formatted_text = "🧠 База знаний ИИ (ai_knowledge_base):\n\n" + "\n\n".join([f"• {r.get('id')}. {r.get('rule_text')}" for r in rules]) if rules else "База знаний пуста."
|
||||
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
|
||||
|
||||
elif fn_name == "db_get_system_prompt":
|
||||
prompt_text = db_get_active_system_prompt()
|
||||
formatted_text = f"⚙️ Актуальный системный промпт ИИ (из базы SQLite):\n\n{prompt_text}"
|
||||
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", ""))
|
||||
formatted_text = res.get("message", "Промпт обновлен.")
|
||||
return formatted_text, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": formatted_text}]
|
||||
|
||||
elif fn_name == "db_add_task":
|
||||
res = db_add_task(module=fn_args.get("module", "general"), title=fn_args.get("title"), priority=fn_args.get("priority", "MEDIUM"), due_date=fn_args.get("due_date"))
|
||||
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}]
|
||||
|
||||
elif fn_name == "db_update_task_status":
|
||||
res = db_update_task_status(task_id=fn_args.get("task_id"), status=fn_args.get("status"), due_date=fn_args.get("due_date"))
|
||||
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}]
|
||||
|
||||
elif fn_name == "db_delete_task":
|
||||
task_id_to_del = fn_args.get("task_id", "").upper()
|
||||
res = db_delete_task(task_id=task_id_to_del)
|
||||
formatted_text = f"[✓] Задача {task_id_to_del} успешно удалена из базы!" if "status" in res else f"❌ Ошибка: {res.get('error')}"
|
||||
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}]
|
||||
|
||||
return content_str, chat_history + [{"role": "user", "content": user_message}, {"role": "assistant", "content": content_str}]
|
||||
|
||||
Reference in New Issue
Block a user