feat(web): стабилизация UI, Gemini-скроллинг, роутеры контекста/снапшотов и актуализация роадмапа
This commit is contained in:
@@ -72,7 +72,7 @@ def login(req: AuthRequest):
|
||||
username = req.username.strip().lower()
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
cursor.execute("SELECT id, username, password_hash, is_admin FROM users WHERE username = ?", (username,))
|
||||
cursor.execute("SELECT id, username, password_hash, full_name, is_admin FROM users WHERE username = ?", (username,))
|
||||
user = cursor.fetchone()
|
||||
conn.close()
|
||||
|
||||
@@ -82,7 +82,17 @@ def login(req: AuthRequest):
|
||||
is_admin = bool(user["is_admin"]) or (user["username"] == "puh")
|
||||
token = create_access_token(user["id"], user["username"], is_admin)
|
||||
|
||||
return {"status": "success", "token": token, "username": user["username"], "is_admin": is_admin}
|
||||
# Возвращаем full_name (если не задано — отдаем username)
|
||||
full_name = user["full_name"] if user["full_name"] else user["username"]
|
||||
|
||||
return {
|
||||
"status": "success",
|
||||
"token": token,
|
||||
"username": user["username"],
|
||||
"full_name": full_name,
|
||||
"user_id": user["id"],
|
||||
"is_admin": is_admin
|
||||
}
|
||||
|
||||
|
||||
@router.post("/change-password")
|
||||
|
||||
+102
-45
@@ -1,22 +1,29 @@
|
||||
"""
|
||||
===============================================================================
|
||||
FILE: modules/web_api/routers/chat.py
|
||||
ROLE: Обработка сообщений веб-чата с поддержкой токенов и гостевого доступа.
|
||||
ROLE: Полнофункциональный роутер чата с извлечением текста из PDF и сканов,
|
||||
поддержкой Function Calling, Fast-Path и оптического распознавания OCR.
|
||||
===============================================================================
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Header, HTTPException, Request
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional, List, Dict, Any
|
||||
import os
|
||||
import shutil
|
||||
import base64
|
||||
import logging
|
||||
from typing import Optional, List, Dict, Any
|
||||
|
||||
from services.text_reporter import ask_ollama
|
||||
from services.knowledge_base import load_knowledge_base
|
||||
from core.database import get_connection
|
||||
from fastapi import APIRouter, Header, HTTPException, UploadFile, File, Form
|
||||
from pydantic import BaseModel
|
||||
|
||||
from llm.agent import process_chat_message
|
||||
from config import BASE_DIR
|
||||
|
||||
logger = logging.getLogger("CHAT_API")
|
||||
router = APIRouter(prefix="/api/v1", tags=["Chat"])
|
||||
|
||||
UPLOAD_TMP_DIR = os.path.join(BASE_DIR, "data", "uploads")
|
||||
os.makedirs(UPLOAD_TMP_DIR, exist_ok=True)
|
||||
|
||||
|
||||
class ChatMessageRequest(BaseModel):
|
||||
message: str
|
||||
@@ -25,17 +32,11 @@ class ChatMessageRequest(BaseModel):
|
||||
|
||||
|
||||
def resolve_user_id(authorization: Optional[str] = None, explicit_user_id: Optional[int] = None) -> int:
|
||||
"""
|
||||
Извлекает ID пользователя из Bearer-токена.
|
||||
Если токен не передан или сессия новая — использует user_id=1 по умолчанию,
|
||||
не блокируя работу ошибкой 403 Forbidden.
|
||||
"""
|
||||
if explicit_user_id and explicit_user_id > 0:
|
||||
return explicit_user_id
|
||||
|
||||
if authorization and authorization.startswith("Bearer "):
|
||||
token = authorization.replace("Bearer ", "").strip()
|
||||
# Если используется простой токен вида 'user_1' или JWT
|
||||
if token.isdigit():
|
||||
return int(token)
|
||||
elif token.startswith("dev_token_"):
|
||||
@@ -43,8 +44,6 @@ def resolve_user_id(authorization: Optional[str] = None, explicit_user_id: Optio
|
||||
return int(token.replace("dev_token_", ""))
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
# Дефолтный пользователь (гостевой / основной аккаунт)
|
||||
return 1
|
||||
|
||||
|
||||
@@ -59,39 +58,97 @@ async def chat_endpoint(payload: ChatMessageRequest, authorization: Optional[str
|
||||
|
||||
logger.info(f"Сообщение от user_id={user_id}, session_id={session_id}: {user_msg}")
|
||||
|
||||
# Загружаем контекст базы знаний
|
||||
kb = load_knowledge_base()
|
||||
rules_text = "\n".join([f"- {r}" for r in kb.get("rules", [])])
|
||||
|
||||
system_prompt = (
|
||||
"Ты — ИИ-ассистент системы кадровой безопасности и контроллинга СКУД Orion AI.\n"
|
||||
"Отвечай четко, профессионально и на русском языке.\n"
|
||||
f"Актуальные правила системы:\n{rules_text}"
|
||||
reply_text, history, action_payload = process_chat_message(
|
||||
user_id=user_id,
|
||||
user_message=user_msg,
|
||||
session_id=session_id
|
||||
)
|
||||
|
||||
try:
|
||||
reply_text = ask_ollama(user_msg, system_prompt=system_prompt)
|
||||
|
||||
# Сохранение истории в SQLite при необходимости
|
||||
return {
|
||||
"status": "success",
|
||||
"user_id": user_id,
|
||||
"session_id": session_id,
|
||||
"response": reply_text,
|
||||
"action_payload": action_payload
|
||||
}
|
||||
|
||||
|
||||
@router.post("/chat/upload")
|
||||
async def chat_upload_endpoint(
|
||||
file: UploadFile = File(...),
|
||||
message: Optional[str] = Form(""),
|
||||
session_id: Optional[str] = Form("web_session_main"),
|
||||
authorization: Optional[str] = Header(None)
|
||||
):
|
||||
user_id = resolve_user_id(authorization, 1)
|
||||
file_path = os.path.join(UPLOAD_TMP_DIR, file.filename)
|
||||
|
||||
with open(file_path, "wb") as buffer:
|
||||
shutil.copyfileobj(file.file, buffer)
|
||||
|
||||
file_context = ""
|
||||
image_b64 = None
|
||||
fn_lower = file.filename.lower()
|
||||
|
||||
# 1. Текстовые форматы
|
||||
if fn_lower.endswith((".txt", ".csv", ".log", ".md")):
|
||||
try:
|
||||
with get_connection() as conn:
|
||||
conn.execute(
|
||||
"INSERT INTO chat_messages (session_id, role, content) VALUES (?, ?, ?), (?, ?, ?)",
|
||||
(session_id, "user", user_msg, session_id, "assistant", reply_text)
|
||||
)
|
||||
conn.commit()
|
||||
with open(file_path, "r", encoding="utf-8", errors="ignore") as f:
|
||||
file_context = f.read(6000)
|
||||
except Exception as e:
|
||||
logger.warning(f"Не удалось прочитать текст: {e}")
|
||||
|
||||
# 2. Изображения (прямой OCR)
|
||||
elif fn_lower.endswith((".png", ".jpg", ".jpeg", ".webp")):
|
||||
try:
|
||||
with open(file_path, "rb") as f:
|
||||
image_b64 = base64.b64encode(f.read()).decode("utf-8")
|
||||
except Exception as e:
|
||||
logger.warning(f"Ошибка кодирования картинки в base64: {e}")
|
||||
|
||||
# 3. PDF документы (текстовый слой + рендеринг скана при необходимости)
|
||||
elif fn_lower.endswith(".pdf"):
|
||||
# Попытка извлечь встроенный текстовый слой
|
||||
try:
|
||||
import pypdf
|
||||
reader = pypdf.PdfReader(file_path)
|
||||
extracted = []
|
||||
for page in reader.pages:
|
||||
t = page.extract_text()
|
||||
if t:
|
||||
extracted.append(t)
|
||||
file_context = "\n".join(extracted).strip()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"status": "success",
|
||||
"user_id": user_id,
|
||||
"session_id": session_id,
|
||||
"response": reply_text
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"Ошибка вызова нейросети: {e}")
|
||||
return {
|
||||
"status": "error",
|
||||
"response": f"⚠️ Ошибка обработки запроса: {str(e)}"
|
||||
}
|
||||
# Если текстового слоя мало (скан или фото документа), рендерим страницу в картинку для Vision OCR
|
||||
if len(file_context) < 40:
|
||||
try:
|
||||
import fitz # PyMuPDF
|
||||
doc = fitz.open(file_path)
|
||||
if len(doc) > 0:
|
||||
page = doc[0]
|
||||
pix = page.get_pixmap(dpi=150)
|
||||
img_bytes = pix.tobytes("png")
|
||||
image_b64 = base64.b64encode(img_bytes).decode("utf-8")
|
||||
file_context = ""
|
||||
except Exception as e:
|
||||
logger.warning(f"PyMuPDF не установлен или сбой рендеринга PDF: {e}")
|
||||
|
||||
user_msg = message.strip() or f"Распознай и проанализируй прикрепленный документ {file.filename}"
|
||||
|
||||
reply_text, history, action_payload = process_chat_message(
|
||||
user_id=user_id,
|
||||
user_message=user_msg,
|
||||
file_context=file_context,
|
||||
image_b64=image_b64,
|
||||
session_id=session_id
|
||||
)
|
||||
|
||||
return {
|
||||
"status": "success",
|
||||
"user_id": user_id,
|
||||
"session_id": session_id,
|
||||
"response": reply_text,
|
||||
"action_payload": action_payload
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
"""
|
||||
===============================================================================
|
||||
FILE: modules/web_api/routers/context.py
|
||||
ROLE: REST API мониторинга состояния сессии и очистки памяти диалога.
|
||||
===============================================================================
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional
|
||||
|
||||
from routers.auth import get_current_user
|
||||
from modules.web_api.llm.db.db_prompts import db_get_session_state, db_clear_session_state
|
||||
from modules.web_api.llm.db.db_chat import db_get_chat_history, db_purge_ephemeral_messages, db_clear_chat_history
|
||||
|
||||
router = APIRouter(prefix="/api/v1/context", tags=["Context"])
|
||||
|
||||
|
||||
class SessionActionRequest(BaseModel):
|
||||
session_id: Optional[str] = "web_session_main"
|
||||
|
||||
|
||||
@router.get("/state")
|
||||
def api_get_context_state(session_id: str = "web_session_main", current_user = Depends(get_current_user)):
|
||||
state = db_get_session_state(session_id) or {}
|
||||
history = db_get_chat_history(session_id, limit=50)
|
||||
|
||||
ephemeral_count = sum(1 for m in history if dict(m).get("is_ephemeral") == 1)
|
||||
total_messages = len(history)
|
||||
|
||||
return {
|
||||
"session_id": session_id,
|
||||
"active_state": state.get("state_type", "IDLE"),
|
||||
"state_data": state.get("data_json", {}),
|
||||
"total_messages": total_messages,
|
||||
"ephemeral_messages": ephemeral_count
|
||||
}
|
||||
|
||||
|
||||
@router.post("/purge-ephemeral")
|
||||
def api_purge_ephemeral(req: SessionActionRequest, current_user = Depends(get_current_user)):
|
||||
purged = db_purge_ephemeral_messages(req.session_id)
|
||||
return {"status": "success", "purged_count": purged}
|
||||
|
||||
|
||||
@router.post("/clear-all")
|
||||
def api_clear_all_context(req: SessionActionRequest, current_user = Depends(get_current_user)):
|
||||
db_clear_session_state(req.session_id)
|
||||
db_clear_chat_history(req.session_id)
|
||||
return {"status": "success", "message": "Контекст сессии полностью очищен"}
|
||||
@@ -0,0 +1,157 @@
|
||||
"""
|
||||
===============================================================================
|
||||
FILE: modules/web_api/routers/remote_workers.py
|
||||
ROLE: REST API реестра удаленщиков (CRUD, редактирование сроков, автоочистка).
|
||||
===============================================================================
|
||||
"""
|
||||
|
||||
import os
|
||||
from datetime import datetime
|
||||
import pandas as pd
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional, List, Dict, Any
|
||||
|
||||
from routers.auth import get_current_user
|
||||
from config import BASE_DIR, DATA_DIR
|
||||
|
||||
router = APIRouter(prefix="/api/v1/remote-workers", tags=["RemoteWorkers"])
|
||||
CSV_PATH = os.path.join(DATA_DIR, "static_reason_workers.csv")
|
||||
|
||||
|
||||
def _load_workers() -> List[Dict[str, Any]]:
|
||||
"""Читает CSV, гарантирует структуру колонок и удаляет просроченные записи."""
|
||||
if not os.path.exists(CSV_PATH):
|
||||
return []
|
||||
try:
|
||||
df = pd.read_csv(CSV_PATH, dtype=str, on_bad_lines='skip').fillna("")
|
||||
for col in ["fio", "department", "reason", "date_from", "date_to"]:
|
||||
if col not in df.columns:
|
||||
df[col] = ""
|
||||
|
||||
today_date = datetime.now().date()
|
||||
valid_workers = []
|
||||
has_expired = False
|
||||
|
||||
for row in df.to_dict(orient="records"):
|
||||
fio = str(row.get("fio", "")).strip()
|
||||
if not fio:
|
||||
continue
|
||||
|
||||
d_to_str = str(row.get("date_to", "")).strip()
|
||||
if d_to_str and d_to_str.lower() not in ["nan", "none", ""]:
|
||||
try:
|
||||
d_to = datetime.strptime(d_to_str.replace('_', '.'), "%d.%m.%Y").date()
|
||||
# Если срок завершился вчера или ранее — запись удаляется из файла
|
||||
if today_date > d_to:
|
||||
has_expired = True
|
||||
continue
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
valid_workers.append(row)
|
||||
|
||||
# Синхронная перезапись файла при обнаружении истекших сроков
|
||||
if has_expired:
|
||||
_save_workers(valid_workers)
|
||||
|
||||
return valid_workers
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
def _save_workers(workers: List[Dict[str, Any]]):
|
||||
"""Сохраняет актуальный список в CSV с сохранением колонок."""
|
||||
df = pd.DataFrame(workers)
|
||||
for col in ["fio", "department", "reason", "date_from", "date_to"]:
|
||||
if col not in df.columns:
|
||||
df[col] = ""
|
||||
os.makedirs(os.path.dirname(CSV_PATH), exist_ok=True)
|
||||
df.to_csv(CSV_PATH, index=False, encoding="utf-8")
|
||||
|
||||
|
||||
class RemoteWorkerItem(BaseModel):
|
||||
fio: str
|
||||
department: Optional[str] = "Все"
|
||||
reason: Optional[str] = "Удаленная работа"
|
||||
date_from: Optional[str] = ""
|
||||
date_to: Optional[str] = ""
|
||||
|
||||
|
||||
class UpdateDatesRequest(BaseModel):
|
||||
fio: str
|
||||
date_from: Optional[str] = ""
|
||||
date_to: Optional[str] = ""
|
||||
|
||||
|
||||
@router.get("")
|
||||
def api_get_remote_workers(current_user = Depends(get_current_user)):
|
||||
return {"workers": _load_workers()}
|
||||
|
||||
|
||||
@router.post("")
|
||||
def api_add_remote_worker(item: RemoteWorkerItem, current_user = Depends(get_current_user)):
|
||||
workers = _load_workers()
|
||||
fio_clean = item.fio.strip()
|
||||
if not fio_clean:
|
||||
raise HTTPException(status_code=400, detail="ФИО не может быть пустым")
|
||||
|
||||
# Если начало не указано — берем сегодня
|
||||
today_str = datetime.now().strftime("%d.%m.%Y")
|
||||
date_from = item.date_from.strip() if item.date_from and item.date_from.strip() else today_str
|
||||
date_to = item.date_to.strip() if item.date_to else ""
|
||||
|
||||
# Проверка на совпадение ФИО (обновление существующей записи)
|
||||
for w in workers:
|
||||
if str(w.get("fio", "")).strip().lower() == fio_clean.lower():
|
||||
w["department"] = item.department.strip() if item.department else (w.get("department") or "Все")
|
||||
w["reason"] = item.reason.strip() if item.reason else (w.get("reason") or "Удаленная работа")
|
||||
w["date_from"] = date_from
|
||||
w["date_to"] = date_to
|
||||
_save_workers(workers)
|
||||
return {"status": "success", "message": "Срок удаленки обновлен", "workers": workers}
|
||||
|
||||
workers.append({
|
||||
"fio": fio_clean,
|
||||
"department": item.department.strip() if item.department else "Все",
|
||||
"reason": item.reason.strip() if item.reason else "Удаленная работа",
|
||||
"date_from": date_from,
|
||||
"date_to": date_to
|
||||
})
|
||||
_save_workers(workers)
|
||||
return {"status": "success", "workers": workers}
|
||||
|
||||
|
||||
@router.put("")
|
||||
def api_update_worker_dates(req: UpdateDatesRequest, current_user = Depends(get_current_user)):
|
||||
"""Редактирование срока удаленки (продление или сокращение)."""
|
||||
workers = _load_workers()
|
||||
target_fio = req.fio.strip().lower()
|
||||
found = False
|
||||
|
||||
for w in workers:
|
||||
if str(w.get("fio", "")).strip().lower() == target_fio:
|
||||
w["date_from"] = req.date_from.strip() if req.date_from is not None else w.get("date_from", "")
|
||||
w["date_to"] = req.date_to.strip() if req.date_to is not None else w.get("date_to", "")
|
||||
found = True
|
||||
break
|
||||
|
||||
if not found:
|
||||
raise HTTPException(status_code=404, detail="Сотрудник не найден в списке")
|
||||
|
||||
_save_workers(workers)
|
||||
return {"status": "success", "message": "Сроки успешно изменены", "workers": workers}
|
||||
|
||||
|
||||
@router.delete("")
|
||||
def api_delete_remote_worker(fio: str, current_user = Depends(get_current_user)):
|
||||
workers = _load_workers()
|
||||
fio_clean = fio.strip().lower()
|
||||
initial_len = len(workers)
|
||||
workers = [w for w in workers if str(w.get("fio", "")).strip().lower() != fio_clean]
|
||||
|
||||
if len(workers) == initial_len:
|
||||
raise HTTPException(status_code=404, detail="Сотрудник не найден")
|
||||
|
||||
_save_workers(workers)
|
||||
return {"status": "success", "workers": workers}
|
||||
@@ -0,0 +1,53 @@
|
||||
"""
|
||||
===============================================================================
|
||||
FILE: modules/web_api/routers/snapshots.py
|
||||
ROLE: REST API эндпоинты для управления и моментального создания срезов СКУД.
|
||||
===============================================================================
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from pydantic import BaseModel
|
||||
from typing import Optional, List, Dict, Any
|
||||
|
||||
from routers.auth import get_current_user
|
||||
from services.snapshots.service import get_snapshots_registry, delete_snapshots_safely
|
||||
from services.scud_export import run_export
|
||||
|
||||
router = APIRouter(prefix="/api/v1/snapshots", tags=["Snapshots"])
|
||||
|
||||
|
||||
class CreateSnapshotRequest(BaseModel):
|
||||
date_str: Optional[str] = None
|
||||
|
||||
|
||||
class DeleteSnapshotsRequest(BaseModel):
|
||||
snapshot_ids: List[str]
|
||||
|
||||
|
||||
@router.get("")
|
||||
def api_get_snapshots(date_str: Optional[str] = None, current_user = Depends(get_current_user)):
|
||||
return get_snapshots_registry(date_str=date_str)
|
||||
|
||||
|
||||
@router.post("/create")
|
||||
def api_create_instant_snapshot(req: CreateSnapshotRequest, current_user = Depends(get_current_user)):
|
||||
"""Моментальный опрос MS SQL СКУД и запись свежего среза в SQLite."""
|
||||
try:
|
||||
success = run_export(input_date=req.date_str, save_xlsx=True, debug=False)
|
||||
if not success:
|
||||
raise HTTPException(status_code=500, detail="Ошибка при обращении к MS SQL Орион")
|
||||
|
||||
fresh_data = get_snapshots_registry(date_str=req.date_str)
|
||||
return {"status": "success", "message": "Срез успешно создан", "data": fresh_data}
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=500, detail=f"Ошибка создания среза: {str(e)}")
|
||||
|
||||
|
||||
@router.delete("")
|
||||
def api_delete_snapshots(req: DeleteSnapshotsRequest, current_user = Depends(get_current_user)):
|
||||
safe_ids = [s for s in req.snapshot_ids if not str(s).startswith("Y")]
|
||||
if not safe_ids:
|
||||
raise HTTPException(status_code=400, detail="Итоговый Y-срез защищен от удаления")
|
||||
|
||||
res = delete_snapshots_safely(snapshot_ids=safe_ids)
|
||||
return {"status": "success", "deleted_count": res.get("deleted_count", len(safe_ids))}
|
||||
Reference in New Issue
Block a user