Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4ee3d25f0 | ||
|
|
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_REPO=MedITron/PTSRaiAgent
|
||||||
GITEA_USER=
|
GITEA_USER=
|
||||||
GITEA_TOKEN=
|
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).
|
# Dashboard-only Streamlit settings (doctor dashboard + demo console).
|
||||||
[theme]
|
[theme]
|
||||||
base = "light"
|
base = "light"
|
||||||
primaryColor = "#2A78D6"
|
primaryColor = "#285E4E"
|
||||||
backgroundColor = "#F6F7F9"
|
backgroundColor = "#F6F7F3"
|
||||||
secondaryBackgroundColor = "#FFFFFF"
|
secondaryBackgroundColor = "#FFFFFF"
|
||||||
textColor = "#1B1F24"
|
textColor = "#213B38"
|
||||||
borderColor = "#E3E6EA"
|
borderColor = "#E1E7E3"
|
||||||
baseRadius = "medium"
|
baseRadius = "medium"
|
||||||
# Falls back to the system sans-serif when offline (ADR-004).
|
# 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"
|
font = "sans-serif"
|
||||||
headingFontWeights = 700
|
headingFontWeights = 600
|
||||||
|
|
||||||
[client]
|
[client]
|
||||||
toolbarMode = "minimal"
|
toolbarMode = "minimal"
|
||||||
|
|||||||
@@ -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 demo as console
|
||||||
from app.api import doctor_views as views
|
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.patient_web import router as patient_web_router
|
||||||
from app.api.questionnaire import router as questionnaire_router
|
from app.api.questionnaire import router as questionnaire_router
|
||||||
from app.api.schemas import (
|
from app.api.schemas import (
|
||||||
@@ -46,6 +46,7 @@ from app.scheduler import jobs as scheduler
|
|||||||
from app.services.monitoring import refresh_status
|
from app.services.monitoring import refresh_status
|
||||||
|
|
||||||
router = APIRouter(prefix="/api/v1")
|
router = APIRouter(prefix="/api/v1")
|
||||||
|
router.include_router(max_notifications.router)
|
||||||
router.include_router(questionnaire_router)
|
router.include_router(questionnaire_router)
|
||||||
router.include_router(patient_web_router)
|
router.include_router(patient_web_router)
|
||||||
|
|
||||||
|
|||||||
+34
-1
@@ -1,10 +1,12 @@
|
|||||||
"""Typed application settings. The only place that reads environment variables."""
|
"""Typed application settings. The only place that reads environment variables."""
|
||||||
|
|
||||||
|
import re
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Literal
|
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
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
ROOT_DIR = Path(__file__).resolve().parent.parent
|
ROOT_DIR = Path(__file__).resolve().parent.parent
|
||||||
@@ -35,6 +37,7 @@ class Settings(BaseSettings):
|
|||||||
openrouter_api_key: str = ""
|
openrouter_api_key: str = ""
|
||||||
openrouter_model: str = "google/gemini-2.5-flash-lite"
|
openrouter_model: str = "google/gemini-2.5-flash-lite"
|
||||||
openrouter_base_url: str = "https://openrouter.ai/api/v1"
|
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_timeout_s: float = 25.0
|
||||||
chat_agent_max_steps: int = 5
|
chat_agent_max_steps: int = 5
|
||||||
|
|
||||||
@@ -42,6 +45,36 @@ class Settings(BaseSettings):
|
|||||||
tg_bot_token: str = ""
|
tg_bot_token: str = ""
|
||||||
doctor_notify_chat_id: int | None = None
|
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).
|
# Virtual clock for the demo (ADR-005).
|
||||||
demo_clock: bool = True
|
demo_clock: bool = True
|
||||||
tz: str = "Europe/Moscow"
|
tz: str = "Europe/Moscow"
|
||||||
|
|||||||
@@ -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 audit as _audit # noqa: F401 (registers audit_log in clinical metadata)
|
||||||
from app.db import intake as _intake # noqa: F401
|
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 import scheduler as _scheduler # noqa: F401
|
||||||
from app.db.clinical import ClinicalBase
|
from app.db.clinical import ClinicalBase
|
||||||
from app.db.identity import IdentityBase
|
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))
|
||||||
@@ -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.core.types import ScrubbedText
|
||||||
from app.llm.agent.prompts import SYSTEM_PROMPT
|
from app.llm.agent.prompts import SYSTEM_PROMPT
|
||||||
from app.llm.agent.providers import (
|
from app.llm.agent.providers import (
|
||||||
|
GigaChatToolProvider,
|
||||||
MockAgentProvider,
|
MockAgentProvider,
|
||||||
OpenRouterProvider,
|
OpenRouterProvider,
|
||||||
ProviderError,
|
ProviderError,
|
||||||
@@ -49,7 +50,7 @@ def build_provider(settings: Settings | None = None) -> ToolChatProvider | None:
|
|||||||
s = settings or get_settings()
|
s = settings or get_settings()
|
||||||
mode = s.chat_agent
|
mode = s.chat_agent
|
||||||
if mode == "auto":
|
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 mode == "openrouter":
|
||||||
if not s.openrouter_api_key:
|
if not s.openrouter_api_key:
|
||||||
log.warning("chat agent: openrouter selected without OPENROUTER_API_KEY — disabled")
|
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":
|
if mode == "mock":
|
||||||
return MockAgentProvider()
|
return MockAgentProvider()
|
||||||
if mode == "gigachat":
|
if mode == "gigachat":
|
||||||
# TODO(GigaChat): function calling via the `gigachat` package (functions=..., message.function_call).
|
if not s.gigachat_credentials:
|
||||||
log.warning("chat agent: gigachat provider not implemented yet — disabled")
|
log.warning("chat agent: gigachat selected without GIGACHAT_CREDENTIALS — disabled")
|
||||||
return None
|
return None
|
||||||
|
return GigaChatToolProvider(s)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def _chat_with_retry(provider: ToolChatProvider, messages: list[dict[str, Any]]):
|
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)."""
|
"""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:
|
try:
|
||||||
return await provider.chat(wire, TOOL_SPECS)
|
return await provider.chat(wire, TOOL_SPECS)
|
||||||
except ProviderError as exc:
|
except ProviderError as exc:
|
||||||
@@ -139,6 +141,9 @@ async def answer_chat(
|
|||||||
except (ProviderError, TimeoutError) as exc:
|
except (ProviderError, TimeoutError) as exc:
|
||||||
log.error("chat agent provider=%s failed: %s %s", provider.name, type(exc).__name__, exc)
|
log.error("chat agent provider=%s failed: %s %s", provider.name, type(exc).__name__, exc)
|
||||||
return None
|
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:
|
def _finish(text: str, ctx: ToolContext, provider: str) -> AgentAnswer | None:
|
||||||
|
|||||||
@@ -68,9 +68,10 @@ class OpenRouterProvider:
|
|||||||
if resp.status_code != 200:
|
if resp.status_code != 200:
|
||||||
# Provider error bodies are generic (no patient text) — log the message to make failures diagnosable.
|
# Provider error bodies are generic (no patient text) — log the message to make failures diagnosable.
|
||||||
try:
|
try:
|
||||||
detail = str(resp.json().get("error", {}).get("message", ""))[:200]
|
err = resp.json().get("error", "")
|
||||||
except ValueError:
|
detail = str(err.get("message", "") if isinstance(err, dict) else err)[:200]
|
||||||
detail = ""
|
except (ValueError, AttributeError):
|
||||||
|
detail = resp.text[:200]
|
||||||
log.error("openrouter http %s: %s", resp.status_code, detail)
|
log.error("openrouter http %s: %s", resp.status_code, detail)
|
||||||
raise ProviderError(f"http {resp.status_code}")
|
raise ProviderError(f"http {resp.status_code}")
|
||||||
try:
|
try:
|
||||||
@@ -90,6 +91,88 @@ class OpenRouterProvider:
|
|||||||
return AssistantTurn(content=msg.get("content"), tool_calls=calls)
|
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
|
# ------------------------------------------------------------------------------------------------ offline mock
|
||||||
|
|
||||||
_DRUG_WORDS = re.compile(
|
_DRUG_WORDS = re.compile(
|
||||||
|
|||||||
+14
-2
@@ -30,12 +30,24 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
|
|||||||
# In compose Postgres is required and healthy before the app starts; this branch is for running the
|
# 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.
|
# 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__)
|
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).
|
# Lanes fill these in (#13, #11); main.py itself stays frozen (#34).
|
||||||
await scheduler.start()
|
max_channel = None
|
||||||
|
try:
|
||||||
await telegram.start()
|
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
|
yield
|
||||||
await telegram.stop()
|
finally:
|
||||||
await scheduler.stop()
|
await scheduler.stop()
|
||||||
|
if max_channel is not None:
|
||||||
|
await max_channel.stop()
|
||||||
|
await telegram.stop()
|
||||||
await dispose()
|
await dispose()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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>'
|
f'<span><i style="border:1.5px dashed var(--grey)"></i>ожидается · {c["pending"]}</span>'
|
||||||
"</div>"
|
"</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:
|
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")
|
main, side = st.columns([1.75, 1], gap="large")
|
||||||
with main:
|
with main:
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-scales"):
|
||||||
c1, c2 = st.columns(2)
|
c1, c2 = st.columns(2)
|
||||||
for col, scale_id, title in ((c1, "phq9", "PHQ-9"), (c2, "pcl5", "PCL-5")):
|
for col, scale_id, title in ((c1, "phq9", "PHQ-9"), (c2, "pcl5", "PCL-5")):
|
||||||
fig = charts.scale_figure(card.series, scale_id, title, start)
|
fig = charts.scale_figure(card.series, scale_id, title, start)
|
||||||
@@ -191,22 +194,22 @@ def render(card: PatientCard, today: date | None) -> None:
|
|||||||
else:
|
else:
|
||||||
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key=f"chart-{scale_id}")
|
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key=f"chart-{scale_id}")
|
||||||
st.caption("◇ — внеплановое заполнение (по триггеру правил). Полосы — градации тяжести из config/scales.")
|
st.caption("◇ — внеплановое заполнение (по триггеру правил). Полосы — градации тяжести из config/scales.")
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-wellbeing"):
|
||||||
fig = charts.wellbeing_figure(card.series, start)
|
fig = charts.wellbeing_figure(card.series, start)
|
||||||
if fig is None:
|
if fig is None:
|
||||||
st.caption("Ежедневных чек-инов пока нет")
|
st.caption("Ежедневных чек-инов пока нет")
|
||||||
else:
|
else:
|
||||||
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key="chart-wellbeing")
|
st.plotly_chart(fig, config=theme.PLOTLY_CONFIG, key="chart-wellbeing")
|
||||||
st.caption("Красная зона настроения ≤ 3 (3 дня → внеплановый PHQ-9); пунктир — сон 4 ч.")
|
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('<div class="mt-panel-title">Календарь приёма</div>')
|
||||||
st.html(dose_strip_html(grid, start))
|
st.html(dose_strip_html(grid, start))
|
||||||
with side:
|
with side:
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-alerts"):
|
||||||
_alerts_feed(card.alerts, today)
|
_alerts_feed(card.alerts, today)
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-summary"):
|
||||||
_summary(card.summary)
|
_summary(card.summary)
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-safety"):
|
||||||
_safety_plan(card.safety_plan)
|
_safety_plan(card.safety_plan)
|
||||||
with st.container(border=True):
|
with st.container(border=True, key="panel-prescriptions"):
|
||||||
_prescriptions(card)
|
_prescriptions(card)
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ def render_playback_panel(persona: dict[str, Any]) -> None:
|
|||||||
token = persona["token"]
|
token = persona["token"]
|
||||||
scenario, source = w.scenario_for(persona)
|
scenario, source = w.scenario_for(persona)
|
||||||
state = w.playback_state(token)
|
state = w.playback_state(token)
|
||||||
st.subheader("🎬 Сценарий демо")
|
st.subheader("Сценарий демо")
|
||||||
_scenario_source_controls(persona, source)
|
_scenario_source_controls(persona, source)
|
||||||
if scenario.errors:
|
if scenario.errors:
|
||||||
with st.expander(f"⚠️ Замечания к сценарию: {len(scenario.errors)}", expanded=not scenario.days):
|
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]:
|
for a in fresh_acute[:1]:
|
||||||
st.markdown(
|
st.markdown(
|
||||||
"<div style='background:#c62828;color:#fff;padding:18px 20px;border-radius:12px;"
|
"<div class='mt-banner t-red mt-console-alert'><div>"
|
||||||
"font-size:1.35rem;font-weight:700;margin-bottom:8px'>"
|
|
||||||
f"🚨 ОСТРЫЙ АЛЕРТ · {_escape(a.get('patient_name', ''))} · {_fmt_ts(a.get('ts'))}<br>"
|
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,
|
unsafe_allow_html=True,
|
||||||
)
|
)
|
||||||
c1, c2 = st.columns(2)
|
c1, c2 = st.columns(2)
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ def _reset() -> None:
|
|||||||
|
|
||||||
def _result(res: ConnectPatientOut, name: str) -> None:
|
def _result(res: ConnectPatientOut, name: str) -> None:
|
||||||
link = h.absolute_link(res.deep_link, os.environ.get("DASHBOARD_PUBLIC_URL", "http://localhost:8501"))
|
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(
|
st.html(
|
||||||
f'<div class="mt-kicker">Пациент подключён · {escape(name)}</div>'
|
f'<div class="mt-kicker">Пациент подключён · {escape(name)}</div>'
|
||||||
'<div class="mt-sub" style="margin:4px 0 10px">Покажите QR пациенту или продиктуйте код — бот спросит '
|
'<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,))
|
st.button("Заполнить демо-данными (Андрей)", icon=":material/auto_fix_high:", on_click=_fill_demo, args=(today,))
|
||||||
|
|
||||||
left, right = st.columns(2, gap="large")
|
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.html('<div class="mt-panel-title">Пациент</div>')
|
||||||
st.text_input("Имя и инициал фамилии", key="cp_name", placeholder="Андрей С.", help="Без полного ФИО")
|
st.text_input("Имя и инициал фамилии", key="cp_name", placeholder="Андрей С.", help="Без полного ФИО")
|
||||||
a, b = st.columns(2)
|
a, b = st.columns(2)
|
||||||
@@ -128,7 +128,7 @@ def main() -> None:
|
|||||||
key="cp_modules",
|
key="cp_modules",
|
||||||
format_func=lambda m: h.MODULE_LABELS[m],
|
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>')
|
st.html('<div class="mt-panel-title">Назначение</div>')
|
||||||
d1, d2 = st.columns([1.4, 1])
|
d1, d2 = st.columns([1.4, 1])
|
||||||
with d1:
|
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 import widgets as w # noqa: E402
|
||||||
from console.playback_ui import render_playback_panel # 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.set_page_config(page_title="Демо-консоль", page_icon="🎬", layout="wide")
|
||||||
|
|
||||||
|
st.html(theme.CSS)
|
||||||
|
st.html(
|
||||||
|
ui.page_header(
|
||||||
|
"Демо-консоль",
|
||||||
|
"Чат пациента и сценарий сопровождения. Прототип на синтетических данных.",
|
||||||
|
kicker="Демонстрация",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
persona = w.select_persona()
|
persona = w.select_persona()
|
||||||
w.render_connect_hero()
|
w.render_connect_hero()
|
||||||
w.show_flash()
|
w.show_flash()
|
||||||
st.sidebar.caption(f"API: {w.get_api().base_url}")
|
st.sidebar.caption(f"API: {w.get_api().base_url}")
|
||||||
|
|
||||||
st.title("Демо-консоль")
|
with st.container(border=True, key="panel-console-clock"):
|
||||||
st.caption("Прототип на синтетических данных. Время — виртуальные демо-часы (ADR-005).")
|
|
||||||
w.render_clock_bar(persona, key="console-clock")
|
w.render_clock_bar(persona, key="console-clock")
|
||||||
st.divider()
|
|
||||||
|
|
||||||
chat_col, play_col = st.columns([1.05, 1], gap="large")
|
chat_col, play_col = st.columns([1.05, 1], gap="large")
|
||||||
with chat_col:
|
with chat_col, st.container(border=True, key="panel-console-chat"):
|
||||||
st.subheader(f"💬 Чат пациента — {persona.get('display_name') or persona['token']}")
|
st.subheader(f"Чат пациента — {persona.get('display_name') or persona['token']}")
|
||||||
w.render_chat(persona["token"], height=560, key="console-chat")
|
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)
|
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 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.set_page_config(page_title="Сплит-экран", page_icon="🖥️", layout="wide", initial_sidebar_state="collapsed")
|
||||||
st.markdown(
|
st.html(theme.CSS)
|
||||||
"<style>.block-container{padding-top:1.2rem;max-width:100%} "
|
st.html(ui.page_header("Сплит-экран", "Пациент и врач: сопровождение в реальном времени.", kicker="Демонстрация"))
|
||||||
"[data-testid='stMarkdownContainer'] p, [data-testid='stMarkdownContainer'] li{font-size:1.08rem}</style>",
|
|
||||||
unsafe_allow_html=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
persona = w.select_persona()
|
persona = w.select_persona()
|
||||||
w.show_flash()
|
w.show_flash()
|
||||||
@@ -44,15 +44,15 @@ if clicked and nxt is not None:
|
|||||||
st.rerun()
|
st.rerun()
|
||||||
|
|
||||||
left, right = st.columns([1.1, 1], gap="large")
|
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()
|
url = w.patient_web_url()
|
||||||
if 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.iframe(url, height=760)
|
||||||
st.caption(f"Веб-приложение пациента: {url}")
|
st.caption(f"Веб-приложение пациента: {url}")
|
||||||
else:
|
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")
|
w.render_chat(token, height=600, key="split-chat")
|
||||||
with right:
|
with right, st.container(border=True, key="panel-split-doctor"):
|
||||||
st.markdown("#### 🩺 Кабинет врача — д-р Смирнова Е. А.")
|
st.markdown("#### Кабинет врача — д-р Смирнова Е. А.")
|
||||||
w.polled_doctor_panel(token, key="split-doc")
|
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; }}
|
.mt-empty p {{ font-size:.85rem; margin:8px 0 0; }}
|
||||||
|
|
||||||
/* ---------- chips, badges, bars ---------- */
|
/* ---------- chips, badges, bars ---------- */
|
||||||
.mt-chip {{ display:inline-block; font-size:.72rem; padding: 1px 8px; border-radius: 999px; margin-right: 4px;
|
.mt-chip {{ display:inline-block; font-size:.72rem; padding: 1px 8px; border-radius: 5px; margin-right: 4px;
|
||||||
background: var(--blue-tint); color: var(--blue-ink); font-weight: 500; }}
|
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;
|
.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; }}
|
border-radius: 5px; white-space: normal; }}
|
||||||
.mt-badge.t-red {{ background: var(--red-tint); color: var(--red-ink); }}
|
.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-banner b {{ color: inherit; }}
|
||||||
.mt-pulse {{ width: 12px; height: 12px; border-radius: 50%; background: var(--red); margin-top: 5px; flex: none;
|
.mt-pulse {{ width: 12px; height: 12px; border-radius: 50%; background: var(--red); margin-top: 5px; flex: none;
|
||||||
box-shadow: 0 0 0 4px #faeeee; }}
|
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; }}
|
color: var(--ink-3); margin: 2px 0 8px; }}
|
||||||
.mt-alert {{ border-left: 4px solid var(--grey); padding: 4px 0 4px 12px; }}
|
.mt-alert {{ border-left: 4px solid var(--grey); padding: 4px 0 4px 12px; }}
|
||||||
.mt-alert.t-red {{ border-left-color: var(--red); }}
|
.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 .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 .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-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);
|
.mt-summary {{ background: #f4f6f2; border:1px solid var(--line); border-radius: 12px; padding: 14px 16px;
|
||||||
line-height: 1.5; font-size: .93rem; }}
|
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 .disc {{ color: var(--ink-2); font-size: .76rem; margin-top: 8px; }}
|
||||||
.mt-plan ol {{ margin: 0; padding-left: 1.2rem; }}
|
.mt-plan ol {{ margin: 0; padding-left: 1.2rem; }}
|
||||||
.mt-plan li {{ margin: 3px 0; color: var(--ink); font-size: .9rem; }}
|
.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;
|
.mt-legend i {{ display:inline-block; width: 12px; height: 12px; border-radius: 3px; margin-right: 5px;
|
||||||
vertical-align: -1px; }}
|
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 ---------- */
|
/* ---------- connect result ---------- */
|
||||||
.mt-code {{ font-size: 2.4rem; font-weight: 700; letter-spacing: .12em; color: var(--ink);
|
.mt-code {{ font-size: 2.4rem; font-weight: 700; letter-spacing: .12em; color: var(--ink);
|
||||||
font-variant-numeric: tabular-nums; }}
|
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-mobile-label {{ display:block; color:var(--ink-3); font-size:.68rem; margin-bottom:5px; }}
|
||||||
.mt-row-details {{ grid-template-columns:1fr; gap:12px; }}
|
.mt-row-details {{ grid-template-columns:1fr; gap:12px; }}
|
||||||
.mt-list-footer {{ flex-wrap:wrap; }}
|
.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; }}
|
.mt-tip:hover::after, .mt-tip:focus-visible::after {{ display:none; }}
|
||||||
}}
|
}}
|
||||||
@media (prefers-reduced-motion: reduce) {{
|
@media (prefers-reduced-motion: reduce) {{
|
||||||
|
|||||||
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
|
||||||
@@ -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)
|
||||||
+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:
|
async def test_create_all_puts_tables_in_the_right_db(dbs: None) -> None:
|
||||||
identity_tables = await _tables(session.identity_engine)
|
identity_tables = await _tables(session.identity_engine)
|
||||||
clinical_tables = await _tables(session.clinical_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 {
|
assert {
|
||||||
"patient_profiles",
|
"patient_profiles",
|
||||||
"item_responses",
|
"item_responses",
|
||||||
|
|||||||
@@ -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 ans is not None and "Алкоголь" in ans.text
|
||||||
assert sent[0]["tool_choice"] == "required" and "tool_choice" not in sent[1]
|
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
|
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)
|
||||||
|
|||||||
@@ -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 { ru } from "../content/ru";
|
||||||
import { useDialog } from "../dialog/DialogContext";
|
import { useDialog } from "../dialog/DialogContext";
|
||||||
|
import { useSession } from "../session/SessionContext";
|
||||||
import { HotlineCard, useHelp } from "./HelpSheet";
|
import { HotlineCard, useHelp } from "./HelpSheet";
|
||||||
import { Icon, LogoMark, type IconName } from "./Icon";
|
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)
|
* 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)
|
* bare: one centred column on every width (questionnaires)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -87,6 +88,10 @@ function Sidebar({ signedIn }: { signedIn: boolean }) {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
|
<div className="sidebar__note">
|
||||||
|
<strong>{ru.product.supportTitle}</strong>
|
||||||
|
<span>{ru.product.supportText}</span>
|
||||||
|
</div>
|
||||||
</nav>
|
</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({
|
export function AppShell({
|
||||||
children,
|
children,
|
||||||
signedIn = true,
|
signedIn = true,
|
||||||
@@ -144,6 +167,7 @@ export function AppShell({
|
|||||||
return (
|
return (
|
||||||
<div className="app app--bare">
|
<div className="app app--bare">
|
||||||
<div className="app__main">
|
<div className="app__main">
|
||||||
|
<WorkspaceHeader signedIn={signedIn} bare />
|
||||||
<main className="screen" id="main">
|
<main className="screen" id="main">
|
||||||
{children}
|
{children}
|
||||||
{sos && <EmergencyBlock />}
|
{sos && <EmergencyBlock />}
|
||||||
@@ -155,6 +179,7 @@ export function AppShell({
|
|||||||
<div className={`app${signedIn && !focus ? " app--tabs" : ""}`}>
|
<div className={`app${signedIn && !focus ? " app--tabs" : ""}`}>
|
||||||
<Sidebar signedIn={signedIn} />
|
<Sidebar signedIn={signedIn} />
|
||||||
<div className="app__main">
|
<div className="app__main">
|
||||||
|
<WorkspaceHeader signedIn={signedIn} />
|
||||||
<main className="screen" id="main">
|
<main className="screen" id="main">
|
||||||
{children}
|
{children}
|
||||||
{sos && <EmergencyBlock />}
|
{sos && <EmergencyBlock />}
|
||||||
|
|||||||
@@ -163,8 +163,8 @@ export function Icon({ name, size = 22, label }: { name: IconName; size?: number
|
|||||||
export function LogoMark({ size = 32 }: { size?: number }) {
|
export function LogoMark({ size = 32 }: { size?: number }) {
|
||||||
return (
|
return (
|
||||||
<svg width={size} height={size} viewBox="0 0 32 32" aria-hidden="true" focusable="false">
|
<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)" />
|
<rect width="32" height="32" rx="9" fill="var(--c-primary)" />
|
||||||
<path d="M13 7h6v6h6v6h-6v6h-6v-6H7v-6h6z" fill="#fff" />
|
<path d="M16 8v16M8 16h16" stroke="#fff" strokeWidth="2" strokeLinecap="round" />
|
||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ export const ru = {
|
|||||||
product: {
|
product: {
|
||||||
name: "Сопровождение пациента",
|
name: "Сопровождение пациента",
|
||||||
tagline: "между визитами к врачу",
|
tagline: "между визитами к врачу",
|
||||||
|
workspace: "Личный кабинет",
|
||||||
|
supportTitle: "Рядом между визитами",
|
||||||
|
supportText: "Наблюдение за самочувствием и поддержка назначенного лечения.",
|
||||||
},
|
},
|
||||||
nav: {
|
nav: {
|
||||||
today: "Сегодня",
|
today: "Сегодня",
|
||||||
@@ -201,6 +204,7 @@ export const ru = {
|
|||||||
toIntake: "Пройти первичный опрос",
|
toIntake: "Пройти первичный опрос",
|
||||||
},
|
},
|
||||||
flow: {
|
flow: {
|
||||||
|
home: "На главный экран",
|
||||||
question: (n: number, total: number) => `Вопрос ${n} из ${total}`,
|
question: (n: number, total: number) => `Вопрос ${n} из ${total}`,
|
||||||
period: "За последний месяц",
|
period: "За последний месяц",
|
||||||
textPlaceholder: "Напишите несколько слов",
|
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/tokens.css";
|
||||||
import "./theme/global.css";
|
import "./theme/global.css";
|
||||||
|
|
||||||
|
|||||||
+14
-15
@@ -265,7 +265,7 @@ function FreeText({
|
|||||||
{skip.label}
|
{skip.label}
|
||||||
</button>
|
</button>
|
||||||
) : (
|
) : (
|
||||||
<button type="button" className="btn btn--ghost" onClick={onExit}>
|
<button type="button" className="btn btn--ghost" disabled={busy} onClick={onExit}>
|
||||||
{ru.flow.exit}
|
{ru.flow.exit}
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
@@ -362,6 +362,7 @@ function SurveyAct({
|
|||||||
press,
|
press,
|
||||||
say,
|
say,
|
||||||
onPause,
|
onPause,
|
||||||
|
onHome,
|
||||||
}: {
|
}: {
|
||||||
step: Survey;
|
step: Survey;
|
||||||
stepKey: string;
|
stepKey: string;
|
||||||
@@ -369,6 +370,7 @@ function SurveyAct({
|
|||||||
press: (b: DialogButton) => void;
|
press: (b: DialogButton) => void;
|
||||||
say: (text: string) => void;
|
say: (text: string) => void;
|
||||||
onPause: (b: DialogButton) => void;
|
onPause: (b: DialogButton) => void;
|
||||||
|
onHome: () => void;
|
||||||
}) {
|
}) {
|
||||||
let answer: ReactNode;
|
let answer: ReactNode;
|
||||||
switch (step.input) {
|
switch (step.input) {
|
||||||
@@ -381,7 +383,7 @@ function SurveyAct({
|
|||||||
break;
|
break;
|
||||||
case "text":
|
case "text":
|
||||||
answer = (
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -522,17 +524,6 @@ export function Flow() {
|
|||||||
navigate("/today", { replace: true });
|
navigate("/today", { replace: true });
|
||||||
}, [step, stepKey, navigate, toast]);
|
}, [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);
|
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.
|
// «Продолжить позже»: answers are already saved on the server — pause and go straight home, no confirmation.
|
||||||
const pause = (b: DialogButton) =>
|
const pause = (b: DialogButton) =>
|
||||||
@@ -588,7 +579,7 @@ export function Flow() {
|
|||||||
) : item ? (
|
) : item ? (
|
||||||
<Progress n={item.index} total={item.total} adaptive={item.adaptive} />
|
<Progress n={item.index} total={item.total} adaptive={item.adaptive} />
|
||||||
) : null;
|
) : 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.
|
// Phone: one column. Desktop: question and context on the left, answers and actions on the right.
|
||||||
let lead: ReactNode;
|
let lead: ReactNode;
|
||||||
let act: ReactNode;
|
let act: ReactNode;
|
||||||
@@ -702,7 +693,7 @@ export function Flow() {
|
|||||||
break;
|
break;
|
||||||
case "survey":
|
case "survey":
|
||||||
lead = <SurveyLead step={step} catalog={catalog} />;
|
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;
|
break;
|
||||||
case "choice":
|
case "choice":
|
||||||
lead = <Head title={step.title} lead={step.lead} />;
|
lead = <Head title={step.title} lead={step.lead} />;
|
||||||
@@ -725,6 +716,14 @@ export function Flow() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<AppShell focus bare sos={step?.kind !== "crisis"}>
|
<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}
|
{content}
|
||||||
</AppShell>
|
</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.
|
* Capacitor wraps this same bundle; a React Native port maps these 1:1 to a theme object.
|
||||||
*/
|
*/
|
||||||
:root {
|
:root {
|
||||||
/* Ink & surfaces */
|
/* Ink & surfaces */
|
||||||
--c-navy: #0f2747; /* primary buttons, headings, desktop sidebar */
|
--c-primary: #285e4e; /* primary buttons and active navigation */
|
||||||
--c-navy-hover: #0a1d37;
|
--c-primary-hover: #204b3e;
|
||||||
--c-navy-soft: #e8eef6;
|
--c-primary-soft: #edf3ee;
|
||||||
--c-text: #13294b;
|
--c-text: #213b38;
|
||||||
--c-text-2: #4d5d73;
|
--c-text-2: #526660;
|
||||||
--c-text-3: #7a889b;
|
--c-text-3: #63736f;
|
||||||
--c-page: #ffffff;
|
--c-page: #f6f7f3;
|
||||||
--c-page-desk: #f4f7fb; /* desktop canvas behind white panels */
|
--c-page-desk: #f6f7f3; /* desktop canvas behind white panels */
|
||||||
--c-surface: #ffffff;
|
--c-surface: #ffffff;
|
||||||
--c-tile: #f3f7fb; /* soft card fill */
|
--c-tile: #f4f6f2; /* soft card fill */
|
||||||
--c-border: #e2e9f1;
|
--c-border: #e1e7e3;
|
||||||
--c-border-strong: #c9d4e1;
|
--c-border-strong: #b4c6ba;
|
||||||
|
|
||||||
/* Selection & positive: teal */
|
/* Selection & positive */
|
||||||
--c-teal: #17a08f;
|
--c-teal: #527f61;
|
||||||
--c-teal-strong: #0e7e71;
|
--c-teal-strong: #38634b;
|
||||||
--c-teal-soft: #e3f5f2;
|
--c-teal-soft: #eef4ee;
|
||||||
|
|
||||||
/* Info: blue */
|
/* Informational surfaces */
|
||||||
--c-blue: #2f7fdb;
|
--c-blue: #38634b;
|
||||||
--c-blue-soft: #eaf3fd;
|
--c-blue-soft: #edf3ee;
|
||||||
|
|
||||||
/* Help & crisis: red */
|
/* Help & crisis: red */
|
||||||
--c-red: #e2383b;
|
--c-red: #a83236;
|
||||||
--c-red-strong: #c62b2e;
|
--c-red-strong: #a83236;
|
||||||
--c-red-soft: #fdeded;
|
--c-red-soft: #faeeee;
|
||||||
--c-red-line: #f7d3d3;
|
--c-red-line: #e7cbcb;
|
||||||
|
|
||||||
/* Warning */
|
/* Warning */
|
||||||
--c-amber: #e69a12;
|
--c-amber: #805714;
|
||||||
--c-amber-soft: #fff4dd;
|
--c-amber-soft: #fbf3e4;
|
||||||
|
|
||||||
--c-focus: #2f7fdb;
|
--c-focus: #598d7a;
|
||||||
|
|
||||||
/* Type: Golos Text (OFL), bundled locally — works offline. */
|
/* Same offline system stack as the doctor workspace. */
|
||||||
--font: "Golos Text", system-ui, -apple-system, "Segoe UI", sans-serif;
|
--font: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif;
|
||||||
--fs-12: 0.75rem;
|
--fs-12: 0.75rem;
|
||||||
--fs-13: 0.8125rem;
|
--fs-13: 0.8125rem;
|
||||||
--fs-14: 0.875rem;
|
--fs-14: 0.875rem;
|
||||||
@@ -63,14 +63,14 @@
|
|||||||
--s-12: 48px;
|
--s-12: 48px;
|
||||||
|
|
||||||
/* Radii: tiles > buttons > chips */
|
/* Radii: tiles > buttons > chips */
|
||||||
--r-tile: 16px;
|
--r-tile: 12px;
|
||||||
--r-btn: 12px;
|
--r-btn: 8px;
|
||||||
--r-chip: 999px;
|
--r-chip: 5px;
|
||||||
|
|
||||||
--tap: 52px;
|
--tap: 52px;
|
||||||
--nav-h: 64px;
|
--nav-h: 64px;
|
||||||
--sidebar-w: 232px;
|
--sidebar-w: 228px;
|
||||||
--rail-w: 300px;
|
--rail-w: 264px;
|
||||||
|
|
||||||
--safe-top: env(safe-area-inset-top, 0px);
|
--safe-top: env(safe-area-inset-top, 0px);
|
||||||
--safe-bottom: env(safe-area-inset-bottom, 0px);
|
--safe-bottom: env(safe-area-inset-bottom, 0px);
|
||||||
|
|||||||
Reference in New Issue
Block a user