Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37b612b8c4 | ||
|
|
44814b7293 | ||
|
|
c09620e6d3 | ||
|
|
07652d044c | ||
|
|
ae4c76aa62 | ||
|
|
a4ee3d25f0 | ||
|
|
7780b484f3 | ||
|
|
28967c7c37 | ||
|
|
2a2fdb171e | ||
|
|
afbfbad19e | ||
|
|
461c3d02ea | ||
|
|
64655ad934 | ||
|
|
db3072d759 | ||
|
|
b3e103954f | ||
|
|
bde6ec6855 | ||
|
|
ade93d959b | ||
|
|
bc044650ac | ||
|
|
473b884ed8 |
@@ -37,3 +37,13 @@ GITEA_URL=https://gitea.24studbank.ru
|
||||
GITEA_REPO=MedITron/PTSRaiAgent
|
||||
GITEA_USER=
|
||||
GITEA_TOKEN=
|
||||
# MAX notifications: keep disabled until the backend/channel PRs and a real bot are installed.
|
||||
MAX_ENABLED=false
|
||||
MAX_BOT_TOKEN=
|
||||
MAX_BOT_USERNAME=
|
||||
MAX_WEBHOOK_SECRET=
|
||||
MAX_WEBHOOK_URL=
|
||||
MAX_SITE_URL=
|
||||
# Optional path to a trusted PEM CA bundle; never disable TLS verification.
|
||||
MAX_CA_BUNDLE=
|
||||
MAX_LINK_TTL_SECONDS=600
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
# Dashboard-only Streamlit settings (doctor dashboard + demo console).
|
||||
[theme]
|
||||
base = "light"
|
||||
primaryColor = "#2A78D6"
|
||||
backgroundColor = "#F6F7F9"
|
||||
primaryColor = "#285E4E"
|
||||
backgroundColor = "#F6F7F3"
|
||||
secondaryBackgroundColor = "#FFFFFF"
|
||||
textColor = "#1B1F24"
|
||||
borderColor = "#E3E6EA"
|
||||
textColor = "#213B38"
|
||||
borderColor = "#E1E7E3"
|
||||
baseRadius = "medium"
|
||||
# Falls back to the system sans-serif when offline (ADR-004).
|
||||
font = "Inter:https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap, sans-serif"
|
||||
headingFontWeights = 700
|
||||
font = "sans-serif"
|
||||
headingFontWeights = 600
|
||||
|
||||
[client]
|
||||
toolbarMode = "minimal"
|
||||
|
||||
+2
-1
@@ -16,6 +16,7 @@ from app.api.schemas import (
|
||||
PatientListItem,
|
||||
SeriesPoint,
|
||||
)
|
||||
from app.core.safety import fill_phones
|
||||
from app.integrations.base import Prescription
|
||||
|
||||
TZ = ZoneInfo("Europe/Moscow")
|
||||
@@ -262,7 +263,7 @@ def andrey_card() -> PatientCard:
|
||||
"Что помогает: прогулка с собакой, душ",
|
||||
"Люди и места: брат Олег, спортзал",
|
||||
"Кому звонить: жена, сослуживец Миша",
|
||||
"Специалисты: д-р Смирнова, 8-800-2000-122, 112",
|
||||
fill_phones("Специалисты: д-р Смирнова, {phone:helpline}, 112"),
|
||||
"Безопасная среда: ружьё хранится у брата",
|
||||
],
|
||||
summary="За 13 дней: приверженность 12/13, эпизод намерения бросить на 5-й день (снят после звонка врача). "
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
"""Server API for a future MAX connect UI; webhook processing is supplied by the channel adapter."""
|
||||
|
||||
import hmac
|
||||
import json
|
||||
import re
|
||||
from datetime import datetime
|
||||
from typing import Annotated, Literal
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
|
||||
from app.config import get_settings
|
||||
from app.core import clock
|
||||
from app.db import repo
|
||||
from app.db.max_notifications import MaxBinding, MaxDelivery
|
||||
from app.db.session import get_clinical_session, get_identity_session
|
||||
from app.integrations import max_store
|
||||
|
||||
router = APIRouter(tags=["max-notifications"])
|
||||
bearer = HTTPBearer(auto_error=False)
|
||||
|
||||
|
||||
async def patient_token(auth: Annotated[HTTPAuthorizationCredentials | None, Depends(bearer)]) -> str:
|
||||
if auth is None or auth.scheme.lower() != "bearer" or not re.fullmatch(r"[A-Za-z0-9_-]{1,64}", auth.credentials):
|
||||
raise HTTPException(401, "patient authentication required", headers={"WWW-Authenticate": "Bearer"})
|
||||
async with get_clinical_session() as session:
|
||||
if await repo.get_profile(session, auth.credentials) is None:
|
||||
raise HTTPException(401, "patient authentication required")
|
||||
return auth.credentials
|
||||
|
||||
|
||||
PatientToken = Annotated[str, Depends(patient_token)]
|
||||
|
||||
|
||||
class MaxStatus(BaseModel):
|
||||
available: bool
|
||||
connected: bool
|
||||
last_delivery: str | None = None
|
||||
|
||||
|
||||
class LinkConsent(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
consent: Literal[True]
|
||||
|
||||
|
||||
class MaxLink(BaseModel):
|
||||
url: str
|
||||
expires_at: datetime
|
||||
|
||||
|
||||
@router.get("/me/notifications/max", response_model=MaxStatus)
|
||||
async def status(token: PatientToken) -> MaxStatus:
|
||||
async with get_identity_session() as session:
|
||||
binding = await session.get(MaxBinding, token)
|
||||
last = await session.scalar(
|
||||
select(MaxDelivery.state)
|
||||
.where(MaxDelivery.token == token)
|
||||
.order_by(MaxDelivery.created_at.desc(), MaxDelivery.id.desc())
|
||||
.limit(1)
|
||||
)
|
||||
return MaxStatus(
|
||||
available=get_settings().max_enabled, connected=bool(binding and binding.enabled), last_delivery=last
|
||||
)
|
||||
|
||||
|
||||
@router.post("/me/notifications/max/link", response_model=MaxLink)
|
||||
async def link(body: LinkConsent, token: PatientToken) -> MaxLink:
|
||||
settings = get_settings()
|
||||
if not settings.max_enabled:
|
||||
raise HTTPException(503, "MAX is not configured")
|
||||
if not await max_store.active_patient(token):
|
||||
raise HTTPException(403, "active consent and adult confirmation required")
|
||||
async with get_identity_session() as session:
|
||||
raw, expires = await max_store.issue_code(session, token, clock.now(), settings.max_link_ttl_seconds)
|
||||
return MaxLink(url=f"https://max.ru/{settings.max_bot_username}?start={raw}", expires_at=expires)
|
||||
|
||||
|
||||
@router.delete("/me/notifications/max", response_model=MaxStatus)
|
||||
async def unlink(token: PatientToken) -> MaxStatus:
|
||||
async with get_identity_session() as session:
|
||||
await max_store.disconnect(session, token)
|
||||
return MaxStatus(available=get_settings().max_enabled, connected=False)
|
||||
|
||||
|
||||
@router.post("/webhooks/max")
|
||||
async def webhook(request: Request) -> dict[str, bool]:
|
||||
settings = get_settings()
|
||||
if not settings.max_enabled:
|
||||
raise HTTPException(503, "MAX is not configured")
|
||||
expected = settings.max_webhook_secret.get_secret_value().encode()
|
||||
supplied = request.headers.get("X-Max-Bot-Api-Secret", "").encode()
|
||||
if not expected or not hmac.compare_digest(supplied, expected):
|
||||
raise HTTPException(403, "invalid webhook secret")
|
||||
raw = bytearray()
|
||||
async for chunk in request.stream():
|
||||
raw.extend(chunk)
|
||||
if len(raw) > 65536:
|
||||
raise HTTPException(413, "event is too large")
|
||||
try:
|
||||
event = json.loads(raw)
|
||||
except (ValueError, UnicodeError) as exc:
|
||||
raise HTTPException(400, "invalid JSON") from exc
|
||||
if not isinstance(event, dict):
|
||||
raise HTTPException(422, "event must be an object")
|
||||
from app.channels.max_bot import handle_update
|
||||
|
||||
try:
|
||||
await handle_update(event)
|
||||
except SQLAlchemyError:
|
||||
# Let MAX retry; do not log DB exception parameters containing identity data.
|
||||
raise HTTPException(503, "notification storage unavailable") from None
|
||||
return {"success": True}
|
||||
+2
-1
@@ -15,7 +15,7 @@ from sqlalchemy import select
|
||||
|
||||
from app.api import demo as console
|
||||
from app.api import doctor_views as views
|
||||
from app.api import fixtures
|
||||
from app.api import fixtures, max_notifications
|
||||
from app.api.patient_web import router as patient_web_router
|
||||
from app.api.questionnaire import router as questionnaire_router
|
||||
from app.api.schemas import (
|
||||
@@ -46,6 +46,7 @@ from app.scheduler import jobs as scheduler
|
||||
from app.services.monitoring import refresh_status
|
||||
|
||||
router = APIRouter(prefix="/api/v1")
|
||||
router.include_router(max_notifications.router)
|
||||
router.include_router(questionnaire_router)
|
||||
router.include_router(patient_web_router)
|
||||
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
# Подключение будущего бота MAX
|
||||
|
||||
Серверная часть готова к подключению. Сам бот ещё не создан, секреты не заполнены,
|
||||
реальная отправка не включена. Изменений интерфейса сайта в этой поставке нет.
|
||||
Интеграция уведомляет **самого пациента**; врачебные оповещения остаются в существующем канале проекта.
|
||||
|
||||
## Что реализовано
|
||||
|
||||
- Одноразовая ссылка для привязки аккаунта MAX к текущему пациенту сайта, срок по умолчанию 10 минут.
|
||||
- Подтверждение подключения, `/help`, `/stop`, отключение при остановке или удалении бота в MAX.
|
||||
- Нейтральные напоминания из существующего планировщика сайта: тесты, дневник, приём лекарств и другие события outbox.
|
||||
- Уведомление о завершении теста: сервер каждые примерно 30 секунд находит новые завершённые
|
||||
`QuestionnaireRecord` и `ScaleResult`, начиная с момента подключения MAX. Незавершённые и старые тесты не отправляются.
|
||||
- Постоянная очередь, восстановление после перезапуска, ограниченные повторы при сетевых ошибках и ответах 429/5xx.
|
||||
- В сообщении только короткий текст и кнопка на сайт. Ответы, оценки, диагнозы, назначения и ключ входа на сайт
|
||||
в MAX не передаются. Переписка с ботом не сохраняется и не отправляется в LLM.
|
||||
|
||||
## 1. Создать бота — будущему владельцу
|
||||
|
||||
1. Открыть [MAX для партнёров](https://business.max.ru/) и пройти регистрацию/проверку профиля.
|
||||
Условия допуска зависят от типа владельца; актуальный порядок — в
|
||||
[официальной инструкции подключения](https://dev.max.ru/help/platform_connection).
|
||||
2. Создать чат-бота, оформить описание и пройти требуемую MAX модерацию.
|
||||
3. В настройках бота получить токен и скопировать имя из его публичной ссылки `https://max.ru/ИМЯ`.
|
||||
4. Передать администратору сервера имя бота, а токен — через защищённое хранилище секретов.
|
||||
Токен не нужен в переписке, MR или репозитории.
|
||||
|
||||
## 2. Заполнить настройки сервера
|
||||
|
||||
Нужны доступная identity/clinical БД проекта, публичный HTTPS-адрес сайта и HTTPS-адрес API на порту 443.
|
||||
Входящие POST от MAX должны доходить до API без браузерной CAPTCHA или страницы авторизации.
|
||||
Прокси должен передавать заголовок `X-Max-Bot-Api-Secret` и не журналировать тело webhook/Authorization.
|
||||
Дополнительные таблицы identity создаются существующим `init_db()` при запуске приложения.
|
||||
|
||||
В `.env` сервера (вне Git) заполнить:
|
||||
|
||||
```dotenv
|
||||
MAX_ENABLED=false
|
||||
MAX_BOT_TOKEN=
|
||||
MAX_BOT_USERNAME=
|
||||
MAX_WEBHOOK_SECRET=
|
||||
MAX_WEBHOOK_URL=https://api.example.org/api/v1/webhooks/max
|
||||
MAX_SITE_URL=https://patient.example.org/
|
||||
MAX_LINK_TTL_SECONDS=600
|
||||
# При необходимости — PEM-файл доверенного CA, доступный внутри контейнера:
|
||||
MAX_CA_BUNDLE=
|
||||
DEMO_CLOCK=false
|
||||
```
|
||||
|
||||
- `MAX_BOT_USERNAME` — только имя, без `@`, домена или параметров ссылки.
|
||||
- `MAX_WEBHOOK_SECRET` — отдельная случайная строка, не токен бота: 32–256 символов из `A–Z a–z 0–9 _ -`.
|
||||
Сгенерировать локально, например `python -c 'import secrets; print(secrets.token_urlsafe(32))'`, сохранить в секреты.
|
||||
- `MAX_SITE_URL` ведёт в обычный личный кабинет; не добавлять в адрес ключи доступа или данные пациента.
|
||||
- Исходящие запросы идут на `https://platform-api2.max.ru`, токен передаётся заголовком `Authorization`.
|
||||
Верификация TLS всегда включена. Если системе нужен корневой сертификат Минцифры, установить его по
|
||||
официальной инструкции MAX и указать PEM-путь в `MAX_CA_BUNDLE`; не отключать проверку TLS.
|
||||
- Переменные должны попасть именно в окружение API-контейнера/процесса, а не только панели сайта.
|
||||
В текущем Compose сервис `app` уже получает `.env` через `env_file`.
|
||||
После изменения окружения пересоздать процесс/контейнер API. Новые зависимости не требуются.
|
||||
|
||||
## 3. Проверить и включить
|
||||
|
||||
В каталоге проекта, в том же окружении, где работает API:
|
||||
|
||||
```sh
|
||||
uv run python -m app.channels.max_setup check
|
||||
```
|
||||
|
||||
Команда проверит токен и совпадение имени бота. Сообщений пользователям она не отправляет.
|
||||
Затем установить `MAX_ENABLED=true`, перезапустить API и выполнить:
|
||||
|
||||
```sh
|
||||
uv run python -m app.channels.max_setup subscribe
|
||||
uv run python -m app.channels.max_setup status
|
||||
```
|
||||
|
||||
`subscribe` регистрирует только заданный webhook с секретом и событиями
|
||||
`bot_started`, `message_created`, `bot_stopped`, `dialog_removed`. Старые чужие подписки автоматически
|
||||
не удаляются: при переносе сервера владелец должен проверить их отдельно через MAX API.
|
||||
`status` проверяет регистрацию адреса; это ещё не проверка доступности сервера из MAX.
|
||||
Команды не печатают токены, секрет webhook или сырые ответы платформы.
|
||||
|
||||
При запуске через Compose вместо `uv run python ...` использовать
|
||||
`docker compose exec app python -m app.channels.max_setup check` (также `subscribe` и `status`).
|
||||
После изменения `.env` пересоздать API: `docker compose up -d --build --force-recreate app`.
|
||||
|
||||
Запускать один процесс API с MAX на один токен бота: его worker отправляет до одного сообщения в секунду.
|
||||
БД защищает очередь от параллельного захвата, но общий лимит скорости нескольких процессов не координируется.
|
||||
Планировщик и MAX worker запускаются вместе с FastAPI, отдельный процесс бота не нужен.
|
||||
При `MAX_ENABLED=false` сетевых вызовов MAX и фонового worker нет; сайт продолжает обычную работу.
|
||||
|
||||
## API для разработчика сайта
|
||||
|
||||
В проекте используется ключ текущего пациента, полученный при входе. Для этих ручек передавать его
|
||||
как `Authorization: Bearer <patient_token>`; это существующая авторизация прототипа, не новая система SSO.
|
||||
Не брать token другого пациента и не публиковать демонстрационные учётные записи для реального использования.
|
||||
|
||||
| Метод и путь | Запрос | Ответ |
|
||||
|---|---|---|
|
||||
| `GET /api/v1/me/notifications/max` | Authorization | `available`, `connected`, `last_delivery` |
|
||||
| `POST /api/v1/me/notifications/max/link` | Authorization; JSON `{"consent": true}` | `url`, `expires_at` |
|
||||
| `DELETE /api/v1/me/notifications/max` | Authorization | состояние с `connected: false` |
|
||||
| `POST /api/v1/webhooks/max` | MAX JSON + `X-Max-Bot-Api-Secret` | `{"success": true}` после записи события |
|
||||
|
||||
Поток подключения: пациент явно соглашается на уведомления → сайт получает `url` → открывает ссылку MAX →
|
||||
пользователь запускает бота → webhook подтверждает привязку → повторный GET показывает `connected: true`.
|
||||
Ссылка одноразовая; новая ссылка отменяет предыдущую. Изначальный ключ пациента не входит в URL MAX.
|
||||
Для привязки и доставки дополнительно нужны действующее согласие и подтверждение совершеннолетия в состоянии пациента.
|
||||
Активную привязку нельзя молча переназначить другому аккаунту: сначала отключить её.
|
||||
|
||||
Коды ошибок: 401 — неизвестный/отсутствующий ключ пациента; 403 — нет согласия или неверный секрет webhook;
|
||||
422 — неверный запрос; 413 — webhook больше 64 КиБ; 503 — MAX выключен или хранилище события недоступно.
|
||||
Повтор webhook с тем же идентификатором события не создаёт новых отправок. Групповые чаты игнорируются.
|
||||
|
||||
`last_delivery`: `queued`, `sending`, `sent`, `failed`, `cancelled` или `null`.
|
||||
`sent` означает принятие сообщения API MAX, а не прочтение человеком.
|
||||
|
||||
## Пробное подключение после создания бота
|
||||
|
||||
1. Войти на сайте синтетическим пациентом и дать необходимые согласия.
|
||||
2. Получить ссылку через POST выше (Swagger `/docs` или будущий интерфейс сайта), перейти в MAX и запустить бота.
|
||||
3. Убедиться, что GET показывает `connected: true` и приходит подтверждение.
|
||||
4. Завершить тест на сайте; примерно через 30 секунд плюс очередь должно прийти сообщение без результатов.
|
||||
5. Дождаться события планировщика и проверить нейтральное напоминание с кнопкой на сайт.
|
||||
6. Отправить `/stop`: GET должен показать `connected: false`, ожидающие уведомления отменяются.
|
||||
7. Повторить подключение новой ссылкой, проверить DELETE через API и остановку бота через интерфейс MAX.
|
||||
|
||||
При недоставке проверить настройки и подписку, доступность HTTPS, состояние очереди и коды ошибок в логах.
|
||||
`http_401`/`http_403` требуют проверки токена/прав; `http_429` — ожидания; `transport` — сети/TLS;
|
||||
`failed` после шести попыток требует вмешательства администратора. Детали ответов и идентификаторы в логи не выводятся.
|
||||
Отключение отменяет очередь; уже принятый MAX запрос отозвать невозможно.
|
||||
|
||||
## Гарантии и ограничения
|
||||
|
||||
Очередь и подтверждения событий сохраняются в identity БД. Клинические записи остаются в clinical БД.
|
||||
Для событий завершения тестов БД повторно просматривается после перезапуска; ключи уведомлений предотвращают
|
||||
повторную постановку. Напоминания используют существующий механизм outbox/повторов планировщика.
|
||||
При временных ошибках — до 6 попыток с увеличением задержки и учётом `Retry-After`; зависшая отправка получает
|
||||
новую аренду через 60 секунд. Потеря процесса между принятием сообщения MAX и записью успеха в БД может
|
||||
привести к повторному сообщению: MAX не предоставляет ключ идемпотентности отправки.
|
||||
Не удалять строки дедупликации/очереди без согласованной политики хранения. При большом количестве пациентов
|
||||
нужны пакетное сканирование завершённых тестов и общий ограничитель скорости; текущая реализация рассчитана на MVP.
|
||||
|
||||
Проверки разработчика: `make lint test`; тесты MAX работают с синтетикой и подменённым HTTP-транспортом.
|
||||
Реальную доставку подтвердит только пробное подключение после выдачи токена и настройки публичного сервера.
|
||||
|
||||
Официальные контракты: [отправка сообщений](https://dev.max.ru/docs-api/methods/POST/messages),
|
||||
[подписка webhook](https://dev.max.ru/docs-api/methods/POST/subscriptions),
|
||||
[события](https://dev.max.ru/docs-api/objects/Update),
|
||||
[ссылки запуска бота](https://dev.max.ru/docs/chatbots/bots-coding/prepare).
|
||||
@@ -0,0 +1,224 @@
|
||||
"""Notifications-only MAX adapter; no patient text enters the dialog engine or an LLM.
|
||||
|
||||
Webhook transactions persist receipts and replies together, then return immediately.
|
||||
The worker delivers from identity DB with leases and bounded retries. MAX has no send
|
||||
idempotency key: a crash after API acceptance and before commit can duplicate a message.
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import contextlib
|
||||
import json
|
||||
import logging
|
||||
from functools import lru_cache
|
||||
|
||||
import yaml
|
||||
from pydantic import BaseModel, Field
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from app.channels.max_client import MaxApiError, MaxClient
|
||||
from app.config import get_settings
|
||||
from app.core import clock
|
||||
from app.db.max_notifications import MaxBinding, MaxReceipt
|
||||
from app.db.session import get_identity_session
|
||||
from app.dialog.contracts import Reply
|
||||
from app.integrations import max_store as store
|
||||
from app.integrations.base import Outbox, integrations
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Texts(BaseModel):
|
||||
connected: str = Field(max_length=4000)
|
||||
not_connected: str = Field(max_length=4000)
|
||||
invalid: str = Field(max_length=4000)
|
||||
stopped: str = Field(max_length=4000)
|
||||
help: str = Field(max_length=4000)
|
||||
notification: str = Field(max_length=4000)
|
||||
completed: str = Field(max_length=4000)
|
||||
open_site: str = Field(max_length=128)
|
||||
|
||||
|
||||
@lru_cache
|
||||
def texts() -> Texts:
|
||||
path = get_settings().config_dir / "texts" / "max.yaml"
|
||||
return Texts.model_validate(yaml.safe_load(path.read_text(encoding="utf-8")))
|
||||
|
||||
|
||||
def _event(event: dict) -> tuple[str, int, str, str] | None:
|
||||
"""Normalize only documented private-user events; unknown/malformed events are ignored."""
|
||||
kind = event.get("update_type")
|
||||
stamp = event.get("timestamp")
|
||||
if type(stamp) is not int or stamp < 0:
|
||||
return None
|
||||
message_id = ""
|
||||
if kind == "message_created":
|
||||
message = event.get("message")
|
||||
if not isinstance(message, dict):
|
||||
return None
|
||||
recipient, body = message.get("recipient"), message.get("body")
|
||||
if not isinstance(recipient, dict) or recipient.get("chat_type") != "dialog" or not isinstance(body, dict):
|
||||
return None
|
||||
user, text, message_id = message.get("sender"), body.get("text"), body.get("mid")
|
||||
if not isinstance(message_id, str) or not message_id or not isinstance(text, str):
|
||||
return None
|
||||
elif kind in ("bot_started", "bot_stopped", "dialog_removed"):
|
||||
user, text = event.get("user"), event.get("payload") or ""
|
||||
else:
|
||||
return None
|
||||
if not isinstance(user, dict) or user.get("is_bot") is not False:
|
||||
return None
|
||||
uid = user.get("user_id")
|
||||
if type(uid) is not int or not 0 < uid < 2**63 or not isinstance(text, str) or len(text) > 4000:
|
||||
return None
|
||||
# Names, profile details and raw text are neither persisted nor logged.
|
||||
receipt = store.digest(f"{kind}:{uid}:{message_id or stamp}")
|
||||
return kind, uid, text.strip(), receipt
|
||||
|
||||
|
||||
async def handle_update(event: dict) -> None:
|
||||
if not get_settings().max_enabled or (parsed := _event(event)) is None:
|
||||
return
|
||||
kind, user_id, text, receipt = parsed
|
||||
now = clock.now()
|
||||
try:
|
||||
async with get_identity_session() as session:
|
||||
if await session.get(MaxReceipt, receipt):
|
||||
return
|
||||
session.add(MaxReceipt(digest=receipt, received_at=now))
|
||||
await session.flush()
|
||||
binding = await session.scalar(select(MaxBinding).where(MaxBinding.user_id == user_id))
|
||||
reply_token = None
|
||||
command, _, payload = text.partition(" ")
|
||||
if kind in ("bot_stopped", "dialog_removed") or command.lower() == "/stop":
|
||||
if binding:
|
||||
await store.disconnect(session, binding.token)
|
||||
# When MAX itself stops/deletes the bot, do not attempt a reply.
|
||||
if kind != "message_created":
|
||||
return
|
||||
reply = "stopped"
|
||||
elif kind == "bot_started" or command.lower() == "/start":
|
||||
code = text if kind == "bot_started" else payload.strip()
|
||||
if code:
|
||||
token = await store.code_token(session, code, now) if len(code) <= 128 else None
|
||||
linked = (
|
||||
token and await store.active_patient(token) and await store.bind(session, code, user_id, now)
|
||||
)
|
||||
reply = "connected" if linked else "invalid"
|
||||
reply_token = token if linked else None
|
||||
else:
|
||||
reply = "connected" if binding and binding.enabled else "not_connected"
|
||||
reply_token = binding.token if binding and binding.enabled else None
|
||||
else:
|
||||
reply = "help"
|
||||
await store.enqueue(session, key=receipt, user_id=user_id, token=reply_token, kind=reply, now=now)
|
||||
except IntegrityError:
|
||||
# A concurrent delivery of the same webhook can race on its receipt primary key.
|
||||
async with get_identity_session() as session:
|
||||
if await session.get(MaxReceipt, receipt) is None:
|
||||
raise
|
||||
|
||||
|
||||
class MaxOutbox:
|
||||
def __init__(self, fallback: Outbox):
|
||||
self.fallback = fallback
|
||||
|
||||
async def push(self, token: str, replies: list[Reply]) -> None:
|
||||
if replies and get_settings().max_enabled and await store.active_patient(token):
|
||||
async with get_identity_session() as session:
|
||||
binding = await session.get(MaxBinding, token)
|
||||
if binding and binding.enabled:
|
||||
# Hash the event for retry deduplication; never store/transmit its clinical text.
|
||||
event = json.dumps([r.model_dump() for r in replies], sort_keys=True, ensure_ascii=False)
|
||||
key = store.digest(f"{token}:{binding.connected_at.isoformat()}:{clock.today()}:{event}")
|
||||
await store.enqueue(
|
||||
session, key=key, user_id=binding.user_id, token=token, kind="notification", now=clock.now()
|
||||
)
|
||||
await self.fallback.push(token, replies)
|
||||
|
||||
|
||||
async def deliver_one(client: MaxClient) -> bool:
|
||||
async with get_identity_session() as session:
|
||||
row = await store.claim(session, clock.now())
|
||||
if row is None:
|
||||
return False
|
||||
if row.token is not None:
|
||||
async with get_identity_session() as session:
|
||||
binding = await session.get(MaxBinding, row.token)
|
||||
valid = (
|
||||
binding
|
||||
and binding.enabled
|
||||
and binding.user_id == row.user_id
|
||||
and binding.connected_at <= row.created_at
|
||||
)
|
||||
if not valid or not await store.active_patient(row.token):
|
||||
async with get_identity_session() as session:
|
||||
await store.finish(session, row, state="cancelled", now=clock.now())
|
||||
return True
|
||||
settings, messages = get_settings(), texts()
|
||||
try:
|
||||
await client.send(
|
||||
row.user_id, getattr(messages, row.kind), site_url=settings.max_site_url, button=messages.open_site
|
||||
)
|
||||
except MaxApiError as exc:
|
||||
retry = exc.retryable and row.attempts < store.MAX_ATTEMPTS
|
||||
delay = max(exc.retry_after, min(300, 5 * 2 ** (row.attempts - 1)))
|
||||
async with get_identity_session() as session:
|
||||
await store.finish(
|
||||
session,
|
||||
row,
|
||||
state="queued" if retry else "failed",
|
||||
now=clock.now(),
|
||||
error=exc.code,
|
||||
retry_seconds=delay if retry else 0,
|
||||
)
|
||||
log.warning("MAX delivery deferred=%s code=%s", retry, exc.code)
|
||||
else:
|
||||
async with get_identity_session() as session:
|
||||
await store.finish(session, row, state="sent", now=clock.now())
|
||||
return True
|
||||
|
||||
|
||||
async def _run(client: MaxClient) -> None:
|
||||
tick = 0
|
||||
while True:
|
||||
try:
|
||||
if tick % 30 == 0:
|
||||
async with get_identity_session() as session:
|
||||
await store.collect_completed(session, clock.now())
|
||||
await deliver_one(client)
|
||||
except Exception as exc:
|
||||
# No exception text: SQL/HTTP errors may contain identifiers or parameters.
|
||||
log.error("MAX worker failed type=%s", type(exc).__name__)
|
||||
tick += 1
|
||||
# One send per second per process, below MAX's two-per-second per-dialog limit.
|
||||
await asyncio.sleep(1)
|
||||
|
||||
|
||||
_client: MaxClient | None = None
|
||||
_task: asyncio.Task | None = None
|
||||
_wrapper: MaxOutbox | None = None
|
||||
|
||||
|
||||
async def start() -> None:
|
||||
global _client, _task, _wrapper
|
||||
if not get_settings().max_enabled or _task is not None:
|
||||
return
|
||||
texts() # Validate templates before replacing a working outbox.
|
||||
_client = MaxClient(get_settings())
|
||||
_wrapper = MaxOutbox(integrations.outbox)
|
||||
integrations.outbox = _wrapper
|
||||
_task = asyncio.create_task(_run(_client), name="max-notifications")
|
||||
|
||||
|
||||
async def stop() -> None:
|
||||
global _client, _task, _wrapper
|
||||
if _task:
|
||||
_task.cancel()
|
||||
with contextlib.suppress(asyncio.CancelledError):
|
||||
await _task
|
||||
if _wrapper and integrations.outbox is _wrapper:
|
||||
integrations.outbox = _wrapper.fallback
|
||||
if _client:
|
||||
await _client.close()
|
||||
_client = _task = _wrapper = None
|
||||
@@ -0,0 +1,101 @@
|
||||
"""Small MAX Bot API client. Secrets stay in headers; failures never expose response bodies."""
|
||||
|
||||
import logging
|
||||
import ssl
|
||||
|
||||
import httpx
|
||||
|
||||
from app.config import Settings
|
||||
|
||||
API_URL = "https://platform-api2.max.ru"
|
||||
UPDATE_TYPES = ["bot_started", "message_created", "bot_stopped", "dialog_removed"]
|
||||
|
||||
|
||||
class _HideRecipient(logging.Filter):
|
||||
def filter(self, record: logging.LogRecord) -> bool:
|
||||
# httpx INFO normally logs query strings, which include a MAX user_id.
|
||||
return "platform-api2.max.ru" not in record.getMessage()
|
||||
|
||||
|
||||
logging.getLogger("httpx").addFilter(_HideRecipient())
|
||||
|
||||
|
||||
class MaxApiError(Exception):
|
||||
def __init__(self, code: str, *, retryable: bool = False, retry_after: float = 0):
|
||||
self.code, self.retryable, self.retry_after = code, retryable, retry_after
|
||||
super().__init__(code)
|
||||
|
||||
|
||||
class MaxClient:
|
||||
def __init__(self, settings: Settings, *, transport: httpx.AsyncBaseTransport | None = None):
|
||||
context = ssl.create_default_context()
|
||||
if settings.max_ca_bundle:
|
||||
context.load_verify_locations(cafile=str(settings.max_ca_bundle))
|
||||
self.http = httpx.AsyncClient(
|
||||
base_url=API_URL,
|
||||
headers={"Authorization": settings.max_bot_token.get_secret_value()},
|
||||
timeout=httpx.Timeout(5),
|
||||
verify=context,
|
||||
follow_redirects=False,
|
||||
transport=transport,
|
||||
)
|
||||
|
||||
async def close(self) -> None:
|
||||
await self.http.aclose()
|
||||
|
||||
async def request(self, method: str, path: str, **kwargs) -> dict:
|
||||
try:
|
||||
response = await self.http.request(method, path, **kwargs)
|
||||
except httpx.RequestError:
|
||||
raise MaxApiError("transport", retryable=True) from None
|
||||
if not response.is_success:
|
||||
try:
|
||||
delay = min(3600, max(0, float(response.headers.get("Retry-After", "0"))))
|
||||
except ValueError:
|
||||
delay = 0
|
||||
raise MaxApiError(
|
||||
f"http_{response.status_code}",
|
||||
retryable=response.status_code in (408, 429) or response.status_code >= 500,
|
||||
retry_after=delay,
|
||||
)
|
||||
try:
|
||||
data = response.json()
|
||||
except ValueError:
|
||||
raise MaxApiError("invalid_response", retryable=True) from None
|
||||
if not isinstance(data, dict):
|
||||
raise MaxApiError("invalid_response", retryable=True)
|
||||
if data.get("success") is False:
|
||||
raise MaxApiError("rejected")
|
||||
return data
|
||||
|
||||
async def send(self, user_id: int, text: str, *, site_url: str, button: str) -> None:
|
||||
data = await self.request(
|
||||
"POST",
|
||||
"/messages",
|
||||
params={"user_id": user_id, "disable_link_preview": "true"},
|
||||
json={
|
||||
"text": text,
|
||||
"notify": True,
|
||||
"attachments": [
|
||||
{
|
||||
"type": "inline_keyboard",
|
||||
"payload": {"buttons": [[{"type": "link", "text": button, "url": site_url}]]},
|
||||
}
|
||||
],
|
||||
},
|
||||
)
|
||||
if not isinstance(data.get("message"), dict):
|
||||
raise MaxApiError("missing_message", retryable=True)
|
||||
|
||||
async def subscribe(self, settings: Settings) -> None:
|
||||
data = await self.request(
|
||||
"POST",
|
||||
"/subscriptions",
|
||||
json={
|
||||
"url": settings.max_webhook_url,
|
||||
"update_types": UPDATE_TYPES,
|
||||
"secret": settings.max_webhook_secret.get_secret_value(),
|
||||
},
|
||||
)
|
||||
if data.get("success") is not True:
|
||||
raise MaxApiError("subscription_not_confirmed")
|
||||
@@ -0,0 +1,56 @@
|
||||
"""Operator commands for a future bot owner. Never runs as part of application startup."""
|
||||
|
||||
import argparse
|
||||
import asyncio
|
||||
import sys
|
||||
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app.channels.max_client import MaxApiError, MaxClient
|
||||
from app.config import Settings
|
||||
|
||||
|
||||
async def run(command: str) -> None:
|
||||
# Validate the same configuration even while the deployed app is still disabled.
|
||||
settings = Settings(max_enabled=True)
|
||||
client = MaxClient(settings)
|
||||
try:
|
||||
bot = await client.request("GET", "/me")
|
||||
if bot.get("is_bot") is not True:
|
||||
raise MaxApiError("not_a_bot")
|
||||
if bot.get("username") != settings.max_bot_username:
|
||||
raise MaxApiError("bot_username_mismatch")
|
||||
if command == "subscribe":
|
||||
await client.subscribe(settings)
|
||||
print("Webhook MAX зарегистрирован. Проверьте командой status, затем выполните пробное подключение.")
|
||||
elif command == "status":
|
||||
result = await client.request("GET", "/subscriptions")
|
||||
subscriptions = result.get("subscriptions", [])
|
||||
configured = any(isinstance(s, dict) and s.get("url") == settings.max_webhook_url for s in subscriptions)
|
||||
print("Нужный webhook зарегистрирован." if configured else "Нужный webhook не найден.")
|
||||
if not configured:
|
||||
raise MaxApiError("webhook_missing")
|
||||
else:
|
||||
print("Токен принят MAX, имя бота совпадает с настройкой. Подписка не изменялась.")
|
||||
finally:
|
||||
await client.close()
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description="Подготовка MAX: параметры берутся только из .env/окружения.")
|
||||
parser.add_argument("command", choices=("check", "subscribe", "status"))
|
||||
args = parser.parse_args()
|
||||
try:
|
||||
asyncio.run(run(args.command))
|
||||
except ValidationError:
|
||||
print("Проверьте параметры MAX в .env по app/channels/MAX_SETUP.md.", file=sys.stderr)
|
||||
return 1
|
||||
except (MaxApiError, OSError) as exc:
|
||||
code = exc.code if isinstance(exc, MaxApiError) else "tls_or_file_error"
|
||||
print(f"Не удалось выполнить настройку MAX: {code}. Секреты и ответ сервера скрыты.", file=sys.stderr)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
+35
-2
@@ -1,10 +1,12 @@
|
||||
"""Typed application settings. The only place that reads environment variables."""
|
||||
|
||||
import re
|
||||
from functools import lru_cache
|
||||
from pathlib import Path
|
||||
from typing import Literal
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
from pydantic import Field
|
||||
from pydantic import Field, SecretStr, model_validator
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
ROOT_DIR = Path(__file__).resolve().parent.parent
|
||||
@@ -12,7 +14,7 @@ ROOT_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
class Settings(BaseSettings):
|
||||
# Empty values in .env (e.g. `TG_BOT_TOKEN=`) fall back to defaults instead of failing validation.
|
||||
model_config = SettingsConfigDict(env_file=".env", extra="ignore", env_ignore_empty=True)
|
||||
model_config = SettingsConfigDict(env_file=".env", extra="ignore", env_ignore_empty=True, hide_input_in_errors=True)
|
||||
|
||||
# Two separate databases (ADR-003): identity holds direct identifiers, clinical holds pseudonymised data.
|
||||
identity_db_url: str = "postgresql+asyncpg://identity_app:identity_app@localhost:5432/identity"
|
||||
@@ -35,6 +37,7 @@ class Settings(BaseSettings):
|
||||
openrouter_api_key: str = ""
|
||||
openrouter_model: str = "google/gemini-2.5-flash-lite"
|
||||
openrouter_base_url: str = "https://openrouter.ai/api/v1"
|
||||
gigachat_agent_model: str = "GigaChat-2-Pro" # function calling quality matters more than price here
|
||||
chat_agent_timeout_s: float = 25.0
|
||||
chat_agent_max_steps: int = 5
|
||||
|
||||
@@ -42,6 +45,36 @@ class Settings(BaseSettings):
|
||||
tg_bot_token: str = ""
|
||||
doctor_notify_chat_id: int | None = None
|
||||
|
||||
# MAX is opt-in. Its adapter is delivered in the related backend/channel changes.
|
||||
max_enabled: bool = False
|
||||
max_bot_token: SecretStr = SecretStr("")
|
||||
max_bot_username: str = ""
|
||||
max_webhook_secret: SecretStr = SecretStr("")
|
||||
max_webhook_url: str = ""
|
||||
max_site_url: str = ""
|
||||
max_ca_bundle: Path | None = None
|
||||
max_link_ttl_seconds: int = Field(default=600, ge=60, le=1800)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_max(self) -> "Settings":
|
||||
if not self.max_enabled:
|
||||
return self
|
||||
if not self.max_bot_token.get_secret_value().strip():
|
||||
raise ValueError("MAX_BOT_TOKEN is required when MAX_ENABLED=true")
|
||||
if not re.fullmatch(r"[A-Za-z0-9_]{1,128}", self.max_bot_username):
|
||||
raise ValueError("MAX_BOT_USERNAME must be the bot nickname without @ or a URL")
|
||||
if not re.fullmatch(r"[A-Za-z0-9_-]{32,256}", self.max_webhook_secret.get_secret_value()):
|
||||
raise ValueError("MAX_WEBHOOK_SECRET must contain 32..256 URL-safe characters")
|
||||
for name, value in (("MAX_SITE_URL", self.max_site_url), ("MAX_WEBHOOK_URL", self.max_webhook_url)):
|
||||
url = urlsplit(value)
|
||||
if url.scheme != "https" or not url.hostname or url.username or url.password or url.port not in (None, 443):
|
||||
raise ValueError(f"{name} must use HTTPS on port 443 without credentials")
|
||||
if url.query or (name == "MAX_WEBHOOK_URL" and url.fragment):
|
||||
raise ValueError(f"{name} must not contain a query string (or a fragment for webhook)")
|
||||
if self.max_ca_bundle is not None and not self.max_ca_bundle.is_file():
|
||||
raise ValueError("MAX_CA_BUNDLE must point to an existing trusted CA bundle")
|
||||
return self
|
||||
|
||||
# Virtual clock for the demo (ADR-005).
|
||||
demo_clock: bool = True
|
||||
tz: str = "Europe/Moscow"
|
||||
|
||||
@@ -13,7 +13,7 @@ from pydantic import BaseModel
|
||||
|
||||
from app.config import get_settings
|
||||
from app.core.cssrs_content import load_cssrs_russian
|
||||
from app.core.intake_questions import DIARY_PARTS, content, diary_config, texts
|
||||
from app.core.intake_questions import DIARY_PARTS, content, diary_config, red_flags, texts
|
||||
from app.core.scales import load_scale
|
||||
|
||||
Section = Literal["safety", "mood", "trauma", "alcohol", "about", "diary", "scale"]
|
||||
@@ -92,6 +92,9 @@ def catalog() -> Catalog:
|
||||
),
|
||||
)
|
||||
|
||||
flags = red_flags()
|
||||
add(FormInfo(id="red_flags", title="Вопросы о безопасности", section="safety"), [i["id"] for i in flags["items"]])
|
||||
|
||||
cssrs = load_cssrs_russian()
|
||||
add(FormInfo(id="cssrs", title=cssrs.title, section="safety"), ["cssrs_" + i.id for i in cssrs.items])
|
||||
|
||||
|
||||
@@ -53,11 +53,25 @@ def cssrs_answers(answers: dict) -> dict[str, int]:
|
||||
return {k.removeprefix("cssrs_"): v for k, v in answers.items() if k.startswith("cssrs_")}
|
||||
|
||||
|
||||
def red_flags() -> dict:
|
||||
return yaml.safe_load((get_settings().config_dir / "instruments/red_flags.yaml").read_text(encoding="utf-8"))
|
||||
|
||||
|
||||
def red_flag_category(item_id: str) -> str | None:
|
||||
return next((i["category"] for i in red_flags()["items"] if i["id"] == item_id), None)
|
||||
|
||||
|
||||
def next_intake(answers: dict, policy: IntakePolicy, sex: str | None) -> Question | None:
|
||||
"""Stage 1 in the fixed order of «Опросники для MVP»: PHQ-2, trauma filter → TSQ, RUS-AUDIT-S, C-SSRS screener,
|
||||
then the context questions; stage 2 (rest of PHQ-9, PCL-5, full RUS-AUDIT) only where stage 1 is positive.
|
||||
Items inside a scale keep the order of the source. The risk stop rules run after every answer (flows/intake.py),
|
||||
so a positive answer interrupts the questionnaire wherever it comes."""
|
||||
"""Stage 1: the red-flag block first (config/instruments/red_flags.yaml), then the fixed order of «Опросники
|
||||
для MVP»: PHQ-2, trauma filter → TSQ, RUS-AUDIT-S, C-SSRS screener, the context questions; stage 2 (rest of
|
||||
PHQ-9, PCL-5, full RUS-AUDIT) only where stage 1 is positive. Items inside a scale keep the order of the source.
|
||||
The risk stop rules run after every answer (flows/intake.py), so a positive answer interrupts the questionnaire
|
||||
wherever it comes."""
|
||||
flags = red_flags()
|
||||
for n, item in enumerate(flags["items"]):
|
||||
if item["id"] not in answers:
|
||||
text = (flags["intro"] + "\n\n" if n == 0 else "") + item["text"]
|
||||
return Question(item["id"], text, tuple((o["value"], o["label"]) for o in flags["options"]), "now")
|
||||
for item in ("phq9_1", "phq9_2"):
|
||||
if item not in answers:
|
||||
return scale_question("phq9", item)
|
||||
|
||||
@@ -12,6 +12,7 @@ import yaml
|
||||
from app.config import get_settings
|
||||
from app.core.intake_questions import content
|
||||
from app.core.questionnaire import IntakeDecision, IntakePolicy
|
||||
from app.core.safety import fill_phones
|
||||
|
||||
# Stage 1 finding → diary module of stage 2 (PTSD is the «veteran» module of the profile).
|
||||
FINDING_MODULE = {"depression_suspected": "depression", "ptsd_suspected": "veteran"}
|
||||
@@ -23,7 +24,7 @@ PCL5_IMPROVED_BELOW = 28
|
||||
|
||||
|
||||
def texts() -> dict[str, Any]:
|
||||
return yaml.safe_load((get_settings().config_dir / "texts/results.yaml").read_text(encoding="utf-8"))
|
||||
return yaml.safe_load(fill_phones((get_settings().config_dir / "texts/results.yaml").read_text(encoding="utf-8")))
|
||||
|
||||
|
||||
def render(interpretation: dict[str, Any]) -> str:
|
||||
|
||||
@@ -50,7 +50,6 @@ class IntakePolicy(BaseModel):
|
||||
phq9_specialist_at: int = Field(ge=0, le=27, strict=True)
|
||||
phq9_priority_at: int = Field(ge=0, le=27, strict=True)
|
||||
pcl5_specialist_at: int = Field(ge=0, le=80, strict=True)
|
||||
pcl5_priority_at: int = Field(ge=0, le=80, strict=True)
|
||||
pcl5_behavior_flag_at: int = Field(ge=0, le=4, strict=True)
|
||||
|
||||
@model_validator(mode="after")
|
||||
@@ -65,8 +64,6 @@ class IntakePolicy(BaseModel):
|
||||
raise ValueError("choose a total threshold OR a zone for alcohol expansion")
|
||||
if not self.phq9_psychologist_at < self.phq9_specialist_at < self.phq9_priority_at:
|
||||
raise ValueError("PHQ-9 thresholds must be ordered")
|
||||
if self.pcl5_specialist_at >= self.pcl5_priority_at:
|
||||
raise ValueError("PCL-5 thresholds must be ordered")
|
||||
return self
|
||||
|
||||
|
||||
@@ -276,7 +273,9 @@ def evaluate_intake(
|
||||
if c.positive:
|
||||
flags.append("cssrs_positive")
|
||||
flags.extend(c.conflicts)
|
||||
if item9_positive or c.risk_lower_bound == "high":
|
||||
# One crisis rule (ADR-013): a high C-SSRS risk. Item 9 alone is a crisis only while the screener is not complete;
|
||||
# with a negative / low screener it is the «discrepancy» flag of the routing table, not the crisis screen.
|
||||
if c.risk_lower_bound == "high" or (item9_positive and not c.complete):
|
||||
return IntakeDecision(policy.version, "crisis", "crisis", (), tuple(flags), c.missing)
|
||||
if c.positive and policy.approval and policy.cssrs_positive_policy == "stop_any":
|
||||
return IntakeDecision(policy.version, "crisis", "crisis", (), tuple(flags), c.missing)
|
||||
@@ -327,9 +326,11 @@ def evaluate_intake(
|
||||
# PHQ-2-negative does not invent a PHQ-9 total; it simply does not trigger expansion.
|
||||
phq_total = phq.total if phq.complete else 0
|
||||
pcl_total = pcl.total if pcl.complete else 0
|
||||
# Risk and flags first, scales second (clinical review 2026-10-04). A high PCL-5 alone is not a reason for a
|
||||
# priority appointment: it goes to the planned specialist route.
|
||||
if c.risk == "moderate":
|
||||
primary = "urgent_psychiatrist"
|
||||
elif phq_total >= policy.phq9_priority_at or pcl_total >= policy.pcl5_priority_at:
|
||||
elif phq_total >= policy.phq9_priority_at:
|
||||
primary = "priority_psychiatrist"
|
||||
elif phq_total >= policy.phq9_specialist_at or pcl_total >= policy.pcl5_specialist_at:
|
||||
primary = "psychiatrist_or_psychotherapist"
|
||||
|
||||
@@ -395,6 +395,25 @@ def _crisis_cfg(path: Path = CRISIS_PATH) -> _CrisisCfg:
|
||||
return _CrisisCfg.model_validate(yaml.safe_load(path.read_text(encoding="utf-8")))
|
||||
|
||||
|
||||
_PHONE_REF = re.compile(r"\{phone:([a-z_]+)\}")
|
||||
|
||||
|
||||
def fill_phones(text: str, path: Path = CRISIS_PATH) -> str:
|
||||
"""Replace `{phone:<resource>}` with the number from the single table in config/texts/crisis.yaml.
|
||||
|
||||
Every patient text and prompt refers to the table instead of repeating a number, so a number is changed in one
|
||||
place. An unknown resource fails loudly: a wrong number on the crisis screen must never pass silently.
|
||||
"""
|
||||
resources = _crisis_cfg(path).resources
|
||||
|
||||
def number(m: re.Match[str]) -> str:
|
||||
if m.group(1) not in resources:
|
||||
raise ValueError(f"unknown crisis resource {m.group(1)!r}")
|
||||
return resources[m.group(1)].phone
|
||||
|
||||
return _PHONE_REF.sub(number, text)
|
||||
|
||||
|
||||
def _render(body: str, resources: list[CrisisResource], doctor_notified: str, grounding: str) -> str:
|
||||
lines = [body.strip(), ""]
|
||||
for r in resources:
|
||||
|
||||
@@ -5,6 +5,7 @@ The only module (besides registration code) that touches both schemas — and on
|
||||
|
||||
from app.db import audit as _audit # noqa: F401 (registers audit_log in clinical metadata)
|
||||
from app.db import intake as _intake # noqa: F401
|
||||
from app.db import max_notifications as _max_notifications # noqa: F401
|
||||
from app.db import scheduler as _scheduler # noqa: F401
|
||||
from app.db.clinical import ClinicalBase
|
||||
from app.db.identity import IdentityBase
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
"""MAX identifiers and delivery metadata live only in the identity DB; no medical message bodies."""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import BigInteger, Boolean, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.db.identity import IdentityBase
|
||||
from app.db.types import TZDateTime
|
||||
|
||||
|
||||
class MaxBinding(IdentityBase):
|
||||
__tablename__ = "max_bindings"
|
||||
|
||||
# No FK: anonymous web profiles intentionally have no patients row in identity.
|
||||
token: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
user_id: Mapped[int] = mapped_column(BigInteger, unique=True)
|
||||
enabled: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
connected_at: Mapped[datetime] = mapped_column(TZDateTime)
|
||||
|
||||
|
||||
class MaxLinkCode(IdentityBase):
|
||||
__tablename__ = "max_link_codes"
|
||||
|
||||
digest: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
token: Mapped[str] = mapped_column(String(64), unique=True)
|
||||
expires_at: Mapped[datetime] = mapped_column(TZDateTime, index=True)
|
||||
used_at: Mapped[datetime | None] = mapped_column(TZDateTime)
|
||||
|
||||
|
||||
class MaxReceipt(IdentityBase):
|
||||
__tablename__ = "max_webhook_receipts"
|
||||
|
||||
digest: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
received_at: Mapped[datetime] = mapped_column(TZDateTime, index=True)
|
||||
|
||||
|
||||
class MaxDelivery(IdentityBase):
|
||||
__tablename__ = "max_deliveries"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
token: Mapped[str | None] = mapped_column(String(64), index=True)
|
||||
user_id: Mapped[int] = mapped_column(BigInteger)
|
||||
kind: Mapped[str] = mapped_column(String(24))
|
||||
state: Mapped[str] = mapped_column(String(16), default="queued", index=True)
|
||||
attempts: Mapped[int] = mapped_column(Integer, default=0)
|
||||
created_at: Mapped[datetime] = mapped_column(TZDateTime)
|
||||
next_attempt_at: Mapped[datetime] = mapped_column(TZDateTime, index=True)
|
||||
lease: Mapped[str | None] = mapped_column(String(32))
|
||||
error_code: Mapped[str | None] = mapped_column(String(32))
|
||||
@@ -14,6 +14,7 @@ from app.core.intake_questions import (
|
||||
diary_questions,
|
||||
group_answers,
|
||||
next_intake,
|
||||
red_flag_category,
|
||||
scale_question,
|
||||
texts,
|
||||
)
|
||||
@@ -27,6 +28,7 @@ from app.dialog.contracts import Button, Event, Reply
|
||||
from app.dialog.crisis import crisis_open, open_crisis
|
||||
from app.dialog.fsm import Step, on_enter, state, trigger
|
||||
from app.services import questionnaire as service
|
||||
from app.services.followup import schedule_post_crisis_call
|
||||
|
||||
|
||||
def allowed(ctx):
|
||||
@@ -105,6 +107,7 @@ async def urgent(ctx, row=None, *, code="help_now", categories=None):
|
||||
level=AlertLevel.ACUTE,
|
||||
params={"record_id": row.id if row else None, "flags": flags},
|
||||
)
|
||||
await schedule_post_crisis_call(ctx.session, ctx.token, ctx.now, source="questionnaire:" + code)
|
||||
step = open_crisis(ctx, categories or [], source="questionnaire:" + code)
|
||||
step.data["questionnaire_record"] = None
|
||||
step.data["intake_review_required"] = True
|
||||
@@ -113,6 +116,41 @@ async def urgent(ctx, row=None, *, code="help_now", categories=None):
|
||||
return step
|
||||
|
||||
|
||||
async def item9_discrepancy(ctx, row):
|
||||
profile = await ctx.profile()
|
||||
if profile:
|
||||
profile.enhanced_monitoring = True
|
||||
await service.alert(
|
||||
ctx.session,
|
||||
ctx.token,
|
||||
row.id + ":phq9_cssrs_discrepancy",
|
||||
"phq9_cssrs_discrepancy",
|
||||
ctx.now,
|
||||
level=AlertLevel.HIGH,
|
||||
params={"record_id": row.id},
|
||||
)
|
||||
row.details = {**row.details, "item9_flagged": True}
|
||||
|
||||
|
||||
async def item9_assessment(ctx, row):
|
||||
"""Thoughts of death in PHQ-9 item 9 → the C-SSRS screener at once; the screener's level decides (graded)."""
|
||||
await service.alert(
|
||||
ctx.session,
|
||||
ctx.token,
|
||||
row.id + ":item9_assessment",
|
||||
"phq9_item9_cssrs",
|
||||
ctx.now,
|
||||
level=AlertLevel.HIGH,
|
||||
params={"record_id": row.id},
|
||||
)
|
||||
await service.finish(ctx, row, "complete", extra={"stop_reason": "phq9_item9_cssrs"})
|
||||
profile = await ctx.profile()
|
||||
if profile:
|
||||
profile.enhanced_monitoring = True
|
||||
task = await service.queue_task(ctx.session, ctx.token, "cssrs_since_contact", row.id + ":cssrs", ctx.now)
|
||||
return await start(ctx, "cssrs_since_contact", task)
|
||||
|
||||
|
||||
async def manual_review(ctx, row, code):
|
||||
await service.finish(ctx, row, "review_required", extra={"stop_reason": code})
|
||||
await service.alert(
|
||||
@@ -135,9 +173,24 @@ async def advance(ctx, row):
|
||||
a = row.answers
|
||||
c = score_cssrs_recent(cssrs_answers(a))
|
||||
policy = load_policy()
|
||||
# PHQ-9 item 9 ≥1 — in the full scale or in the depression module of the diary — stops at once (stage 1 rule).
|
||||
if a.get("phq9_9", 0) > 0 or a.get("dphq_9", 0) > 0 or c.risk_lower_bound == "high":
|
||||
# Red flags (asked first): any «Да» stops the questionnaire with the help screen of its category.
|
||||
for item_id, value in a.items():
|
||||
if item_id.startswith("rf_") and value == 1:
|
||||
category = red_flag_category(item_id)
|
||||
return await urgent(ctx, row, code="red_flag_" + item_id[3:], categories=[category] if category else [])
|
||||
# One crisis rule for the whole app (ADR-013): the crisis screen opens at a HIGH C-SSRS risk only. Moderate →
|
||||
# stop + psychiatrist (about 24 h); low → flag, safety plan, continue.
|
||||
if c.risk_lower_bound == "high":
|
||||
return await urgent(ctx, row, code="suicide_signal")
|
||||
if a.get("dphq_9", 0) > 0 and row.kind in DIARY_KINDS:
|
||||
# Diary depression module, item 9 ≥1 → the C-SSRS right away («Этап 2»); its risk level decides.
|
||||
return await item9_assessment(ctx, row)
|
||||
if a.get("phq9_9", 0) > 0 and not c.complete:
|
||||
# Item 9 without a completed screener (only in a scheduled PHQ-9): assess the risk right away.
|
||||
return await item9_assessment(ctx, row)
|
||||
if a.get("phq9_9", 0) > 0 and not row.details.get("item9_flagged"):
|
||||
# Item 9 ≥1 with a negative / low C-SSRS = discrepancy (routing table): flag to the doctor, safety plan.
|
||||
await item9_discrepancy(ctx, row)
|
||||
if c.positive and policy.cssrs_positive_policy == "stop_any":
|
||||
return await urgent(ctx, row, code="cssrs_positive")
|
||||
if c.conflicts:
|
||||
@@ -165,7 +218,7 @@ async def advance(ctx, row):
|
||||
return await manual_review(ctx, row, "answer_conflict")
|
||||
if q:
|
||||
replies = [question_reply(row, q)]
|
||||
if c.complete and c.risk == "low" and not row.details.get("plan_shown"):
|
||||
if ((c.complete and c.risk == "low") or row.details.get("item9_flagged")) and not row.details.get("plan_shown"):
|
||||
from app.dialog.actions import safety_plan_reply
|
||||
|
||||
replies.insert(0, await safety_plan_reply(ctx))
|
||||
@@ -225,11 +278,12 @@ async def advance(ctx, row):
|
||||
if row.kind in ("phq9", "pcl5"):
|
||||
sid = row.kind
|
||||
total = extra["totals"][sid]["total"]
|
||||
priority = getattr(policy, sid + "_priority_at")
|
||||
# Only PHQ-9 has a priority threshold; PCL-5 alone never makes an appointment a priority.
|
||||
priority = getattr(policy, sid + "_priority_at", None)
|
||||
specialist = getattr(policy, sid + "_specialist_at")
|
||||
extra["route"] = (
|
||||
"priority_psychiatrist"
|
||||
if total >= priority
|
||||
if priority is not None and total >= priority
|
||||
else ("psychiatrist_or_psychotherapist" if total >= specialist else "review_with_treating_clinician")
|
||||
)
|
||||
earlier = [
|
||||
@@ -284,7 +338,13 @@ async def advance(ctx, row):
|
||||
return step
|
||||
from app.dialog.flows.core import menu_reply
|
||||
|
||||
return Step(replies=[menu_reply(ctx, shown)], next_state="idle", data={"questionnaire_record": None})
|
||||
replies = [menu_reply(ctx, shown)]
|
||||
if ((c.complete and c.risk == "low") or row.details.get("item9_flagged")) and not row.details.get("plan_shown"):
|
||||
# The safety plan is never skipped because the risk signal came with the last question.
|
||||
from app.dialog.actions import safety_plan_reply
|
||||
|
||||
replies.insert(0, await safety_plan_reply(ctx))
|
||||
return Step(replies=replies, next_state="idle", data={"questionnaire_record": None})
|
||||
|
||||
|
||||
# Diary flags that bring a full scale forward («Этап 2», p.4).
|
||||
|
||||
+3
-1
@@ -7,6 +7,7 @@ import yaml
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
from app.config import get_settings
|
||||
from app.core.safety import fill_phones
|
||||
|
||||
|
||||
class _Strict(BaseModel):
|
||||
@@ -91,6 +92,7 @@ class ReachOutTexts(_Strict):
|
||||
silence: str
|
||||
missed_doses: str
|
||||
default: str
|
||||
after_crisis: str
|
||||
|
||||
|
||||
class VisitTexts(_Strict):
|
||||
@@ -120,4 +122,4 @@ def dialog_texts_path() -> Path:
|
||||
@lru_cache
|
||||
def load_dialog_texts(path: Path | None = None) -> DialogTexts:
|
||||
path = path or dialog_texts_path()
|
||||
return DialogTexts.model_validate(yaml.safe_load(path.read_text(encoding="utf-8")))
|
||||
return DialogTexts.model_validate(yaml.safe_load(fill_phones(path.read_text(encoding="utf-8"))))
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
"""Registration boundary and durable MAX queue. Callers own the identity transaction.
|
||||
|
||||
Only this boundary joins a pseudonymous profile to a MAX recipient. Clinical modules never import it.
|
||||
Queue rows contain a template name, never replies, scores, prescriptions or patient-auth tokens in URLs.
|
||||
"""
|
||||
|
||||
import hashlib
|
||||
import secrets
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from sqlalchemy import delete, select, update
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.db import repo
|
||||
from app.db.clinical import ScaleResult
|
||||
from app.db.intake import QuestionnaireRecord
|
||||
from app.db.max_notifications import MaxBinding, MaxDelivery, MaxLinkCode
|
||||
from app.db.session import get_clinical_session
|
||||
|
||||
MAX_ATTEMPTS = 6
|
||||
LEASE_SECONDS = 60
|
||||
|
||||
|
||||
def digest(value: str) -> str:
|
||||
return hashlib.sha256(value.encode()).hexdigest()
|
||||
|
||||
|
||||
async def active_patient(token: str) -> bool:
|
||||
"""Same consent/adult gate used by the scheduler, checked again at delivery time."""
|
||||
async with get_clinical_session() as session:
|
||||
state = await repo.get_dialog_state(session, token)
|
||||
return bool(
|
||||
await repo.get_profile(session, token)
|
||||
and state
|
||||
and state.data.get("consent") is True
|
||||
and state.data.get("adult") is True
|
||||
)
|
||||
|
||||
|
||||
async def issue_code(session: AsyncSession, token: str, now: datetime, ttl: int) -> tuple[str, datetime]:
|
||||
raw = secrets.token_urlsafe(32)
|
||||
expires = now + timedelta(seconds=ttl)
|
||||
await session.execute(delete(MaxLinkCode).where(MaxLinkCode.token == token))
|
||||
session.add(MaxLinkCode(digest=digest(raw), token=token, expires_at=expires))
|
||||
await session.flush()
|
||||
return raw, expires
|
||||
|
||||
|
||||
async def code_token(session: AsyncSession, raw: str, now: datetime) -> str | None:
|
||||
row = await session.get(MaxLinkCode, digest(raw))
|
||||
return row.token if row and row.used_at is None and row.expires_at > now else None
|
||||
|
||||
|
||||
async def bind(session: AsyncSession, raw: str, user_id: int, now: datetime) -> str | None:
|
||||
"""Atomically consume a code. Existing active identities cannot be silently reassigned."""
|
||||
token = await code_token(session, raw, now)
|
||||
if token is None:
|
||||
return None
|
||||
owner = await session.scalar(select(MaxBinding).where(MaxBinding.user_id == user_id))
|
||||
binding = await session.get(MaxBinding, token)
|
||||
if owner and owner.token != token and owner.enabled:
|
||||
return None
|
||||
if binding and binding.user_id != user_id and binding.enabled:
|
||||
return None
|
||||
used = await session.execute(
|
||||
update(MaxLinkCode)
|
||||
.where(MaxLinkCode.digest == digest(raw), MaxLinkCode.used_at.is_(None), MaxLinkCode.expires_at > now)
|
||||
.values(used_at=now)
|
||||
.returning(MaxLinkCode.token)
|
||||
)
|
||||
if used.scalar_one_or_none() is None:
|
||||
return None
|
||||
if owner and owner.token != token:
|
||||
await session.delete(owner)
|
||||
await session.flush()
|
||||
if binding is None:
|
||||
binding = MaxBinding(token=token, user_id=user_id, connected_at=now)
|
||||
session.add(binding)
|
||||
# Cancel stale deliveries even when the same account reconnects later.
|
||||
await cancel_pending(session, token)
|
||||
binding.user_id, binding.enabled, binding.connected_at = user_id, True, now
|
||||
await session.flush()
|
||||
return token
|
||||
|
||||
|
||||
async def cancel_pending(session: AsyncSession, token: str) -> None:
|
||||
await session.execute(
|
||||
update(MaxDelivery)
|
||||
.where(MaxDelivery.token == token, MaxDelivery.state.in_(("queued", "sending")))
|
||||
.values(state="cancelled", lease=None)
|
||||
)
|
||||
|
||||
|
||||
async def disconnect(session: AsyncSession, token: str) -> None:
|
||||
binding = await session.get(MaxBinding, token)
|
||||
if binding:
|
||||
binding.enabled = False
|
||||
await session.execute(delete(MaxLinkCode).where(MaxLinkCode.token == token))
|
||||
await cancel_pending(session, token)
|
||||
|
||||
|
||||
async def enqueue(
|
||||
session: AsyncSession, *, key: str, user_id: int, kind: str, now: datetime, token: str | None = None
|
||||
) -> None:
|
||||
if await session.get(MaxDelivery, key) is not None:
|
||||
return
|
||||
try:
|
||||
async with session.begin_nested():
|
||||
session.add(
|
||||
MaxDelivery(id=key, user_id=user_id, token=token, kind=kind, created_at=now, next_attempt_at=now)
|
||||
)
|
||||
await session.flush()
|
||||
except IntegrityError:
|
||||
# Another worker may enqueue the same event between SELECT and INSERT.
|
||||
if await session.get(MaxDelivery, key) is None:
|
||||
raise
|
||||
|
||||
|
||||
async def collect_completed(session: AsyncSession, now: datetime) -> None:
|
||||
"""Recover completion events from committed clinical records, including after a restart.
|
||||
|
||||
No clinical hooks depend on identity. Read only IDs/dates, then enqueue a generic template.
|
||||
A binding's activation time bounds history; repeated scans are idempotent.
|
||||
"""
|
||||
bindings = (await session.scalars(select(MaxBinding).where(MaxBinding.enabled.is_(True)))).all()
|
||||
for binding in bindings:
|
||||
if not await active_patient(binding.token):
|
||||
continue
|
||||
async with get_clinical_session() as clinical:
|
||||
forms = (
|
||||
await clinical.scalars(
|
||||
select(QuestionnaireRecord.id).where(
|
||||
QuestionnaireRecord.token == binding.token,
|
||||
QuestionnaireRecord.status == "complete",
|
||||
QuestionnaireRecord.completed_at >= binding.connected_at,
|
||||
)
|
||||
)
|
||||
).all()
|
||||
scales = (
|
||||
await clinical.scalars(
|
||||
select(ScaleResult.id).where(
|
||||
ScaleResult.token == binding.token,
|
||||
ScaleResult.complete.is_(True),
|
||||
ScaleResult.ts >= binding.connected_at,
|
||||
)
|
||||
)
|
||||
).all()
|
||||
for source, ids in (("form", forms), ("scale", scales)):
|
||||
for record_id in ids:
|
||||
key = digest(f"completed:{binding.token}:{binding.connected_at.isoformat()}:{source}:{record_id}")
|
||||
await enqueue(session, key=key, token=binding.token, user_id=binding.user_id, kind="completed", now=now)
|
||||
|
||||
|
||||
async def claim(session: AsyncSession, now: datetime) -> MaxDelivery | None:
|
||||
"""One lease per row; recovery after a worker crash is bounded by the lease deadline."""
|
||||
ready = (MaxDelivery.state.in_(("queued", "sending"))) & (MaxDelivery.next_attempt_at <= now)
|
||||
row = await session.scalar(
|
||||
select(MaxDelivery)
|
||||
.where(ready)
|
||||
.order_by(MaxDelivery.created_at, MaxDelivery.id)
|
||||
.with_for_update(skip_locked=True)
|
||||
.limit(1)
|
||||
)
|
||||
if row is None:
|
||||
return None
|
||||
if row.attempts >= MAX_ATTEMPTS:
|
||||
row.state, row.error_code, row.lease = "failed", "attempt_limit", None
|
||||
return None
|
||||
lease = secrets.token_hex(16)
|
||||
result = await session.execute(
|
||||
update(MaxDelivery)
|
||||
.where(MaxDelivery.id == row.id, ready)
|
||||
.values(
|
||||
state="sending",
|
||||
attempts=MaxDelivery.attempts + 1,
|
||||
lease=lease,
|
||||
next_attempt_at=now + timedelta(seconds=LEASE_SECONDS),
|
||||
)
|
||||
.returning(MaxDelivery.id)
|
||||
)
|
||||
if result.scalar_one_or_none() is None:
|
||||
return None
|
||||
await session.refresh(row)
|
||||
return row
|
||||
|
||||
|
||||
async def finish(
|
||||
session: AsyncSession,
|
||||
row: MaxDelivery,
|
||||
*,
|
||||
state: str,
|
||||
now: datetime,
|
||||
error: str | None = None,
|
||||
retry_seconds: float = 0,
|
||||
) -> None:
|
||||
await session.execute(
|
||||
update(MaxDelivery)
|
||||
.where(MaxDelivery.id == row.id, MaxDelivery.lease == row.lease, MaxDelivery.state == "sending")
|
||||
.values(state=state, lease=None, error_code=error, next_attempt_at=now + timedelta(seconds=retry_seconds))
|
||||
)
|
||||
@@ -22,6 +22,7 @@ from app.config import Settings, get_settings
|
||||
from app.core.types import ScrubbedText
|
||||
from app.llm.agent.prompts import SYSTEM_PROMPT
|
||||
from app.llm.agent.providers import (
|
||||
GigaChatToolProvider,
|
||||
MockAgentProvider,
|
||||
OpenRouterProvider,
|
||||
ProviderError,
|
||||
@@ -49,7 +50,7 @@ def build_provider(settings: Settings | None = None) -> ToolChatProvider | None:
|
||||
s = settings or get_settings()
|
||||
mode = s.chat_agent
|
||||
if mode == "auto":
|
||||
mode = "openrouter" if s.openrouter_api_key else "off"
|
||||
mode = "gigachat" if s.gigachat_credentials else "openrouter" if s.openrouter_api_key else "off"
|
||||
if mode == "openrouter":
|
||||
if not s.openrouter_api_key:
|
||||
log.warning("chat agent: openrouter selected without OPENROUTER_API_KEY — disabled")
|
||||
@@ -58,15 +59,16 @@ def build_provider(settings: Settings | None = None) -> ToolChatProvider | None:
|
||||
if mode == "mock":
|
||||
return MockAgentProvider()
|
||||
if mode == "gigachat":
|
||||
# TODO(GigaChat): function calling via the `gigachat` package (functions=..., message.function_call).
|
||||
log.warning("chat agent: gigachat provider not implemented yet — disabled")
|
||||
return None
|
||||
if not s.gigachat_credentials:
|
||||
log.warning("chat agent: gigachat selected without GIGACHAT_CREDENTIALS — disabled")
|
||||
return None
|
||||
return GigaChatToolProvider(s)
|
||||
return None
|
||||
|
||||
|
||||
async def _chat_with_retry(provider: ToolChatProvider, messages: list[dict[str, Any]]):
|
||||
"""One retry: OpenRouter occasionally fails a single call (seen live as intermittent ProviderError)."""
|
||||
wire = _wire(messages) if provider.name != "mock" else messages
|
||||
wire = _wire(messages) if provider.name == "openrouter" else messages # gigachat needs the tool `name`
|
||||
try:
|
||||
return await provider.chat(wire, TOOL_SPECS)
|
||||
except ProviderError as exc:
|
||||
@@ -139,6 +141,9 @@ async def answer_chat(
|
||||
except (ProviderError, TimeoutError) as exc:
|
||||
log.error("chat agent provider=%s failed: %s %s", provider.name, type(exc).__name__, exc)
|
||||
return None
|
||||
except Exception: # noqa: BLE001 — the agent is optional: any bug must degrade to the extractive answer, not a 500
|
||||
log.exception("chat agent provider=%s crashed", provider.name)
|
||||
return None
|
||||
|
||||
|
||||
def _finish(text: str, ctx: ToolContext, provider: str) -> AgentAnswer | None:
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
"""System prompt of the chat agent (Russian). Prohibitions follow SPEC §7; grounding: answer only from tools."""
|
||||
|
||||
SYSTEM_PROMPT = """Ты — помощник пациента в сервисе сопровождения лечения между визитами к врачу. Пациент лечится у
|
||||
from app.core.safety import fill_phones
|
||||
|
||||
_SYSTEM_PROMPT = """Ты — помощник пациента в сервисе сопровождения лечения между визитами к врачу. Пациент лечится у
|
||||
психиатра; ты отвечаешь на его вопросы о состоянии, лечении и лекарствах.
|
||||
|
||||
Как работать:
|
||||
@@ -32,4 +34,7 @@ SYSTEM_PROMPT = """Ты — помощник пациента в сервисе
|
||||
|
||||
Стиль: по-русски, на «вы», спокойно и по-человечески, 3–6 коротких предложений, без markdown-заголовков.
|
||||
Если в вопросе есть признаки угрозы жизни — коротко скажи, что важно сразу позвонить 112 или на телефон
|
||||
доверия 8-800-2000-122, и что врач будет уведомлён."""
|
||||
доверия {phone:helpline}, и что врач будет уведомлён."""
|
||||
|
||||
# Numbers come from the single table config/texts/crisis.yaml.
|
||||
SYSTEM_PROMPT = fill_phones(_SYSTEM_PROMPT)
|
||||
|
||||
@@ -68,9 +68,10 @@ class OpenRouterProvider:
|
||||
if resp.status_code != 200:
|
||||
# Provider error bodies are generic (no patient text) — log the message to make failures diagnosable.
|
||||
try:
|
||||
detail = str(resp.json().get("error", {}).get("message", ""))[:200]
|
||||
except ValueError:
|
||||
detail = ""
|
||||
err = resp.json().get("error", "")
|
||||
detail = str(err.get("message", "") if isinstance(err, dict) else err)[:200]
|
||||
except (ValueError, AttributeError):
|
||||
detail = resp.text[:200]
|
||||
log.error("openrouter http %s: %s", resp.status_code, detail)
|
||||
raise ProviderError(f"http {resp.status_code}")
|
||||
try:
|
||||
@@ -90,6 +91,88 @@ class OpenRouterProvider:
|
||||
return AssistantTurn(content=msg.get("content"), tool_calls=calls)
|
||||
|
||||
|
||||
class GigaChatToolProvider:
|
||||
"""GigaChat function calling (RF provider, 152-FZ compliant). Converts the OpenAI-style history the agent keeps:
|
||||
assistant `tool_calls` → `function_call`, `tool` results → role `function` with the function name.
|
||||
GigaChat returns at most one function call per turn — the agent loop handles that naturally."""
|
||||
|
||||
name = "gigachat"
|
||||
|
||||
def __init__(self, settings: Settings, client: Any | None = None) -> None:
|
||||
self._settings = settings
|
||||
self._client = client
|
||||
|
||||
def _get_client(self) -> Any:
|
||||
if self._client is None:
|
||||
from gigachat import GigaChat
|
||||
|
||||
s = self._settings
|
||||
self._client = GigaChat(
|
||||
credentials=s.gigachat_credentials,
|
||||
scope=s.gigachat_scope,
|
||||
model=s.gigachat_agent_model,
|
||||
verify_ssl_certs=s.gigachat_verify_ssl,
|
||||
timeout=s.chat_agent_timeout_s,
|
||||
)
|
||||
return self._client
|
||||
|
||||
@staticmethod
|
||||
def to_messages(messages: list[dict[str, Any]]) -> list[Any]:
|
||||
from gigachat.models import FunctionCall, Messages, MessagesRole
|
||||
|
||||
out = []
|
||||
for m in messages:
|
||||
role = m["role"]
|
||||
if role == "system":
|
||||
out.append(Messages(role=MessagesRole.SYSTEM, content=m["content"]))
|
||||
elif role == "user":
|
||||
out.append(Messages(role=MessagesRole.USER, content=m["content"]))
|
||||
elif role == "assistant":
|
||||
calls = m.get("tool_calls") or []
|
||||
for c in calls or [None]:
|
||||
fc = None
|
||||
if c is not None:
|
||||
fc = FunctionCall(name=c["function"]["name"], arguments=json.loads(c["function"]["arguments"]))
|
||||
out.append(Messages(role=MessagesRole.ASSISTANT, content=m.get("content") or "", function_call=fc))
|
||||
elif role == "tool":
|
||||
out.append(Messages(role=MessagesRole.FUNCTION, name=m.get("name"), content=m["content"]))
|
||||
return out
|
||||
|
||||
@staticmethod
|
||||
def to_functions(tools: list[dict[str, Any]]) -> list[Any]:
|
||||
from gigachat.models import Function
|
||||
|
||||
return [Function.model_validate(t["function"]) for t in tools]
|
||||
|
||||
async def chat(self, messages: list[dict[str, Any]], tools: list[dict[str, Any]]) -> AssistantTurn:
|
||||
from gigachat.models import Chat
|
||||
|
||||
chat = Chat(
|
||||
messages=self.to_messages(messages),
|
||||
functions=self.to_functions(tools),
|
||||
function_call="auto",
|
||||
temperature=0.1,
|
||||
max_tokens=900,
|
||||
)
|
||||
try:
|
||||
resp = await self._get_client().achat(chat)
|
||||
except Exception as exc: # noqa: BLE001 — network/auth/HTTP errors of the SDK
|
||||
raise ProviderError(type(exc).__name__) from exc
|
||||
msg = resp.choices[0].message
|
||||
calls = []
|
||||
if msg.function_call is not None:
|
||||
args = msg.function_call.arguments or {}
|
||||
if isinstance(args, str):
|
||||
try:
|
||||
args = json.loads(args)
|
||||
except json.JSONDecodeError:
|
||||
args = {}
|
||||
calls.append(ToolCall(id=msg.function_call.name, name=msg.function_call.name, arguments=args))
|
||||
usage = getattr(resp, "usage", None)
|
||||
log.info("gigachat agent ok calls=%d tokens=%s", len(calls), getattr(usage, "total_tokens", None))
|
||||
return AssistantTurn(content=msg.content or None, tool_calls=calls)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------------------------ offline mock
|
||||
|
||||
_DRUG_WORDS = re.compile(
|
||||
|
||||
+18
-6
@@ -30,13 +30,25 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
|
||||
# In compose Postgres is required and healthy before the app starts; this branch is for running the
|
||||
# API (and its tests) without a database. Endpoints touching the DB will fail until it is reachable.
|
||||
log.error("db init failed, continuing without db: %s", type(exc).__name__)
|
||||
if settings.max_enabled:
|
||||
raise # MAX requires persistent bindings and a delivery queue.
|
||||
# Lanes fill these in (#13, #11); main.py itself stays frozen (#34).
|
||||
await scheduler.start()
|
||||
await telegram.start()
|
||||
yield
|
||||
await telegram.stop()
|
||||
await scheduler.stop()
|
||||
await dispose()
|
||||
max_channel = None
|
||||
try:
|
||||
await telegram.start()
|
||||
if settings.max_enabled:
|
||||
from app.channels import max_bot
|
||||
|
||||
max_channel = max_bot
|
||||
await max_channel.start()
|
||||
await scheduler.start()
|
||||
yield
|
||||
finally:
|
||||
await scheduler.stop()
|
||||
if max_channel is not None:
|
||||
await max_channel.stop()
|
||||
await telegram.stop()
|
||||
await dispose()
|
||||
|
||||
|
||||
app = FastAPI(title="PTSRaiAgent API", version="0.1.0", lifespan=lifespan)
|
||||
|
||||
+12
-1
@@ -22,11 +22,13 @@ from app.db import repo
|
||||
from app.db.clinical import PatientProfile
|
||||
from app.db.intake import QuestionnaireTask
|
||||
from app.db.session import get_clinical_session
|
||||
from app.dialog.contracts import Event, Reply, get_engine
|
||||
from app.dialog.contracts import Button, Event, Reply, get_engine
|
||||
from app.dialog.texts import load_dialog_texts
|
||||
from app.integrations.base import integrations
|
||||
from app.scheduler import demo
|
||||
from app.services import monitoring
|
||||
from app.services import questionnaire as service
|
||||
from app.services.followup import next_day_check_due
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
_worker = None
|
||||
@@ -43,6 +45,15 @@ async def plan():
|
||||
state = await repo.get_dialog_state(session, profile.token)
|
||||
if not state or state.data.get("consent") is not True or state.data.get("adult") is not True:
|
||||
continue
|
||||
crisis = state.data.get("crisis")
|
||||
if next_day_check_due(crisis, now):
|
||||
# The day after a crisis the app asks how the person is, the safety plan one tap away.
|
||||
texts = load_dialog_texts()
|
||||
plan_button = Button(label=texts.safety_plan.title.rstrip(":"), data="safety_plan")
|
||||
await integrations.outbox.push(
|
||||
profile.token, [Reply(text=texts.reach_out.after_crisis, buttons=[[plan_button]], kind="question")]
|
||||
)
|
||||
state.data = {**state.data, "crisis": {**crisis, "followup_sent": now.isoformat()}}
|
||||
rows = await service.records(session, profile.token)
|
||||
initial = next((r for r in reversed(rows) if r.kind == "intake" and r.status == "complete"), None)
|
||||
if initial is None:
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
"""Follow-up after a crisis (clinical review 2026-10-04: «план безопасности и звонок после кризиса — обязательно»).
|
||||
|
||||
Every crisis — from the safety lexicon, a rule (PHQ-9 item 9, C-SSRS high) or the questionnaire (red flags, high
|
||||
risk) — leaves a task for the doctor on duty: call the patient back, about 24 hours as a guide. The task is an alert
|
||||
on the dashboard; «позвонили» is its acknowledgement (`repo.ack_alert`, audited). One open task per patient: a
|
||||
repeated crisis signal does not pile up callbacks. On the next day the app itself asks how the person is, with the
|
||||
safety plan at hand (`app/scheduler/jobs.py`).
|
||||
"""
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.types import AlertLevel
|
||||
from app.db import repo
|
||||
from app.db.clinical import Alert
|
||||
|
||||
POST_CRISIS_CALL = "post_crisis_call"
|
||||
ON_DUTY = "on-duty"
|
||||
CALL_WITHIN = timedelta(hours=24) # a guide, not a guarantee
|
||||
NEXT_DAY_CHECK_AFTER = timedelta(hours=20)
|
||||
|
||||
|
||||
async def schedule_post_crisis_call(session: AsyncSession, token: str, now: datetime, *, source: str) -> Alert | None:
|
||||
if POST_CRISIS_CALL in await repo.open_alert_codes(session, token):
|
||||
return None
|
||||
return await repo.add_alert(
|
||||
session,
|
||||
token=token,
|
||||
level=AlertLevel.HIGH,
|
||||
code=POST_CRISIS_CALL,
|
||||
reason="Перезвонить пациенту после кризиса — дежурный специалист, ориентир 24 ч. Отметка «позвонили» — "
|
||||
"подтверждение этого сигнала.",
|
||||
ts=now,
|
||||
params={"due_at": (now + CALL_WITHIN).isoformat(), "assignee": ON_DUTY, "source": source},
|
||||
)
|
||||
|
||||
|
||||
def next_day_check_due(crisis: dict | None, now: datetime) -> bool:
|
||||
"""The day after a crisis the app asks how the person is — once per crisis episode."""
|
||||
if not crisis or not crisis.get("opened_at") or crisis.get("followup_sent"):
|
||||
return False
|
||||
return now - datetime.fromisoformat(crisis["opened_at"]) >= NEXT_DAY_CHECK_AFTER
|
||||
@@ -30,6 +30,7 @@ from app.db.audit import audit
|
||||
from app.db.session import get_clinical_session
|
||||
from app.integrations.base import integrations
|
||||
from app.services.contracts import register_monitoring
|
||||
from app.services.followup import schedule_post_crisis_call
|
||||
from app.services.snapshot import build_snapshot
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
@@ -93,6 +94,7 @@ class RuleMonitoring:
|
||||
ts=now,
|
||||
)
|
||||
notify.append((ON_DUTY_DOCTOR, level, action.reason_ru))
|
||||
await schedule_post_crisis_call(s, token, now, source=f"rule:{action.code}")
|
||||
await refresh_status(s, token)
|
||||
log.info("monitoring token=%s actions=%s", token, [a.code for a in actions])
|
||||
for doctor_id, level, text in notify:
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# Red flags — asked first in stage 1, before any scale (clinical review 2026-10-04: «обязательно»).
|
||||
# Any «Да» stops the questionnaire: an acute alert to the doctor, a callback task for the doctor on duty and the
|
||||
# help screen (crisis script variant by `category`, config/texts/crisis.yaml). Wording — team draft, the doctor
|
||||
# approves it (#8). These are not a scale: there is no score, only a stop rule.
|
||||
version: red-flags-v1-2026-10-04
|
||||
intro: "Сначала несколько коротких вопросов о безопасности. Отвечайте так, как есть сейчас."
|
||||
options:
|
||||
- {value: 1, label: Да}
|
||||
- {value: 0, label: Нет}
|
||||
items:
|
||||
- id: rf_psychosis
|
||||
text: Слышите ли Вы сейчас голоса или видите то, чего не видят и не слышат другие люди?
|
||||
category: null
|
||||
- id: rf_harm_others
|
||||
text: Есть ли у Вас сейчас мысли причинить вред другому человеку?
|
||||
category: harm_others
|
||||
- id: rf_weapons
|
||||
text: Есть ли у Вас дома или рядом доступ к оружию?
|
||||
category: null
|
||||
- id: rf_violence
|
||||
text: Угрожает ли Вам сейчас кто-то дома или применяет к Вам насилие?
|
||||
category: domestic_violence
|
||||
- id: rf_intoxication
|
||||
text: Находитесь ли Вы сейчас в состоянии сильного опьянения или тяжёлой отмены алкоголя либо других веществ?
|
||||
category: null
|
||||
@@ -1,7 +1,8 @@
|
||||
# Review candidate from the supplied MVP PDF, not a signed clinical protocol.
|
||||
version: mvp-v2-review-2026-10-03
|
||||
approval: null
|
||||
cssrs_positive_policy: pending
|
||||
# C01 decided by the team after the clinical review (2026-10-04, ADR-013): crisis screen at HIGH risk only.
|
||||
cssrs_positive_policy: graded
|
||||
rus_audit_s_expand_from_zone: null
|
||||
phq2_expand_at: 2
|
||||
tsq_expand_at: 6
|
||||
@@ -9,5 +10,4 @@ phq9_psychologist_at: 5
|
||||
phq9_specialist_at: 10
|
||||
phq9_priority_at: 20
|
||||
pcl5_specialist_at: 31
|
||||
pcl5_priority_at: 50
|
||||
pcl5_behavior_flag_at: 3
|
||||
|
||||
@@ -17,5 +17,4 @@ phq9_psychologist_at: 5
|
||||
phq9_specialist_at: 10
|
||||
phq9_priority_at: 20
|
||||
pcl5_specialist_at: 31
|
||||
pcl5_priority_at: 50
|
||||
pcl5_behavior_flag_at: 3
|
||||
|
||||
+5
-3
@@ -62,7 +62,7 @@ rules:
|
||||
params: {}
|
||||
actions:
|
||||
- {type: alert, level: high}
|
||||
reason_ru: "C-SSRS: умеренный риск, врачу в течение 24 ч"
|
||||
reason_ru: "C-SSRS: умеренный риск, психиатр — ориентир 24 ч"
|
||||
|
||||
# ---------------------------------------------------------------- scale thresholds (yellow)
|
||||
- id: phq9_severe
|
||||
@@ -73,10 +73,12 @@ rules:
|
||||
reason_ru: "PHQ-9 = {total} (тяжёлая депрессия, порог {threshold})"
|
||||
|
||||
- id: pcl5_severe
|
||||
description: Latest PCL-5 total >= 50 → doctor within 24 h.
|
||||
description: >
|
||||
Latest PCL-5 total >= 50 → planned specialist review. Not a priority appointment by itself: risk and flags
|
||||
come first, scales second (clinical review 2026-10-04).
|
||||
params: {threshold: 50}
|
||||
actions:
|
||||
- {type: alert, level: high}
|
||||
- {type: alert, level: moderate}
|
||||
reason_ru: "PCL-5 = {total} (порог {threshold})"
|
||||
|
||||
- id: phq9_rise
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
# Кризисный скрипт (guardrail №2, issue #4). Отправляется ДОСЛОВНО при safety = acute; LLM не вызывается.
|
||||
# `resources` — ЕДИНСТВЕННАЯ таблица телефонов приложения: остальные тексты и промпты ссылаются на неё через
|
||||
# `{phone:<ключ>}` (app/core/safety.py::fill_phones). Источники и проверка — docs/clinical/crisis-contacts.md.
|
||||
# СТАТУС: черновик, утверждает психиатр (#8).
|
||||
#
|
||||
# Выбор варианта (app/core/safety.py::crisis_reply): `<audience>.<категория>` по порядку category_priority,
|
||||
@@ -17,6 +19,11 @@ resources:
|
||||
name: "Психологическая помощь МЧС России"
|
||||
phone: "+7 (495) 989-50-50"
|
||||
note: "круглосуточно; стоимость звонка по тарифу оператора"
|
||||
# For minors only (age gate stop text); not a general adult crisis line (docs/clinical/crisis-contacts.md).
|
||||
child_helpline:
|
||||
name: "Детский телефон доверия"
|
||||
phone: "8-800-2000-122"
|
||||
note: "для детей, подростков и родителей; бесплатно, анонимно"
|
||||
police:
|
||||
name: "Полиция"
|
||||
phone: "102"
|
||||
|
||||
@@ -53,7 +53,7 @@ age_gate:
|
||||
unclear: "Не удалось понять ответ. Нажмите кнопку или напишите год рождения четырьмя цифрами, например 1990."
|
||||
minor_stop: |-
|
||||
Спасибо, что ответили. Этот помощник рассчитан на взрослых, поэтому дальше я не смогу с вами работать и не сохраняю ваши ответы.
|
||||
Если вам тяжело или нужна поддержка — позвоните на Детский телефон доверия 8-800-2000-122 (бесплатно, анонимно, круглосуточно) или расскажите взрослому, которому доверяете: родителям, учителю, школьному психологу.
|
||||
Если вам тяжело или нужна поддержка — позвоните на Детский телефон доверия {phone:child_helpline} (бесплатно, анонимно) или расскажите взрослому, которому доверяете: родителям, учителю, школьному психологу.
|
||||
Если есть угроза жизни прямо сейчас — звоните 112.
|
||||
|
||||
idle:
|
||||
@@ -79,9 +79,9 @@ revoked:
|
||||
|
||||
crisis:
|
||||
# Повторный острый сигнал в уже открытом кризисе: скрипт второй раз не шлём, только это + ресурсы.
|
||||
repeat: "Я рядом. Ваш при угрозе жизни звоните 112. Если вам угрожает опасность прямо сейчас — позвоните:"
|
||||
repeat: "Я рядом. Если вам угрожает опасность прямо сейчас — позвоните:"
|
||||
# Любое другое сообщение, пока кризис открыт (до подтверждения врача).
|
||||
hold: "Я на связи и читаю вас. Не ждите ответа врача, если помощь нужна сейчас. Если станет хуже — звоните 112 или на телефон доверия +7 (495) 989-50-50."
|
||||
hold: "Я на связи и читаю вас. Не ждите ответа врача, если помощь нужна сейчас. Если станет хуже — звоните 112 или на телефон доверия {phone:helpline}."
|
||||
# Врач подтвердил кризисный алерт (doctor_ack): выходим из кризиса.
|
||||
closed: "Ваш врач получил сообщение и в курсе вашей ситуации. Спасибо, что остаётесь на связи. Если снова станет тяжело — напишите мне в любой момент."
|
||||
|
||||
@@ -101,7 +101,7 @@ safety_plan:
|
||||
- "Что помогает мне самому: прогулка, душ, дыхание, любимое дело."
|
||||
- "Люди и места, которые отвлекают: к кому можно пойти."
|
||||
- "Кому позвонить, если тяжело: близкий человек, сослуживец."
|
||||
- "Специалисты: ваш врач, телефон доверия +7 (495) 989-50-50, экстренные службы 112."
|
||||
- "Специалисты: ваш врач, телефон доверия {phone:helpline}, экстренные службы 112."
|
||||
- "Безопасная среда: оружие и лишние лекарства — на хранение близкому человеку."
|
||||
means_restriction: "Если дома есть оружие или запас лекарств — попросите близкого человека временно хранить их у себя."
|
||||
|
||||
@@ -109,10 +109,12 @@ reach_out:
|
||||
silence: "Давно не было вестей от вас. Как вы? Можно ответить одним словом — мне важно знать, что с вами всё в порядке."
|
||||
missed_doses: "Заметил, что несколько приёмов препарата пропущено. Всё ли в порядке? Если что-то мешает — расскажите, я передам врачу."
|
||||
default: "Хотел узнать, как вы. Напишите пару слов, когда будет удобно."
|
||||
# The day after a crisis (app/services/followup.py); the doctor on duty also calls back.
|
||||
after_crisis: "Как вы сегодня? Вчера было очень тяжело — мне важно знать, что вы в порядке. Ваш план безопасности под кнопкой ниже. С вами также свяжется дежурный специалист. Если станет хуже — звоните 112 или на телефон доверия {phone:helpline}."
|
||||
|
||||
visit:
|
||||
button: "Записаться к врачу раньше"
|
||||
|
||||
unavailable: |-
|
||||
Сейчас у меня технические неполадки, и я не могу сохранить ваше сообщение. Пожалуйста, напишите чуть позже.
|
||||
Если вам плохо прямо сейчас — звоните 112 или на телефон доверия +7 (495) 989-50-50.
|
||||
Если вам плохо прямо сейчас — звоните 112 или на телефон доверия {phone:helpline}.
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
connected: "Уведомления подключены. Здесь будут появляться напоминания с сайта. Отключить их можно командой /stop."
|
||||
not_connected: "Чтобы получать уведомления, откройте сайт и подключите MAX в настройках уведомлений."
|
||||
invalid: "Не удалось подключить уведомления. Создайте новую ссылку на сайте. Если MAX уже подключён к другому аккаунту, сначала отключите прежнюю привязку."
|
||||
stopped: "Уведомления отключены. Подключить их снова можно по новой ссылке с сайта."
|
||||
help: "Этот бот присылает уведомления. Пройти тесты, посмотреть результаты и продолжить общение можно на сайте. Команда /stop отключает уведомления."
|
||||
notification: "На сайте есть напоминание для вас. Откройте личный кабинет, чтобы продолжить."
|
||||
completed: "Прохождение теста завершено. Подробности доступны в личном кабинете на сайте."
|
||||
open_site: "Открыть сайт"
|
||||
@@ -32,13 +32,13 @@ findings:
|
||||
text: "Рекомендуем консультацию нарколога — параллельно с основным маршрутом."
|
||||
suicide_low:
|
||||
title: "Тяжёлые мысли"
|
||||
text: "Вы отметили мысли о смерти. Мы добавили план безопасности и будем каждый день коротко спрашивать о самочувствии. Если станет тяжело — звоните 112 или на телефон доверия."
|
||||
text: "Вы отметили мысли о смерти. Мы добавили план безопасности и будем каждый день коротко спрашивать о самочувствии. Если станет тяжело — звоните 112 или на телефон доверия {phone:helpline}."
|
||||
tbi:
|
||||
title: "Контузия или ЧМТ"
|
||||
text: "Рекомендуем консультацию невролога."
|
||||
|
||||
routes:
|
||||
urgent_psychiatrist: "Срочно свяжитесь с психиатром — сегодня или завтра."
|
||||
urgent_psychiatrist: "Срочно свяжитесь с психиатром — ориентир: в течение 24 часов."
|
||||
priority_psychiatrist: "Рекомендуем приоритетную запись к психиатру в ближайшие дни."
|
||||
psychiatrist_or_psychotherapist: "Рекомендуем плановую запись к психиатру или психотерапевту."
|
||||
psychologist: "Рекомендуем консультацию психолога."
|
||||
|
||||
@@ -42,7 +42,10 @@ def dose_strip_html(grid: h.DoseGrid, start: date | None) -> str:
|
||||
f'<span><i style="border:1.5px dashed var(--grey)"></i>ожидается · {c["pending"]}</span>'
|
||||
"</div>"
|
||||
)
|
||||
return f'<div class="mt-doses" style="grid-template-columns:{cols}">{"".join(cells)}</div>{legend}'
|
||||
return (
|
||||
f'<div class="mt-dose-scroll"><div class="mt-doses" style="grid-template-columns:{cols}">'
|
||||
f"{''.join(cells)}</div></div>{legend}"
|
||||
)
|
||||
|
||||
|
||||
def _tile(label: str, value: str, hint: str = "", tone: str = "blue") -> str:
|
||||
@@ -181,7 +184,7 @@ def render(card: PatientCard, today: date | None) -> None:
|
||||
|
||||
main, side = st.columns([1.75, 1], gap="large")
|
||||
with main:
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-scales"):
|
||||
c1, c2 = st.columns(2)
|
||||
for col, scale_id, title in ((c1, "phq9", "PHQ-9"), (c2, "pcl5", "PCL-5")):
|
||||
fig = charts.scale_figure(card.series, scale_id, title, start)
|
||||
@@ -191,22 +194,22 @@ def render(card: PatientCard, today: date | None) -> None:
|
||||
else:
|
||||
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key=f"chart-{scale_id}")
|
||||
st.caption("◇ — внеплановое заполнение (по триггеру правил). Полосы — градации тяжести из config/scales.")
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-wellbeing"):
|
||||
fig = charts.wellbeing_figure(card.series, start)
|
||||
if fig is None:
|
||||
st.caption("Ежедневных чек-инов пока нет")
|
||||
else:
|
||||
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key="chart-wellbeing")
|
||||
st.caption("Красная зона настроения ≤ 3 (3 дня → внеплановый PHQ-9); пунктир — сон 4 ч.")
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-doses"):
|
||||
st.html('<div class="mt-panel-title">Календарь приёма</div>')
|
||||
st.html(dose_strip_html(grid, start))
|
||||
with side:
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-alerts"):
|
||||
_alerts_feed(card.alerts, today)
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-summary"):
|
||||
_summary(card.summary)
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-safety"):
|
||||
_safety_plan(card.safety_plan)
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-prescriptions"):
|
||||
_prescriptions(card)
|
||||
|
||||
@@ -51,7 +51,7 @@ def render_playback_panel(persona: dict[str, Any]) -> None:
|
||||
token = persona["token"]
|
||||
scenario, source = w.scenario_for(persona)
|
||||
state = w.playback_state(token)
|
||||
st.subheader("🎬 Сценарий демо")
|
||||
st.subheader("Сценарий демо")
|
||||
_scenario_source_controls(persona, source)
|
||||
if scenario.errors:
|
||||
with st.expander(f"⚠️ Замечания к сценарию: {len(scenario.errors)}", expanded=not scenario.days):
|
||||
|
||||
@@ -368,10 +368,9 @@ def render_doctor_panel(highlight_token: str | None, *, key: str = "doc") -> Non
|
||||
]
|
||||
for a in fresh_acute[:1]:
|
||||
st.markdown(
|
||||
"<div style='background:#c62828;color:#fff;padding:18px 20px;border-radius:12px;"
|
||||
"font-size:1.35rem;font-weight:700;margin-bottom:8px'>"
|
||||
"<div class='mt-banner t-red mt-console-alert'><div>"
|
||||
f"🚨 ОСТРЫЙ АЛЕРТ · {_escape(a.get('patient_name', ''))} · {_fmt_ts(a.get('ts'))}<br>"
|
||||
f"<span style='font-size:1.05rem;font-weight:500'>{_escape(a.get('reason', ''))}</span></div>",
|
||||
f"<div class='mt-sub'>{_escape(a.get('reason', ''))}</div></div></div>",
|
||||
unsafe_allow_html=True,
|
||||
)
|
||||
c1, c2 = st.columns(2)
|
||||
|
||||
@@ -68,7 +68,7 @@ def _reset() -> None:
|
||||
|
||||
def _result(res: ConnectPatientOut, name: str) -> None:
|
||||
link = h.absolute_link(res.deep_link, os.environ.get("DASHBOARD_PUBLIC_URL", "http://localhost:8501"))
|
||||
with st.container(border=True):
|
||||
with st.container(border=True, key="panel-connect-result"):
|
||||
st.html(
|
||||
f'<div class="mt-kicker">Пациент подключён · {escape(name)}</div>'
|
||||
'<div class="mt-sub" style="margin:4px 0 10px">Покажите QR пациенту или продиктуйте код — бот спросит '
|
||||
@@ -108,7 +108,7 @@ def main() -> None:
|
||||
st.button("Заполнить демо-данными (Андрей)", icon=":material/auto_fix_high:", on_click=_fill_demo, args=(today,))
|
||||
|
||||
left, right = st.columns(2, gap="large")
|
||||
with left, st.container(border=True):
|
||||
with left, st.container(border=True, key="panel-connect-person"):
|
||||
st.html('<div class="mt-panel-title">Пациент</div>')
|
||||
st.text_input("Имя и инициал фамилии", key="cp_name", placeholder="Андрей С.", help="Без полного ФИО")
|
||||
a, b = st.columns(2)
|
||||
@@ -128,7 +128,7 @@ def main() -> None:
|
||||
key="cp_modules",
|
||||
format_func=lambda m: h.MODULE_LABELS[m],
|
||||
)
|
||||
with right, st.container(border=True):
|
||||
with right, st.container(border=True, key="panel-connect-prescription"):
|
||||
st.html('<div class="mt-panel-title">Назначение</div>')
|
||||
d1, d2 = st.columns([1.4, 1])
|
||||
with d1:
|
||||
|
||||
@@ -14,21 +14,31 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
from console import widgets as w # noqa: E402
|
||||
from console.playback_ui import render_playback_panel # noqa: E402
|
||||
|
||||
from dashboard import theme # noqa: E402
|
||||
from dashboard.components import ui # noqa: E402
|
||||
|
||||
st.set_page_config(page_title="Демо-консоль", page_icon="🎬", layout="wide")
|
||||
|
||||
st.html(theme.CSS)
|
||||
st.html(
|
||||
ui.page_header(
|
||||
"Демо-консоль",
|
||||
"Чат пациента и сценарий сопровождения. Прототип на синтетических данных.",
|
||||
kicker="Демонстрация",
|
||||
)
|
||||
)
|
||||
|
||||
persona = w.select_persona()
|
||||
w.render_connect_hero()
|
||||
w.show_flash()
|
||||
st.sidebar.caption(f"API: {w.get_api().base_url}")
|
||||
|
||||
st.title("Демо-консоль")
|
||||
st.caption("Прототип на синтетических данных. Время — виртуальные демо-часы (ADR-005).")
|
||||
w.render_clock_bar(persona, key="console-clock")
|
||||
st.divider()
|
||||
with st.container(border=True, key="panel-console-clock"):
|
||||
w.render_clock_bar(persona, key="console-clock")
|
||||
|
||||
chat_col, play_col = st.columns([1.05, 1], gap="large")
|
||||
with chat_col:
|
||||
st.subheader(f"💬 Чат пациента — {persona.get('display_name') or persona['token']}")
|
||||
with chat_col, st.container(border=True, key="panel-console-chat"):
|
||||
st.subheader(f"Чат пациента — {persona.get('display_name') or persona['token']}")
|
||||
w.render_chat(persona["token"], height=560, key="console-chat")
|
||||
with play_col:
|
||||
with play_col, st.container(border=True, key="panel-console-scenario"):
|
||||
render_playback_panel(persona)
|
||||
|
||||
@@ -15,12 +15,12 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
|
||||
from console import widgets as w # noqa: E402
|
||||
|
||||
from dashboard import theme # noqa: E402
|
||||
from dashboard.components import ui # noqa: E402
|
||||
|
||||
st.set_page_config(page_title="Сплит-экран", page_icon="🖥️", layout="wide", initial_sidebar_state="collapsed")
|
||||
st.markdown(
|
||||
"<style>.block-container{padding-top:1.2rem;max-width:100%} "
|
||||
"[data-testid='stMarkdownContainer'] p, [data-testid='stMarkdownContainer'] li{font-size:1.08rem}</style>",
|
||||
unsafe_allow_html=True,
|
||||
)
|
||||
st.html(theme.CSS)
|
||||
st.html(ui.page_header("Сплит-экран", "Пациент и врач: сопровождение в реальном времени.", kicker="Демонстрация"))
|
||||
|
||||
persona = w.select_persona()
|
||||
w.show_flash()
|
||||
@@ -44,15 +44,15 @@ if clicked and nxt is not None:
|
||||
st.rerun()
|
||||
|
||||
left, right = st.columns([1.1, 1], gap="large")
|
||||
with left:
|
||||
with left, st.container(border=True, key="panel-split-patient"):
|
||||
url = w.patient_web_url()
|
||||
if url:
|
||||
st.markdown(f"#### 📱 Пациент — {persona.get('display_name') or token}")
|
||||
st.markdown(f"#### Пациент — {persona.get('display_name') or token}")
|
||||
st.iframe(url, height=760)
|
||||
st.caption(f"Веб-приложение пациента: {url}")
|
||||
else:
|
||||
st.markdown(f"#### 💬 Пациент — {persona.get('display_name') or token}")
|
||||
st.markdown(f"#### Пациент — {persona.get('display_name') or token}")
|
||||
w.render_chat(token, height=600, key="split-chat")
|
||||
with right:
|
||||
st.markdown("#### 🩺 Кабинет врача — д-р Смирнова Е. А.")
|
||||
with right, st.container(border=True, key="panel-split-doctor"):
|
||||
st.markdown("#### Кабинет врача — д-р Смирнова Е. А.")
|
||||
w.polled_doctor_panel(token, key="split-doc")
|
||||
|
||||
+23
-6
@@ -138,8 +138,8 @@ div[class*="st-key-prow-"] {{ border-top:1px solid var(--line); padding:18px 0 4
|
||||
.mt-empty p {{ font-size:.85rem; margin:8px 0 0; }}
|
||||
|
||||
/* ---------- chips, badges, bars ---------- */
|
||||
.mt-chip {{ display:inline-block; font-size:.72rem; padding: 1px 8px; border-radius: 999px; margin-right: 4px;
|
||||
background: var(--blue-tint); color: var(--blue-ink); font-weight: 500; }}
|
||||
.mt-chip {{ display:inline-block; font-size:.72rem; padding: 1px 8px; border-radius: 5px; margin-right: 4px;
|
||||
background: #edf3ee; color: #38634b; font-weight: 500; }}
|
||||
.mt-badge {{ display:inline-flex; align-items:center; gap:6px; font-size:.7rem; font-weight:550; padding: 5px 8px;
|
||||
border-radius: 5px; white-space: normal; }}
|
||||
.mt-badge.t-red {{ background: var(--red-tint); color: var(--red-ink); }}
|
||||
@@ -166,7 +166,7 @@ div[class*="st-key-prow-"] {{ border-top:1px solid var(--line); padding:18px 0 4
|
||||
.mt-banner b {{ color: inherit; }}
|
||||
.mt-pulse {{ width: 12px; height: 12px; border-radius: 50%; background: var(--red); margin-top: 5px; flex: none;
|
||||
box-shadow: 0 0 0 4px #faeeee; }}
|
||||
.mt-panel-title {{ font-size: .8rem; text-transform: uppercase; letter-spacing: .07em; font-weight: 650;
|
||||
.mt-panel-title {{ font-size: .82rem; text-transform: uppercase; letter-spacing: .03em; font-weight: 550;
|
||||
color: var(--ink-3); margin: 2px 0 8px; }}
|
||||
.mt-alert {{ border-left: 4px solid var(--grey); padding: 4px 0 4px 12px; }}
|
||||
.mt-alert.t-red {{ border-left-color: var(--red); }}
|
||||
@@ -175,9 +175,9 @@ div[class*="st-key-prow-"] {{ border-top:1px solid var(--line); padding:18px 0 4
|
||||
.mt-alert .when {{ color: var(--ink-3); font-size: .78rem; }}
|
||||
.mt-alert .why {{ color: var(--ink); font-weight: 600; font-size: .92rem; margin: 2px 0; }}
|
||||
.mt-alert.acked .why {{ color: var(--ink-3); font-weight: 500; }}
|
||||
.mt-summary {{ background: var(--blue-tint); border-radius: 12px; padding: 14px 16px; color: var(--ink);
|
||||
line-height: 1.5; font-size: .93rem; }}
|
||||
.mt-summary .disc {{ color: var(--blue-ink); font-size: .76rem; margin-top: 8px; }}
|
||||
.mt-summary {{ background: #f4f6f2; border:1px solid var(--line); border-radius: 12px; padding: 14px 16px;
|
||||
color: var(--ink); line-height: 1.5; font-size: .93rem; }}
|
||||
.mt-summary .disc {{ color: var(--ink-2); font-size: .76rem; margin-top: 8px; }}
|
||||
.mt-plan ol {{ margin: 0; padding-left: 1.2rem; }}
|
||||
.mt-plan li {{ margin: 3px 0; color: var(--ink); font-size: .9rem; }}
|
||||
|
||||
@@ -195,6 +195,21 @@ div[class*="st-key-prow-"] {{ border-top:1px solid var(--line); padding:18px 0 4
|
||||
.mt-legend i {{ display:inline-block; width: 12px; height: 12px; border-radius: 3px; margin-right: 5px;
|
||||
vertical-align: -1px; }}
|
||||
|
||||
/* ---------- internal pages ---------- */
|
||||
div[class*="st-key-panel-"] {{ background:var(--surface); border:1px solid var(--line); border-radius:12px;
|
||||
padding:20px; }}
|
||||
[data-testid="stExpander"] {{ background:var(--surface); border-color:var(--line); border-radius:12px; }}
|
||||
[data-testid="stChatMessage"] {{ background:#f4f6f2; border:1px solid var(--line); border-radius:12px; }}
|
||||
[data-testid="stChatInput"] {{ background:var(--surface); border:1px solid var(--line); border-radius:8px; }}
|
||||
[data-testid="stNumberInputContainer"], [data-testid="stDateInput"] input {{
|
||||
background:var(--surface); color:var(--ink); border-color:var(--line); border-radius:8px; }}
|
||||
[data-testid="stApp"] [data-variant="pills"][data-selected] {{ background:#edf3ee; color:#285e4e;
|
||||
border-color:#b4c6ba; }}
|
||||
.mt-console-alert {{ font-size:1.1rem; font-weight:600; }}
|
||||
.mt-console-alert .mt-sub {{ color:var(--red-ink); font-weight:400; }}
|
||||
.mt-dose-scroll {{ overflow-x:auto; padding-bottom:4px; }}
|
||||
.mt-doses {{ min-width:max-content; }}
|
||||
|
||||
/* ---------- connect result ---------- */
|
||||
.mt-code {{ font-size: 2.4rem; font-weight: 700; letter-spacing: .12em; color: var(--ink);
|
||||
font-variant-numeric: tabular-nums; }}
|
||||
@@ -222,6 +237,8 @@ div[class*="st-key-prow-"] {{ border-top:1px solid var(--line); padding:18px 0 4
|
||||
.mt-mobile-label {{ display:block; color:var(--ink-3); font-size:.68rem; margin-bottom:5px; }}
|
||||
.mt-row-details {{ grid-template-columns:1fr; gap:12px; }}
|
||||
.mt-list-footer {{ flex-wrap:wrap; }}
|
||||
.mt-head .mt-side {{ text-align:left; }}
|
||||
div[class*="st-key-panel-"] {{ padding:16px; }}
|
||||
.mt-tip:hover::after, .mt-tip:focus-visible::after {{ display:none; }}
|
||||
}}
|
||||
@media (prefers-reduced-motion: reduce) {{
|
||||
|
||||
@@ -3,6 +3,17 @@
|
||||
> Живой журнал: **что** решили и **почему**. Новые записи — сверху. Одна запись = одно решение.
|
||||
> При конфликте с [`docs/info/SPEC.md`](info/SPEC.md) действует ADR.
|
||||
|
||||
## 2026-10-04 — ADR-013: Правки по клиническому ревью — красные флаги, одно правило кризиса, звонок после кризиса, одна таблица номеров
|
||||
**Контекст:** ревью опросников: обязательны блок красных флагов и план безопасности со звонком после кризиса; маршрутизация должна сначала смотреть на риск и флаги, потом на шкалы; в документе два противоречащих правила кризисного экрана («любое Да» против «только высокий риск»); кризисные номера разбросаны по текстам (и чат-агент давал взрослым детский телефон доверия).
|
||||
**Решение:**
|
||||
1. Красные флаги (`config/instruments/red_flags.yaml`) идут первыми в этапе 1: голоса/видения, мысли причинить вред другому, доступ к оружию, насилие дома, сильное опьянение или отмена. Любое «Да» останавливает опрос: острый алерт врачу и экран помощи нужного варианта (`harm_others`, `domestic_violence`).
|
||||
2. Одно правило кризиса во всём приложении: кризисный экран открывается только при **высоком** риске C-SSRS. Умеренный риск — стоп опроса и психиатр, «ориентир 24 ч»; низкий — флаг врачу, план безопасности, опрос продолжается. Пункт 9 PHQ-9 при отрицательном C-SSRS — флаг «расхождение» и план безопасности; без пройденного C-SSRS (плановый PHQ-9, дневник) — сразу C-SSRS, решает его уровень. `config/questionnaire.yaml`: `cssrs_positive_policy: graded` (C01).
|
||||
3. После любого кризиса дежурному создаётся задача «перезвонить пациенту» (алерт `post_crisis_call`, ориентир 24 ч; «позвонили» — подтверждение алерта), одна на пациента, пока открыта. На следующий день приложение само спрашивает «как вы» с кнопкой плана безопасности (`app/services/followup.py`).
|
||||
4. Маршрут: риск и флаги → шкалы. PCL-5 ≥50 убран из приоритетной записи (и в правилах дашборда `pcl5_severe` — уровень moderate): высокий PCL-5 ведёт к плановой записи к специалисту.
|
||||
5. Все телефоны — только в `config/texts/crisis.yaml`; остальные тексты и промпт агента ссылаются через `{phone:<ключ>}`, неизвестный ключ роняет загрузку, тест не пускает «голые» номера в код и тексты.
|
||||
**Причина:** врач назвал пункты 1–2 обязательными; одно правило кризиса исключает расхождение демо с документом; неверный номер на кризисном экране недопустим.
|
||||
**Последствия:** формулировки красных флагов — черновик команды, утверждает врач (#8). Старое правило дашборда `phq9_item9` (ADR-006, сценарий без опросника) по-прежнему поднимает кризис по п.9 — свести при следующем ревью правил.
|
||||
|
||||
## 2026-10-04 — ADR-012: Два этапа опросов — общий скрининг, предварительный результат пациенту, дневник по результату
|
||||
**Контекст:** PDF «Опросники для MVP» (этап 1) и «Этап 2: наблюдение после диагноза». Пациент должен видеть, что у него всё в порядке или есть признаки депрессии/ПТСР, и дальше вести дневник под свой результат. Клиническая политика (`config/questionnaire.yaml`) закрыта до решений врача C01–C09, поэтому в демо опрос всегда заканчивался остановкой «нужна оценка специалиста».
|
||||
**Решение:** этап 1 общий для всех и идёт в фиксированном порядке документа: PHQ-2 → фильтр травмы/TSQ → RUS-AUDIT-S → C-SSRS → общие вопросы, затем этап 2 только там, где этап 1 положительный. Пункты внутри шкал не переставляются. Стоп-правила риска срабатывают после каждого ответа. После этапа 1 правила (`app/core/interpretation.py`, тексты в `config/texts/results.yaml`) показывают пациенту предварительный результат: «не выявлено», «предположение депрессии» (PHQ-9 ≥10), «склонность к ПТСР» (PCL-5 ≥31), алкоголь, ЧМТ, маршрут. Это всегда «результат скрининга, не диагноз». Результат включает модули дневника: `depression` и `veteran` (ПТСР). Без врача их определяет скрининг, модули врача сохраняются и дополняются. Дневник этапа 2 состоит из двух частей: утро (часы сна, качество сна, порции алкоголя) и вечер (настроение, лекарства + модули: 3 пункта PHQ-9 в день по кругу, короткая PCL-5 из 4 пунктов). C-SSRS «с последнего контакта» задаётся каждый вечер только при суицидальном риске. Флаги считаются по недельным средним против личной нормы за первые 14 дней и выносят полную шкалу раньше срока. Каждая запись хранит интерпретацию, показанную при завершении; журнал отдаёт `/me/{token}/results`. Демо (`INTAKE_DEMO=1` + демо-часы) читает отдельный `config/questionnaire_demo.yaml`, помеченный «не клиническое согласование», а реальная политика не меняется.
|
||||
|
||||
@@ -160,7 +160,7 @@ q6 за всю жизнь всем; при положительном q6 уто
|
||||
|
||||
| ID | Решение, которое нужно зафиксировать | Статус |
|
||||
|---|---|---|
|
||||
| C01 | Любой «Да» останавливает обычный опрос или разрешено продолжение после низкого риска? Различить обычный опрос, уточнение риска и кризисную помощь. Новый PDF с.1 против с.12; в старом с.1 против с.11. Скриншот поддерживает остановку. | pending |
|
||||
| C01 | Любой «Да» останавливает обычный опрос или разрешено продолжение после низкого риска? Различить обычный опрос, уточнение риска и кризисную помощь. Новый PDF с.1 против с.12; в старом с.1 против с.11. Скриншот поддерживает остановку. | **решено 2026-10-04 (ADR-013):** кризисный экран только при высоком риске; умеренный — стоп и психиатр (ориентир 24 ч); низкий — флаг, план безопасности, продолжение. `cssrs_positive_policy: graded`. Подпись врача — в #8. |
|
||||
| C02 | Использовать сумму ≥1 или согласованную границу зоны для расширения RUS-AUDIT-S? Не переносить порог AUDIT-C ≥3/≥4. | pending |
|
||||
| C03 | Самозаполнение полного RUS-AUDIT, таблица стандартных порций, порядок дополнения и повторные замеры. | pending |
|
||||
| C04 | Новая спецификация: TSQ ≥6 вместо PC-PTSD-5 ≥3; получить приложение Г1, согласовать применение и PCL-5 ≥31 для популяции. TSQ из приложения Г1 редакции 2023 года уже добавлен; актуальность редакции и применение требуют подтверждения. | pending |
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# Проверка контактов: 3 октября 2026
|
||||
|
||||
> **Единая таблица номеров приложения — `config/texts/crisis.yaml` (`resources`).** Остальные тексты и промпт
|
||||
> чат-агента ссылаются на неё через `{phone:<ключ>}` (ADR-013); номер меняется в одном месте.
|
||||
|
||||
Проверены официальные страницы, **не телефонное соединение**. Никаких звонков
|
||||
или уведомлений службам/врачу не выполнялось.
|
||||
|
||||
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
# Deploy origin/dev to the shared server (ssh alias `vobot`, dir /srv/ptsr). Run from a clean checkout:
|
||||
# infra/deploy/deploy.sh [git-ref] default: origin/dev
|
||||
# Keeps /srv/ptsr/.env (secrets live only on the server) and the Postgres volume.
|
||||
set -euo pipefail
|
||||
REF=${1:-origin/dev}
|
||||
HOST=${DEPLOY_HOST:-vobot}
|
||||
DIR=/srv/ptsr
|
||||
git fetch -q origin || true
|
||||
SHA=$(git rev-parse --short "$REF")
|
||||
echo "deploy $REF ($SHA) -> $HOST:$DIR"
|
||||
git archive --format=tar "$REF" | ssh "$HOST" "rm -rf $DIR/app.new && mkdir -p $DIR/app.new && tar -x -C $DIR/app.new"
|
||||
ssh "$HOST" bash -s <<SH
|
||||
set -euo pipefail
|
||||
cd $DIR
|
||||
cp .env app.new/.env
|
||||
rm -rf app.old; [ -d app ] && mv app app.old; mv app.new app
|
||||
cd app
|
||||
echo "$SHA" > REVISION
|
||||
docker run --rm -v "\$PWD/web:/w" -w /w node:20-alpine sh -c "npm ci --no-audit --no-fund >/dev/null && npm run build >/dev/null"
|
||||
docker compose -p ptsr -f docker-compose.yml -f infra/deploy/docker-compose.server.yml up -d --build </dev/null
|
||||
for i in \$(seq 1 40); do curl -sf 127.0.0.1:8010/health >/dev/null && break; sleep 3; done
|
||||
curl -sf 127.0.0.1:8010/health && echo " api ok"
|
||||
SH
|
||||
@@ -0,0 +1,30 @@
|
||||
# Server override (shared host with vobot): loopback-only ports behind host nginx, restart policy, memory caps.
|
||||
# docker compose -p ptsr -f docker-compose.yml -f infra/deploy/docker-compose.server.yml up -d --build
|
||||
services:
|
||||
postgres:
|
||||
ports: !reset []
|
||||
restart: unless-stopped
|
||||
mem_limit: 512m
|
||||
|
||||
app:
|
||||
ports: !override
|
||||
- "127.0.0.1:8010:8000"
|
||||
restart: unless-stopped
|
||||
mem_limit: 768m
|
||||
|
||||
dashboard:
|
||||
command:
|
||||
- streamlit
|
||||
- run
|
||||
- dashboard/app.py
|
||||
- --server.port=8501
|
||||
- --server.address=0.0.0.0
|
||||
- --server.baseUrlPath=doctor
|
||||
- --browser.gatherUsageStats=false
|
||||
environment:
|
||||
API_BASE_URL: http://app:8000
|
||||
DASHBOARD_PUBLIC_URL: ${PUBLIC_URL:-http://localhost}/doctor
|
||||
ports: !override
|
||||
- "127.0.0.1:8511:8501"
|
||||
restart: unless-stopped
|
||||
mem_limit: 768m
|
||||
@@ -0,0 +1,52 @@
|
||||
# meditron.tenvex.ru — PTSRaiAgent prototype (synthetic data only).
|
||||
# / patient web app (static, web/dist)
|
||||
# /api/ FastAPI (127.0.0.1:8010)
|
||||
# /doctor/ Streamlit doctor dashboard + demo console (127.0.0.1:8511, baseUrlPath=doctor)
|
||||
# TLS: after the DNS A-record exists — certbot --nginx -d meditron.tenvex.ru
|
||||
|
||||
map $http_upgrade $ptsr_connection_upgrade {
|
||||
default upgrade;
|
||||
'' close;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name meditron.tenvex.ru;
|
||||
|
||||
access_log /var/log/nginx/ptsr-access.log;
|
||||
client_max_body_size 5m;
|
||||
|
||||
root /srv/ptsr/app/web/dist;
|
||||
index index.html;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8010;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_read_timeout 120s; # chat agent + scheduler replay on clock advance
|
||||
}
|
||||
|
||||
location ~ ^/(docs|openapi.json|health)$ {
|
||||
proxy_pass http://127.0.0.1:8010;
|
||||
proxy_set_header Host $host;
|
||||
}
|
||||
|
||||
location /doctor/ {
|
||||
proxy_pass http://127.0.0.1:8511;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $ptsr_connection_upgrade;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_read_timeout 86400s;
|
||||
proxy_buffering off;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
"""MAX endpoints authenticate before reading bindings or accepting events."""
|
||||
|
||||
import sys
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import AsyncMock
|
||||
from urllib.parse import parse_qs, urlsplit
|
||||
|
||||
import pytest
|
||||
from httpx import ASGITransport, AsyncClient
|
||||
from sqlalchemy.exc import OperationalError
|
||||
|
||||
from app.config import get_settings
|
||||
from app.core import clock
|
||||
from app.db import repo, session
|
||||
from app.db.bootstrap import init_db
|
||||
from app.integrations import max_store
|
||||
from app.main import app
|
||||
|
||||
BASE = "/api/v1/me/notifications/max"
|
||||
HOOK = "/api/v1/webhooks/max"
|
||||
TOKEN = "synthetic-patient"
|
||||
AUTH = {"Authorization": f"Bearer {TOKEN}"}
|
||||
SECRET = "test-secret-" * 4
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
async def client(monkeypatch):
|
||||
for key, value in {
|
||||
"MAX_ENABLED": "true",
|
||||
"MAX_BOT_TOKEN": "fake-token",
|
||||
"MAX_BOT_USERNAME": "test_bot",
|
||||
"MAX_WEBHOOK_SECRET": SECRET,
|
||||
"MAX_WEBHOOK_URL": "https://api.example.org" + HOOK,
|
||||
"MAX_SITE_URL": "https://example.org",
|
||||
}.items():
|
||||
monkeypatch.setenv(key, value)
|
||||
get_settings.cache_clear()
|
||||
await session.configure(identity_url="sqlite+aiosqlite:///:memory:", clinical_url="sqlite+aiosqlite:///:memory:")
|
||||
await init_db()
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.upsert_profile(s, token=TOKEN, doctor_id="")
|
||||
await repo.set_dialog_state(
|
||||
s, token=TOKEN, state="idle", data={"consent": True, "adult": True}, now=clock.now()
|
||||
)
|
||||
async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as c:
|
||||
yield c
|
||||
await session.configure()
|
||||
get_settings.cache_clear()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("auth", [{}, {"Authorization": "Bearer unknown"}, {"Authorization": "Basic test"}])
|
||||
async def test_auth_required(client, auth):
|
||||
assert (await client.get(BASE, headers=auth)).status_code == 401
|
||||
assert (await client.post(BASE + "/link", headers=auth, json={"consent": True})).status_code == 401
|
||||
assert (await client.delete(BASE, headers=auth)).status_code == 401
|
||||
|
||||
|
||||
async def test_link_requires_consent_and_hides_patient_credential(client):
|
||||
for body in ({}, {"consent": False}, {"consent": True, "user_id": 100}):
|
||||
assert (await client.post(BASE + "/link", headers=AUTH, json=body)).status_code == 422
|
||||
response = await client.post(BASE + "/link", headers=AUTH, json={"consent": True})
|
||||
assert response.status_code == 200
|
||||
assert TOKEN not in response.text
|
||||
url = urlsplit(response.json()["url"])
|
||||
assert url.netloc == "max.ru" and url.path == "/test_bot"
|
||||
code = parse_qs(url.query)["start"][0]
|
||||
async with session.get_identity_session() as s:
|
||||
assert await max_store.bind(s, code, 100, clock.now()) == TOKEN
|
||||
assert (await client.get(BASE, headers=AUTH)).json()["connected"] is True
|
||||
assert (await client.delete(BASE, headers=AUTH)).json()["connected"] is False
|
||||
|
||||
|
||||
async def test_revoke_consent_prevents_linking(client):
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.set_dialog_state(
|
||||
s, token=TOKEN, state="idle", data={"consent": False, "adult": True}, now=clock.now()
|
||||
)
|
||||
assert (await client.post(BASE + "/link", headers=AUTH, json={"consent": True})).status_code == 403
|
||||
|
||||
|
||||
async def test_disabled_service_still_allows_disconnect(client, monkeypatch):
|
||||
monkeypatch.setenv("MAX_ENABLED", "false")
|
||||
get_settings.cache_clear()
|
||||
assert (await client.get(BASE, headers=AUTH)).json()["available"] is False
|
||||
assert (await client.post(BASE + "/link", headers=AUTH, json={"consent": True})).status_code == 503
|
||||
assert (await client.post(HOOK, json={})).status_code == 503
|
||||
assert (await client.delete(BASE, headers=AUTH)).status_code == 200
|
||||
|
||||
|
||||
async def test_webhook_secret_checked_before_body_or_adapter(client):
|
||||
assert (await client.post(HOOK, content="not-json")).status_code == 403
|
||||
assert (await client.post(HOOK, headers={"X-Max-Bot-Api-Secret": "wrong"}, json={})).status_code == 403
|
||||
headers = {"X-Max-Bot-Api-Secret": SECRET}
|
||||
assert (await client.post(HOOK, headers=headers, content="not-json")).status_code == 400
|
||||
assert (await client.post(HOOK, headers=headers, json=[])).status_code == 422
|
||||
assert (await client.post(HOOK, headers=headers, content=" " * 65537)).status_code == 413
|
||||
|
||||
|
||||
async def test_webhook_storage_failure_is_retryable_without_identity_details(client, monkeypatch):
|
||||
handler = AsyncMock(side_effect=OperationalError("private SQL", {"token": TOKEN}, Exception("private")))
|
||||
monkeypatch.setitem(sys.modules, "app.channels.max_bot", SimpleNamespace(handle_update=handler))
|
||||
response = await client.post(HOOK, headers={"X-Max-Bot-Api-Secret": SECRET}, json={})
|
||||
assert response.status_code == 503 and TOKEN not in response.text and "private" not in response.text
|
||||
@@ -169,8 +169,8 @@ async def test_demo_flag_opens_intake_in_the_engine(client: AsyncClient, monkeyp
|
||||
await press()
|
||||
await press("consent:yes")
|
||||
buttons = await press("age:adult")
|
||||
# Stage 1 starts with PHQ-2, in the order of the MVP questionnaire.
|
||||
assert any(b.startswith("iq:") and ":phq9_1:" in b for b in buttons)
|
||||
# Stage 1 starts with the red-flag block, then the order of the MVP questionnaire.
|
||||
assert any(b.startswith("iq:") and ":rf_psychosis:" in b for b in buttons)
|
||||
assert "intake:help" in buttons and "intake:pause" in buttons
|
||||
q = (await client.get(f"/api/v1/me/{persona}/today")).json()["questionnaires"]
|
||||
assert q["enabled"] and q["intake"] == "active"
|
||||
@@ -214,7 +214,7 @@ async def test_stage_one_starts_without_modules(client: AsyncClient, monkeypatch
|
||||
assert (await client.get(f"/api/v1/me/{token}/today")).json()["questionnaires"]["enabled"]
|
||||
await press()
|
||||
await press("consent:yes")
|
||||
assert any(":phq9_1:" in b for b in await press("age:adult"))
|
||||
assert any(":rf_psychosis:" in b for b in await press("age:adult"))
|
||||
|
||||
|
||||
async def test_patient_app_has_its_own_demo_personas(client: AsyncClient) -> None:
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
"""MAX stays off without credentials; enabled deployments fail closed on incomplete settings."""
|
||||
|
||||
import pytest
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app.config import Settings
|
||||
|
||||
|
||||
def configured(**overrides):
|
||||
fields = {
|
||||
"max_enabled": True,
|
||||
"max_bot_token": "test-only-token",
|
||||
"max_bot_username": "test_bot",
|
||||
"max_webhook_secret": "test-only-secret-" * 3,
|
||||
"max_webhook_url": "https://api.example.org/api/v1/webhooks/max",
|
||||
"max_site_url": "https://patient.example.org/#/today",
|
||||
}
|
||||
return Settings(_env_file=None, **(fields | overrides))
|
||||
|
||||
|
||||
def test_max_disabled_by_default():
|
||||
assert not Settings(_env_file=None).max_enabled
|
||||
|
||||
|
||||
def test_max_secrets_are_redacted():
|
||||
settings = configured()
|
||||
assert "test-only-token" not in repr(settings)
|
||||
assert "test-only-secret" not in repr(settings)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"overrides",
|
||||
[
|
||||
{"max_bot_token": ""},
|
||||
{"max_bot_username": "@test_bot"},
|
||||
{"max_webhook_secret": "short"},
|
||||
{"max_site_url": "http://patient.example.org"},
|
||||
{"max_webhook_url": "http://api.example.org"},
|
||||
{"max_webhook_url": "https://api.example.org:8443/hook"},
|
||||
{"max_webhook_url": "https://user:password@api.example.org/hook"},
|
||||
{"max_webhook_url": "https://api.example.org/hook#fragment"},
|
||||
{"max_site_url": "https://patient.example.org?token=credential"},
|
||||
],
|
||||
)
|
||||
def test_max_rejects_incomplete_or_unsafe_settings(overrides):
|
||||
with pytest.raises(ValidationError):
|
||||
configured(**overrides)
|
||||
@@ -0,0 +1,21 @@
|
||||
"""Startup validation errors must not print configuration credentials."""
|
||||
|
||||
import pytest
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app.config import Settings
|
||||
|
||||
|
||||
def test_incomplete_max_configuration_does_not_expose_token():
|
||||
with pytest.raises(ValidationError) as error:
|
||||
Settings(_env_file=None, max_enabled=True, max_bot_token="SYNTHETIC_SECRET")
|
||||
message = str(error.value)
|
||||
assert "MAX_BOT_USERNAME" in message
|
||||
assert "SYNTHETIC_SECRET" not in message and "input_value" not in message
|
||||
|
||||
|
||||
def test_invalid_field_does_not_expose_accidentally_pasted_secret():
|
||||
with pytest.raises(ValidationError) as error:
|
||||
Settings(_env_file=None, max_enabled="SYNTHETIC_SECRET")
|
||||
assert "max_enabled" in str(error.value)
|
||||
assert "SYNTHETIC_SECRET" not in str(error.value)
|
||||
@@ -0,0 +1,31 @@
|
||||
"""Crisis numbers live in one table (config/texts/crisis.yaml); every other text refers to it by `{phone:<key>}`."""
|
||||
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from app.core.safety import CRISIS_PATH, fill_phones
|
||||
from app.llm.agent.prompts import SYSTEM_PROMPT
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
# Any phone number except the universal short emergency numbers 112 / 101–103.
|
||||
NUMBER = re.compile(r"(\+7|\b8)[\s(-]*\d{3}[\s)-]*\d{3}[\s-]*\d{2}[\s-]*\d{2}")
|
||||
|
||||
|
||||
def test_no_number_outside_the_crisis_table():
|
||||
texts = [p for p in (ROOT / "config" / "texts").glob("*.yaml") if p != CRISIS_PATH]
|
||||
code = [*(ROOT / "app").rglob("*.py"), *(ROOT / "web" / "src").rglob("*.ts*")]
|
||||
offenders = [
|
||||
str(p.relative_to(ROOT))
|
||||
for p in [*texts, *code]
|
||||
if p.name != "privacy.py" # the PII scrubber documents the phone format with an example
|
||||
and NUMBER.search("\n".join(line for line in p.read_text(encoding="utf-8").splitlines() if "#" not in line))
|
||||
]
|
||||
assert offenders == []
|
||||
|
||||
|
||||
def test_references_resolve_and_unknown_keys_fail():
|
||||
assert "989-50-50" in fill_phones("{phone:helpline}") and "989-50-50" in SYSTEM_PROMPT
|
||||
with pytest.raises(ValueError):
|
||||
fill_phones("{phone:no_such_line}")
|
||||
+9
-1
@@ -53,7 +53,15 @@ async def _tables(engine_fn: Callable[[], AsyncEngine]) -> set[str]:
|
||||
async def test_create_all_puts_tables_in_the_right_db(dbs: None) -> None:
|
||||
identity_tables = await _tables(session.identity_engine)
|
||||
clinical_tables = await _tables(session.clinical_engine)
|
||||
assert identity_tables == {"patients", "doctors", "connect_codes"}
|
||||
assert identity_tables == {
|
||||
"patients",
|
||||
"doctors",
|
||||
"connect_codes",
|
||||
"max_bindings",
|
||||
"max_link_codes",
|
||||
"max_webhook_receipts",
|
||||
"max_deliveries",
|
||||
}
|
||||
assert {
|
||||
"patient_profiles",
|
||||
"item_responses",
|
||||
|
||||
@@ -482,4 +482,6 @@ def test_dialog_texts_avoid_forbidden_words() -> None:
|
||||
body = "\n".join(line for line in raw.splitlines() if not line.lstrip().startswith("#"))
|
||||
for word in ("учёт", "учет", "контрол", "надзор", "диагноз:"):
|
||||
assert word not in body
|
||||
assert "152-фз" in body and "8-800-2000-122" in body
|
||||
assert "152-фз" in body
|
||||
# Numbers live in one table (config/texts/crisis.yaml); the minors' stop text gets the children's line from it.
|
||||
assert "8-800-2000-122" not in body and "8-800-2000-122" in load_dialog_texts().age_gate.minor_stop
|
||||
|
||||
+68
-11
@@ -13,6 +13,7 @@ from app.core import clock
|
||||
from app.core.scales import clear_cache
|
||||
from app.db import repo, session
|
||||
from app.db.bootstrap import init_db
|
||||
from app.db.clinical import Alert
|
||||
from app.db.intake import QuestionnaireNotice, QuestionnaireRecord, QuestionnaireTask
|
||||
from app.dialog.contracts import Event
|
||||
from app.dialog.engine import Engine
|
||||
@@ -76,7 +77,8 @@ def answer_button(replies, choices=None):
|
||||
for b in line:
|
||||
if b.data.startswith("iq:"):
|
||||
item = b.data.split(":")[2]
|
||||
index = choices.get(item, 1 if item.startswith("cssrs_") else 0)
|
||||
# «Нет» by default for the safety items (C-SSRS, red flags), the first option otherwise.
|
||||
index = choices.get(item, 1 if item.startswith(("cssrs_", "rf_")) else 0)
|
||||
for line2 in reply.buttons:
|
||||
for other in line2:
|
||||
if other.data.endswith(":" + str(index)) and other.data.startswith("iq:"):
|
||||
@@ -122,17 +124,17 @@ async def test_pause_restart_and_duplicate_callbacks(released):
|
||||
old = answer_button(replies)
|
||||
await asyncio.gather(press(released, old), press(released, old))
|
||||
(row,) = await rows()
|
||||
assert row.answers == {"phq9_1": 0}
|
||||
assert row.answers == {"rf_psychosis": 0}
|
||||
await press(released, "intake:pause")
|
||||
restarted = Engine(gateway=LLMGateway(MockTasks()))
|
||||
replies = await press(restarted, "intake:resume")
|
||||
assert "phq9_2" in answer_button(replies)
|
||||
assert "rf_harm_others" in answer_button(replies)
|
||||
await press(restarted, old)
|
||||
assert (await rows())[0].answers == {"phq9_1": 0}
|
||||
assert (await rows())[0].answers == {"rf_psychosis": 0}
|
||||
assert all(len(b.data.encode()) <= 64 for r in replies for line in r.buttons for b in line)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("signal", ["help", "phq", "cssrs"])
|
||||
@pytest.mark.parametrize("signal", ["help", "red_flag", "cssrs"])
|
||||
async def test_immediate_stop_preserves_partial_answers(released, signal):
|
||||
replies = await press(released, "intake:start")
|
||||
if signal == "help":
|
||||
@@ -142,13 +144,45 @@ async def test_immediate_stop_preserves_partial_answers(released, signal):
|
||||
for item in ("cssrs_q1", "cssrs_q2", "cssrs_q3", "cssrs_q4"):
|
||||
replies = await press(released, answer_button(replies, {item: 0}))
|
||||
else:
|
||||
replies = await complete_existing(released, replies, {"trauma": 1, "phq9_1": 2, "phq9_9": 1})
|
||||
replies = await press(released, answer_button(replies, {"rf_psychosis": 0}))
|
||||
assert any(r.kind == "crisis" for r in replies)
|
||||
(row,) = await rows()
|
||||
assert row.status == "interrupted" and row.completed_at is None
|
||||
notices = await rows(QuestionnaireNotice)
|
||||
assert len(notices) == 1 and notices[0].status == "test_sink"
|
||||
assert "уведомлён" not in replies[0].text
|
||||
# Every crisis leaves a callback task for the doctor on duty (one per patient while it is open).
|
||||
calls = [a for a in await rows(Alert) if a.code == "post_crisis_call"]
|
||||
assert len(calls) == 1 and calls[0].params["assignee"] == "on-duty"
|
||||
|
||||
|
||||
async def test_red_flag_violence_uses_its_crisis_variant(released):
|
||||
replies = await press(released, "intake:start")
|
||||
for _ in range(3): # psychosis, harm to others, weapons: «Нет»
|
||||
replies = await press(released, answer_button(replies))
|
||||
replies = await press(released, answer_button(replies, {"rf_violence": 0}))
|
||||
crisis = next(r for r in replies if r.kind == "crisis")
|
||||
assert "насили" in crisis.text.lower()
|
||||
(row,) = await rows()
|
||||
assert row.details["stop_reason"] == "red_flag_violence"
|
||||
|
||||
|
||||
async def test_item9_with_a_negative_screener_is_a_flag_not_a_crisis(released):
|
||||
# One crisis rule (ADR-013): C-SSRS was negative, so PHQ-9 item 9 is a discrepancy for the doctor.
|
||||
choices = {f"phq9_{i}": 2 for i in range(1, 9)}
|
||||
choices.update(trauma=1, tbi=1, psychotropics=1, phq9_9=1)
|
||||
replies = await press(released, "intake:start")
|
||||
for _ in range(60):
|
||||
button = answer_button(replies, choices)
|
||||
if button is None or any(r.kind == "safety_plan" for r in replies):
|
||||
break
|
||||
replies = await press(released, button)
|
||||
assert not any(r.kind == "crisis" for r in replies)
|
||||
assert any(r.kind == "safety_plan" for r in replies)
|
||||
codes = {a.code for a in await rows(Alert)}
|
||||
assert "phq9_cssrs_discrepancy" in codes and "post_crisis_call" not in codes
|
||||
(row,) = await rows()
|
||||
assert row.status == "complete" and "phq9_cssrs_discrepancy" in row.details["decision"]["flags"]
|
||||
|
||||
|
||||
async def complete_existing(e, replies, choices):
|
||||
@@ -350,16 +384,24 @@ async def test_diary_morning_then_evening_with_the_ptsd_module(released):
|
||||
assert any("уже заполнен" in r.text for r in replies)
|
||||
|
||||
|
||||
async def test_depression_module_item9_stops_with_crisis(released, monkeypatch):
|
||||
async def test_depression_module_item9_asks_the_screener_at_once(released, monkeypatch):
|
||||
await complete_intake(released, {"trauma": 1, "tbi": 1, "psychotropics": 1})
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.upsert_profile(s, token=TOKEN, modules=["depression"])
|
||||
monkeypatch.setattr(clock, "now", lambda: NOW + timedelta(days=2))
|
||||
await run_diary(released, await press(released, "menu:checkin"))
|
||||
replies = await run_diary(released, await press(released, "menu:checkin"), {"medication": 2, "dphq_9": 1})
|
||||
assert any(r.kind == "crisis" for r in replies)
|
||||
replies = await press(released, "menu:checkin")
|
||||
for _ in range(10):
|
||||
button = answer_button(replies, {"medication": 2, "dphq_9": 1})
|
||||
replies = await press(released, button)
|
||||
if ":cssrs_" in (answer_button(replies) or ""):
|
||||
break
|
||||
# Item 9 → the C-SSRS right away («Этап 2»): no crisis screen before the screener says the risk is high.
|
||||
assert not any(r.kind == "crisis" for r in replies) and any("последнего ответа" in r.text for r in replies)
|
||||
evening = next(r for r in await rows() if r.kind == "diary_evening")
|
||||
assert evening.answers["dphq_9"] == 1 and evening.status == "interrupted"
|
||||
assert evening.answers["dphq_9"] == 1 and evening.details["stop_reason"] == "phq9_item9_cssrs"
|
||||
replies = await complete_existing(released, replies, {"cssrs_q1": 0, "cssrs_q2": 0, "cssrs_q3": 0, "cssrs_q4": 0})
|
||||
assert any(r.kind == "crisis" for r in replies)
|
||||
|
||||
|
||||
async def test_unknown_sex_goes_to_review_without_a_zone(released):
|
||||
@@ -380,7 +422,7 @@ async def test_version_change_blocks_resume_and_preserves_answers(released):
|
||||
path.write_text(yaml.safe_dump(data, allow_unicode=True))
|
||||
await press(released, "intake:resume")
|
||||
(row,) = await rows()
|
||||
assert row.status == "review_required" and row.answers == {"phq9_1": 0}
|
||||
assert row.status == "review_required" and row.answers == {"rf_psychosis": 0}
|
||||
|
||||
|
||||
async def test_followup_delta_uses_comparable_complete_baseline(released):
|
||||
@@ -434,6 +476,8 @@ async def test_diary_schedule_uses_moscow_date(released, monkeypatch):
|
||||
|
||||
async def test_resumed_answer_keeps_original_period(released, monkeypatch):
|
||||
replies = await press(released, "intake:start")
|
||||
for _ in range(5): # the red-flag block
|
||||
replies = await press(released, answer_button(replies))
|
||||
await press(released, answer_button(replies))
|
||||
await press(released, "intake:pause")
|
||||
monkeypatch.setattr(clock, "now", lambda: NOW + timedelta(days=1))
|
||||
@@ -472,3 +516,16 @@ async def test_without_a_doctor_the_screening_defines_the_modules(released):
|
||||
assert any("не выявлено" in r.text for r in replies)
|
||||
async with session.get_clinical_session() as s:
|
||||
assert (await repo.get_profile(s, TOKEN)).modules == []
|
||||
|
||||
|
||||
async def test_next_day_after_a_crisis_the_app_asks_once(released, monkeypatch):
|
||||
replies = await press(released, "intake:start")
|
||||
await press(released, answer_button(replies, {"rf_psychosis": 0})) # red flag → crisis
|
||||
outbox = MemoryOutbox()
|
||||
monkeypatch.setattr(integrations, "outbox", outbox)
|
||||
monkeypatch.setattr(clock, "now", lambda: NOW + timedelta(hours=21))
|
||||
await jobs.plan()
|
||||
await jobs.plan()
|
||||
sent = outbox.drain(TOKEN)
|
||||
assert len(sent) == 1 and "Как вы сегодня" in sent[0].text
|
||||
assert any(b.data == "safety_plan" for line in sent[0].buttons for b in line)
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
"""Persistent, one-time linking and queue recovery; synthetic identities only."""
|
||||
|
||||
from datetime import timedelta
|
||||
|
||||
import pytest
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.core import clock
|
||||
from app.db import repo, session
|
||||
from app.db.bootstrap import init_db
|
||||
from app.db.clinical import ScaleResult
|
||||
from app.db.max_notifications import MaxBinding, MaxDelivery, MaxLinkCode
|
||||
from app.integrations import max_store as store
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
async def database():
|
||||
await session.configure(identity_url="sqlite+aiosqlite:///:memory:", clinical_url="sqlite+aiosqlite:///:memory:")
|
||||
await init_db()
|
||||
yield
|
||||
await session.configure()
|
||||
|
||||
|
||||
async def test_codes_are_hashed_expiring_one_time_and_replaced():
|
||||
now = clock.now()
|
||||
async with session.get_identity_session() as s:
|
||||
old, _ = await store.issue_code(s, "patient", now, 60)
|
||||
code, expires = await store.issue_code(s, "patient", now, 60)
|
||||
assert await store.code_token(s, old, now) is None
|
||||
row = (await s.scalars(select(MaxLinkCode))).one()
|
||||
assert row.digest != code and row.digest == store.digest(code)
|
||||
assert await store.code_token(s, code, expires) is None
|
||||
assert await store.bind(s, code, 100, now) == "patient"
|
||||
assert await store.bind(s, code, 100, now) is None
|
||||
async with session.get_identity_session() as s:
|
||||
assert (await s.get(MaxBinding, "patient")).user_id == 100
|
||||
|
||||
|
||||
async def test_active_binding_cannot_be_reassigned_in_either_direction():
|
||||
now = clock.now()
|
||||
async with session.get_identity_session() as s:
|
||||
code, _ = await store.issue_code(s, "one", now, 60)
|
||||
await store.bind(s, code, 100, now)
|
||||
code, _ = await store.issue_code(s, "two", now, 60)
|
||||
assert await store.bind(s, code, 100, now) is None
|
||||
assert await store.code_token(s, code, now) == "two"
|
||||
code, _ = await store.issue_code(s, "one", now, 60)
|
||||
assert await store.bind(s, code, 200, now) is None
|
||||
await store.disconnect(s, "one")
|
||||
assert await store.code_token(s, code, now) is None
|
||||
code, _ = await store.issue_code(s, "two", now, 60)
|
||||
assert await store.bind(s, code, 100, now) == "two"
|
||||
|
||||
|
||||
async def test_disconnect_cancels_pending_delivery_and_prevents_stale_ack():
|
||||
now = clock.now()
|
||||
async with session.get_identity_session() as s:
|
||||
await store.enqueue(s, key="job", user_id=100, token="one", kind="notification", now=now)
|
||||
row = await store.claim(s, now)
|
||||
async with session.get_identity_session() as s:
|
||||
await store.disconnect(s, "one")
|
||||
await store.finish(s, row, state="sent", now=now)
|
||||
async with session.get_identity_session() as s:
|
||||
assert (await s.get(MaxDelivery, "job")).state == "cancelled"
|
||||
|
||||
|
||||
async def test_queue_survives_sessions_deduplicates_and_recovers_expired_lease():
|
||||
now = clock.now()
|
||||
async with session.get_identity_session() as s:
|
||||
for _ in range(2):
|
||||
await store.enqueue(s, key="job", user_id=100, kind="help", now=now)
|
||||
async with session.get_identity_session() as s:
|
||||
first = await store.claim(s, now)
|
||||
assert first.attempts == 1
|
||||
async with session.get_identity_session() as s:
|
||||
assert await store.claim(s, now + timedelta(seconds=59)) is None
|
||||
async with session.get_identity_session() as s:
|
||||
second = await store.claim(s, now + timedelta(seconds=61))
|
||||
assert second.id == first.id and second.lease != first.lease and second.attempts == 2
|
||||
async with session.get_identity_session() as s:
|
||||
await store.finish(s, first, state="sent", now=now)
|
||||
async with session.get_identity_session() as s:
|
||||
assert (await s.get(MaxDelivery, "job")).state == "sending"
|
||||
await store.finish(s, second, state="sent", now=now)
|
||||
async with session.get_identity_session() as s:
|
||||
assert await store.claim(s, now + timedelta(days=1)) is None
|
||||
|
||||
|
||||
async def test_retry_deadline_and_attempt_limit():
|
||||
now = clock.now()
|
||||
async with session.get_identity_session() as s:
|
||||
await store.enqueue(s, key="job", user_id=100, kind="help", now=now)
|
||||
for attempt in range(store.MAX_ATTEMPTS):
|
||||
when = now + timedelta(seconds=attempt * 120)
|
||||
async with session.get_identity_session() as s:
|
||||
row = await store.claim(s, when)
|
||||
async with session.get_identity_session() as s:
|
||||
await store.finish(s, row, state="queued", now=when, retry_seconds=120, error="http_429")
|
||||
async with session.get_identity_session() as s:
|
||||
assert await store.claim(s, when + timedelta(seconds=119)) is None
|
||||
async with session.get_identity_session() as s:
|
||||
assert await store.claim(s, now + timedelta(days=1)) is None
|
||||
async with session.get_identity_session() as s:
|
||||
row = await s.get(MaxDelivery, "job")
|
||||
assert row.state == "failed" and row.attempts == store.MAX_ATTEMPTS
|
||||
|
||||
|
||||
async def test_completion_scan_ignores_old_and_incomplete_tests_and_recovers_without_duplicates():
|
||||
now = clock.now()
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.upsert_profile(s, token="one", doctor_id="")
|
||||
await repo.set_dialog_state(s, token="one", state="idle", data={"consent": True, "adult": True}, now=now)
|
||||
for ts, complete in ((now - timedelta(days=1), True), (now, True), (now, False)):
|
||||
s.add(ScaleResult(token="one", ts=ts, scale="phq9", total=0, severity="none", complete=complete))
|
||||
async with session.get_identity_session() as s:
|
||||
s.add(MaxBinding(token="one", user_id=100, enabled=True, connected_at=now))
|
||||
for _ in range(2):
|
||||
async with session.get_identity_session() as s:
|
||||
await store.collect_completed(s, now)
|
||||
async with session.get_identity_session() as s:
|
||||
row = (await s.scalars(select(MaxDelivery))).one()
|
||||
assert row.kind == "completed" and row.token == "one"
|
||||
assert "phq9" not in row.id
|
||||
@@ -197,3 +197,75 @@ async def test_empty_final_answer_is_nudged(sertraline):
|
||||
assert ans is not None and "Алкоголь" in ans.text
|
||||
assert sent[0]["tool_choice"] == "required" and "tool_choice" not in sent[1]
|
||||
assert "сертралин" in sent[0]["messages"][0]["content"] # patient brief in the system prompt
|
||||
|
||||
|
||||
async def test_region_block_string_error_degrades():
|
||||
# Seen live from the RF server: 403 {"success": false, "error": "Access denied by security policy."}
|
||||
client = httpx.AsyncClient(
|
||||
transport=httpx.MockTransport(lambda r: httpx.Response(403, json={"success": False, "error": "Access denied"}))
|
||||
)
|
||||
provider = OpenRouterProvider(_settings(), client=client)
|
||||
assert await agent.answer_chat(ANDREY, scrub("вопрос"), provider=provider, settings=_settings()) is None
|
||||
|
||||
|
||||
async def test_unexpected_provider_bug_degrades():
|
||||
class Broken:
|
||||
name = "broken"
|
||||
|
||||
async def chat(self, messages, tools):
|
||||
raise AttributeError("boom")
|
||||
|
||||
assert await agent.answer_chat(ANDREY, scrub("вопрос"), provider=Broken(), settings=_settings()) is None
|
||||
|
||||
|
||||
# ------------------------------------------------------------------------------------------------- gigachat
|
||||
|
||||
|
||||
class _FakeGiga:
|
||||
"""Mimics gigachat.GigaChat.achat: first a function_call, then the final text."""
|
||||
|
||||
def __init__(self):
|
||||
self.chats = []
|
||||
|
||||
async def achat(self, chat):
|
||||
from types import SimpleNamespace as NS
|
||||
|
||||
self.chats.append(chat)
|
||||
if len(self.chats) == 1:
|
||||
fc = NS(name="check_drug_for_patient", arguments={"drug": "ибупрофен"})
|
||||
msg = NS(content="", function_call=fc)
|
||||
else:
|
||||
msg = NS(
|
||||
content="Ибупрофен вместе с сертралином повышает риск кровотечений. Обсудите с врачом.",
|
||||
function_call=None,
|
||||
)
|
||||
return NS(choices=[NS(message=msg)], usage=NS(total_tokens=42))
|
||||
|
||||
|
||||
async def test_gigachat_tool_loop(sertraline):
|
||||
from app.llm.agent.providers import GigaChatToolProvider
|
||||
|
||||
fake = _FakeGiga()
|
||||
s = Settings(_env_file=None, chat_agent="gigachat", gigachat_credentials="x", chat_agent_timeout_s=5.0)
|
||||
ans = await agent.answer_chat(
|
||||
ANDREY, scrub("Можно ибупрофен?"), provider=GigaChatToolProvider(s, client=fake), settings=s
|
||||
)
|
||||
assert ans is not None and "кровотеч" in ans.text and ans.provider == "gigachat"
|
||||
second = fake.chats[1]
|
||||
roles = [str(m.role.value if hasattr(m.role, "value") else m.role) for m in second.messages]
|
||||
assert roles == ["system", "user", "assistant", "function"]
|
||||
assert second.messages[2].function_call.name == "check_drug_for_patient"
|
||||
assert second.messages[3].name == "check_drug_for_patient"
|
||||
assert {f.name for f in second.functions} == {
|
||||
"search_guidelines",
|
||||
"get_patient_record",
|
||||
"get_drug_info",
|
||||
"check_drug_for_patient",
|
||||
}
|
||||
|
||||
|
||||
def test_build_provider_prefers_gigachat():
|
||||
from app.llm.agent.providers import GigaChatToolProvider
|
||||
|
||||
s = Settings(_env_file=None, chat_agent="auto", gigachat_credentials="x", openrouter_api_key="y")
|
||||
assert isinstance(agent.build_provider(s), GigaChatToolProvider)
|
||||
|
||||
@@ -0,0 +1,281 @@
|
||||
"""End-to-end server-only MAX flow, real SQLite transactions and mocked network."""
|
||||
|
||||
from datetime import timedelta
|
||||
from unittest.mock import AsyncMock
|
||||
from urllib.parse import parse_qs, urlsplit
|
||||
|
||||
import pytest
|
||||
from httpx import ASGITransport, AsyncClient
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.channels import max_bot
|
||||
from app.channels.max_client import MaxApiError
|
||||
from app.config import get_settings
|
||||
from app.core import clock
|
||||
from app.db import repo, session
|
||||
from app.db.bootstrap import init_db
|
||||
from app.db.clinical import ScaleResult
|
||||
from app.db.intake import QuestionnaireRecord
|
||||
from app.db.max_notifications import MaxBinding, MaxDelivery, MaxReceipt
|
||||
from app.dialog.contracts import Reply
|
||||
from app.integrations import max_store as store
|
||||
from app.integrations.base import MemoryOutbox, integrations
|
||||
from app.main import app
|
||||
|
||||
TOKEN = "synthetic-patient"
|
||||
SECRET = "synthetic-webhook-secret-" * 2
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
async def database(monkeypatch):
|
||||
for key, value in {
|
||||
"MAX_ENABLED": "true",
|
||||
"MAX_BOT_TOKEN": "fake-token",
|
||||
"MAX_BOT_USERNAME": "test_bot",
|
||||
"MAX_WEBHOOK_SECRET": SECRET,
|
||||
"MAX_WEBHOOK_URL": "https://api.example.org/api/v1/webhooks/max",
|
||||
"MAX_SITE_URL": "https://example.org",
|
||||
}.items():
|
||||
monkeypatch.setenv(key, value)
|
||||
get_settings.cache_clear()
|
||||
max_bot.texts.cache_clear()
|
||||
await session.configure(identity_url="sqlite+aiosqlite:///:memory:", clinical_url="sqlite+aiosqlite:///:memory:")
|
||||
await init_db()
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.upsert_profile(s, token=TOKEN, doctor_id="")
|
||||
await repo.set_dialog_state(
|
||||
s, token=TOKEN, state="idle", data={"consent": True, "adult": True}, now=clock.now()
|
||||
)
|
||||
yield
|
||||
await max_bot.stop()
|
||||
await session.configure()
|
||||
get_settings.cache_clear()
|
||||
|
||||
|
||||
def event(kind="bot_started", text="", uid=100, *, stamp=1000):
|
||||
user = {"user_id": uid, "is_bot": False, "first_name": "Synthetic"}
|
||||
if kind == "message_created":
|
||||
return {
|
||||
"update_type": kind,
|
||||
"timestamp": stamp,
|
||||
"message": {
|
||||
"sender": user,
|
||||
"recipient": {"chat_type": "dialog", "chat_id": 123},
|
||||
"body": {"mid": f"mid-{stamp}", "text": text},
|
||||
},
|
||||
}
|
||||
return {"update_type": kind, "timestamp": stamp, "user": user, "chat_id": 123, "payload": text}
|
||||
|
||||
|
||||
async def connect():
|
||||
async with session.get_identity_session() as s:
|
||||
code, _ = await store.issue_code(s, TOKEN, clock.now(), 600)
|
||||
await max_bot.handle_update(event(text=code))
|
||||
return code
|
||||
|
||||
|
||||
async def test_http_connect_webhook_duplicate_notification_and_stop():
|
||||
async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as client:
|
||||
auth = {"Authorization": f"Bearer {TOKEN}"}
|
||||
linked = await client.post("/api/v1/me/notifications/max/link", headers=auth, json={"consent": True})
|
||||
code = parse_qs(urlsplit(linked.json()["url"]).query)["start"][0]
|
||||
headers = {"X-Max-Bot-Api-Secret": SECRET}
|
||||
for _ in range(2):
|
||||
assert (
|
||||
await client.post("/api/v1/webhooks/max", headers=headers, json=event(text=code))
|
||||
).status_code == 200
|
||||
assert (await client.get("/api/v1/me/notifications/max", headers=auth)).json()["connected"]
|
||||
async with session.get_identity_session() as s:
|
||||
assert len((await s.scalars(select(MaxReceipt))).all()) == 1
|
||||
assert len((await s.scalars(select(MaxDelivery))).all()) == 1
|
||||
sender = AsyncMock()
|
||||
assert await max_bot.deliver_one(sender)
|
||||
assert sender.send.call_args.args == (100, max_bot.texts().connected)
|
||||
await client.post("/api/v1/webhooks/max", headers=headers, json=event("message_created", "/stop", stamp=2000))
|
||||
assert not (await client.get("/api/v1/me/notifications/max", headers=auth)).json()["connected"]
|
||||
|
||||
|
||||
async def test_unbound_start_help_and_invalid_code_are_generic():
|
||||
for e in (event(), event("message_created", "private patient text", stamp=2000), event(text="expired", stamp=3000)):
|
||||
await max_bot.handle_update(e)
|
||||
async with session.get_identity_session() as s:
|
||||
rows = (await s.scalars(select(MaxDelivery))).all()
|
||||
assert {r.kind for r in rows} == {"not_connected", "help", "invalid"}
|
||||
assert all(r.token is None for r in rows)
|
||||
assert not (await s.scalars(select(MaxBinding))).all()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("kind", ["bot_stopped", "dialog_removed", "message_created"])
|
||||
async def test_stopping_cancels_pending_confirmation_and_reminders(kind):
|
||||
await connect()
|
||||
await max_bot.MaxOutbox(MemoryOutbox()).push(TOKEN, [Reply(text="private scheduled question")])
|
||||
await max_bot.handle_update(event(kind, "/stop", stamp=2000))
|
||||
async with session.get_identity_session() as s:
|
||||
assert not (await s.get(MaxBinding, TOKEN)).enabled
|
||||
rows = (await s.scalars(select(MaxDelivery).where(MaxDelivery.token == TOKEN))).all()
|
||||
assert rows and all(r.state == "cancelled" for r in rows)
|
||||
sender = AsyncMock()
|
||||
await max_bot.deliver_one(sender)
|
||||
assert sender.send.call_count == (1 if kind == "message_created" else 0)
|
||||
|
||||
|
||||
async def test_private_patient_content_stays_in_fallback_only():
|
||||
await connect()
|
||||
fallback = MemoryOutbox()
|
||||
wrapper = max_bot.MaxOutbox(fallback)
|
||||
replies = [Reply(text="SYNTHETIC confidential result 42", kind="question")]
|
||||
await wrapper.push(TOKEN, replies)
|
||||
await wrapper.push(TOKEN, replies)
|
||||
assert fallback.drain(TOKEN) == replies * 2
|
||||
async with session.get_identity_session() as s:
|
||||
rows = (await s.scalars(select(MaxDelivery).where(MaxDelivery.kind == "notification"))).all()
|
||||
assert len(rows) == 1
|
||||
assert "confidential" not in repr(rows[0].__dict__)
|
||||
sender = AsyncMock()
|
||||
while await max_bot.deliver_one(sender):
|
||||
pass
|
||||
assert any(c.args[1] == max_bot.texts().notification for c in sender.send.call_args_list)
|
||||
assert all("confidential" not in c.args[1] and TOKEN not in str(c.kwargs) for c in sender.send.call_args_list)
|
||||
|
||||
|
||||
async def test_revoked_consent_prevents_binding_and_delivery():
|
||||
await connect()
|
||||
async with session.get_clinical_session() as s:
|
||||
await repo.set_dialog_state(
|
||||
s, token=TOKEN, state="idle", data={"consent": False, "adult": True}, now=clock.now()
|
||||
)
|
||||
sender = AsyncMock()
|
||||
await max_bot.deliver_one(sender)
|
||||
sender.send.assert_not_called()
|
||||
async with session.get_identity_session() as s:
|
||||
await store.disconnect(s, TOKEN)
|
||||
code, _ = await store.issue_code(s, TOKEN, clock.now(), 600)
|
||||
await max_bot.handle_update(event(text=code, stamp=2000))
|
||||
async with session.get_identity_session() as s:
|
||||
assert not (await s.get(MaxBinding, TOKEN)).enabled
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"bad",
|
||||
[
|
||||
{},
|
||||
{"update_type": "other", "timestamp": 1},
|
||||
event() | {"timestamp": True},
|
||||
event() | {"user": {"user_id": True, "is_bot": False}},
|
||||
event() | {"user": {"user_id": 100, "is_bot": True}},
|
||||
event() | {"payload": {"wrong": "type"}},
|
||||
{"update_type": "message_created", "timestamp": 1, "message": {}},
|
||||
],
|
||||
)
|
||||
async def test_malformed_or_bot_events_are_ignored(bad):
|
||||
await max_bot.handle_update(bad)
|
||||
async with session.get_identity_session() as s:
|
||||
assert not (await s.scalars(select(MaxReceipt))).all()
|
||||
|
||||
|
||||
async def test_group_cannot_claim_a_patient_link():
|
||||
async with session.get_identity_session() as s:
|
||||
code, _ = await store.issue_code(s, TOKEN, clock.now(), 600)
|
||||
update = event("message_created", "/start " + code)
|
||||
update["message"]["recipient"]["chat_type"] = "chat"
|
||||
await max_bot.handle_update(update)
|
||||
async with session.get_identity_session() as s:
|
||||
assert await s.get(MaxBinding, TOKEN) is None
|
||||
assert await store.code_token(s, code, clock.now()) == TOKEN
|
||||
|
||||
|
||||
async def test_429_respects_retry_deadline_and_then_succeeds(monkeypatch):
|
||||
await max_bot.handle_update(event())
|
||||
now = clock.now()
|
||||
monkeypatch.setattr(clock, "now", lambda: now)
|
||||
sender = AsyncMock()
|
||||
sender.send.side_effect = MaxApiError("http_429", retryable=True, retry_after=120)
|
||||
assert await max_bot.deliver_one(sender)
|
||||
async with session.get_identity_session() as s:
|
||||
row = (await s.scalars(select(MaxDelivery))).one()
|
||||
assert row.state == "queued" and row.next_attempt_at == now + timedelta(seconds=120)
|
||||
assert not await max_bot.deliver_one(sender)
|
||||
now += timedelta(seconds=121)
|
||||
sender.send.side_effect = None
|
||||
assert await max_bot.deliver_one(sender)
|
||||
async with session.get_identity_session() as s:
|
||||
row = (await s.scalars(select(MaxDelivery))).one()
|
||||
assert row.state == "sent" and row.attempts == 2
|
||||
|
||||
|
||||
async def test_permanent_error_does_not_retry():
|
||||
await max_bot.handle_update(event())
|
||||
sender = AsyncMock()
|
||||
sender.send.side_effect = MaxApiError("http_403")
|
||||
await max_bot.deliver_one(sender)
|
||||
assert not await max_bot.deliver_one(sender)
|
||||
async with session.get_identity_session() as s:
|
||||
assert (await s.scalars(select(MaxDelivery))).one().state == "failed"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("source", ["scale", "questionnaire"])
|
||||
async def test_completed_test_produces_one_neutral_notification(source):
|
||||
await connect()
|
||||
sender = AsyncMock()
|
||||
await max_bot.deliver_one(sender)
|
||||
sender.reset_mock()
|
||||
async with session.get_clinical_session() as s:
|
||||
now = clock.now()
|
||||
if source == "scale":
|
||||
s.add(ScaleResult(token=TOKEN, ts=now, scale="phq9", total=1, severity="synthetic", complete=True))
|
||||
else:
|
||||
s.add(
|
||||
QuestionnaireRecord(
|
||||
id="synthetic-form",
|
||||
token=TOKEN,
|
||||
kind="intake",
|
||||
version="test",
|
||||
policy_version="test",
|
||||
started_at=now,
|
||||
completed_at=now,
|
||||
day=now.date(),
|
||||
status="complete",
|
||||
answers={},
|
||||
details={},
|
||||
)
|
||||
)
|
||||
for _ in range(2):
|
||||
async with session.get_identity_session() as s:
|
||||
await store.collect_completed(s, clock.now())
|
||||
assert await max_bot.deliver_one(sender)
|
||||
assert not await max_bot.deliver_one(sender)
|
||||
sender.send.assert_awaited_once_with(
|
||||
100, max_bot.texts().completed, site_url="https://example.org", button=max_bot.texts().open_site
|
||||
)
|
||||
|
||||
|
||||
async def test_private_start_command_accepts_issued_code():
|
||||
async with session.get_identity_session() as s:
|
||||
code, _ = await store.issue_code(s, TOKEN, clock.now(), 600)
|
||||
await max_bot.handle_update(event("message_created", "/start " + code))
|
||||
async with session.get_identity_session() as s:
|
||||
assert (await s.get(MaxBinding, TOKEN)).user_id == 100
|
||||
|
||||
|
||||
async def test_disabled_lifecycle_never_constructs_client(monkeypatch):
|
||||
monkeypatch.setenv("MAX_ENABLED", "false")
|
||||
get_settings.cache_clear()
|
||||
monkeypatch.setattr(max_bot, "MaxClient", lambda _: pytest.fail("disabled MAX must not create a network client"))
|
||||
before = integrations.outbox
|
||||
await max_bot.start()
|
||||
await max_bot.handle_update(event())
|
||||
await max_bot.stop()
|
||||
assert integrations.outbox is before
|
||||
|
||||
|
||||
async def test_lifecycle_wraps_once_restores_and_closes(monkeypatch):
|
||||
sender = AsyncMock()
|
||||
monkeypatch.setattr(max_bot, "MaxClient", lambda _: sender)
|
||||
before = integrations.outbox
|
||||
await max_bot.start()
|
||||
first = integrations.outbox
|
||||
await max_bot.start()
|
||||
assert integrations.outbox is first and first.fallback is before
|
||||
await max_bot.stop()
|
||||
assert integrations.outbox is before
|
||||
sender.close.assert_awaited_once()
|
||||
@@ -0,0 +1,95 @@
|
||||
"""Wire contract with MAX, using an in-process HTTP fake (no real bot/token)."""
|
||||
|
||||
import json
|
||||
import logging
|
||||
|
||||
import httpx
|
||||
import pytest
|
||||
|
||||
from app.channels.max_client import API_URL, UPDATE_TYPES, MaxApiError, MaxClient
|
||||
from app.config import Settings
|
||||
|
||||
|
||||
def settings():
|
||||
return Settings(
|
||||
_env_file=None,
|
||||
max_enabled=True,
|
||||
max_bot_token="synthetic-secret-token",
|
||||
max_bot_username="synthetic_bot",
|
||||
max_webhook_secret="synthetic-webhook-secret-" * 2,
|
||||
max_webhook_url="https://api.example.org/api/v1/webhooks/max",
|
||||
max_site_url="https://example.org",
|
||||
)
|
||||
|
||||
|
||||
async def test_message_wire_contract_and_no_identifiers_in_logs(caplog):
|
||||
def handler(request):
|
||||
assert str(request.url).startswith(API_URL + "/messages?")
|
||||
assert request.url.params["user_id"] == "1234567890123"
|
||||
assert "access_token" not in request.url.params
|
||||
assert request.headers["Authorization"] == "synthetic-secret-token"
|
||||
body = json.loads(request.content)
|
||||
assert body["text"] == "neutral reminder" and "format" not in body
|
||||
button = body["attachments"][0]["payload"]["buttons"][0][0]
|
||||
assert button == {"type": "link", "text": "Open", "url": "https://example.org"}
|
||||
return httpx.Response(200, json={"message": {"body": {"mid": "synthetic-id"}}})
|
||||
|
||||
client = MaxClient(settings(), transport=httpx.MockTransport(handler))
|
||||
with caplog.at_level(logging.INFO):
|
||||
await client.send(1234567890123, "neutral reminder", site_url="https://example.org", button="Open")
|
||||
await client.close()
|
||||
assert "1234567890123" not in caplog.text and "synthetic-secret-token" not in caplog.text
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"status,retry", [(429, True), (500, True), (503, True), (408, True), (401, False), (403, False)]
|
||||
)
|
||||
async def test_error_codes_are_redacted_and_classified(status, retry):
|
||||
client = MaxClient(
|
||||
settings(),
|
||||
transport=httpx.MockTransport(
|
||||
lambda r: httpx.Response(
|
||||
status, json={"message": "sensitive provider text"}, headers={"Retry-After": "120"}
|
||||
)
|
||||
),
|
||||
)
|
||||
with pytest.raises(MaxApiError) as error:
|
||||
await client.send(100, "neutral", site_url="https://example.org", button="Open")
|
||||
assert error.value.retryable is retry and error.value.retry_after == 120
|
||||
assert "sensitive" not in str(error.value)
|
||||
await client.close()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("body", [{"success": False, "message": "private"}, {}, {"success": True}, []])
|
||||
async def test_http_200_is_not_enough_to_mark_delivered(body):
|
||||
client = MaxClient(settings(), transport=httpx.MockTransport(lambda r: httpx.Response(200, json=body)))
|
||||
with pytest.raises(MaxApiError):
|
||||
await client.send(100, "neutral", site_url="https://example.org", button="Open")
|
||||
await client.close()
|
||||
|
||||
|
||||
async def test_timeout_is_retryable_without_request_details():
|
||||
def handler(request):
|
||||
raise httpx.ReadTimeout("private URL", request=request)
|
||||
|
||||
client = MaxClient(settings(), transport=httpx.MockTransport(handler))
|
||||
with pytest.raises(MaxApiError, match="^transport$") as error:
|
||||
await client.request("GET", "/me")
|
||||
assert error.value.retryable
|
||||
await client.close()
|
||||
|
||||
|
||||
async def test_subscription_includes_secret_and_exact_event_types():
|
||||
def handler(request):
|
||||
assert request.url.path == "/subscriptions"
|
||||
body = json.loads(request.content)
|
||||
assert body == {
|
||||
"url": settings().max_webhook_url,
|
||||
"update_types": UPDATE_TYPES,
|
||||
"secret": settings().max_webhook_secret.get_secret_value(),
|
||||
}
|
||||
return httpx.Response(200, json={"success": True})
|
||||
|
||||
client = MaxClient(settings(), transport=httpx.MockTransport(handler))
|
||||
await client.subscribe(settings())
|
||||
await client.close()
|
||||
@@ -0,0 +1,51 @@
|
||||
"""Operator tools do not send messages or expose credentials."""
|
||||
|
||||
from unittest.mock import AsyncMock
|
||||
|
||||
import pytest
|
||||
|
||||
from app.channels import max_setup
|
||||
from app.channels.max_client import MaxApiError
|
||||
from app.config import Settings
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client(monkeypatch):
|
||||
settings = Settings(_env_file=None, max_bot_username="test_bot", max_webhook_url="https://api.example.org/hook")
|
||||
sender = AsyncMock()
|
||||
sender.request.return_value = {"is_bot": True, "username": "test_bot"}
|
||||
monkeypatch.setattr(max_setup, "Settings", lambda **kwargs: settings)
|
||||
monkeypatch.setattr(max_setup, "MaxClient", lambda cfg: sender)
|
||||
return sender
|
||||
|
||||
|
||||
async def test_check_only_reads_bot_identity(client):
|
||||
await max_setup.run("check")
|
||||
client.request.assert_awaited_once_with("GET", "/me")
|
||||
client.subscribe.assert_not_called()
|
||||
client.send.assert_not_called()
|
||||
client.close.assert_awaited_once()
|
||||
|
||||
|
||||
async def test_subscribe_is_explicit_and_checks_bot_first(client):
|
||||
await max_setup.run("subscribe")
|
||||
client.subscribe.assert_awaited_once()
|
||||
client.send.assert_not_called()
|
||||
|
||||
|
||||
async def test_mismatched_bot_does_not_change_webhooks(client):
|
||||
client.request.return_value = {"is_bot": True, "username": "another_bot"}
|
||||
with pytest.raises(MaxApiError, match="bot_username_mismatch"):
|
||||
await max_setup.run("subscribe")
|
||||
client.subscribe.assert_not_called()
|
||||
client.close.assert_awaited_once()
|
||||
|
||||
|
||||
async def test_status_checks_exact_configured_webhook(client):
|
||||
client.request.side_effect = [
|
||||
{"is_bot": True, "username": "test_bot"},
|
||||
{"subscriptions": [{"url": "https://elsewhere.example.org"}]},
|
||||
]
|
||||
with pytest.raises(MaxApiError, match="webhook_missing"):
|
||||
await max_setup.run("status")
|
||||
client.subscribe.assert_not_called()
|
||||
@@ -172,12 +172,16 @@ def test_unapproved_policy_never_continues_even_a_negative_screen():
|
||||
def test_immediate_safety_preempts_unfinished_or_invalid_unrelated_scales():
|
||||
for overrides in [
|
||||
dict(help_now=True, cssrs={"broken": "data"}),
|
||||
dict(phq9={"phq9_9": 1}),
|
||||
dict(phq9={"phq9_9": 1}, cssrs={}), # item 9 before the screener is complete
|
||||
dict(cssrs={"q4": 1}, alcohol={"bad": 50}),
|
||||
]:
|
||||
assert intake(policy=load_policy(), **overrides).status == "crisis"
|
||||
|
||||
|
||||
def test_item9_with_a_negative_screener_is_a_discrepancy_flag_not_a_crisis():
|
||||
# One crisis rule (ADR-013): the crisis screen opens at a high C-SSRS risk only.
|
||||
r = intake(phq9={"phq9_9": 1})
|
||||
assert "phq9_cssrs_discrepancy" in r.flags
|
||||
assert r.status != "crisis" and {"phq9_item9_positive", "phq9_cssrs_discrepancy"} <= set(r.flags)
|
||||
|
||||
|
||||
def test_physician_must_choose_between_stop_and_graded():
|
||||
@@ -208,7 +212,8 @@ def test_phq2_and_trauma_expansion_do_not_turn_missing_into_negative():
|
||||
(30, "self_help"),
|
||||
(31, "psychiatrist_or_psychotherapist"),
|
||||
(49, "psychiatrist_or_psychotherapist"),
|
||||
(50, "priority_psychiatrist"),
|
||||
(50, "psychiatrist_or_psychotherapist"),
|
||||
(80, "psychiatrist_or_psychotherapist"),
|
||||
],
|
||||
)
|
||||
def test_pdf_pcl_boundaries_are_distinct_from_legacy_33(total, route):
|
||||
|
||||
+3
-1
@@ -155,7 +155,9 @@ def test_severe_totals(scale: str, total: int, code: str, fires: bool) -> None:
|
||||
acts = evaluate(s)
|
||||
assert (code in codes(acts)) is fires
|
||||
if fires:
|
||||
assert next(a for a in acts if a.code == code).level == AlertLevel.HIGH
|
||||
# PCL-5 alone is a planned specialist review, not a priority (clinical review 2026-10-04).
|
||||
expected = AlertLevel.MODERATE if scale == "pcl5" else AlertLevel.HIGH
|
||||
assert next(a for a in acts if a.code == code).level == expected
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
||||
@@ -178,6 +178,7 @@ async def test_andrey_13_days(db: MemoryNotifier) -> None:
|
||||
"sleep_lt4_3n",
|
||||
"alcohol_3d",
|
||||
"phq9_item9", # same evaluation: YAML order
|
||||
"post_crisis_call", # the crisis leaves a callback task for the doctor on duty
|
||||
"phq9_rise",
|
||||
]
|
||||
assert len(crisis_audit) == 1 and crisis_audit[0].token == TOKEN and crisis_audit[0].actor == "system"
|
||||
@@ -260,7 +261,7 @@ async def test_notifier_failure_keeps_alert(db: MemoryNotifier, monkeypatch: pyt
|
||||
await scale("pcl5", 55)
|
||||
await monitoring.RuleMonitoring().after_data_change(TOKEN)
|
||||
async with session.get_clinical_session() as s:
|
||||
assert [(a.code, a.level) for a in await repo.list_alerts(s, token=TOKEN)] == [("pcl5_severe", "high")]
|
||||
assert [(a.code, a.level) for a in await repo.list_alerts(s, token=TOKEN)] == [("pcl5_severe", "moderate")]
|
||||
assert await color() == "yellow"
|
||||
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" rx="6" fill="#0a4da2"/><path d="M13 7h6v6h6v6h-6v6h-6v-6H7v-6h6z" fill="#fff"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" rx="9" fill="#285e4e"/><path d="M16 8v16M8 16h16" stroke="#fff" stroke-width="2" stroke-linecap="round"/></svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 175 B After Width: | Height: | Size: 201 B |
@@ -3,13 +3,14 @@ import { Link, NavLink } from "react-router-dom";
|
||||
|
||||
import { ru } from "../content/ru";
|
||||
import { useDialog } from "../dialog/DialogContext";
|
||||
import { useSession } from "../session/SessionContext";
|
||||
import { HotlineCard, useHelp } from "./HelpSheet";
|
||||
import { Icon, LogoMark, type IconName } from "./Icon";
|
||||
|
||||
/*
|
||||
* Layout from docs/mock (series 2).
|
||||
* Shared patient workspace, following the approved doctor dashboard.
|
||||
* phone: content → «Экстренная помощь» block → bottom tab bar (signed in)
|
||||
* desktop: navy sidebar | content | right rail (optional `aside` + emergency panel)
|
||||
* desktop: white sidebar | workspace header | content + emergency panel
|
||||
* bare: one centred column on every width (questionnaires)
|
||||
*/
|
||||
|
||||
@@ -87,6 +88,10 @@ function Sidebar({ signedIn }: { signedIn: boolean }) {
|
||||
</li>
|
||||
</ul>
|
||||
)}
|
||||
<div className="sidebar__note">
|
||||
<strong>{ru.product.supportTitle}</strong>
|
||||
<span>{ru.product.supportText}</span>
|
||||
</div>
|
||||
</nav>
|
||||
);
|
||||
}
|
||||
@@ -122,6 +127,24 @@ function Rail({ aside }: { aside?: ReactNode }) {
|
||||
);
|
||||
}
|
||||
|
||||
function WorkspaceHeader({ signedIn, bare = false }: { signedIn: boolean; bare?: boolean }) {
|
||||
const { session } = useSession();
|
||||
return (
|
||||
<header className={`workspace${bare ? " workspace--bare" : ""}`}>
|
||||
<div className="workspace__brand">
|
||||
<LogoMark size={30} />
|
||||
<span>{bare ? ru.product.name : signedIn ? ru.product.workspace : ru.nav.signIn}</span>
|
||||
</div>
|
||||
{signedIn && !bare ? (
|
||||
<Link className="workspace__profile" to="/profile">
|
||||
<span className="avatar"><Icon name="user" size={18} /></span>
|
||||
<span>{session?.displayName || ru.nav.profile}</span>
|
||||
</Link>
|
||||
) : <span className="workspace__tag">{ru.product.tagline}</span>}
|
||||
</header>
|
||||
);
|
||||
}
|
||||
|
||||
export function AppShell({
|
||||
children,
|
||||
signedIn = true,
|
||||
@@ -144,6 +167,7 @@ export function AppShell({
|
||||
return (
|
||||
<div className="app app--bare">
|
||||
<div className="app__main">
|
||||
<WorkspaceHeader signedIn={signedIn} bare />
|
||||
<main className="screen" id="main">
|
||||
{children}
|
||||
{sos && <EmergencyBlock />}
|
||||
@@ -155,6 +179,7 @@ export function AppShell({
|
||||
<div className={`app${signedIn && !focus ? " app--tabs" : ""}`}>
|
||||
<Sidebar signedIn={signedIn} />
|
||||
<div className="app__main">
|
||||
<WorkspaceHeader signedIn={signedIn} />
|
||||
<main className="screen" id="main">
|
||||
{children}
|
||||
{sos && <EmergencyBlock />}
|
||||
|
||||
@@ -163,8 +163,8 @@ export function Icon({ name, size = 22, label }: { name: IconName; size?: number
|
||||
export function LogoMark({ size = 32 }: { size?: number }) {
|
||||
return (
|
||||
<svg width={size} height={size} viewBox="0 0 32 32" aria-hidden="true" focusable="false">
|
||||
<rect width="32" height="32" rx="9" fill="var(--c-teal)" />
|
||||
<path d="M13 7h6v6h6v6h-6v6h-6v-6H7v-6h6z" fill="#fff" />
|
||||
<rect width="32" height="32" rx="9" fill="var(--c-primary)" />
|
||||
<path d="M16 8v16M8 16h16" stroke="#fff" strokeWidth="2" strokeLinecap="round" />
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,6 +6,9 @@ export const ru = {
|
||||
product: {
|
||||
name: "Сопровождение пациента",
|
||||
tagline: "между визитами к врачу",
|
||||
workspace: "Личный кабинет",
|
||||
supportTitle: "Рядом между визитами",
|
||||
supportText: "Наблюдение за самочувствием и поддержка назначенного лечения.",
|
||||
},
|
||||
nav: {
|
||||
today: "Сегодня",
|
||||
@@ -201,6 +204,7 @@ export const ru = {
|
||||
toIntake: "Пройти первичный опрос",
|
||||
},
|
||||
flow: {
|
||||
home: "На главный экран",
|
||||
question: (n: number, total: number) => `Вопрос ${n} из ${total}`,
|
||||
period: "За последний месяц",
|
||||
textPlaceholder: "Напишите несколько слов",
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
import "@fontsource/golos-text/400.css";
|
||||
import "@fontsource/golos-text/500.css";
|
||||
import "@fontsource/golos-text/600.css";
|
||||
import "@fontsource/golos-text/700.css";
|
||||
import "./theme/tokens.css";
|
||||
import "./theme/global.css";
|
||||
|
||||
|
||||
+14
-15
@@ -265,7 +265,7 @@ function FreeText({
|
||||
{skip.label}
|
||||
</button>
|
||||
) : (
|
||||
<button type="button" className="btn btn--ghost" onClick={onExit}>
|
||||
<button type="button" className="btn btn--ghost" disabled={busy} onClick={onExit}>
|
||||
{ru.flow.exit}
|
||||
</button>
|
||||
)}
|
||||
@@ -362,6 +362,7 @@ function SurveyAct({
|
||||
press,
|
||||
say,
|
||||
onPause,
|
||||
onHome,
|
||||
}: {
|
||||
step: Survey;
|
||||
stepKey: string;
|
||||
@@ -369,6 +370,7 @@ function SurveyAct({
|
||||
press: (b: DialogButton) => void;
|
||||
say: (text: string) => void;
|
||||
onPause: (b: DialogButton) => void;
|
||||
onHome: () => void;
|
||||
}) {
|
||||
let answer: ReactNode;
|
||||
switch (step.input) {
|
||||
@@ -381,7 +383,7 @@ function SurveyAct({
|
||||
break;
|
||||
case "text":
|
||||
answer = (
|
||||
<FreeText key={stepKey} skip={step.skip} busy={busy} onSend={say} onSkip={press} onExit={() => undefined} />
|
||||
<FreeText key={stepKey} skip={step.skip} busy={busy} onSend={say} onSkip={press} onExit={onHome} />
|
||||
);
|
||||
break;
|
||||
default:
|
||||
@@ -522,17 +524,6 @@ export function Flow() {
|
||||
navigate("/today", { replace: true });
|
||||
}, [step, stepKey, navigate, toast]);
|
||||
|
||||
// Questionnaire: answers are saved on the server per question, and there is no going back to change one.
|
||||
// The browser «back» is absorbed by a duplicate history entry of this same screen.
|
||||
const testing = step?.kind === "survey" || step?.kind === "choice" || step?.kind === "consent";
|
||||
useEffect(() => {
|
||||
if (!testing) return;
|
||||
window.history.pushState(null, "", window.location.href);
|
||||
const stay = () => window.history.pushState(null, "", window.location.href);
|
||||
window.addEventListener("popstate", stay);
|
||||
return () => window.removeEventListener("popstate", stay);
|
||||
}, [testing]);
|
||||
|
||||
const press = (b: DialogButton) => void dialog.send({ type: "button", button: b.data }, b.label);
|
||||
// «Продолжить позже»: answers are already saved on the server — pause and go straight home, no confirmation.
|
||||
const pause = (b: DialogButton) =>
|
||||
@@ -588,7 +579,7 @@ export function Flow() {
|
||||
) : item ? (
|
||||
<Progress n={item.index} total={item.total} adaptive={item.adaptive} />
|
||||
) : null;
|
||||
const top = <TopBar onBack={testing ? undefined : home}>{progress}</TopBar>;
|
||||
const top = progress ? <TopBar>{progress}</TopBar> : null;
|
||||
// Phone: one column. Desktop: question and context on the left, answers and actions on the right.
|
||||
let lead: ReactNode;
|
||||
let act: ReactNode;
|
||||
@@ -702,7 +693,7 @@ export function Flow() {
|
||||
break;
|
||||
case "survey":
|
||||
lead = <SurveyLead step={step} catalog={catalog} />;
|
||||
act = <SurveyAct step={step} stepKey={stepKey} busy={dialog.busy} press={press} say={say} onPause={pause} />;
|
||||
act = <SurveyAct step={step} stepKey={stepKey} busy={dialog.busy} press={press} say={say} onPause={pause} onHome={home} />;
|
||||
break;
|
||||
case "choice":
|
||||
lead = <Head title={step.title} lead={step.lead} />;
|
||||
@@ -725,6 +716,14 @@ export function Flow() {
|
||||
|
||||
return (
|
||||
<AppShell focus bare sos={step?.kind !== "crisis"}>
|
||||
<nav className="flow-nav" aria-label={ru.flow.home}>
|
||||
{/* Leaving does not send an answer or clear pending: Today can reopen this same question.
|
||||
Wait for an in-flight answer before leaving so its result has reached the shared dialog. */}
|
||||
<button type="button" className="btn btn--ghost btn--auto" disabled={dialog.busy} onClick={home}>
|
||||
<Icon name="home" size={20} />
|
||||
{ru.flow.home}
|
||||
</button>
|
||||
</nav>
|
||||
{content}
|
||||
</AppShell>
|
||||
);
|
||||
|
||||
+387
-106
File diff suppressed because it is too large
Load Diff
+33
-33
@@ -1,45 +1,45 @@
|
||||
/*
|
||||
* Design tokens — single source of colours, type and spacing (docs/mock, series 2).
|
||||
* Shared visual language with dashboard/theme.py and the approved doctor workspace.
|
||||
* Capacitor wraps this same bundle; a React Native port maps these 1:1 to a theme object.
|
||||
*/
|
||||
:root {
|
||||
/* Ink & surfaces */
|
||||
--c-navy: #0f2747; /* primary buttons, headings, desktop sidebar */
|
||||
--c-navy-hover: #0a1d37;
|
||||
--c-navy-soft: #e8eef6;
|
||||
--c-text: #13294b;
|
||||
--c-text-2: #4d5d73;
|
||||
--c-text-3: #7a889b;
|
||||
--c-page: #ffffff;
|
||||
--c-page-desk: #f4f7fb; /* desktop canvas behind white panels */
|
||||
--c-primary: #285e4e; /* primary buttons and active navigation */
|
||||
--c-primary-hover: #204b3e;
|
||||
--c-primary-soft: #edf3ee;
|
||||
--c-text: #213b38;
|
||||
--c-text-2: #526660;
|
||||
--c-text-3: #63736f;
|
||||
--c-page: #f6f7f3;
|
||||
--c-page-desk: #f6f7f3; /* desktop canvas behind white panels */
|
||||
--c-surface: #ffffff;
|
||||
--c-tile: #f3f7fb; /* soft card fill */
|
||||
--c-border: #e2e9f1;
|
||||
--c-border-strong: #c9d4e1;
|
||||
--c-tile: #f4f6f2; /* soft card fill */
|
||||
--c-border: #e1e7e3;
|
||||
--c-border-strong: #b4c6ba;
|
||||
|
||||
/* Selection & positive: teal */
|
||||
--c-teal: #17a08f;
|
||||
--c-teal-strong: #0e7e71;
|
||||
--c-teal-soft: #e3f5f2;
|
||||
/* Selection & positive */
|
||||
--c-teal: #527f61;
|
||||
--c-teal-strong: #38634b;
|
||||
--c-teal-soft: #eef4ee;
|
||||
|
||||
/* Info: blue */
|
||||
--c-blue: #2f7fdb;
|
||||
--c-blue-soft: #eaf3fd;
|
||||
/* Informational surfaces */
|
||||
--c-blue: #38634b;
|
||||
--c-blue-soft: #edf3ee;
|
||||
|
||||
/* Help & crisis: red */
|
||||
--c-red: #e2383b;
|
||||
--c-red-strong: #c62b2e;
|
||||
--c-red-soft: #fdeded;
|
||||
--c-red-line: #f7d3d3;
|
||||
--c-red: #a83236;
|
||||
--c-red-strong: #a83236;
|
||||
--c-red-soft: #faeeee;
|
||||
--c-red-line: #e7cbcb;
|
||||
|
||||
/* Warning */
|
||||
--c-amber: #e69a12;
|
||||
--c-amber-soft: #fff4dd;
|
||||
--c-amber: #805714;
|
||||
--c-amber-soft: #fbf3e4;
|
||||
|
||||
--c-focus: #2f7fdb;
|
||||
--c-focus: #598d7a;
|
||||
|
||||
/* Type: Golos Text (OFL), bundled locally — works offline. */
|
||||
--font: "Golos Text", system-ui, -apple-system, "Segoe UI", sans-serif;
|
||||
/* Same offline system stack as the doctor workspace. */
|
||||
--font: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif;
|
||||
--fs-12: 0.75rem;
|
||||
--fs-13: 0.8125rem;
|
||||
--fs-14: 0.875rem;
|
||||
@@ -63,14 +63,14 @@
|
||||
--s-12: 48px;
|
||||
|
||||
/* Radii: tiles > buttons > chips */
|
||||
--r-tile: 16px;
|
||||
--r-btn: 12px;
|
||||
--r-chip: 999px;
|
||||
--r-tile: 12px;
|
||||
--r-btn: 8px;
|
||||
--r-chip: 5px;
|
||||
|
||||
--tap: 52px;
|
||||
--nav-h: 64px;
|
||||
--sidebar-w: 232px;
|
||||
--rail-w: 300px;
|
||||
--sidebar-w: 228px;
|
||||
--rail-w: 264px;
|
||||
|
||||
--safe-top: env(safe-area-inset-top, 0px);
|
||||
--safe-bottom: env(safe-area-inset-bottom, 0px);
|
||||
|
||||
Reference in New Issue
Block a user