From 48bdc244e045c954d546ddd31e65bfd59b9bc2a1 Mon Sep 17 00:00:00 2001 From: manoraga Date: Fri, 14 Aug 2026 17:02:29 +0300 Subject: [PATCH] =?UTF-8?q?feat(db/llm/ui):=20=D0=BD=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D1=82=D0=B2=D0=B5=D1=80=D0=B6=D0=B4=D0=B0=D1=8E=D1=89?= =?UTF-8?q?=D0=B8=D1=85=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=BD=D0=B5c=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=B8=20=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=B7=20=D0=B8=D0=BD=D1=81=D1=82?= =?UTF-8?q?=D1=80=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20=D1=81=D0=B5=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/scud_orion_ai.db | Bin 6021120 -> 6033408 bytes data/scud_orion_ai.db-shm | Bin 32768 -> 32768 bytes data/scud_orion_ai.db-wal | Bin 230752 -> 37112 bytes modules/web_api/llm/agent.py | 105 ++++++++++++++++++++------- modules/web_api/llm/db/db_prompts.py | 20 +++++ modules/web_api/llm/db_tools.py | 4 +- modules/web_api/static/js/chat.js | 42 ++++++++--- scripts/db_cli.py | 32 +++++++- scripts/init_tool_registry.py | 104 ++++++++++++++++++++++++++ 9 files changed, 268 insertions(+), 39 deletions(-) create mode 100644 scripts/init_tool_registry.py diff --git a/data/scud_orion_ai.db b/data/scud_orion_ai.db index 0867d0b9cae4e1bc488b99ab591e802580f19b2f..b24e2af9c8cb2e222a542d012801f96219ea4c21 100644 GIT binary patch delta 2882 zcmds(drVVT9LI0pmPao>usW+;3-0;=E~TJY#{i)S8xtSxL8rnhAr zG~k1|d6zh%E}EHT*$N5;l-EBd%l}^dfEJk1fiKB2<3W$AXLEe{%ot_;b7CHj1{SdTPpGhd5!#< z93U5w`^YcJ-wZ#ICFClSFx-k*C}yWV5?->rQIoqQRaL0)d%Yf)yV<|r+vaL#TlRDQ z_Re_=^eS4}ywB}-wXz)NZecm)7a;~Q3dAT8qe6@tF&e~Z5u-!QJjCb`lZ2RL#H1i5 zb%ZhezHOexYRj|O3X2eLKs<@~G{nzG`~t);MEoMerz3tb;*E%3g7~F~e*y8!5N|^K za>TDde8vb*C2!MAlYf#A;whieCTS+Rt6=XJySJb_6uPr=(1HXI{bcb8|ON}#oP!d`e>UlhUiQIAEC9nDoSf?C{zk! zCvD7~YpX8HT%($)msSW($7z#rl6KN@ z|64NU3Zd3b5~=rflgS18kEK5TOlR+ULunw2m+FJ7g2g#qoZh;3kE_|;*35cbzIJb` z&kqmw(0=xC^zFNWJ_>(;Blrd$#uGB5;whp3SEW%naL7QGPl}=VoY?_F#HWXp>xuy)4`S ztcz=N`?!5xKlkLHd*_9I3coA%;z3!y3COb-1ctDXC2aqgtY z9|rZIeqt{LNk%BhGmInBn=~c661#I{?~=H%Wjsp3%(zq`$yn@@!;MAvItmdc@pwXP z7#d0_Vj!W4=Or^KG{_}4LPGLS%R3cY4Q=zRxQR7ABZ+}019&J}kSA>st=Zi52pv=z zh&4uikO?w5q0HI!@VmJ;CAerA1lR*82aOVbO78@@F&U2OJp_x7;bB2ktY2u(#h2yu z;4sK11YUx0hNR=bOC2Tl2?Ns&%K}r-hEbvA-jo9-2>c9v<92xTKWZB{srm;|pG#AM zP*g`&p4QqG^WRBP7>E+MdAzZkN3a|=EKQ2tGaq(S!psBnBBALnogDa^s-T0|9cz4O zWRNv_8;r&;9|{k}8e3BJsm6ZZJ4yL}zLZS=b}98d3OIq+fn7jdrJ8hObC%^n2?4i%AUD*+7kKFra0+# ztP6tfwIGO%0xrliRTn1fi|P4Fx5c)hp||OC`i0I?Cmo<4>37=(ZKKsxohvKvk<^8< z@`R+s)1<;#V${gu)q&ojp6h*sgT4KIgW~)h28;j`foXtgf$4zhfl0s&z>L65z|6ob zz^qwj`;jm-G{++0STqdW2Al%719t!~0lp2m6L=}`?Z92Y%Yg3yz7x0`xCeMS@Cx9S zS?)C_baV6<&Hej2wP8}ISN+lr2PuBOPypRrVgG+-Gl6s! zqyvzy&Zc+$T#5EV z0U;;VXhiFKvCBHH_$Kvl)f$km5v6WaeyUd7mHk93SxJYAp*T_RkI7Gn*0L$Mr`lag zJR`5E!F%$GR*Q{!paj!I5nC#hk#X6hSVm>9)alW?y2GNfd`osIxlwt~n0-P^9LMorQFm49GPLThin=SYwzm}zVa3kcM!NC@p1{ruTaREb7G6R)|HdSf zrjcmcrk(ko)AdzXVhy1dHsgxf2+Zu!}sjg@=$-_E67 z&;6eFVt0+BRzlAbN z5&}^W7>`1c)QA8A2q1s}0tg_`Ab}2fTGDQVqSq^ITs=yc->qA(h{Qp_-iSPOtYHTqE@x3Vt7iU5(E%Hpv?s`T5t0T zNFRY(1qPMSjJ9jN&b>$pOhl?$ibVhc1X@KPrkz$vg**^I009ILXc>WNt!Yb#Et3z4 IAn=#K5AN7KQ~&?~ diff --git a/data/scud_orion_ai.db-wal b/data/scud_orion_ai.db-wal index 1b919fe9d6a2fdb9408578368e6f5266037c1afb..ebf0535ed6d4ae7b451bd2495db84f6867d7dc36 100644 GIT binary patch delta 1502 zcmeH{O-vI(6vwx_2(`&BwHIr|Fr@K|&_Y|0N>YgliBU0d;bKfmLn`1`BdtbG?QXMC zgotq!G;-m92T!|{V$pVy;6c>GOb-$gObjP6AsP=xVj{j-T2sQ2qi#0Y%$xV#%>4hq z*-v+bpJS}AAyz6e&Sg8pSQ+}n&*rLsy#C(4KHaA9%Bl-OpBZMyY$2XonY<8FW)qrk zt-R9PSnq3eA7dCcT3oBy?moW0bn|4g&01#N^|v&0{MRG@SNpwWH!@py7aA^hjE|Nm zPnY=ec7_*n%6fbcE98Mo9LiAZ z-qPh!8R4-J&1TxC%(q%&M8rCgNgS&9H$VTG*Yu< zfXFV31rI~UO9-WiL}zKK4mmmmr*N7`WDptMHCRU?2}DGAVM3(&xHf~K6V4P0GtfYS z;!KmL&U4gR=X1J`Aa`E=X8F{}`4Y~5U}M|>XXT3R_+YXpelIpSwyp3xLt)1zg*)aC zEq>%rR8xgHA#5ltghAt=z%|Qf=*B8MAQzEp=mBT2N{03_X@%=-l99~#knOnax zylqq78>Z~vWXiePHxDl@e6dkeN_a7E3NL~!*LaI~QEs8=OMQTTMQj`h1USiUtk)ng zN(4mH2#~}R)GYeZ0r4!j_5!F(5Q%2>Q>y8VK{jAJ09VAQ1dnydRt?%UgLRP%0m+nK zSf?M*UyeUOFw|h-78QD_c$#t#Z3bNk--kV@Q2mAr3^WS>_ delta 6529 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 diff --git a/modules/web_api/llm/agent.py b/modules/web_api/llm/agent.py index e46e3ad..0fd7df5 100644 --- a/modules/web_api/llm/agent.py +++ b/modules/web_api/llm/agent.py @@ -1,25 +1,28 @@ """ =============================================================================== FILE: modules/web_api/llm/agent.py -PROJECT: SCUD Orion AI (Unified Repository) +PROJECT: SCUD Orion AI (Unified Architecture) MODULE: web_api / llm (Core Agent & Function Calling Dispatcher) ROLE: Главный оркестратор взаимодействия с Ollama LLM (Qwen 2.5), разбор вызовов - инструментов (Function Calling), генерация превью промпта и логирование. + инструментов (Function Calling), интеграция с декларативным реестром + действий SQLite (tool_action_registry) и управление сессионными кнопками. AI-CONTEXT-ANCHORS & INVARIANTS: - - ANCHOR[LOGGING_CONFIG]: Явный вывод логов в stdout для мгновенной видимости - вызовов тулов в systemd journalctl. + - ANCHOR[LOGGING_CONFIG]: Настройка StreamHandler в sys.stdout с propagate=False + для предотвращения дублирования строк в systemd journalctl. - ANCHOR[DYNAMIC_CONTEXT]: Сборка системного контекста (календарь, сессия, промпт). - ANCHOR[INFERENCE_OPTIONS]: Параметры инференса (repeat_penalty, ctx_size) для предотвращения урезания длинных списков моделью Qwen 2.5. - ANCHOR[TOOL_ROUTER]: Диспетчеризация функций SQLite (CRUD задач, снапшотов, KB). - ANCHOR[PROMPT_MERGE_LOGIC]: Универсальный парсер точечного добавления и удаления пунктов системного промпта в режиме предпросмотра (PROMPT_PREVIEW). + - ANCHOR[DATA_DRIVEN_ACTIONS]: Универсальная обработка инструментов на базе + таблицы tool_action_registry (мгновенный возврат ответов и динамических кнопок). - ANCHOR[SECONDARY_PASS]: Вторичный вызов LLM для формирования текстового ответа на основе полученного tool_result. DEPENDENCIES: - - modules/web_api/llm/db_tools.py (доступ к SQLite) + - modules/web_api/llm/db_tools.py (доступ к SQLite и реестру действий) - modules/web_api/llm/schemas.py (TOOLS_SCHEMA) - modules/web_api/llm/core/calendar_utils.py (get_dynamic_calendar_context) - modules/web_api/llm/core/tool_injector.py (clean_raw_tool_tags, clean_output) @@ -40,6 +43,7 @@ from typing import List, Dict, Any, Tuple, Optional from .db_tools import ( db_get_active_system_prompt, db_add_system_prompt, + db_get_tool_action, db_get_tasks, db_update_task_status, db_delete_task, @@ -66,7 +70,7 @@ from .core.tool_injector import clean_raw_tool_tags, clean_output, inject_tools_ # --- [SECTION 2: LOGGING CONFIGURATION] --- # ANCHOR[LOGGING_CONFIG] logger = logging.getLogger("SCUD_AGENT") logger.setLevel(logging.INFO) -logger.propagate = False +logger.propagate = False # Исключаем дублирование сообщений в родительском логгере Uvicorn if not logger.handlers: handler = logging.StreamHandler(sys.stdout) @@ -87,13 +91,14 @@ def process_chat_message( image_b64: Optional[str] = None, chat_history: List[Dict[str, Any]] = None, session_id: str = "web_session_main" -) -> Tuple[str, List[Dict[str, Any]]]: +) -> Tuple[str, List[Dict[str, Any]], Optional[Dict[str, Any]]]: """ Главный конвейер обработки входящего сообщения: 1. Сохранение сообщения пользователя. 2. Формирование системного контекста и вызов Ollama. 3. Выполнение вызванного Tool (если сгенерирован). - 4. Вторичный проход генерации и возврат истории. + 4. Опрос Data-Driven реестра действий (tool_action_registry) или вторичный проход LLM. + 5. Возврат кортежа: (reply_text, chat_history, action_metadata). """ logger.info(f"Получено сообщение от user_id={user_id}, session_id={session_id}: {user_message}") @@ -182,8 +187,46 @@ def process_chat_message( logger.info(f"🚀 Вызов функции (Tool): {fn_name} с аргументами: {fn_args}") tool_result_content = "" - # Роутинг инструментов - if fn_name == "db_get_snapshots": + # --- 5.1. УНИВЕРСАЛЬНАЯ ПРОВЕРКА DATA-DRIVEN РЕЕСТРА (tool_action_registry) --- # ANCHOR[DATA_DRIVEN_ACTIONS] + action_cfg = db_get_tool_action(fn_name) + + if fn_name == "db_confirm_prompt_preview": + if session_state and session_state.get("state_type") == "PROMPT_PREVIEW": + db_add_system_prompt("main_agent", session_state.get("pending_data", "")) + db_clear_session_state(session_id) + + if action_cfg and action_cfg.get("bypass_llm"): + reply_text = action_cfg["success_template"] + if action_cfg.get("follow_up_question"): + reply_text += f"\n\n{action_cfg['follow_up_question']}" + + db_save_chat_message(session_id, "assistant", reply_text) + return reply_text, db_get_chat_history(session_id), { + "type": action_cfg.get("action_type"), + "buttons": action_cfg.get("buttons", []) + } + tool_result_content = json.dumps({"status": "success"}, ensure_ascii=False) + else: + err_reply = "⚠️ Нет активного превью для подтверждения." + db_save_chat_message(session_id, "assistant", err_reply) + return err_reply, db_get_chat_history(session_id), None + + elif fn_name == "db_cancel_prompt_preview": + db_clear_session_state(session_id) + if action_cfg and action_cfg.get("bypass_llm"): + reply_text = action_cfg["success_template"] + if action_cfg.get("follow_up_question"): + reply_text += f"\n\n{action_cfg['follow_up_question']}" + + db_save_chat_message(session_id, "assistant", reply_text) + return reply_text, db_get_chat_history(session_id), { + "type": action_cfg.get("action_type"), + "buttons": action_cfg.get("buttons", []) + } + tool_result_content = json.dumps({"status": "cancelled"}, ensure_ascii=False) + + # --- 5.2. СТАНДАРТНЫЙ РОУТИНГ ИНСТРУМЕНТОВ --- + elif fn_name == "db_get_snapshots": snapshots_res = db_get_snapshots(session_id=session_id, date_str=fn_args.get("date_str"), original_user_message=user_message) tool_result_content = json.dumps(snapshots_res, ensure_ascii=False) @@ -206,7 +249,17 @@ def process_chat_message( tool_result_content = json.dumps(db_get_session_states(), ensure_ascii=False) elif fn_name == "db_delete_snapshots": - tool_result_content = json.dumps(db_delete_snapshots(snapshot_id=fn_args.get("snapshot_id"), day_str=fn_args.get("day_str")), ensure_ascii=False) + res = db_delete_snapshots(snapshot_id=fn_args.get("snapshot_id"), day_str=fn_args.get("day_str")) + if action_cfg and action_cfg.get("bypass_llm"): + reply_text = action_cfg["success_template"] + if action_cfg.get("follow_up_question"): + reply_text += f"\n\n{action_cfg['follow_up_question']}" + db_save_chat_message(session_id, "assistant", reply_text) + return reply_text, db_get_chat_history(session_id), { + "type": action_cfg.get("action_type"), + "buttons": action_cfg.get("buttons", []) + } + tool_result_content = json.dumps(res, ensure_ascii=False) elif fn_name == "db_get_reference": tool_result_content = json.dumps(db_get_reference(category=fn_args.get("category")), ensure_ascii=False) @@ -260,20 +313,13 @@ def process_chat_message( f"Для применения изменений подтвердите действие («подтверждаю») или отмените («отмена»)." ) db_save_chat_message(session_id, "assistant", preview_reply) - # Возвращаем "PROMPT_PREVIEW" как третий параметр - return clean_raw_tool_tags(preview_reply), db_get_chat_history(session_id), "PROMPT_PREVIEW" - - elif fn_name == "db_confirm_prompt_preview": - if session_state and session_state.get("state_type") == "PROMPT_PREVIEW": - res = db_add_system_prompt("main_agent", session_state.get("pending_data", "")) - 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) + return clean_raw_tool_tags(preview_reply), db_get_chat_history(session_id), { + "type": "PROMPT_PREVIEW", + "buttons": [ + {"label": "Подтвердить", "value": "подтверждаю", "style": "primary"}, + {"label": "Отменить", "value": "отмена", "style": "danger"} + ] + } elif fn_name == "db_get_rules": tool_result_content = json.dumps(db_get_rules(), ensure_ascii=False) @@ -288,6 +334,15 @@ def process_chat_message( elif fn_name == "db_delete_task": res = db_delete_task(user_id=user_id, task_id=str(fn_args.get("task_id", "")).upper()) + if action_cfg and action_cfg.get("bypass_llm"): + reply_text = action_cfg["success_template"] + if action_cfg.get("follow_up_question"): + reply_text += f"\n\n{action_cfg['follow_up_question']}" + db_save_chat_message(session_id, "assistant", reply_text) + return reply_text, db_get_chat_history(session_id), { + "type": action_cfg.get("action_type"), + "buttons": action_cfg.get("buttons", []) + } tool_result_content = json.dumps(res, ensure_ascii=False) messages.append({"role": "tool", "content": tool_result_content}) diff --git a/modules/web_api/llm/db/db_prompts.py b/modules/web_api/llm/db/db_prompts.py index f7d7334..9978bc4 100644 --- a/modules/web_api/llm/db/db_prompts.py +++ b/modules/web_api/llm/db/db_prompts.py @@ -1,6 +1,7 @@ """ FILE: modules/web_api/llm/db/db_prompts.py """ +import json import logging from typing import List, Dict, Any, Optional from .connection import get_db_connection @@ -15,6 +16,25 @@ def db_get_active_system_prompt() -> str: conn.close() return row["prompt_text"] if row else "Ты — ИИ-ассистент SCUD Orion AI." +def db_get_tool_action(tool_name: str) -> Optional[Dict[str, Any]]: + """Получение шаблона и кнопок действия для инструмента из SQLite.""" + conn = get_db_connection() + cursor = conn.cursor() + cursor.execute(""" + SELECT tool_name, category, bypass_llm, success_template, + follow_up_question, action_type, buttons_json + FROM tool_action_registry + WHERE tool_name = ? AND is_active = 1 + """, (tool_name,)) + row = cursor.fetchone() + conn.close() + + if row: + res = dict(row) + res["buttons"] = json.loads(res["buttons_json"]) if res.get("buttons_json") else [] + return res + return None + def db_add_system_prompt(name: str, prompt_text: str) -> Dict[str, Any]: try: with get_db_connection() as conn: diff --git a/modules/web_api/llm/db_tools.py b/modules/web_api/llm/db_tools.py index 806fb07..df4f588 100644 --- a/modules/web_api/llm/db_tools.py +++ b/modules/web_api/llm/db_tools.py @@ -9,6 +9,7 @@ from .db.db_snapshots import db_get_snapshots, db_delete_snapshots from .db.db_prompts import ( db_get_active_system_prompt, db_add_system_prompt, + db_get_tool_action, db_get_rules, db_set_session_state, db_get_session_state, @@ -16,7 +17,8 @@ from .db.db_prompts import ( db_get_session_states, db_get_stats, db_get_anomalies, - db_get_reference + db_get_reference, + db_get_tool_action ) def db_get_current_server_time(): diff --git a/modules/web_api/static/js/chat.js b/modules/web_api/static/js/chat.js index 4083a01..cedc7bf 100644 --- a/modules/web_api/static/js/chat.js +++ b/modules/web_api/static/js/chat.js @@ -133,19 +133,37 @@ async function sendMessage(e) { // Генерация блока кнопок подтверждения при необходимости let actionButtonsHtml = ""; - if (data.action_type === "PROMPT_PREVIEW") { + const actionData = data.action_type || data.action; + + if (actionData && actionData.buttons && actionData.buttons.length > 0) { + const buttonsMarkup = actionData.buttons.map(btn => { + let btnClasses = "bg-slate-100 hover:bg-slate-200 active:bg-slate-300 text-slate-700 border border-slate-300"; + let iconMarkup = ''; + + const labelLower = (btn.label || "").toLowerCase(); + const isPrimary = btn.style === "primary" || labelLower.includes("подтверд") || labelLower.startsWith("да"); + const isDanger = btn.style === "danger" || labelLower.includes("отмен") || labelLower.startsWith("нет") || labelLower.includes("законч") || labelLower.includes("заверш"); + + if (isPrimary) { + btnClasses = "bg-emerald-600 hover:bg-emerald-700 active:bg-emerald-800 text-white shadow-sm"; + iconMarkup = ''; + } else if (isDanger) { + btnClasses = "bg-rose-50 hover:bg-rose-100 active:bg-rose-200 text-rose-700 border border-rose-300"; + iconMarkup = ''; + } + + return ` + + `; + }).join(""); + actionButtonsHtml = ` -
- - +
+ ${buttonsMarkup}
`; } diff --git a/scripts/db_cli.py b/scripts/db_cli.py index 5fa6101..2049738 100644 --- a/scripts/db_cli.py +++ b/scripts/db_cli.py @@ -18,6 +18,31 @@ from core.database import ( DB_PATH = os.path.join(DATA_DIR, "scud_orion_ai.db") +def print_tool_actions(): + """Выводит реестр декларативных действий инструментов и шаблоны кнопок.""" + print("\n" + "=" * 110) + print("🧰 ДЕКЛАРАТИВНЫЙ РЕЕСТР ДЕЙСТВИЙ ИНСТРУМЕНТОВ (tool_action_registry):") + print("=" * 110) + with get_connection() as conn: + cursor = conn.cursor() + cursor.execute(""" + SELECT id, tool_name, category, bypass_llm, success_template, follow_up_question, buttons_json + FROM tool_action_registry + WHERE is_active = 1 + ORDER BY id ASC + """) + rows = cursor.fetchall() + if not rows: + print("Таблица tool_action_registry пуста.") + else: + for r in rows: + print(f"ID: {r[0]} | Tool: [{r[1]}] | Категория: {r[2]} | Bypass LLM: {'ДА (0.05с)' if r[3] else 'НЕТ'}") + print(f" • Сообщение: {r[4]}") + if r[5]: + print(f" • Вопрос: {r[5]}") + print(f" • Кнопки: {r[6]}") + print("-" * 110) + print("=" * 110 + "\n") def print_stats(): """Выводит общую статистику по записям в таблицах БД.""" @@ -255,6 +280,7 @@ def print_session_states(): print("=" * 80 + "\n") +Python HELP_TEXT = """ CLI-утилита инспекции и управления SQLite базой данных СКУД (scud_orion_ai.db) @@ -266,6 +292,7 @@ CLI-утилита инспекции и управления SQLite базой anomalies -- Посмотреть историю найденных аномалий СКУД ⟷ 1С rules -- Посмотреть правила Базы Знаний ИИ из SQLite prompts -- Посмотреть системные промпты (system_prompts) + tools -- Посмотреть реестр действий инструментов и кнопок (tool_action_registry) sessions -- Посмотреть активные сессии и превью (session_states) dump [output.xlsx] -- Полный дамп всех таблиц БД в многостраничный Excel snapshot del [ID] или [--day ДД.ММ.ГГГГ] -- Удаление снапшота по ID или всех за выбранный день @@ -277,6 +304,7 @@ CLI-утилита инспекции и управления SQLite базой python scripts/db_cli.py scud --snapshot Y20260805-007 python scripts/db_cli.py absences 07.08.2026 python scripts/db_cli.py prompts + python scripts/db_cli.py tools python scripts/db_cli.py sessions python scripts/db_cli.py snapshot del Y20260805-007 python scripts/db_cli.py snapshot del --day 04.08.2026 @@ -294,7 +322,7 @@ def main(): formatter_class=argparse.RawDescriptionHelpFormatter, add_help=False ) - parser.add_argument('command', nargs='?', default=None, choices=['stats', 'snapshots', 'scud', 'absences', 'anomalies', 'rules', 'prompts', 'sessions', 'dump', 'snapshot'], help="Основная команда") + parser.add_argument('command', nargs='?', default=None, choices=['stats', 'snapshots', 'scud', 'absences', 'anomalies', 'rules', 'prompts', 'sessions', 'dump', 'snapshot', 'tools'], help="Основная команда") parser.add_argument('action', nargs='?', default=None, help="Дополнительное действие (например, 'del')") parser.add_argument('param', nargs='?', default=None, help="Параметр (дата, ID снапшота или имя файла)") parser.add_argument('--snapshot', type=str, default=None, help="ID конкретного снапшота для инспекции") @@ -325,6 +353,8 @@ def main(): print_system_prompts() elif args.command == 'sessions': print_session_states() + elif args.command == 'tools': + print_tool_actions() elif args.command == 'dump': filename = args.param if args.param else "db_dump_full.xlsx" dump_all_to_excel(filename) diff --git a/scripts/init_tool_registry.py b/scripts/init_tool_registry.py new file mode 100644 index 0000000..5cc8a1b --- /dev/null +++ b/scripts/init_tool_registry.py @@ -0,0 +1,104 @@ +""" +Скрипт инициализации таблицы tool_action_registry в SQLite БД. +""" +import os +import sys +import json +import sqlite3 + +BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +DB_PATH = os.path.join(BASE_DIR, "data", "scud_orion_ai.db") + +def init_tool_action_registry(): + conn = sqlite3.connect(DB_PATH) + cursor = conn.cursor() + + # 1. Создаем таблицу + cursor.execute(""" + CREATE TABLE IF NOT EXISTS tool_action_registry ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + tool_name TEXT UNIQUE NOT NULL, + category TEXT DEFAULT 'general', + bypass_llm INTEGER DEFAULT 1, + success_template TEXT NOT NULL, + follow_up_question TEXT, + action_type TEXT DEFAULT 'BUTTONS', + buttons_json TEXT, + is_active INTEGER DEFAULT 1, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + ); + """) + + # 2. Начальное наполнение базовыми сценариями + seed_tools = [ + ( + "db_confirm_prompt_preview", + "prompt", + 1, + "✅ Системный промпт успешно сохранен и применен в базе данных.", + "Желаете продолжить работу с системным промптом?", + "FOLLOW_UP_ACTION", + json.dumps([ + {"label": "Показать промпт", "value": "покажи системный промпт"}, + {"label": "Готово", "value": "нет, спасибо"} + ], ensure_ascii=False) + ), + ( + "db_cancel_prompt_preview", + "prompt", + 1, + "❌ Изменения системного промпта отменены.", + "Желаете продолжить работу с системным промптом?", + "FOLLOW_UP_ACTION", + json.dumps([ + {"label": "Показать промпт", "value": "покажи системный промпт"}, + {"label": "Готово", "value": "нет, спасибо"} + ], ensure_ascii=False) + ), + ( + "db_delete_task", + "tasks", + 1, + "🗑 Задача успешно удалена из вашего реестра.", + "Хотите посмотреть обновленный список задач?", + "FOLLOW_UP_ACTION", + json.dumps([ + {"label": "Показать задачи", "value": "покажи список задач"}, + {"label": "Готово", "value": "нет"} + ], ensure_ascii=False) + ), + ( + "db_delete_snapshots", + "snapshots", + 1, + "🗑 Выбранные снапшоты успешно удалены из базы данных.", + "Вывести актуальный список снапшотов?", + "FOLLOW_UP_ACTION", + json.dumps([ + {"label": "Показать снапшоты", "value": "покажи список снапшотов"}, + {"label": "Готово", "value": "нет"} + ], ensure_ascii=False) + ) + ] + + for item in seed_tools: + cursor.execute(""" + INSERT INTO tool_action_registry ( + tool_name, category, bypass_llm, success_template, follow_up_question, action_type, buttons_json + ) VALUES (?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(tool_name) DO UPDATE SET + category = excluded.category, + bypass_llm = excluded.bypass_llm, + success_template = excluded.success_template, + follow_up_question = excluded.follow_up_question, + action_type = excluded.action_type, + buttons_json = excluded.buttons_json, + updated_at = CURRENT_TIMESTAMP + """, item) + + conn.commit() + conn.close() + print("[✓] Таблица tool_action_registry успешно создана и наполнена!") + +if __name__ == "__main__": + init_tool_action_registry()