v1.7.0: refactor max_bot to flat structure, add VCF+UserModel+NLP history context, portal pages and proxy fixes
- Refactored max_bot from nested packages to flat module structure - Q2: Extended BotUser model (patronymic, email, org, address, vcf_raw, contact_hash, phone_verified, email_verified, last_interaction, total_conversations, total_tickets) - Q2: VCF parser (FN, N, TEL, EMAIL, ORG, ADR), upsert on re-contact, NLP history context (_get_user_history_context -> YandexGPT) - Q1: Broadcast preview modal with 10s confirmation timer - Q3: CSS var(--white)->var(--bg-card), var(--text)->var(--text-primary) - Q4: bot_settings showNotification(), editable max_bot_id - Q5: Webhook secret passthrough via X-Max-Bot-Api-Secret - Masking sensitive keys, dialog_cleared handler, migrate via _add_column_if_not_exists() - Rate limit (asyncio.sleep 0.5 per 10), dead code removed, conv.intent context in contact.py - Portal pages: bot_consent, bot_kb (edit), bot_settings, bot_test, bot_tickets, portal_settings - Tests: 21/21 passing, added test_yandex_gpt.py, test_email_sender.py - Deploy: deploy_full.sh, schema.sql, seed_knowledge_base.sql
This commit is contained in:
+54
-1
@@ -1,4 +1,5 @@
|
||||
import os
|
||||
import asyncio
|
||||
from contextlib import asynccontextmanager
|
||||
from fastapi import FastAPI, Request, Depends
|
||||
from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
|
||||
@@ -63,7 +64,7 @@ SEED_COEFFICIENTS = [
|
||||
|
||||
async def seed_initial_data():
|
||||
from sqlalchemy import text, select, func
|
||||
from app.models.models import FormulaCoefficient, User
|
||||
from app.models.models import FormulaCoefficient, User, RoleMenuPermission
|
||||
|
||||
async with async_session() as db:
|
||||
try:
|
||||
@@ -74,6 +75,24 @@ async def seed_initial_data():
|
||||
db.add(FC(key=key, value=value, description=desc, formula_ref=ref))
|
||||
await db.commit()
|
||||
|
||||
# Seed default role menu permissions if table is empty
|
||||
perm_count = await db.execute(select(func.count(RoleMenuPermission.id)))
|
||||
if perm_count.scalar() == 0:
|
||||
DEFAULT_PERMISSIONS = {
|
||||
"engineer": [
|
||||
"charts", "customers", "objects", "sla", "questionnaire", "passports",
|
||||
"tasks", "reports", "incidents", "tech_access", "docs",
|
||||
|
||||
],
|
||||
"technician": [
|
||||
"tasks", "reports", "incidents", "checklist",
|
||||
],
|
||||
}
|
||||
for role, keys in DEFAULT_PERMISSIONS.items():
|
||||
for key in keys:
|
||||
db.add(RoleMenuPermission(role=role, menu_key=key, visible=True))
|
||||
await db.commit()
|
||||
|
||||
await db.execute(text("DELETE FROM users WHERE login = 'admin'"))
|
||||
await db.commit()
|
||||
except Exception:
|
||||
@@ -91,6 +110,7 @@ async def lifespan(app: FastAPI):
|
||||
from app.calculations.engine import reload_coefficients
|
||||
await reload_coefficients(db)
|
||||
discover_docs()
|
||||
|
||||
yield
|
||||
|
||||
|
||||
@@ -116,6 +136,32 @@ class RoleGuardMiddleware(BaseHTTPMiddleware):
|
||||
app.add_middleware(RoleGuardMiddleware)
|
||||
app.add_middleware(SessionMiddleware, secret_key=settings.SECRET_KEY, max_age=settings.SESSION_TTL)
|
||||
|
||||
|
||||
class PermissionsMiddleware(BaseHTTPMiddleware):
|
||||
async def dispatch(self, request: Request, call_next):
|
||||
if "session" not in request.scope:
|
||||
request.state.role_permissions = {}
|
||||
return await call_next(request)
|
||||
from app.models.models import RoleMenuPermission
|
||||
from sqlalchemy import select
|
||||
user = request.session.get("user")
|
||||
if user and user.get("role") in ("engineer", "technician"):
|
||||
from app.database import async_session
|
||||
async with async_session() as db:
|
||||
result = await db.execute(
|
||||
select(RoleMenuPermission).where(RoleMenuPermission.role == user["role"])
|
||||
)
|
||||
request.state.role_permissions = {
|
||||
row.menu_key: row.visible for row in result.scalars().all()
|
||||
}
|
||||
else:
|
||||
request.state.role_permissions = {}
|
||||
response = await call_next(request)
|
||||
return response
|
||||
|
||||
|
||||
app.add_middleware(PermissionsMiddleware)
|
||||
|
||||
app.include_router(documents_router)
|
||||
|
||||
from app.routers.service_pages import router as service_pages_router
|
||||
@@ -210,8 +256,15 @@ async def dashboard(request: Request, db: AsyncSession = Depends(get_db), user:
|
||||
shs_alert = f"SHS ниже 70 ({stats['shs']['shs_score']}) — {stats['shs']['shs_status']}"
|
||||
|
||||
now = __import__("datetime").datetime.now().strftime("%d.%m.%Y %H:%M")
|
||||
original_user = request.session.get("original_user")
|
||||
available_roles = {"owner": ["owner", "engineer", "technician"], "engineer": ["engineer", "technician"]}
|
||||
return templates.TemplateResponse("dashboard.html", {
|
||||
"request": request, "stats": stats, "shs_alert": shs_alert, "now": now, "user": user,
|
||||
"active_page": "dashboard",
|
||||
"role_permissions": getattr(request.state, 'role_permissions', {}),
|
||||
"role_override_active": original_user is not None,
|
||||
"original_role": original_user["role"] if original_user else None,
|
||||
"available_roles": available_roles.get(user["role"], [user["role"]]) if user else [],
|
||||
})
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user