Compare commits
50
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7eb6ac2a5 | ||
|
|
016bc22c05 | ||
|
|
094f8cd40f | ||
|
|
6794e88d53 | ||
|
|
7884430b3d | ||
|
|
46d42b7d98 | ||
|
|
ef58c5f2d2 | ||
|
|
6e3fe5a616 | ||
|
|
67b6bd1b48 | ||
|
|
0752001d85 | ||
|
|
c37294be17 | ||
|
|
5360cac8ad | ||
|
|
ea932f27fb | ||
|
|
bf0183bef4 | ||
|
|
0c6419f37e | ||
|
|
f768e7648f | ||
|
|
e30ab2b889 | ||
|
|
730f586784 | ||
|
|
ef2b1c6dd6 | ||
|
|
c693899b12 | ||
|
|
d274ccb5e2 | ||
|
|
5d19992f00 | ||
|
|
81aec1c63a | ||
|
|
4029c31ed7 | ||
|
|
e24e89d326 | ||
|
|
dc34a03357 | ||
|
|
3f7ff9329a | ||
|
|
699bbbde57 | ||
|
|
7a0199e685 | ||
|
|
672019830d | ||
|
|
e720baa21e | ||
|
|
9e86cc64ac | ||
|
|
e2b928273c | ||
|
|
64b7680ec4 | ||
|
|
89f52963b7 | ||
|
|
76bd22c24b | ||
|
|
51a317ccd9 | ||
|
|
08590bf9ea | ||
|
|
25fb8fbee5 | ||
|
|
cfcfe7146e | ||
|
|
2e2adeb9e2 | ||
|
|
25d2494616 | ||
|
|
bd5f64d000 | ||
|
|
350df1d119 | ||
|
|
64462fac92 | ||
|
|
6bf446f889 | ||
|
|
68ea87e1b2 | ||
|
|
c5bfa47a23 | ||
|
|
4ab7732da9 | ||
|
|
4a2d788e85 |
@@ -1,8 +1,11 @@
|
|||||||
"""AI模型配置接口"""
|
"""AI模型配置接口"""
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
import secrets
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends, Header, HTTPException
|
||||||
from sqlalchemy import select, update
|
from sqlalchemy import select, update
|
||||||
|
|
||||||
from app.core.database import get_db
|
from app.core.database import get_db
|
||||||
|
from app.core.config import settings
|
||||||
from app.schemas import ApiResponse, AIModelCreateRequest, AIModelUpdateRequest, AIModelTestRequest
|
from app.schemas import ApiResponse, AIModelCreateRequest, AIModelUpdateRequest, AIModelTestRequest
|
||||||
from app.models import AIModelConfig
|
from app.models import AIModelConfig
|
||||||
from app.utils.crypto import encrypt, decrypt
|
from app.utils.crypto import encrypt, decrypt
|
||||||
@@ -22,13 +25,20 @@ async def list_models(db=Depends(get_db)):
|
|||||||
@router.post("")
|
@router.post("")
|
||||||
async def create_model(req: AIModelCreateRequest, db=Depends(get_db)):
|
async def create_model(req: AIModelCreateRequest, db=Depends(get_db)):
|
||||||
if req.is_default:
|
if req.is_default:
|
||||||
await db.execute(update(AIModelConfig).values(is_default=0))
|
await db.execute(
|
||||||
|
update(AIModelConfig)
|
||||||
|
.where(AIModelConfig.usage_scope == req.usage_scope)
|
||||||
|
.values(is_default=0)
|
||||||
|
)
|
||||||
model = AIModelConfig(
|
model = AIModelConfig(
|
||||||
model_name=req.model_name,
|
model_name=req.model_name,
|
||||||
provider=req.provider,
|
provider=req.provider,
|
||||||
|
usage_scope=req.usage_scope,
|
||||||
api_base_url=req.api_base_url,
|
api_base_url=req.api_base_url,
|
||||||
api_key_enc=encrypt(req.api_key) if req.api_key else None,
|
api_key_enc=encrypt(req.api_key) if req.api_key else None,
|
||||||
model_version=req.model_version,
|
model_version=req.model_version,
|
||||||
|
vision_model_version=req.vision_model_version,
|
||||||
|
ocr_model_version=req.ocr_model_version,
|
||||||
temperature=req.temperature,
|
temperature=req.temperature,
|
||||||
max_tokens=req.max_tokens,
|
max_tokens=req.max_tokens,
|
||||||
timeout_seconds=req.timeout_seconds,
|
timeout_seconds=req.timeout_seconds,
|
||||||
@@ -47,8 +57,16 @@ async def update_model(model_id: int, req: AIModelUpdateRequest, db=Depends(get_
|
|||||||
model = result.scalar_one_or_none()
|
model = result.scalar_one_or_none()
|
||||||
if not model:
|
if not model:
|
||||||
raise HTTPException(status_code=404, detail="模型不存在")
|
raise HTTPException(status_code=404, detail="模型不存在")
|
||||||
if req.is_default:
|
target_scope = req.usage_scope or model.usage_scope
|
||||||
await db.execute(update(AIModelConfig).where(AIModelConfig.id != model_id).values(is_default=0))
|
if req.is_default or (req.usage_scope and model.is_default):
|
||||||
|
await db.execute(
|
||||||
|
update(AIModelConfig)
|
||||||
|
.where(
|
||||||
|
AIModelConfig.id != model_id,
|
||||||
|
AIModelConfig.usage_scope == target_scope,
|
||||||
|
)
|
||||||
|
.values(is_default=0)
|
||||||
|
)
|
||||||
for field, val in req.model_dump(exclude_none=True).items():
|
for field, val in req.model_dump(exclude_none=True).items():
|
||||||
if field == "api_key":
|
if field == "api_key":
|
||||||
model.api_key_enc = encrypt(val) if val else None
|
model.api_key_enc = encrypt(val) if val else None
|
||||||
@@ -59,6 +77,39 @@ async def update_model(model_id: int, req: AIModelUpdateRequest, db=Depends(get_
|
|||||||
return ApiResponse(data=_format_model(model), message="更新成功")
|
return ApiResponse(data=_format_model(model), message="更新成功")
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/runtime/digital-avatar")
|
||||||
|
async def get_digital_avatar_runtime_model(
|
||||||
|
x_avatar_config_token: str | None = Header(default=None),
|
||||||
|
db=Depends(get_db),
|
||||||
|
):
|
||||||
|
expected = settings.AVATAR_MODEL_CONFIG_TOKEN
|
||||||
|
if not expected:
|
||||||
|
raise HTTPException(status_code=503, detail="数字分身模型配置服务未启用")
|
||||||
|
if not x_avatar_config_token or not secrets.compare_digest(x_avatar_config_token, expected):
|
||||||
|
raise HTTPException(status_code=401, detail="无权读取数字分身模型配置")
|
||||||
|
|
||||||
|
result = await db.execute(
|
||||||
|
select(AIModelConfig).where(
|
||||||
|
AIModelConfig.usage_scope == "digital_avatar",
|
||||||
|
AIModelConfig.is_default == 1,
|
||||||
|
AIModelConfig.is_enabled == 1,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
model = result.scalar_one_or_none()
|
||||||
|
if not model:
|
||||||
|
raise HTTPException(status_code=404, detail="尚未配置启用的数字分身专用模型")
|
||||||
|
return ApiResponse(data={
|
||||||
|
"api_base_url": model.api_base_url or "https://api.openai.com/v1",
|
||||||
|
"api_key": decrypt(model.api_key_enc) if model.api_key_enc else "",
|
||||||
|
"model": model.model_version or model.model_name,
|
||||||
|
"vision_model": model.vision_model_version or "qwen3.6-flash",
|
||||||
|
"ocr_model": model.ocr_model_version or "qwen-vl-ocr",
|
||||||
|
"temperature": model.temperature,
|
||||||
|
"max_tokens": model.max_tokens,
|
||||||
|
"timeout_seconds": model.timeout_seconds,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{model_id}")
|
@router.delete("/{model_id}")
|
||||||
async def delete_model(model_id: int, db=Depends(get_db)):
|
async def delete_model(model_id: int, db=Depends(get_db)):
|
||||||
result = await db.execute(select(AIModelConfig).where(AIModelConfig.id == model_id))
|
result = await db.execute(select(AIModelConfig).where(AIModelConfig.id == model_id))
|
||||||
@@ -79,8 +130,11 @@ async def test_model(req: AIModelTestRequest, db=Depends(get_db)):
|
|||||||
def _format_model(m: AIModelConfig) -> dict:
|
def _format_model(m: AIModelConfig) -> dict:
|
||||||
return {
|
return {
|
||||||
"id": m.id, "model_name": m.model_name, "provider": m.provider,
|
"id": m.id, "model_name": m.model_name, "provider": m.provider,
|
||||||
|
"usage_scope": m.usage_scope,
|
||||||
"api_base_url": m.api_base_url, "has_api_key": bool(m.api_key_enc),
|
"api_base_url": m.api_base_url, "has_api_key": bool(m.api_key_enc),
|
||||||
"model_version": m.model_version, "temperature": m.temperature,
|
"model_version": m.model_version, "temperature": m.temperature,
|
||||||
|
"vision_model_version": m.vision_model_version,
|
||||||
|
"ocr_model_version": m.ocr_model_version,
|
||||||
"max_tokens": m.max_tokens, "timeout_seconds": m.timeout_seconds,
|
"max_tokens": m.max_tokens, "timeout_seconds": m.timeout_seconds,
|
||||||
"is_default": m.is_default, "is_enabled": m.is_enabled,
|
"is_default": m.is_default, "is_enabled": m.is_enabled,
|
||||||
"created_at": m.created_at.isoformat(),
|
"created_at": m.created_at.isoformat(),
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ class Settings(BaseSettings):
|
|||||||
# 安全
|
# 安全
|
||||||
SECRET_KEY: str = os.getenv("SECRET_KEY", "dev-secret-key-change-in-prod")
|
SECRET_KEY: str = os.getenv("SECRET_KEY", "dev-secret-key-change-in-prod")
|
||||||
AES_KEY: str = os.getenv("AES_KEY", "your-aes-key-32-chars-change-now!")
|
AES_KEY: str = os.getenv("AES_KEY", "your-aes-key-32-chars-change-now!")
|
||||||
|
AVATAR_MODEL_CONFIG_TOKEN: str = os.getenv("AVATAR_MODEL_CONFIG_TOKEN", "")
|
||||||
|
|
||||||
# 新闻平台
|
# 新闻平台
|
||||||
NEWS_PLATFORM_BASE_URL: str = os.getenv(
|
NEWS_PLATFORM_BASE_URL: str = os.getenv(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
"""数据库连接管理"""
|
"""数据库连接管理"""
|
||||||
import asyncio
|
import asyncio
|
||||||
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
|
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
|
||||||
|
from sqlalchemy import text
|
||||||
from sqlalchemy.orm import DeclarativeBase
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
from app.core.config import settings
|
from app.core.config import settings
|
||||||
from app.core.logger import logger
|
from app.core.logger import logger
|
||||||
@@ -64,6 +65,37 @@ async def init_db():
|
|||||||
VirtualUser, UserPersonality, InteractionRecord,
|
VirtualUser, UserPersonality, InteractionRecord,
|
||||||
PendingReplyTask, TokenStat, AIModelConfig, SystemConfig, LoginLog
|
PendingReplyTask, TokenStat, AIModelConfig, SystemConfig, LoginLog
|
||||||
)
|
)
|
||||||
|
async with engine.begin() as conn:
|
||||||
|
await conn.execute(text("SELECT GET_LOCK('ai_model_config_migration', 30)"))
|
||||||
|
try:
|
||||||
|
columns = (
|
||||||
|
(
|
||||||
|
"usage_scope",
|
||||||
|
"ALTER TABLE ai_model_configs ADD COLUMN usage_scope "
|
||||||
|
"VARCHAR(16) NOT NULL DEFAULT 'general' AFTER provider",
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"vision_model_version",
|
||||||
|
"ALTER TABLE ai_model_configs ADD COLUMN vision_model_version "
|
||||||
|
"VARCHAR(64) NULL AFTER model_version",
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"ocr_model_version",
|
||||||
|
"ALTER TABLE ai_model_configs ADD COLUMN ocr_model_version "
|
||||||
|
"VARCHAR(64) NULL AFTER vision_model_version",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
for column_name, ddl in columns:
|
||||||
|
result = await conn.execute(text(
|
||||||
|
"SELECT COUNT(*) FROM information_schema.COLUMNS "
|
||||||
|
"WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'ai_model_configs' "
|
||||||
|
"AND COLUMN_NAME = :column_name"
|
||||||
|
), {"column_name": column_name})
|
||||||
|
if result.scalar_one() == 0:
|
||||||
|
await conn.execute(text(ddl))
|
||||||
|
logger.info("AI模型配置表已增加 %s 字段", column_name)
|
||||||
|
finally:
|
||||||
|
await conn.execute(text("SELECT RELEASE_LOCK('ai_model_config_migration')"))
|
||||||
logger.info("✅ 数据库模型注册成功")
|
logger.info("✅ 数据库模型注册成功")
|
||||||
logger.info("✅ 数据库初始化完成")
|
logger.info("✅ 数据库初始化完成")
|
||||||
|
|
||||||
|
|||||||
@@ -122,9 +122,12 @@ class AIModelConfig(Base):
|
|||||||
id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True)
|
id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True)
|
||||||
model_name: Mapped[str] = mapped_column(String(64), nullable=False)
|
model_name: Mapped[str] = mapped_column(String(64), nullable=False)
|
||||||
provider: Mapped[str] = mapped_column(String(32), nullable=False)
|
provider: Mapped[str] = mapped_column(String(32), nullable=False)
|
||||||
|
usage_scope: Mapped[str] = mapped_column(String(16), nullable=False, default="general")
|
||||||
api_base_url: Mapped[str | None] = mapped_column(String(256))
|
api_base_url: Mapped[str | None] = mapped_column(String(256))
|
||||||
api_key_enc: Mapped[str | None] = mapped_column(String(512))
|
api_key_enc: Mapped[str | None] = mapped_column(String(512))
|
||||||
model_version: Mapped[str | None] = mapped_column(String(64))
|
model_version: Mapped[str | None] = mapped_column(String(64))
|
||||||
|
vision_model_version: Mapped[str | None] = mapped_column(String(64))
|
||||||
|
ocr_model_version: Mapped[str | None] = mapped_column(String(64))
|
||||||
temperature: Mapped[float] = mapped_column(Float, default=0.7)
|
temperature: Mapped[float] = mapped_column(Float, default=0.7)
|
||||||
max_tokens: Mapped[int] = mapped_column(Integer, default=1000)
|
max_tokens: Mapped[int] = mapped_column(Integer, default=1000)
|
||||||
timeout_seconds: Mapped[int] = mapped_column(Integer, default=30)
|
timeout_seconds: Mapped[int] = mapped_column(Integer, default=30)
|
||||||
|
|||||||
@@ -154,9 +154,12 @@ class InteractionResponse(BaseModel):
|
|||||||
class AIModelCreateRequest(BaseModel):
|
class AIModelCreateRequest(BaseModel):
|
||||||
model_name: str = Field(..., min_length=1, max_length=64)
|
model_name: str = Field(..., min_length=1, max_length=64)
|
||||||
provider: str = Field(..., pattern="^(openai|zhipu|wenxin|qianwen|local)$")
|
provider: str = Field(..., pattern="^(openai|zhipu|wenxin|qianwen|local)$")
|
||||||
|
usage_scope: str = Field(default="general", pattern="^(general|digital_avatar)$")
|
||||||
api_base_url: Optional[str] = None
|
api_base_url: Optional[str] = None
|
||||||
api_key: Optional[str] = None
|
api_key: Optional[str] = None
|
||||||
model_version: Optional[str] = None
|
model_version: Optional[str] = None
|
||||||
|
vision_model_version: Optional[str] = Field(None, max_length=64)
|
||||||
|
ocr_model_version: Optional[str] = Field(None, max_length=64)
|
||||||
temperature: float = Field(default=0.7, ge=0.0, le=2.0)
|
temperature: float = Field(default=0.7, ge=0.0, le=2.0)
|
||||||
max_tokens: int = Field(default=1000, ge=1, le=32000)
|
max_tokens: int = Field(default=1000, ge=1, le=32000)
|
||||||
timeout_seconds: int = Field(default=30, ge=5, le=300)
|
timeout_seconds: int = Field(default=30, ge=5, le=300)
|
||||||
@@ -165,9 +168,13 @@ class AIModelCreateRequest(BaseModel):
|
|||||||
|
|
||||||
class AIModelUpdateRequest(BaseModel):
|
class AIModelUpdateRequest(BaseModel):
|
||||||
model_name: Optional[str] = None
|
model_name: Optional[str] = None
|
||||||
|
provider: Optional[str] = Field(None, pattern="^(openai|zhipu|wenxin|qianwen|local)$")
|
||||||
|
usage_scope: Optional[str] = Field(None, pattern="^(general|digital_avatar)$")
|
||||||
api_base_url: Optional[str] = None
|
api_base_url: Optional[str] = None
|
||||||
api_key: Optional[str] = None
|
api_key: Optional[str] = None
|
||||||
model_version: Optional[str] = None
|
model_version: Optional[str] = None
|
||||||
|
vision_model_version: Optional[str] = Field(None, max_length=64)
|
||||||
|
ocr_model_version: Optional[str] = Field(None, max_length=64)
|
||||||
temperature: Optional[float] = Field(None, ge=0.0, le=2.0)
|
temperature: Optional[float] = Field(None, ge=0.0, le=2.0)
|
||||||
max_tokens: Optional[int] = Field(None, ge=1, le=32000)
|
max_tokens: Optional[int] = Field(None, ge=1, le=32000)
|
||||||
timeout_seconds: Optional[int] = Field(None, ge=5, le=300)
|
timeout_seconds: Optional[int] = Field(None, ge=5, le=300)
|
||||||
@@ -179,9 +186,12 @@ class AIModelResponse(BaseModel):
|
|||||||
id: int
|
id: int
|
||||||
model_name: str
|
model_name: str
|
||||||
provider: str
|
provider: str
|
||||||
|
usage_scope: str
|
||||||
api_base_url: Optional[str]
|
api_base_url: Optional[str]
|
||||||
has_api_key: bool
|
has_api_key: bool
|
||||||
model_version: Optional[str]
|
model_version: Optional[str]
|
||||||
|
vision_model_version: Optional[str]
|
||||||
|
ocr_model_version: Optional[str]
|
||||||
temperature: float
|
temperature: float
|
||||||
max_tokens: int
|
max_tokens: int
|
||||||
timeout_seconds: int
|
timeout_seconds: int
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ class AIService:
|
|||||||
async def _get_default_model(self, db: AsyncSession) -> Optional[AIModelConfig]:
|
async def _get_default_model(self, db: AsyncSession) -> Optional[AIModelConfig]:
|
||||||
result = await db.execute(
|
result = await db.execute(
|
||||||
select(AIModelConfig).where(
|
select(AIModelConfig).where(
|
||||||
AIModelConfig.is_default == 1, AIModelConfig.is_enabled == 1
|
AIModelConfig.usage_scope == "general",
|
||||||
|
AIModelConfig.is_default == 1,
|
||||||
|
AIModelConfig.is_enabled == 1,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return result.scalar_one_or_none()
|
return result.scalar_one_or_none()
|
||||||
|
|||||||
@@ -2,3 +2,5 @@ node_modules
|
|||||||
dist
|
dist
|
||||||
.env
|
.env
|
||||||
*.log
|
*.log
|
||||||
|
backend/avatar.db
|
||||||
|
backend/routers/uploads/
|
||||||
|
|||||||
@@ -4,11 +4,10 @@ FROM node:18-alpine AS build
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
RUN npm install
|
RUN npm ci
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
# 跳过 vue-tsc 类型检查直接打包(与本机已知 vue-tsc + Node 版本兼容问题无关,保证可构建)
|
RUN npm run build
|
||||||
RUN npx vite build
|
|
||||||
|
|
||||||
# 运行阶段:nginx 托管静态资源并反向代理 /api 到后端
|
# 运行阶段:nginx 托管静态资源并反向代理 /api 到后端
|
||||||
# 锁定 1.28-alpine:测试服务器 Docker 的 seccomp 拦截 pwrite 系统调用,
|
# 锁定 1.28-alpine:测试服务器 Docker 的 seccomp 拦截 pwrite 系统调用,
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ from sqlalchemy.orm import sessionmaker, declarative_base, Session
|
|||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
DB_FILE = os.path.join(BASE_DIR, "avatar.db")
|
DB_FILE = os.path.join(BASE_DIR, "avatar.db")
|
||||||
|
DATABASE_URL = os.getenv("DATABASE_URL", f"sqlite:///{DB_FILE}")
|
||||||
|
|
||||||
engine = create_engine(
|
engine = create_engine(
|
||||||
f"sqlite:///{DB_FILE}",
|
DATABASE_URL,
|
||||||
connect_args={"check_same_thread": False},
|
connect_args={"check_same_thread": False} if DATABASE_URL.startswith("sqlite:") else {},
|
||||||
)
|
)
|
||||||
SessionLocal = sessionmaker(bind=engine, autoflush=False, expire_on_commit=False)
|
SessionLocal = sessionmaker(bind=engine, autoflush=False, expire_on_commit=False)
|
||||||
Base = declarative_base()
|
Base = declarative_base()
|
||||||
@@ -37,8 +38,17 @@ def init_db():
|
|||||||
("avatars", "owner_id", "VARCHAR DEFAULT ''"),
|
("avatars", "owner_id", "VARCHAR DEFAULT ''"),
|
||||||
("authorizations", "takeover_enabled", "BOOLEAN DEFAULT 0"),
|
("authorizations", "takeover_enabled", "BOOLEAN DEFAULT 0"),
|
||||||
("authorizations", "takeover_mode", "VARCHAR DEFAULT 'immediate'"),
|
("authorizations", "takeover_mode", "VARCHAR DEFAULT 'immediate'"),
|
||||||
("authorizations", "takeover_delay_seconds", "INTEGER DEFAULT 30"),
|
("authorizations", "takeover_delay_seconds", "INTEGER DEFAULT 180"),
|
||||||
|
("avatars", "share_token", "VARCHAR DEFAULT NULL"),
|
||||||
|
("token_account", "user_id", "VARCHAR DEFAULT ''"),
|
||||||
|
("token_account", "total_granted", "BIGINT DEFAULT 0"),
|
||||||
|
("token_account", "total_consumed", "BIGINT DEFAULT 0"),
|
||||||
|
("token_account", "created_at", "TIMESTAMP"),
|
||||||
|
("token_account", "updated_at", "TIMESTAMP"),
|
||||||
)
|
)
|
||||||
|
_normalize_optional_unique_values()
|
||||||
|
_normalize_takeover_delays()
|
||||||
|
_create_token_indexes()
|
||||||
|
|
||||||
|
|
||||||
def _try_add_columns(*cols):
|
def _try_add_columns(*cols):
|
||||||
@@ -50,3 +60,25 @@ def _try_add_columns(*cols):
|
|||||||
except Exception:
|
except Exception:
|
||||||
# 列已存在(或全新库由 create_all 建好)则忽略
|
# 列已存在(或全新库由 create_all 建好)则忽略
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_optional_unique_values():
|
||||||
|
with engine.begin() as conn:
|
||||||
|
conn.exec_driver_sql("UPDATE avatars SET share_token = NULL WHERE share_token = ''")
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_takeover_delays():
|
||||||
|
with engine.begin() as conn:
|
||||||
|
# The old 30-second column default was never wired into the scheduler.
|
||||||
|
conn.exec_driver_sql(
|
||||||
|
"UPDATE authorizations SET takeover_delay_seconds = 180 "
|
||||||
|
"WHERE takeover_delay_seconds IS NULL OR takeover_delay_seconds = 30"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _create_token_indexes():
|
||||||
|
with engine.begin() as conn:
|
||||||
|
conn.exec_driver_sql(
|
||||||
|
"CREATE UNIQUE INDEX IF NOT EXISTS ux_token_account_user_id "
|
||||||
|
"ON token_account(user_id) WHERE user_id <> ''"
|
||||||
|
)
|
||||||
|
|||||||
@@ -18,6 +18,14 @@ EMBED_DIM = 256
|
|||||||
MODEL = os.getenv("EMBEDDING_MODEL", "mock-hash-embed-v1")
|
MODEL = os.getenv("EMBEDDING_MODEL", "mock-hash-embed-v1")
|
||||||
|
|
||||||
|
|
||||||
|
def _embedding_endpoint(api_url):
|
||||||
|
"""Accept either an OpenAI-compatible base URL or its full endpoint."""
|
||||||
|
api_url = (api_url or "").strip().rstrip("/")
|
||||||
|
if not api_url or api_url.endswith("/embeddings"):
|
||||||
|
return api_url
|
||||||
|
return f"{api_url}/embeddings"
|
||||||
|
|
||||||
|
|
||||||
def _tokenize(text):
|
def _tokenize(text):
|
||||||
text = (text or "").lower()
|
text = (text or "").lower()
|
||||||
# 英文/数字按词,CJK 逐字(中文无空格,需拆到字级才能命中子词)
|
# 英文/数字按词,CJK 逐字(中文无空格,需拆到字级才能命中子词)
|
||||||
@@ -47,26 +55,36 @@ def embed(texts):
|
|||||||
"""返回 list[list[float]],与输入顺序一致。"""
|
"""返回 list[list[float]],与输入顺序一致。"""
|
||||||
if not texts:
|
if not texts:
|
||||||
return []
|
return []
|
||||||
api_url = os.getenv("EMBEDDING_API_URL")
|
api_url = _embedding_endpoint(os.getenv("EMBEDDING_API_URL"))
|
||||||
if api_url:
|
if api_url:
|
||||||
api_key = os.getenv("EMBEDDING_API_KEY", "")
|
api_key = os.getenv("EMBEDDING_API_KEY", "")
|
||||||
model = os.getenv("EMBEDDING_MODEL", "text-embedding-3-small")
|
model = os.getenv("EMBEDDING_MODEL", "text-embedding-3-small")
|
||||||
payload = json.dumps({"input": texts, "model": model}).encode("utf-8")
|
try:
|
||||||
req = urllib.request.Request(
|
batch_size = max(1, int(os.getenv("EMBEDDING_BATCH_SIZE", "10")))
|
||||||
api_url,
|
except ValueError:
|
||||||
data=payload,
|
batch_size = 10
|
||||||
headers={
|
embeddings = []
|
||||||
"Content-Type": "application/json",
|
for start in range(0, len(texts), batch_size):
|
||||||
"Authorization": f"Bearer {api_key}" if api_key else "",
|
batch = texts[start:start + batch_size]
|
||||||
},
|
payload = json.dumps({"input": batch, "model": model}).encode("utf-8")
|
||||||
method="POST",
|
req = urllib.request.Request(
|
||||||
)
|
api_url,
|
||||||
with urllib.request.urlopen(req, timeout=30) as resp:
|
data=payload,
|
||||||
data = json.loads(resp.read().decode("utf-8"))
|
headers={
|
||||||
items = data["data"]
|
"Content-Type": "application/json",
|
||||||
if items and "index" in items[0]:
|
"Authorization": f"Bearer {api_key}" if api_key else "",
|
||||||
items = sorted(items, key=lambda x: x["index"])
|
},
|
||||||
return [item["embedding"] for item in items]
|
method="POST",
|
||||||
|
)
|
||||||
|
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||||
|
data = json.loads(resp.read().decode("utf-8"))
|
||||||
|
items = data["data"]
|
||||||
|
if items and "index" in items[0]:
|
||||||
|
items = sorted(items, key=lambda x: x["index"])
|
||||||
|
if len(items) != len(batch):
|
||||||
|
raise ValueError("embedding response count does not match request")
|
||||||
|
embeddings.extend(item["embedding"] for item in items)
|
||||||
|
return embeddings
|
||||||
return _hash_embedding(texts)
|
return _hash_embedding(texts)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,11 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from apscheduler.schedulers.background import BackgroundScheduler
|
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||||
from apscheduler.triggers.interval import IntervalTrigger
|
from apscheduler.triggers.interval import IntervalTrigger
|
||||||
import redis as redis_lib
|
|
||||||
|
|
||||||
from database import init_db, SessionLocal
|
from database import init_db, SessionLocal
|
||||||
from models import Avatar, Authorization, Organization, TokenAccount, TokenPlan
|
from models import Avatar, Authorization, Organization, TokenAccount, TokenPlan, User
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
import routers.avatars
|
import routers.avatars
|
||||||
import routers.tokens
|
import routers.tokens
|
||||||
@@ -20,9 +19,14 @@ import routers.huihui_auth
|
|||||||
import routers.chat
|
import routers.chat
|
||||||
import routers.takeover
|
import routers.takeover
|
||||||
from responses import ok
|
from responses import ok
|
||||||
|
from services.chat_attachment_service import purge_expired_chat_attachments
|
||||||
|
from services.token_billing import DEFAULT_TOKEN_GRANT, release_stale_reservations
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
takeover_scheduler = None
|
||||||
|
maintenance_scheduler = None
|
||||||
|
|
||||||
app = FastAPI(title="会会数字分身 API", version="1.0.0")
|
app = FastAPI(title="会会数字分身 API", version="1.0.0")
|
||||||
|
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
@@ -55,17 +59,29 @@ def health():
|
|||||||
def seed():
|
def seed():
|
||||||
db = SessionLocal()
|
db = SessionLocal()
|
||||||
try:
|
try:
|
||||||
if db.query(TokenAccount).first() is None:
|
plan_specs = [
|
||||||
db.add(TokenAccount(balance=1250))
|
{"id": "1", "name": "基础套餐", "amount": 2_000_000, "price": 10, "badge": "", "desc": "2M 积分"},
|
||||||
|
{"id": "2", "name": "标准套餐", "amount": 20_000_000, "price": 100, "badge": "常用", "desc": "20M 积分"},
|
||||||
|
{"id": "3", "name": "专业套餐", "amount": 250_000_000, "price": 1000, "badge": "加赠25%", "desc": "250M 积分"},
|
||||||
|
{"id": "4", "name": "企业套餐", "amount": 2_500_000_000, "price": 10000, "badge": "企业推荐", "desc": "2500M 积分"},
|
||||||
|
]
|
||||||
|
for spec in plan_specs:
|
||||||
|
plan = db.query(TokenPlan).filter(TokenPlan.id == spec["id"]).first()
|
||||||
|
if plan is None:
|
||||||
|
db.add(TokenPlan(**spec))
|
||||||
|
else:
|
||||||
|
for key, value in spec.items():
|
||||||
|
setattr(plan, key, value)
|
||||||
|
|
||||||
if db.query(TokenPlan).count() == 0:
|
for user in db.query(User).all():
|
||||||
plans = [
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == user.id).first()
|
||||||
TokenPlan(id="1", name="新手体验", amount=1000, price=9.9, desc="新手体验"),
|
if account is None:
|
||||||
TokenPlan(id="2", name="热门套餐", amount=5000, price=39.9, badge="热门"),
|
db.add(TokenAccount(
|
||||||
TokenPlan(id="3", name="超值套餐", amount=12000, price=89.9, badge="超值"),
|
user_id=user.id,
|
||||||
TokenPlan(id="4", name="企业推荐", amount=30000, price=199, badge="企业推荐", desc="适合高频使用"),
|
balance=DEFAULT_TOKEN_GRANT,
|
||||||
]
|
total_granted=DEFAULT_TOKEN_GRANT,
|
||||||
db.add_all(plans)
|
total_consumed=0,
|
||||||
|
))
|
||||||
|
|
||||||
if db.query(Avatar).count() == 0:
|
if db.query(Avatar).count() == 0:
|
||||||
avatar = Avatar(
|
avatar = Avatar(
|
||||||
@@ -104,49 +120,138 @@ def seed():
|
|||||||
db.add_all(orgs)
|
db.add_all(orgs)
|
||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
|
release_stale_reservations(db)
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
@app.on_event("startup")
|
@app.on_event("startup")
|
||||||
def on_startup():
|
def on_startup():
|
||||||
|
global takeover_scheduler
|
||||||
|
|
||||||
init_db()
|
init_db()
|
||||||
seed()
|
seed()
|
||||||
|
|
||||||
|
# Release stale resources when startup is invoked again by a reload/test.
|
||||||
|
stop_takeover_scheduler()
|
||||||
|
stop_maintenance_scheduler()
|
||||||
|
try:
|
||||||
|
start_maintenance_scheduler()
|
||||||
|
except Exception as exc:
|
||||||
|
stop_maintenance_scheduler()
|
||||||
|
logger.warning(
|
||||||
|
"Failed to initialize chat attachment cleanup, app will continue: %s",
|
||||||
|
exc,
|
||||||
|
)
|
||||||
|
|
||||||
# --- Takeover scheduler ---
|
# --- Takeover scheduler ---
|
||||||
try:
|
try:
|
||||||
# Initialize Redis (optional)
|
# BOXIM production endpoints are intentionally separate from the login API.
|
||||||
redis_client = None
|
|
||||||
redis_url = os.getenv("REDIS_URL", "")
|
|
||||||
if redis_url:
|
|
||||||
try:
|
|
||||||
redis_client = redis_lib.from_url(redis_url)
|
|
||||||
redis_client.ping()
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"Redis connection failed, delayed takeover will degrade to immediate: {e}")
|
|
||||||
|
|
||||||
# Initialize Box IM client
|
|
||||||
from services.boxim_client import BoxIMClient
|
from services.boxim_client import BoxIMClient
|
||||||
boxim_config = {
|
boxim_config = {
|
||||||
"HUIHUI_IM_BASE_URL": os.getenv("HUIHUI_IM_BASE_URL", "http://192.168.1.200:60040"),
|
"HUIHUI_PLATFORM_BASE_URL": os.getenv(
|
||||||
|
"HUIHUI_PLATFORM_BASE_URL", "https://open.99hui.com/api"
|
||||||
|
),
|
||||||
|
"BOXIM_API_BASE_URL": os.getenv(
|
||||||
|
"BOXIM_API_BASE_URL", "https://im.99hui.com/api"
|
||||||
|
),
|
||||||
"HUIHUI_APP_ID": os.getenv("HUIHUI_APP_ID", ""),
|
"HUIHUI_APP_ID": os.getenv("HUIHUI_APP_ID", ""),
|
||||||
"HUIHUI_ACCESS_ID": os.getenv("HUIHUI_ACCESS_ID", ""),
|
"HUIHUI_ACCESS_ID": os.getenv("HUIHUI_ACCESS_ID", ""),
|
||||||
"HUIHUI_ACCESS_SECRET": os.getenv("HUIHUI_ACCESS_SECRET", ""),
|
"HUIHUI_ACCESS_SECRET": os.getenv("HUIHUI_ACCESS_SECRET", ""),
|
||||||
|
"BOXIM_TIMEOUT_SECONDS": os.getenv("BOXIM_TIMEOUT_SECONDS", "20"),
|
||||||
}
|
}
|
||||||
boxim_client = BoxIMClient(boxim_config)
|
boxim_client = BoxIMClient(boxim_config)
|
||||||
|
|
||||||
# Initialize takeover service
|
|
||||||
from services.takeover_service import TakeoverService
|
from services.takeover_service import TakeoverService
|
||||||
takeover_service = TakeoverService(SessionLocal(), boxim_client, redis_client)
|
takeover_service = TakeoverService(SessionLocal, boxim_client)
|
||||||
|
|
||||||
# Start periodic polling job
|
poll_interval = max(0.5, float(os.getenv("BOXIM_POLL_INTERVAL_SECONDS", "1")))
|
||||||
scheduler = BackgroundScheduler()
|
takeover_scheduler = AsyncIOScheduler()
|
||||||
scheduler.add_job(
|
takeover_scheduler.add_job(
|
||||||
takeover_service.poll_and_process_messages,
|
takeover_service.poll_messages,
|
||||||
trigger=IntervalTrigger(seconds=10),
|
trigger=IntervalTrigger(seconds=poll_interval),
|
||||||
id="takeover_message_poll",
|
id="takeover_message_poll",
|
||||||
|
max_instances=1,
|
||||||
|
coalesce=True,
|
||||||
|
)
|
||||||
|
process_interval = max(
|
||||||
|
0.25, float(os.getenv("TAKEOVER_PROCESS_INTERVAL_SECONDS", "0.5"))
|
||||||
|
)
|
||||||
|
takeover_scheduler.add_job(
|
||||||
|
takeover_service.process_reply_tasks,
|
||||||
|
trigger=IntervalTrigger(seconds=process_interval),
|
||||||
|
id="takeover_reply_process",
|
||||||
|
max_instances=1,
|
||||||
|
coalesce=True,
|
||||||
|
)
|
||||||
|
takeover_scheduler.start()
|
||||||
|
logger.info(
|
||||||
|
"BOXIM takeover scheduler started (poll=%ss, process=%ss)",
|
||||||
|
poll_interval,
|
||||||
|
process_interval,
|
||||||
)
|
)
|
||||||
scheduler.start()
|
|
||||||
logger.info("Takeover message polling scheduler started (interval=10s)")
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
stop_takeover_scheduler()
|
||||||
logger.warning(f"Failed to initialize takeover scheduler, app will continue without it: {e}")
|
logger.warning(f"Failed to initialize takeover scheduler, app will continue without it: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def stop_takeover_scheduler():
|
||||||
|
global takeover_scheduler
|
||||||
|
|
||||||
|
if takeover_scheduler is not None:
|
||||||
|
try:
|
||||||
|
if takeover_scheduler.running:
|
||||||
|
takeover_scheduler.shutdown(wait=False)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to stop takeover scheduler cleanly: {e}")
|
||||||
|
finally:
|
||||||
|
takeover_scheduler = None
|
||||||
|
|
||||||
|
|
||||||
|
def purge_expired_chat_attachments_job():
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
count = purge_expired_chat_attachments(db)
|
||||||
|
if count:
|
||||||
|
logger.info("Purged %s expired chat image attachment(s)", count)
|
||||||
|
except Exception as exc:
|
||||||
|
db.rollback()
|
||||||
|
logger.warning("Failed to purge expired chat image attachments: %s", exc)
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def start_maintenance_scheduler():
|
||||||
|
global maintenance_scheduler
|
||||||
|
|
||||||
|
purge_expired_chat_attachments_job()
|
||||||
|
interval_minutes = max(
|
||||||
|
5, min(1440, int(os.getenv("CHAT_ATTACHMENT_CLEANUP_MINUTES", "60")))
|
||||||
|
)
|
||||||
|
maintenance_scheduler = AsyncIOScheduler()
|
||||||
|
maintenance_scheduler.add_job(
|
||||||
|
purge_expired_chat_attachments_job,
|
||||||
|
trigger=IntervalTrigger(minutes=interval_minutes),
|
||||||
|
id="chat_attachment_cleanup",
|
||||||
|
max_instances=1,
|
||||||
|
coalesce=True,
|
||||||
|
)
|
||||||
|
maintenance_scheduler.start()
|
||||||
|
|
||||||
|
|
||||||
|
def stop_maintenance_scheduler():
|
||||||
|
global maintenance_scheduler
|
||||||
|
|
||||||
|
if maintenance_scheduler is not None:
|
||||||
|
try:
|
||||||
|
if maintenance_scheduler.running:
|
||||||
|
maintenance_scheduler.shutdown(wait=False)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning("Failed to stop maintenance scheduler cleanly: %s", exc)
|
||||||
|
finally:
|
||||||
|
maintenance_scheduler = None
|
||||||
|
|
||||||
|
@app.on_event("shutdown")
|
||||||
|
def on_shutdown():
|
||||||
|
stop_takeover_scheduler()
|
||||||
|
stop_maintenance_scheduler()
|
||||||
|
|||||||
@@ -1,6 +1,18 @@
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from sqlalchemy import Column, String, Integer, Float, DateTime, Text, JSON, Boolean
|
from sqlalchemy import (
|
||||||
|
BigInteger,
|
||||||
|
Boolean,
|
||||||
|
Column,
|
||||||
|
DateTime,
|
||||||
|
Float,
|
||||||
|
Index,
|
||||||
|
Integer,
|
||||||
|
JSON,
|
||||||
|
String,
|
||||||
|
Text,
|
||||||
|
UniqueConstraint,
|
||||||
|
)
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
|
||||||
from database import Base
|
from database import Base
|
||||||
@@ -20,6 +32,7 @@ class Avatar(Base):
|
|||||||
photo_url = Column(String, default="")
|
photo_url = Column(String, default="")
|
||||||
emoji = Column(String, default="🤖")
|
emoji = Column(String, default="🤖")
|
||||||
status = Column(String, default="active") # active | inactive | training
|
status = Column(String, default="active") # active | inactive | training
|
||||||
|
share_token = Column(String, nullable=True, default=None, unique=True, index=True) # 对外分享使用的不可猜测令牌
|
||||||
token_balance = Column(Integer, default=0)
|
token_balance = Column(Integer, default=0)
|
||||||
config = Column(JSON, default=dict)
|
config = Column(JSON, default=dict)
|
||||||
created_at = Column(DateTime, server_default=func.now())
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
@@ -35,6 +48,7 @@ class Avatar(Base):
|
|||||||
"photoUrl": self.photo_url,
|
"photoUrl": self.photo_url,
|
||||||
"emoji": self.emoji,
|
"emoji": self.emoji,
|
||||||
"status": self.status,
|
"status": self.status,
|
||||||
|
"shareToken": self.share_token or "",
|
||||||
"tokenBalance": self.token_balance,
|
"tokenBalance": self.token_balance,
|
||||||
"config": self.config or {},
|
"config": self.config or {},
|
||||||
"createdAt": _iso(self.created_at),
|
"createdAt": _iso(self.created_at),
|
||||||
@@ -53,7 +67,7 @@ class Authorization(Base):
|
|||||||
status = Column(String, default="active") # active | inactive
|
status = Column(String, default="active") # active | inactive
|
||||||
takeover_enabled = Column(Boolean, default=False) # 是否开启分身接管
|
takeover_enabled = Column(Boolean, default=False) # 是否开启分身接管
|
||||||
takeover_mode = Column(String, default="immediate") # immediate | delayed
|
takeover_mode = Column(String, default="immediate") # immediate | delayed
|
||||||
takeover_delay_seconds = Column(Integer, default=30) # 延迟秒数
|
takeover_delay_seconds = Column(Integer, default=180) # 延迟秒数,默认 3 分钟
|
||||||
created_at = Column(DateTime, server_default=func.now())
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self):
|
||||||
@@ -72,6 +86,76 @@ class Authorization(Base):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TakeoverCursor(Base):
|
||||||
|
"""Durable BOXIM polling cursor for one avatar owner."""
|
||||||
|
|
||||||
|
__tablename__ = "takeover_cursors"
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
avatar_id = Column(String, nullable=False, unique=True, index=True)
|
||||||
|
owner_id = Column(String, nullable=False, default="", index=True)
|
||||||
|
boxim_owner_id = Column(String, default="")
|
||||||
|
last_message_id = Column(String, default="0")
|
||||||
|
initialized = Column(Boolean, default=False)
|
||||||
|
last_polled_at = Column(DateTime)
|
||||||
|
last_error = Column(Text, default="")
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now())
|
||||||
|
|
||||||
|
|
||||||
|
class TakeoverMessage(Base):
|
||||||
|
"""BOXIM message receipt used for audit, deduplication, and chat context."""
|
||||||
|
|
||||||
|
__tablename__ = "takeover_messages"
|
||||||
|
__table_args__ = (
|
||||||
|
UniqueConstraint("owner_id", "boxim_message_id", name="uq_takeover_message_owner_boxim"),
|
||||||
|
Index("ix_takeover_message_conversation", "owner_id", "peer_id", "send_time"),
|
||||||
|
)
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
avatar_id = Column(String, nullable=False, index=True)
|
||||||
|
owner_id = Column(String, nullable=False, index=True)
|
||||||
|
boxim_message_id = Column(String, nullable=False)
|
||||||
|
boxim_local_id = Column(String, nullable=True)
|
||||||
|
peer_id = Column(String, nullable=False, index=True)
|
||||||
|
direction = Column(String, nullable=False) # incoming | outgoing
|
||||||
|
message_type = Column(Integer, default=0)
|
||||||
|
content = Column(Text, default="")
|
||||||
|
is_avatar = Column(Boolean, default=False)
|
||||||
|
send_time = Column(DateTime, nullable=False)
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
|
||||||
|
|
||||||
|
class TakeoverReplyTask(Base):
|
||||||
|
"""Restart-safe three-second BOXIM reply task."""
|
||||||
|
|
||||||
|
__tablename__ = "takeover_reply_tasks"
|
||||||
|
__table_args__ = (
|
||||||
|
UniqueConstraint("owner_id", "trigger_message_id", name="uq_takeover_task_owner_trigger"),
|
||||||
|
Index("ix_takeover_task_due", "status", "scheduled_at"),
|
||||||
|
Index("ix_takeover_task_conversation", "owner_id", "peer_id", "status"),
|
||||||
|
)
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
avatar_id = Column(String, nullable=False, index=True)
|
||||||
|
owner_id = Column(String, nullable=False, index=True)
|
||||||
|
peer_id = Column(String, nullable=False, index=True)
|
||||||
|
trigger_message_id = Column(String, nullable=False)
|
||||||
|
source_message_ids = Column(JSON, default=list)
|
||||||
|
prompt = Column(Text, default="")
|
||||||
|
response_text = Column(Text, default="")
|
||||||
|
status = Column(String, default="pending")
|
||||||
|
scheduled_at = Column(DateTime, nullable=False)
|
||||||
|
locked_at = Column(DateTime)
|
||||||
|
sent_at = Column(DateTime)
|
||||||
|
attempts = Column(Integer, default=0)
|
||||||
|
last_error = Column(Text, default="")
|
||||||
|
cancel_reason = Column(String, default="")
|
||||||
|
boxim_local_id = Column(String, nullable=False)
|
||||||
|
boxim_sent_message_id = Column(String, default="")
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now())
|
||||||
|
|
||||||
|
|
||||||
class Organization(Base):
|
class Organization(Base):
|
||||||
__tablename__ = "organizations"
|
__tablename__ = "organizations"
|
||||||
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
@@ -104,7 +188,7 @@ class KnowledgeDoc(Base):
|
|||||||
file_type = Column(String, default="") # pdf | doc | docx | xlsx
|
file_type = Column(String, default="") # pdf | doc | docx | xlsx
|
||||||
file_size = Column(Integer, default=0)
|
file_size = Column(Integer, default=0)
|
||||||
file_url = Column(String, default="")
|
file_url = Column(String, default="")
|
||||||
status = Column(String, default="uploaded") # uploaded | parsing | ready
|
status = Column(String, default="uploaded") # uploaded | parsing | ready | failed
|
||||||
vectorized = Column(Boolean, default=False) # 是否已向量化
|
vectorized = Column(Boolean, default=False) # 是否已向量化
|
||||||
embedding_model = Column(String, default="") # 向量模型标识
|
embedding_model = Column(String, default="") # 向量模型标识
|
||||||
chunk_count = Column(Integer, default=0) # 切片数量
|
chunk_count = Column(Integer, default=0) # 切片数量
|
||||||
@@ -173,17 +257,83 @@ class KnowledgeChunk(Base):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class ChatAttachment(Base):
|
||||||
|
"""Private, avatar-scoped result of one chat image analysis."""
|
||||||
|
|
||||||
|
__tablename__ = "chat_attachments"
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
avatar_id = Column(String, nullable=False, default="", index=True)
|
||||||
|
uploader_kind = Column(String, default="owner") # owner | public
|
||||||
|
filename = Column(String, default="")
|
||||||
|
mime_type = Column(String, default="")
|
||||||
|
file_size = Column(Integer, default=0)
|
||||||
|
status = Column(String, default="processing") # processing | ready | failed
|
||||||
|
category = Column(String, default="general_image")
|
||||||
|
summary = Column(Text, default="")
|
||||||
|
extracted_text = Column(Text, default="")
|
||||||
|
structured_data = Column(JSON, default=dict)
|
||||||
|
warning = Column(Text, default="")
|
||||||
|
vision_model = Column(String, default="")
|
||||||
|
ocr_model = Column(String, default="")
|
||||||
|
used_at = Column(DateTime)
|
||||||
|
expires_at = Column(DateTime, nullable=False)
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
|
||||||
|
def to_dict(self):
|
||||||
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"avatarId": self.avatar_id,
|
||||||
|
"filename": self.filename,
|
||||||
|
"mimeType": self.mime_type,
|
||||||
|
"fileSize": self.file_size,
|
||||||
|
"status": self.status,
|
||||||
|
"category": self.category,
|
||||||
|
"summary": self.summary,
|
||||||
|
"warning": self.warning,
|
||||||
|
"expiresAt": _iso(self.expires_at),
|
||||||
|
"createdAt": _iso(self.created_at),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class TokenAccount(Base):
|
class TokenAccount(Base):
|
||||||
__tablename__ = "token_account"
|
__tablename__ = "token_account"
|
||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
balance = Column(Integer, default=1250)
|
user_id = Column(String, nullable=False, default="", index=True)
|
||||||
|
balance = Column(BigInteger, default=1_000_000)
|
||||||
|
total_granted = Column(BigInteger, default=1_000_000)
|
||||||
|
total_consumed = Column(BigInteger, default=0)
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now())
|
||||||
|
|
||||||
|
|
||||||
|
class TokenUsage(Base):
|
||||||
|
__tablename__ = "token_usage"
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_token_usage_user_created", "user_id", "created_at"),
|
||||||
|
Index("ix_token_usage_avatar_created", "avatar_id", "created_at"),
|
||||||
|
)
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
user_id = Column(String, nullable=False, index=True)
|
||||||
|
avatar_id = Column(String, nullable=False, default="", index=True)
|
||||||
|
source = Column(String, nullable=False, default="chat")
|
||||||
|
model = Column(String, default="")
|
||||||
|
status = Column(String, nullable=False, default="reserved")
|
||||||
|
reserved_tokens = Column(BigInteger, default=0)
|
||||||
|
prompt_tokens = Column(BigInteger, default=0)
|
||||||
|
completion_tokens = Column(BigInteger, default=0)
|
||||||
|
total_tokens = Column(BigInteger, default=0)
|
||||||
|
balance_after = Column(BigInteger, default=0)
|
||||||
|
failure_reason = Column(String, default="")
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
settled_at = Column(DateTime)
|
||||||
|
|
||||||
|
|
||||||
class TokenPlan(Base):
|
class TokenPlan(Base):
|
||||||
__tablename__ = "token_plans"
|
__tablename__ = "token_plans"
|
||||||
id = Column(String, primary_key=True)
|
id = Column(String, primary_key=True)
|
||||||
name = Column(String, default="")
|
name = Column(String, default="")
|
||||||
amount = Column(Integer, default=0)
|
amount = Column(BigInteger, default=0)
|
||||||
price = Column(Float, default=0)
|
price = Column(Float, default=0)
|
||||||
badge = Column(String, default="")
|
badge = Column(String, default="")
|
||||||
desc = Column(String, default="")
|
desc = Column(String, default="")
|
||||||
@@ -199,6 +349,47 @@ class TokenPlan(Base):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TokenPaymentOrder(Base):
|
||||||
|
__tablename__ = "token_payment_orders"
|
||||||
|
|
||||||
|
id = Column(String, primary_key=True, default=lambda: uuid.uuid4().hex)
|
||||||
|
order_no = Column(String, nullable=False, unique=True, index=True)
|
||||||
|
user_id = Column(String, nullable=False, index=True)
|
||||||
|
plan_id = Column(String, nullable=False)
|
||||||
|
payment_method = Column(String, nullable=False)
|
||||||
|
pay_type = Column(String, nullable=False)
|
||||||
|
pay_way = Column(String, nullable=False)
|
||||||
|
points_amount = Column(BigInteger, nullable=False)
|
||||||
|
price_cents = Column(Integer, nullable=False)
|
||||||
|
status = Column(String, nullable=False, default="pending", index=True)
|
||||||
|
provider_order_id = Column(String, default="")
|
||||||
|
provider_order_no = Column(String, default="")
|
||||||
|
provider_status = Column(String, default="")
|
||||||
|
pay_message = Column(Text, default="")
|
||||||
|
failure_reason = Column(String, default="")
|
||||||
|
created_at = Column(DateTime, server_default=func.now())
|
||||||
|
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now())
|
||||||
|
paid_at = Column(DateTime)
|
||||||
|
|
||||||
|
def to_dict(self):
|
||||||
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"orderNo": self.order_no,
|
||||||
|
"planId": self.plan_id,
|
||||||
|
"paymentMethod": self.payment_method,
|
||||||
|
"payType": self.pay_type,
|
||||||
|
"payWay": self.pay_way,
|
||||||
|
"pointsAmount": self.points_amount,
|
||||||
|
"price": self.price_cents / 100,
|
||||||
|
"status": self.status,
|
||||||
|
"providerStatus": self.provider_status,
|
||||||
|
"payMessage": self.pay_message,
|
||||||
|
"failureReason": self.failure_reason,
|
||||||
|
"createdAt": _iso(self.created_at),
|
||||||
|
"paidAt": _iso(self.paid_at),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class User(Base):
|
class User(Base):
|
||||||
"""会会用户 ↔ 本地用户体系映射(短信验证码登录落库)"""
|
"""会会用户 ↔ 本地用户体系映射(短信验证码登录落库)"""
|
||||||
|
|
||||||
|
|||||||
@@ -7,5 +7,5 @@ httpx
|
|||||||
pypdf
|
pypdf
|
||||||
python-docx
|
python-docx
|
||||||
openpyxl
|
openpyxl
|
||||||
redis>=5.0
|
|
||||||
apscheduler>=3.10
|
apscheduler>=3.10
|
||||||
|
Pillow>=10.4
|
||||||
|
|||||||
@@ -1,32 +1,404 @@
|
|||||||
from fastapi import APIRouter, Depends, Body
|
from fastapi import APIRouter, Body, Depends, Header, HTTPException
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from models import Authorization
|
from models import Authorization, Avatar, TakeoverCursor, TakeoverReplyTask
|
||||||
from responses import ok, fail
|
from responses import fail, ok
|
||||||
|
from routers.avatars import _require_owned_avatar
|
||||||
|
|
||||||
router = APIRouter(tags=["授权"])
|
router = APIRouter(tags=["授权"])
|
||||||
|
|
||||||
|
TARGET_TYPES = {"user", "organization", "application"}
|
||||||
|
PERMISSION_ORDER = ("friend", "chat", "publish", "browse", "interact", "takeover")
|
||||||
|
ALLOWED_PERMISSIONS = set(PERMISSION_ORDER)
|
||||||
|
AVATAR_PERMISSION_ORDER = PERMISSION_ORDER
|
||||||
|
AVATAR_PERMISSION_KEY = "authorizationPermissions"
|
||||||
|
DEFAULT_AVATAR_PERMISSIONS = ["friend", "chat"]
|
||||||
|
TAKEOVER_DELAY_KEY = "takeoverReplyDelaySeconds"
|
||||||
|
DEFAULT_TAKEOVER_DELAY_SECONDS = 180
|
||||||
|
MIN_TAKEOVER_DELAY_SECONDS = 3
|
||||||
|
MAX_TAKEOVER_DELAY_SECONDS = 86_400
|
||||||
|
LEGACY_PERMISSION_MAP = {
|
||||||
|
"read": "browse",
|
||||||
|
"reply": "chat",
|
||||||
|
"write": "publish",
|
||||||
|
"edit": "publish",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _read(payload: dict, camel_key: str, snake_key: str | None = None, default=None):
|
||||||
|
if camel_key in payload:
|
||||||
|
return payload[camel_key]
|
||||||
|
if snake_key and snake_key in payload:
|
||||||
|
return payload[snake_key]
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
def _clean_text(value, field_name: str, *, max_length: int) -> str:
|
||||||
|
text = str(value or "").strip()
|
||||||
|
if not text:
|
||||||
|
raise ValueError(f"{field_name}不能为空")
|
||||||
|
if len(text) > max_length:
|
||||||
|
raise ValueError(f"{field_name}不能超过 {max_length} 个字符")
|
||||||
|
return text
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_permissions(value) -> list[str]:
|
||||||
|
if not isinstance(value, list):
|
||||||
|
raise ValueError("权限格式不正确")
|
||||||
|
|
||||||
|
normalized = []
|
||||||
|
for raw in value:
|
||||||
|
permission = LEGACY_PERMISSION_MAP.get(str(raw).strip(), str(raw).strip())
|
||||||
|
if permission not in ALLOWED_PERMISSIONS:
|
||||||
|
raise ValueError(f"不支持的权限:{raw}")
|
||||||
|
if permission not in normalized:
|
||||||
|
normalized.append(permission)
|
||||||
|
|
||||||
|
if not [item for item in normalized if item != "takeover"]:
|
||||||
|
raise ValueError("请至少选择一项权限")
|
||||||
|
return sorted(normalized, key=PERMISSION_ORDER.index)
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_avatar_permissions(value) -> list[str]:
|
||||||
|
if not isinstance(value, list):
|
||||||
|
raise ValueError("权限格式不正确")
|
||||||
|
|
||||||
|
normalized = []
|
||||||
|
for raw in value:
|
||||||
|
permission = LEGACY_PERMISSION_MAP.get(str(raw).strip(), str(raw).strip())
|
||||||
|
if permission not in AVATAR_PERMISSION_ORDER:
|
||||||
|
raise ValueError(f"不支持的权限:{raw}")
|
||||||
|
if permission not in normalized:
|
||||||
|
normalized.append(permission)
|
||||||
|
return sorted(normalized, key=AVATAR_PERMISSION_ORDER.index)
|
||||||
|
|
||||||
|
|
||||||
|
def _stored_avatar_permissions(avatar) -> list[str]:
|
||||||
|
config = avatar.config or {}
|
||||||
|
if AVATAR_PERMISSION_KEY not in config:
|
||||||
|
return list(DEFAULT_AVATAR_PERMISSIONS)
|
||||||
|
|
||||||
|
stored = config.get(AVATAR_PERMISSION_KEY)
|
||||||
|
if not isinstance(stored, list):
|
||||||
|
return list(DEFAULT_AVATAR_PERMISSIONS)
|
||||||
|
|
||||||
|
permissions = []
|
||||||
|
for raw in stored:
|
||||||
|
permission = LEGACY_PERMISSION_MAP.get(str(raw).strip(), str(raw).strip())
|
||||||
|
if permission in AVATAR_PERMISSION_ORDER and permission not in permissions:
|
||||||
|
permissions.append(permission)
|
||||||
|
return sorted(permissions, key=AVATAR_PERMISSION_ORDER.index)
|
||||||
|
|
||||||
|
|
||||||
|
def _permission_settings_payload(avatar) -> dict:
|
||||||
|
return {
|
||||||
|
"avatarId": avatar.id,
|
||||||
|
"permissions": _stored_avatar_permissions(avatar),
|
||||||
|
"takeoverReplyDelaySeconds": _stored_takeover_delay(avatar),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _stored_takeover_delay(avatar) -> int:
|
||||||
|
raw = (avatar.config or {}).get(TAKEOVER_DELAY_KEY, DEFAULT_TAKEOVER_DELAY_SECONDS)
|
||||||
|
if isinstance(raw, bool):
|
||||||
|
return DEFAULT_TAKEOVER_DELAY_SECONDS
|
||||||
|
try:
|
||||||
|
delay = int(raw)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return DEFAULT_TAKEOVER_DELAY_SECONDS
|
||||||
|
if not MIN_TAKEOVER_DELAY_SECONDS <= delay <= MAX_TAKEOVER_DELAY_SECONDS:
|
||||||
|
return DEFAULT_TAKEOVER_DELAY_SECONDS
|
||||||
|
return delay
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_takeover_delay(value) -> int:
|
||||||
|
if isinstance(value, bool) or not isinstance(value, int):
|
||||||
|
raise ValueError("自动回复等待时间必须是整数秒")
|
||||||
|
if not MIN_TAKEOVER_DELAY_SECONDS <= value <= MAX_TAKEOVER_DELAY_SECONDS:
|
||||||
|
raise ValueError("自动回复等待时间需在 3 秒到 24 小时之间")
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def _disable_other_takeovers(db: Session, avatar) -> list[str]:
|
||||||
|
disabled_ids = []
|
||||||
|
others = (
|
||||||
|
db.query(Avatar)
|
||||||
|
.filter(Avatar.owner_id == avatar.owner_id, Avatar.id != avatar.id)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for other in others:
|
||||||
|
permissions = _stored_avatar_permissions(other)
|
||||||
|
if "takeover" not in permissions:
|
||||||
|
continue
|
||||||
|
other.config = {
|
||||||
|
**(other.config or {}),
|
||||||
|
AVATAR_PERMISSION_KEY: [item for item in permissions if item != "takeover"],
|
||||||
|
}
|
||||||
|
disabled_ids.append(other.id)
|
||||||
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.avatar_id == other.id,
|
||||||
|
TakeoverReplyTask.status.in_(("pending", "generating", "ready", "sending")),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for task in tasks:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "another_avatar_takeover_enabled"
|
||||||
|
task.locked_at = None
|
||||||
|
return disabled_ids
|
||||||
|
|
||||||
|
|
||||||
|
def _require_authorization(db: Session, avatar_id: str, authorization_id: str) -> Authorization:
|
||||||
|
authorization = (
|
||||||
|
db.query(Authorization)
|
||||||
|
.filter(
|
||||||
|
Authorization.id == authorization_id,
|
||||||
|
Authorization.avatar_id == avatar_id,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not authorization:
|
||||||
|
raise HTTPException(status_code=404, detail="授权不存在")
|
||||||
|
return authorization
|
||||||
|
|
||||||
|
|
||||||
|
def _duplicate_target(
|
||||||
|
db: Session,
|
||||||
|
avatar_id: str,
|
||||||
|
target_type: str,
|
||||||
|
target_id: str,
|
||||||
|
*,
|
||||||
|
exclude_id: str | None = None,
|
||||||
|
):
|
||||||
|
query = db.query(Authorization).filter(
|
||||||
|
Authorization.avatar_id == avatar_id,
|
||||||
|
Authorization.target_type == target_type,
|
||||||
|
Authorization.target_id == target_id,
|
||||||
|
)
|
||||||
|
if exclude_id:
|
||||||
|
query = query.filter(Authorization.id != exclude_id)
|
||||||
|
return query.first()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/avatar/{avatar_id}/permission-settings")
|
||||||
|
def get_permission_settings(
|
||||||
|
avatar_id: str,
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
avatar = _require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
return ok(_permission_settings_payload(avatar))
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/avatar/{avatar_id}/permission-settings")
|
||||||
|
def update_permission_settings(
|
||||||
|
avatar_id: str,
|
||||||
|
payload: dict = Body(...),
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
avatar = _require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
if "permissions" not in payload and TAKEOVER_DELAY_KEY not in payload:
|
||||||
|
return fail("缺少授权设置", 400)
|
||||||
|
try:
|
||||||
|
permissions = (
|
||||||
|
_normalize_avatar_permissions(payload["permissions"])
|
||||||
|
if "permissions" in payload
|
||||||
|
else _stored_avatar_permissions(avatar)
|
||||||
|
)
|
||||||
|
takeover_delay = (
|
||||||
|
_validate_takeover_delay(payload[TAKEOVER_DELAY_KEY])
|
||||||
|
if TAKEOVER_DELAY_KEY in payload
|
||||||
|
else _stored_takeover_delay(avatar)
|
||||||
|
)
|
||||||
|
except ValueError as exc:
|
||||||
|
return fail(str(exc), 400)
|
||||||
|
|
||||||
|
previous_permissions = _stored_avatar_permissions(avatar)
|
||||||
|
avatar.config = {
|
||||||
|
**(avatar.config or {}),
|
||||||
|
AVATAR_PERMISSION_KEY: permissions,
|
||||||
|
TAKEOVER_DELAY_KEY: takeover_delay,
|
||||||
|
}
|
||||||
|
disabled_avatar_ids = _disable_other_takeovers(db, avatar) if "takeover" in permissions else []
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar.id).first()
|
||||||
|
if cursor and "takeover" in permissions and "takeover" not in previous_permissions:
|
||||||
|
cursor.initialized = False
|
||||||
|
cursor.last_message_id = "0"
|
||||||
|
cursor.last_error = ""
|
||||||
|
elif cursor and "takeover" not in permissions:
|
||||||
|
cursor.last_error = ""
|
||||||
|
|
||||||
|
if "takeover" not in permissions:
|
||||||
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.avatar_id == avatar.id,
|
||||||
|
TakeoverReplyTask.status.in_(("pending", "generating", "ready", "sending")),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for task in tasks:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "takeover_disabled"
|
||||||
|
task.locked_at = None
|
||||||
|
db.commit()
|
||||||
|
db.refresh(avatar)
|
||||||
|
response = _permission_settings_payload(avatar)
|
||||||
|
response["disabledAvatarIds"] = disabled_avatar_ids
|
||||||
|
return ok(response, "授权设置已保存")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/avatar/{avatar_id}/authorizations")
|
@router.get("/avatar/{avatar_id}/authorizations")
|
||||||
def list_auth(avatar_id: str, db: Session = Depends(get_db)):
|
def list_auth(
|
||||||
# demo:返回全部授权(忽略具体 avatar 绑定,便于联调)
|
avatar_id: str,
|
||||||
items = db.query(Authorization).order_by(Authorization.created_at.desc()).all()
|
authorization: str = Header(None),
|
||||||
return ok([a.to_dict() for a in items])
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
items = (
|
||||||
|
db.query(Authorization)
|
||||||
|
.filter(Authorization.avatar_id == avatar_id)
|
||||||
|
.order_by(Authorization.created_at.desc())
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
return ok([item.to_dict() for item in items])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/avatar/{avatar_id}/authorizations")
|
||||||
|
def create_auth(
|
||||||
|
avatar_id: str,
|
||||||
|
payload: dict = Body(...),
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
try:
|
||||||
|
target_type = _clean_text(
|
||||||
|
_read(payload, "targetType", "target_type", "user"),
|
||||||
|
"授权类型",
|
||||||
|
max_length=24,
|
||||||
|
)
|
||||||
|
if target_type not in TARGET_TYPES:
|
||||||
|
return fail("授权类型不正确", 400)
|
||||||
|
target_id = _clean_text(
|
||||||
|
_read(payload, "targetId", "target_id"),
|
||||||
|
"对象标识",
|
||||||
|
max_length=120,
|
||||||
|
)
|
||||||
|
target_name = _clean_text(
|
||||||
|
_read(payload, "targetName", "target_name"),
|
||||||
|
"对象名称",
|
||||||
|
max_length=50,
|
||||||
|
)
|
||||||
|
permissions = _normalize_permissions(payload.get("permissions", []))
|
||||||
|
except ValueError as exc:
|
||||||
|
return fail(str(exc), 400)
|
||||||
|
|
||||||
|
if _duplicate_target(db, avatar_id, target_type, target_id):
|
||||||
|
return fail("该对象已在授权列表中,可直接编辑现有授权", 409)
|
||||||
|
|
||||||
|
item = Authorization(
|
||||||
|
avatar_id=avatar_id,
|
||||||
|
target_type=target_type,
|
||||||
|
target_id=target_id,
|
||||||
|
target_name=target_name,
|
||||||
|
permissions=permissions,
|
||||||
|
status="active",
|
||||||
|
takeover_enabled=False,
|
||||||
|
takeover_mode="immediate",
|
||||||
|
takeover_delay_seconds=DEFAULT_TAKEOVER_DELAY_SECONDS,
|
||||||
|
)
|
||||||
|
db.add(item)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(item)
|
||||||
|
return ok(item.to_dict(), "授权已添加")
|
||||||
|
|
||||||
|
|
||||||
@router.put("/avatar/{avatar_id}/authorizations")
|
@router.put("/avatar/{avatar_id}/authorizations")
|
||||||
def update_auth(avatar_id: str, payload: dict = Body(...), db: Session = Depends(get_db)):
|
def update_auth(
|
||||||
auth_id = payload.get("id")
|
avatar_id: str,
|
||||||
|
payload: dict = Body(...),
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
auth_id = payload.get("id") or _read(payload, "authorizationId", "authorization_id")
|
||||||
if not auth_id:
|
if not auth_id:
|
||||||
return fail("缺少授权 id", 400)
|
return fail("缺少授权 id", 400)
|
||||||
a = db.query(Authorization).filter(Authorization.id == auth_id).first()
|
|
||||||
if not a:
|
item = _require_authorization(db, avatar_id, str(auth_id))
|
||||||
return fail("授权不存在", 404)
|
try:
|
||||||
|
target_type = item.target_type
|
||||||
|
target_id = item.target_id
|
||||||
|
if "targetType" in payload or "target_type" in payload:
|
||||||
|
target_type = _clean_text(
|
||||||
|
_read(payload, "targetType", "target_type"),
|
||||||
|
"授权类型",
|
||||||
|
max_length=24,
|
||||||
|
)
|
||||||
|
if target_type not in TARGET_TYPES:
|
||||||
|
return fail("授权类型不正确", 400)
|
||||||
|
if "targetId" in payload or "target_id" in payload:
|
||||||
|
target_id = _clean_text(
|
||||||
|
_read(payload, "targetId", "target_id"),
|
||||||
|
"对象标识",
|
||||||
|
max_length=120,
|
||||||
|
)
|
||||||
|
if "targetName" in payload or "target_name" in payload:
|
||||||
|
item.target_name = _clean_text(
|
||||||
|
_read(payload, "targetName", "target_name"),
|
||||||
|
"对象名称",
|
||||||
|
max_length=50,
|
||||||
|
)
|
||||||
|
if "permissions" in payload:
|
||||||
|
item.permissions = _normalize_permissions(payload["permissions"])
|
||||||
|
except ValueError as exc:
|
||||||
|
return fail(str(exc), 400)
|
||||||
|
|
||||||
|
if _duplicate_target(
|
||||||
|
db,
|
||||||
|
avatar_id,
|
||||||
|
target_type,
|
||||||
|
target_id,
|
||||||
|
exclude_id=item.id,
|
||||||
|
):
|
||||||
|
return fail("该对象已在授权列表中", 409)
|
||||||
|
|
||||||
if "status" in payload:
|
if "status" in payload:
|
||||||
a.status = payload["status"]
|
status = str(payload["status"] or "")
|
||||||
if "permissions" in payload:
|
if status not in ("active", "inactive"):
|
||||||
a.permissions = payload["permissions"]
|
return fail("授权状态不正确", 400)
|
||||||
|
item.status = status
|
||||||
|
|
||||||
|
item.target_type = target_type
|
||||||
|
item.target_id = target_id
|
||||||
|
|
||||||
|
permissions = list(item.permissions or [])
|
||||||
|
chat_allowed = "chat" in permissions or "reply" in permissions
|
||||||
|
if item.status != "active" or item.target_type != "user" or not chat_allowed:
|
||||||
|
item.takeover_enabled = False
|
||||||
|
item.permissions = [permission for permission in permissions if permission != "takeover"]
|
||||||
|
elif item.takeover_enabled and "takeover" not in permissions:
|
||||||
|
item.permissions = permissions + ["takeover"]
|
||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
items = db.query(Authorization).order_by(Authorization.created_at.desc()).all()
|
db.refresh(item)
|
||||||
return ok([x.to_dict() for x in items])
|
return ok(item.to_dict(), "授权已更新")
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/avatar/{avatar_id}/authorizations/{authorization_id}")
|
||||||
|
def delete_auth(
|
||||||
|
avatar_id: str,
|
||||||
|
authorization_id: str,
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
item = _require_authorization(db, avatar_id, authorization_id)
|
||||||
|
db.delete(item)
|
||||||
|
db.commit()
|
||||||
|
return ok({"id": authorization_id}, "授权已删除")
|
||||||
|
|||||||
@@ -1,15 +1,27 @@
|
|||||||
from fastapi import APIRouter, Depends, Body, Header, UploadFile, File
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
import mimetypes
|
|
||||||
|
from fastapi import APIRouter, Depends, Body, Header, UploadFile, File, HTTPException
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from routers.knowledge import UPLOAD_DIR
|
from routers.knowledge import UPLOAD_DIR
|
||||||
from models import Avatar, KnowledgeDoc, KnowledgeChunk, QAPair, Authorization, User
|
from models import (
|
||||||
|
Authorization,
|
||||||
|
Avatar,
|
||||||
|
KnowledgeChunk,
|
||||||
|
KnowledgeDoc,
|
||||||
|
QAPair,
|
||||||
|
TakeoverCursor,
|
||||||
|
TakeoverMessage,
|
||||||
|
TakeoverReplyTask,
|
||||||
|
User,
|
||||||
|
)
|
||||||
from responses import ok, fail
|
from responses import ok, fail
|
||||||
|
|
||||||
router = APIRouter(tags=["分身"])
|
router = APIRouter(tags=["分身"])
|
||||||
|
ALLOWED_AVATAR_EXTENSIONS = {".jpg", ".jpeg", ".png", ".webp", ".gif"}
|
||||||
|
MAX_AVATAR_BYTES = 5 * 1024 * 1024
|
||||||
|
|
||||||
|
|
||||||
def _resolve_user(authorization: str | None, db: Session):
|
def _resolve_user(authorization: str | None, db: Session):
|
||||||
@@ -20,6 +32,40 @@ def _resolve_user(authorization: str | None, db: Session):
|
|||||||
return db.query(User).filter(User.app_token == token).first()
|
return db.query(User).filter(User.app_token == token).first()
|
||||||
|
|
||||||
|
|
||||||
|
def _require_owned_avatar(db: Session, avatar_id: str, authorization: str | None):
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
||||||
|
if not avatar:
|
||||||
|
raise HTTPException(status_code=404, detail="分身不存在")
|
||||||
|
user = _resolve_user(authorization, db)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=401, detail="未登录")
|
||||||
|
if avatar.owner_id and avatar.owner_id != user.huihui_user_id:
|
||||||
|
raise HTTPException(status_code=403, detail="无权访问该分身")
|
||||||
|
return avatar
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/avatar/{avatar_id}/photo")
|
||||||
|
async def upload_avatar_photo(
|
||||||
|
avatar_id: str,
|
||||||
|
file: UploadFile = File(...),
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
extension = os.path.splitext(file.filename or "")[1].lower()
|
||||||
|
if extension not in ALLOWED_AVATAR_EXTENSIONS or not (file.content_type or "").startswith("image/"):
|
||||||
|
return fail("仅支持 JPG、PNG、WebP 或 GIF 图片", code=400)
|
||||||
|
content = await file.read()
|
||||||
|
if len(content) > MAX_AVATAR_BYTES:
|
||||||
|
return fail("头像图片不能超过 5MB", code=400)
|
||||||
|
avatar_dir = os.path.join(UPLOAD_DIR, avatar_id)
|
||||||
|
os.makedirs(avatar_dir, exist_ok=True)
|
||||||
|
stored_name = f"avatar-{uuid.uuid4().hex}{extension}"
|
||||||
|
with open(os.path.join(avatar_dir, stored_name), "wb") as stream:
|
||||||
|
stream.write(content)
|
||||||
|
return ok({"photoUrl": f"/api/files/{avatar_id}/{stored_name}"})
|
||||||
|
|
||||||
|
|
||||||
@router.get("/avatar")
|
@router.get("/avatar")
|
||||||
def list_avatars(page: int = 1, limit: int = 20, authorization: str = Header(None), db: Session = Depends(get_db)):
|
def list_avatars(page: int = 1, limit: int = 20, authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
# 仅返回当前登录用户自己的分身;未登录返回空,避免看到种子/他人数据
|
# 仅返回当前登录用户自己的分身;未登录返回空,避免看到种子/他人数据
|
||||||
@@ -38,18 +84,21 @@ def list_avatars(page: int = 1, limit: int = 20, authorization: str = Header(Non
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/avatar/{avatar_id}")
|
@router.get("/avatar/{avatar_id}")
|
||||||
def get_avatar(avatar_id: str, db: Session = Depends(get_db)):
|
def get_avatar(
|
||||||
a = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
avatar_id: str,
|
||||||
if not a:
|
authorization: str = Header(None),
|
||||||
return fail("分身不存在", 404)
|
db: Session = Depends(get_db),
|
||||||
return ok(a.to_dict())
|
):
|
||||||
|
return ok(_require_owned_avatar(db, avatar_id, authorization).to_dict())
|
||||||
|
|
||||||
|
|
||||||
@router.post("/avatar")
|
@router.post("/avatar")
|
||||||
def create_avatar(payload: dict = Body(...), authorization: str = Header(None), db: Session = Depends(get_db)):
|
def create_avatar(payload: dict = Body(...), authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
user = _resolve_user(authorization, db)
|
user = _resolve_user(authorization, db)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=401, detail="未登录")
|
||||||
a = Avatar(
|
a = Avatar(
|
||||||
owner_id=user.huihui_user_id if user else "",
|
owner_id=user.huihui_user_id,
|
||||||
name=payload.get("name", "未命名分身"),
|
name=payload.get("name", "未命名分身"),
|
||||||
display_name=payload.get("displayName", "") or payload.get("display_name", ""),
|
display_name=payload.get("displayName", "") or payload.get("display_name", ""),
|
||||||
description=payload.get("description", ""),
|
description=payload.get("description", ""),
|
||||||
@@ -66,10 +115,13 @@ def create_avatar(payload: dict = Body(...), authorization: str = Header(None),
|
|||||||
|
|
||||||
|
|
||||||
@router.put("/avatar/{avatar_id}")
|
@router.put("/avatar/{avatar_id}")
|
||||||
def update_avatar(avatar_id: str, payload: dict = Body(...), db: Session = Depends(get_db)):
|
def update_avatar(
|
||||||
a = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
avatar_id: str,
|
||||||
if not a:
|
payload: dict = Body(...),
|
||||||
return fail("分身不存在", 404)
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
a = _require_owned_avatar(db, avatar_id, authorization)
|
||||||
mapping = {
|
mapping = {
|
||||||
"displayName": "display_name",
|
"displayName": "display_name",
|
||||||
"photoUrl": "photo_url",
|
"photoUrl": "photo_url",
|
||||||
@@ -78,60 +130,32 @@ def update_avatar(avatar_id: str, payload: dict = Body(...), db: Session = Depen
|
|||||||
for key in ("name", "displayName", "description", "photoUrl", "emoji", "status", "tokenBalance", "config"):
|
for key in ("name", "displayName", "description", "photoUrl", "emoji", "status", "tokenBalance", "config"):
|
||||||
if key in payload:
|
if key in payload:
|
||||||
col = mapping.get(key, key)
|
col = mapping.get(key, key)
|
||||||
setattr(a, col, payload[key])
|
value = payload[key]
|
||||||
|
if key == "config":
|
||||||
|
if not isinstance(value, dict):
|
||||||
|
return fail("分身配置格式不正确", 400)
|
||||||
|
value = {**(a.config or {}), **value}
|
||||||
|
setattr(a, col, value)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(a)
|
db.refresh(a)
|
||||||
return ok(a.to_dict())
|
return ok(a.to_dict())
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/avatar/{avatar_id}")
|
@router.delete("/avatar/{avatar_id}")
|
||||||
def delete_avatar(avatar_id: str, db: Session = Depends(get_db)):
|
def delete_avatar(
|
||||||
a = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
avatar_id: str,
|
||||||
if not a:
|
authorization: str = Header(None),
|
||||||
return fail("分身不存在", 404)
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
a = _require_owned_avatar(db, avatar_id, authorization)
|
||||||
# 级联清理关联数据,避免孤儿记录
|
# 级联清理关联数据,避免孤儿记录
|
||||||
db.query(KnowledgeDoc).filter(KnowledgeDoc.avatar_id == avatar_id).delete()
|
db.query(KnowledgeDoc).filter(KnowledgeDoc.avatar_id == avatar_id).delete()
|
||||||
db.query(KnowledgeChunk).filter(KnowledgeChunk.avatar_id == avatar_id).delete()
|
db.query(KnowledgeChunk).filter(KnowledgeChunk.avatar_id == avatar_id).delete()
|
||||||
db.query(QAPair).filter(QAPair.avatar_id == avatar_id).delete()
|
db.query(QAPair).filter(QAPair.avatar_id == avatar_id).delete()
|
||||||
db.query(Authorization).filter(Authorization.avatar_id == avatar_id).delete()
|
db.query(Authorization).filter(Authorization.avatar_id == avatar_id).delete()
|
||||||
|
db.query(TakeoverReplyTask).filter(TakeoverReplyTask.avatar_id == avatar_id).delete()
|
||||||
|
db.query(TakeoverMessage).filter(TakeoverMessage.avatar_id == avatar_id).delete()
|
||||||
|
db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar_id).delete()
|
||||||
db.delete(a)
|
db.delete(a)
|
||||||
db.commit()
|
db.commit()
|
||||||
return ok({"success": True})
|
return ok({"success": True})
|
||||||
|
|
||||||
|
|
||||||
@router.post("/avatar/{avatar_id}/photo")
|
|
||||||
async def upload_avatar_photo(
|
|
||||||
avatar_id: str,
|
|
||||||
file: UploadFile = File(...),
|
|
||||||
db: Session = Depends(get_db),
|
|
||||||
):
|
|
||||||
"""上传数字分身头像"""
|
|
||||||
a = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
|
||||||
if not a:
|
|
||||||
return fail("分身不存在", 404)
|
|
||||||
|
|
||||||
# 验证文件类型
|
|
||||||
if not file.content_type or not file.content_type.startswith("image/"):
|
|
||||||
return fail("仅支持图片文件", 400)
|
|
||||||
|
|
||||||
file_bytes = await file.read()
|
|
||||||
if len(file_bytes) > 5 * 1024 * 1024:
|
|
||||||
return fail("头像文件不能超过5MB", 400)
|
|
||||||
|
|
||||||
# 保存到 uploads 目录
|
|
||||||
ext = mimetypes.guess_extension(file.content_type) or ".jpg"
|
|
||||||
filename = f"avatar-{uuid.uuid4().hex}{ext}"
|
|
||||||
avatar_dir = os.path.join(UPLOAD_DIR, avatar_id)
|
|
||||||
os.makedirs(avatar_dir, exist_ok=True)
|
|
||||||
file_path = os.path.join(avatar_dir, filename)
|
|
||||||
|
|
||||||
with open(file_path, "wb") as f:
|
|
||||||
f.write(file_bytes)
|
|
||||||
|
|
||||||
# 更新数据库
|
|
||||||
photo_url = f"/api/files/{avatar_id}/{filename}"
|
|
||||||
a.photo_url = photo_url
|
|
||||||
db.commit()
|
|
||||||
db.refresh(a)
|
|
||||||
|
|
||||||
return ok(a.to_dict())
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -27,8 +27,9 @@ from sqlalchemy.orm import Session
|
|||||||
_CN_TZ = timezone(timedelta(hours=8))
|
_CN_TZ = timezone(timedelta(hours=8))
|
||||||
|
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from models import User
|
from models import Avatar, TakeoverCursor, TakeoverMessage, TakeoverReplyTask, User
|
||||||
from responses import ok, fail
|
from responses import ok, fail
|
||||||
|
from services.boxim_client import BoxIMClient, BoxIMError
|
||||||
|
|
||||||
router = APIRouter(tags=["会会账号"])
|
router = APIRouter(tags=["会会账号"])
|
||||||
|
|
||||||
@@ -111,6 +112,19 @@ def _cfg_ready() -> bool:
|
|||||||
return bool(AUTH_BASE_URL and APP_ID and ACCESS_ID and ACCESS_SECRET)
|
return bool(AUTH_BASE_URL and APP_ID and ACCESS_ID and ACCESS_SECRET)
|
||||||
|
|
||||||
|
|
||||||
|
def _create_boxim_client() -> BoxIMClient:
|
||||||
|
return BoxIMClient({
|
||||||
|
"HUIHUI_PLATFORM_BASE_URL": os.getenv(
|
||||||
|
"HUIHUI_PLATFORM_BASE_URL", "https://open.99hui.com/api"
|
||||||
|
),
|
||||||
|
"BOXIM_API_BASE_URL": os.getenv("BOXIM_API_BASE_URL", "https://im.99hui.com/api"),
|
||||||
|
"HUIHUI_APP_ID": APP_ID,
|
||||||
|
"HUIHUI_ACCESS_ID": ACCESS_ID,
|
||||||
|
"HUIHUI_ACCESS_SECRET": ACCESS_SECRET,
|
||||||
|
"BOXIM_TIMEOUT_SECONDS": os.getenv("BOXIM_TIMEOUT_SECONDS", "20"),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
def _call_huihui(path: str, params: dict, as_query: bool = False):
|
def _call_huihui(path: str, params: dict, as_query: bool = False):
|
||||||
"""调用会会接口,返回 (ok: bool, payload: dict, http_status: int)"""
|
"""调用会会接口,返回 (ok: bool, payload: dict, http_status: int)"""
|
||||||
url = f"{AUTH_BASE_URL}{path}"
|
url = f"{AUTH_BASE_URL}{path}"
|
||||||
@@ -281,12 +295,108 @@ def pwd_login(body: dict = Body(...), db: Session = Depends(get_db)):
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
def _issue_session(db: Session, phone: str, info: dict):
|
@router.post("/huihui/token/login")
|
||||||
|
async def token_login(body: dict = Body(...), db: Session = Depends(get_db)):
|
||||||
|
"""Validate a production Huihui token through BOXIM and issue an app session."""
|
||||||
|
huihui_token = (body.get("token") or "").strip()
|
||||||
|
if not huihui_token or len(huihui_token) > 8192:
|
||||||
|
return fail("会会登录凭证无效或已过期", 401)
|
||||||
|
if not _cfg_ready():
|
||||||
|
return fail("会会登录服务未配置", 500)
|
||||||
|
|
||||||
|
client = _create_boxim_client()
|
||||||
|
try:
|
||||||
|
token_data = await client.exchange_access_token(huihui_token)
|
||||||
|
profile = await client.get_self(token_data["accessToken"])
|
||||||
|
except BoxIMError as exc:
|
||||||
|
if exc.auth_error:
|
||||||
|
return fail("会会登录凭证无效或已过期", 401)
|
||||||
|
return fail("会会登录服务暂时不可用,请稍后重试", 502)
|
||||||
|
|
||||||
|
# BOXIM's id is its internal IM id. Account ownership must use huihuiUserId.
|
||||||
|
huihui_user_id = str(profile.get("huihuiUserId") or "").strip()
|
||||||
|
if not huihui_user_id:
|
||||||
|
return fail("会会未返回用户标识", 502)
|
||||||
|
|
||||||
|
phone = str(_pick(profile, "mobile", "phone", default="")).strip()
|
||||||
|
nickname = str(_pick(profile, "nickName", "nickname", "name", "userName", default="")).strip()
|
||||||
|
avatar_url = str(
|
||||||
|
_pick(profile, "headImage", "headImageThumb", "avatar", "avatarUrl", default="")
|
||||||
|
).strip()
|
||||||
|
return _issue_session(
|
||||||
|
db,
|
||||||
|
phone,
|
||||||
|
{
|
||||||
|
"userId": huihui_user_id,
|
||||||
|
"nickname": nickname,
|
||||||
|
"avatarUrl": avatar_url,
|
||||||
|
"token": huihui_token,
|
||||||
|
},
|
||||||
|
reuse_existing_session=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _transfer_avatar_ownership(db: Session, old_owner_id: str, new_owner_id: str) -> int:
|
||||||
|
"""Move one user's avatar-owned data to a replacement Huihui identity."""
|
||||||
|
if not old_owner_id or old_owner_id == new_owner_id:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
avatar_ids = [
|
||||||
|
avatar_id
|
||||||
|
for (avatar_id,) in db.query(Avatar.id).filter(Avatar.owner_id == old_owner_id).all()
|
||||||
|
]
|
||||||
|
if not avatar_ids:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
db.query(Avatar).filter(Avatar.id.in_(avatar_ids)).update(
|
||||||
|
{Avatar.owner_id: new_owner_id}, synchronize_session="fetch"
|
||||||
|
)
|
||||||
|
for model in (TakeoverCursor, TakeoverMessage, TakeoverReplyTask):
|
||||||
|
db.query(model).filter(model.avatar_id.in_(avatar_ids)).update(
|
||||||
|
{model.owner_id: new_owner_id}, synchronize_session="fetch"
|
||||||
|
)
|
||||||
|
return len(avatar_ids)
|
||||||
|
|
||||||
|
|
||||||
|
def _find_or_link_user(db: Session, phone: str, huihui_user_id: str) -> User:
|
||||||
|
"""Resolve an account and safely retain avatars across Huihui environments."""
|
||||||
|
user = db.query(User).filter(User.huihui_user_id == huihui_user_id).first()
|
||||||
|
if not phone:
|
||||||
|
return user or User(huihui_user_id=huihui_user_id)
|
||||||
|
|
||||||
|
same_phone_users = db.query(User).filter(User.phone == phone).all()
|
||||||
|
|
||||||
|
if user is None:
|
||||||
|
# A unique verified-phone match is the same person whose upstream ID changed.
|
||||||
|
if len(same_phone_users) == 1:
|
||||||
|
user = same_phone_users[0]
|
||||||
|
old_owner_id = user.huihui_user_id
|
||||||
|
_transfer_avatar_ownership(db, old_owner_id, huihui_user_id)
|
||||||
|
user.huihui_user_id = huihui_user_id
|
||||||
|
return user
|
||||||
|
return User(huihui_user_id=huihui_user_id)
|
||||||
|
|
||||||
|
legacy_users = [candidate for candidate in same_phone_users if candidate.id != user.id]
|
||||||
|
current_avatar_count = db.query(Avatar).filter(Avatar.owner_id == huihui_user_id).count()
|
||||||
|
if len(legacy_users) == 1 and current_avatar_count == 0:
|
||||||
|
legacy_user = legacy_users[0]
|
||||||
|
_transfer_avatar_ownership(db, legacy_user.huihui_user_id, huihui_user_id)
|
||||||
|
legacy_user.app_token = ""
|
||||||
|
legacy_user.huihui_token = ""
|
||||||
|
db.add(legacy_user)
|
||||||
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
def _issue_session(
|
||||||
|
db: Session,
|
||||||
|
phone: str,
|
||||||
|
info: dict,
|
||||||
|
*,
|
||||||
|
reuse_existing_session: bool = False,
|
||||||
|
):
|
||||||
"""建/链本地用户并签发本系统会话 token"""
|
"""建/链本地用户并签发本系统会话 token"""
|
||||||
huihui_user_id = info.get("userId", "")
|
huihui_user_id = info.get("userId", "")
|
||||||
user = db.query(User).filter(User.huihui_user_id == huihui_user_id).first()
|
user = _find_or_link_user(db, phone, huihui_user_id)
|
||||||
if not user:
|
|
||||||
user = User(huihui_user_id=huihui_user_id)
|
|
||||||
if phone:
|
if phone:
|
||||||
user.phone = phone
|
user.phone = phone
|
||||||
if info.get("nickname"):
|
if info.get("nickname"):
|
||||||
@@ -294,12 +404,16 @@ def _issue_session(db: Session, phone: str, info: dict):
|
|||||||
if info.get("avatarUrl"):
|
if info.get("avatarUrl"):
|
||||||
user.avatar_url = info["avatarUrl"]
|
user.avatar_url = info["avatarUrl"]
|
||||||
user.huihui_token = info.get("token", "")
|
user.huihui_token = info.get("token", "")
|
||||||
user.app_token = uuid.uuid4().hex
|
if not reuse_existing_session or not user.app_token:
|
||||||
|
user.app_token = uuid.uuid4().hex
|
||||||
user.last_login_at = datetime.now()
|
user.last_login_at = datetime.now()
|
||||||
db.add(user)
|
db.add(user)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(user)
|
db.refresh(user)
|
||||||
|
|
||||||
|
from services.token_billing import get_or_create_account
|
||||||
|
get_or_create_account(db, user.id)
|
||||||
|
|
||||||
return ok({
|
return ok({
|
||||||
"token": user.app_token,
|
"token": user.app_token,
|
||||||
"user": user.to_dict(),
|
"user": user.to_dict(),
|
||||||
@@ -307,7 +421,6 @@ def _issue_session(db: Session, phone: str, info: dict):
|
|||||||
"userId": huihui_user_id,
|
"userId": huihui_user_id,
|
||||||
"nickname": info.get("nickname", ""),
|
"nickname": info.get("nickname", ""),
|
||||||
"avatarUrl": info.get("avatarUrl", ""),
|
"avatarUrl": info.get("avatarUrl", ""),
|
||||||
"token": info.get("token", ""),
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
@@ -13,9 +14,10 @@ from responses import ok, fail
|
|||||||
import embeddings
|
import embeddings
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
UPLOAD_DIR = os.path.join(BASE_DIR, "uploads")
|
UPLOAD_DIR = os.path.abspath(os.getenv("UPLOAD_DIR", os.path.join(BASE_DIR, "uploads")))
|
||||||
os.makedirs(UPLOAD_DIR, exist_ok=True)
|
os.makedirs(UPLOAD_DIR, exist_ok=True)
|
||||||
|
|
||||||
ALLOWED_EXT = {".md", ".txt", ".pdf", ".doc", ".docx", ".xlsx"}
|
ALLOWED_EXT = {".md", ".txt", ".pdf", ".doc", ".docx", ".xlsx"}
|
||||||
@@ -32,6 +34,14 @@ class EnabledIn(BaseModel):
|
|||||||
enabled: bool = True
|
enabled: bool = True
|
||||||
|
|
||||||
|
|
||||||
|
def _doc_payload(doc: KnowledgeDoc) -> dict:
|
||||||
|
payload = doc.to_dict()
|
||||||
|
stored_name = os.path.basename(doc.file_url or "")
|
||||||
|
stored_path = os.path.join(UPLOAD_DIR, doc.avatar_id, stored_name)
|
||||||
|
payload["filePresent"] = bool(stored_name and os.path.isfile(stored_path))
|
||||||
|
return payload
|
||||||
|
|
||||||
|
|
||||||
def _resolve_user(authorization: str | None, db: Session):
|
def _resolve_user(authorization: str | None, db: Session):
|
||||||
if not authorization:
|
if not authorization:
|
||||||
return None
|
return None
|
||||||
@@ -61,7 +71,16 @@ def list_docs(avatar_id: str, authorization: str = Header(None), db: Session = D
|
|||||||
.order_by(KnowledgeDoc.created_at.desc())
|
.order_by(KnowledgeDoc.created_at.desc())
|
||||||
.all()
|
.all()
|
||||||
)
|
)
|
||||||
return ok([d.to_dict() for d in docs])
|
# Older synchronous uploads could be interrupted after persisting "parsing".
|
||||||
|
# New uploads are committed only after indexing finishes, so these rows are stale.
|
||||||
|
stale_docs = [doc for doc in docs if doc.status == "parsing"]
|
||||||
|
if stale_docs:
|
||||||
|
for doc in stale_docs:
|
||||||
|
doc.status = "failed"
|
||||||
|
doc.vectorized = False
|
||||||
|
doc.chunk_count = 0
|
||||||
|
db.commit()
|
||||||
|
return ok([_doc_payload(d) for d in docs])
|
||||||
|
|
||||||
|
|
||||||
@router.post("/avatar/{avatar_id}/knowledge/docs")
|
@router.post("/avatar/{avatar_id}/knowledge/docs")
|
||||||
@@ -80,6 +99,7 @@ async def upload_doc(avatar_id: str, file: UploadFile = File(...), authorization
|
|||||||
with open(path, "wb") as f:
|
with open(path, "wb") as f:
|
||||||
f.write(content)
|
f.write(content)
|
||||||
doc = KnowledgeDoc(
|
doc = KnowledgeDoc(
|
||||||
|
id=uuid.uuid4().hex,
|
||||||
avatar_id=avatar_id,
|
avatar_id=avatar_id,
|
||||||
filename=file.filename,
|
filename=file.filename,
|
||||||
file_type=ext.lstrip("."),
|
file_type=ext.lstrip("."),
|
||||||
@@ -87,41 +107,49 @@ async def upload_doc(avatar_id: str, file: UploadFile = File(...), authorization
|
|||||||
file_url=f"/api/files/{avatar_id}/{stored}",
|
file_url=f"/api/files/{avatar_id}/{stored}",
|
||||||
status="parsing",
|
status="parsing",
|
||||||
)
|
)
|
||||||
db.add(doc)
|
|
||||||
db.commit()
|
|
||||||
db.refresh(doc)
|
|
||||||
|
|
||||||
# 向量化:抽取文本 -> 分块 -> 调第三方/本地嵌入 -> 存切片
|
# Complete extraction and embedding before the first database commit so a
|
||||||
|
# process restart cannot leave a permanent "parsing" row behind.
|
||||||
try:
|
try:
|
||||||
text = embeddings.extract_text(path, ext)
|
text = embeddings.extract_text(path, ext)
|
||||||
chunks = embeddings.chunk_text(text)
|
chunks = embeddings.chunk_text(text)
|
||||||
if chunks:
|
if not chunks:
|
||||||
vectors = embeddings.embed(chunks)
|
raise ValueError("文档没有可建立索引的文字内容")
|
||||||
for i, (c, v) in enumerate(zip(chunks, vectors)):
|
vectors = embeddings.embed(chunks)
|
||||||
db.add(
|
if len(vectors) != len(chunks):
|
||||||
KnowledgeChunk(
|
raise ValueError("向量服务返回数量与文档分段不一致")
|
||||||
doc_id=doc.id,
|
doc.vectorized = True
|
||||||
avatar_id=avatar_id,
|
doc.embedding_model = embeddings.MODEL
|
||||||
content=c,
|
doc.chunk_count = len(chunks)
|
||||||
vector=json.dumps(v),
|
doc.vectorized_at = datetime.now(timezone.utc)
|
||||||
chunk_index=i,
|
|
||||||
embedding_model=embeddings.MODEL,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
doc.vectorized = True
|
|
||||||
doc.embedding_model = embeddings.MODEL
|
|
||||||
doc.chunk_count = len(chunks)
|
|
||||||
doc.vectorized_at = datetime.now(timezone.utc)
|
|
||||||
doc.status = "ready"
|
doc.status = "ready"
|
||||||
|
db.add(doc)
|
||||||
|
for i, (chunk, vector) in enumerate(zip(chunks, vectors)):
|
||||||
|
db.add(
|
||||||
|
KnowledgeChunk(
|
||||||
|
doc_id=doc.id,
|
||||||
|
avatar_id=avatar_id,
|
||||||
|
content=chunk,
|
||||||
|
vector=json.dumps(vector),
|
||||||
|
chunk_index=i,
|
||||||
|
embedding_model=embeddings.MODEL,
|
||||||
|
)
|
||||||
|
)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(doc)
|
db.refresh(doc)
|
||||||
except Exception as e:
|
except Exception as exc:
|
||||||
print("vectorize failed:", e)
|
db.rollback()
|
||||||
doc.status = "ready" # 上传成功但向量化失败,仍可展示
|
doc.status = "failed"
|
||||||
|
doc.vectorized = False
|
||||||
|
doc.embedding_model = ""
|
||||||
|
doc.chunk_count = 0
|
||||||
|
doc.vectorized_at = None
|
||||||
|
db.add(doc)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(doc)
|
db.refresh(doc)
|
||||||
|
logger.exception("knowledge vectorization failed for %s: %s", doc.id, exc)
|
||||||
|
|
||||||
return ok(doc.to_dict())
|
return ok(_doc_payload(doc))
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/avatar/{avatar_id}/knowledge/docs/{doc_id}")
|
@router.delete("/avatar/{avatar_id}/knowledge/docs/{doc_id}")
|
||||||
|
|||||||
@@ -1,41 +1,153 @@
|
|||||||
"""分身接管配置 API"""
|
"""数字分身 BOXIM 单聊接管 API。"""
|
||||||
from fastapi import APIRouter, Depends, Body
|
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Body, Depends, Header
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from models import Authorization
|
from models import TakeoverCursor, TakeoverReplyTask, User
|
||||||
from responses import ok, fail
|
from responses import fail, ok
|
||||||
|
from routers.authorizations import (
|
||||||
|
DEFAULT_TAKEOVER_DELAY_SECONDS,
|
||||||
|
MAX_TAKEOVER_DELAY_SECONDS,
|
||||||
|
MIN_TAKEOVER_DELAY_SECONDS,
|
||||||
|
_require_authorization,
|
||||||
|
_stored_takeover_delay,
|
||||||
|
)
|
||||||
|
from routers.avatars import _require_owned_avatar
|
||||||
|
|
||||||
router = APIRouter(tags=["分身接管"])
|
router = APIRouter(tags=["分身接管"])
|
||||||
|
BOXIM_STATUS_FRESH_SECONDS = 60
|
||||||
|
|
||||||
|
|
||||||
|
def _delay_label(seconds: int) -> str:
|
||||||
|
if seconds % 60 == 0:
|
||||||
|
return f"{seconds // 60} 分钟"
|
||||||
|
return f"{seconds} 秒"
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/avatar/{avatar_id}/takeover/status")
|
||||||
|
def get_takeover_status(
|
||||||
|
avatar_id: str,
|
||||||
|
authorization: str = Header(None),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
avatar = _require_owned_avatar(db, avatar_id, authorization)
|
||||||
|
permissions = (avatar.config or {}).get("authorizationPermissions", [])
|
||||||
|
enabled = isinstance(permissions, list) and "takeover" in permissions
|
||||||
|
reply_delay_seconds = _stored_takeover_delay(avatar)
|
||||||
|
user = db.query(User).filter(User.huihui_user_id == avatar.owner_id).first()
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar.id).first()
|
||||||
|
pending_count = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.avatar_id == avatar.id,
|
||||||
|
TakeoverReplyTask.status.in_(("pending", "generating", "ready", "sending")),
|
||||||
|
)
|
||||||
|
.count()
|
||||||
|
)
|
||||||
|
|
||||||
|
if cursor and cursor.last_error:
|
||||||
|
status, message = "error", cursor.last_error
|
||||||
|
elif not enabled:
|
||||||
|
status, message = "disabled", "主动接管未开启"
|
||||||
|
elif not user or not user.huihui_token:
|
||||||
|
status, message = "needs_login", "请重新登录会会生产账号以连接 BOXIM"
|
||||||
|
elif (
|
||||||
|
cursor
|
||||||
|
and cursor.initialized
|
||||||
|
and cursor.last_polled_at
|
||||||
|
# BOXIM offline-message reads can long-poll for about 20 seconds.
|
||||||
|
and cursor.last_polled_at
|
||||||
|
>= datetime.utcnow() - timedelta(seconds=BOXIM_STATUS_FRESH_SECONDS)
|
||||||
|
):
|
||||||
|
status, message = (
|
||||||
|
"ready",
|
||||||
|
f"BOXIM 已连接,收到私聊消息 {_delay_label(reply_delay_seconds)}后自动回复",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
status, message = "connecting", "正在连接 BOXIM"
|
||||||
|
|
||||||
|
return ok(
|
||||||
|
{
|
||||||
|
"enabled": enabled,
|
||||||
|
"status": status,
|
||||||
|
"message": message,
|
||||||
|
"pendingCount": pending_count,
|
||||||
|
"takeoverReplyDelaySeconds": reply_delay_seconds,
|
||||||
|
"lastPolledAt": cursor.last_polled_at.isoformat() if cursor and cursor.last_polled_at else None,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _has(payload: dict, camel_key: str, snake_key: str) -> bool:
|
||||||
|
return camel_key in payload or snake_key in payload
|
||||||
|
|
||||||
|
|
||||||
|
def _read(payload: dict, camel_key: str, snake_key: str, default=None):
|
||||||
|
if camel_key in payload:
|
||||||
|
return payload[camel_key]
|
||||||
|
if snake_key in payload:
|
||||||
|
return payload[snake_key]
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
@router.put("/avatar/{avatar_id}/authorizations/takeover")
|
@router.put("/avatar/{avatar_id}/authorizations/takeover")
|
||||||
def update_takeover_config(
|
def update_takeover_config(
|
||||||
avatar_id: str,
|
avatar_id: str,
|
||||||
payload: dict = Body(...),
|
payload: dict = Body(...),
|
||||||
|
authorization: str = Header(None),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
):
|
):
|
||||||
"""更新分身接管配置"""
|
_require_owned_avatar(db, avatar_id, authorization)
|
||||||
auth_id = payload.get("authorizationId") or payload.get("authorization_id")
|
auth_id = _read(payload, "authorizationId", "authorization_id")
|
||||||
if not auth_id:
|
if not auth_id:
|
||||||
return fail("缺少 authorization_id", 400)
|
return fail("缺少 authorization_id", 400)
|
||||||
|
|
||||||
auth = db.query(Authorization).filter(Authorization.id == auth_id).first()
|
auth = _require_authorization(db, avatar_id, str(auth_id))
|
||||||
if not auth:
|
enabled = bool(auth.takeover_enabled)
|
||||||
return fail("授权不存在", 404)
|
mode = auth.takeover_mode or "immediate"
|
||||||
|
delay = auth.takeover_delay_seconds or DEFAULT_TAKEOVER_DELAY_SECONDS
|
||||||
|
|
||||||
if "takeover_enabled" in payload:
|
if _has(payload, "takeoverEnabled", "takeover_enabled"):
|
||||||
auth.takeover_enabled = payload["takeover_enabled"]
|
raw_enabled = _read(payload, "takeoverEnabled", "takeover_enabled")
|
||||||
if "takeover_mode" in payload:
|
if not isinstance(raw_enabled, bool):
|
||||||
mode = payload["takeover_mode"]
|
return fail("takeover_enabled 必须是布尔值", 400)
|
||||||
|
enabled = raw_enabled
|
||||||
|
|
||||||
|
if _has(payload, "takeoverMode", "takeover_mode"):
|
||||||
|
mode = _read(payload, "takeoverMode", "takeover_mode")
|
||||||
if mode not in ("immediate", "delayed"):
|
if mode not in ("immediate", "delayed"):
|
||||||
return fail("takeover_mode 必须是 immediate 或 delayed", 400)
|
return fail("takeover_mode 必须是 immediate 或 delayed", 400)
|
||||||
auth.takeover_mode = mode
|
|
||||||
if "takeover_delay_seconds" in payload:
|
|
||||||
delay = payload["takeover_delay_seconds"]
|
|
||||||
if not isinstance(delay, int) or delay < 5:
|
|
||||||
return fail("takeover_delay_seconds 必须 >= 5", 400)
|
|
||||||
auth.takeover_delay_seconds = delay
|
|
||||||
|
|
||||||
|
if _has(payload, "takeoverDelaySeconds", "takeover_delay_seconds"):
|
||||||
|
delay = _read(payload, "takeoverDelaySeconds", "takeover_delay_seconds")
|
||||||
|
if (
|
||||||
|
isinstance(delay, bool)
|
||||||
|
or not isinstance(delay, int)
|
||||||
|
or not MIN_TAKEOVER_DELAY_SECONDS <= delay <= MAX_TAKEOVER_DELAY_SECONDS
|
||||||
|
):
|
||||||
|
return fail("延迟时间需在 3 秒到 24 小时之间", 400)
|
||||||
|
|
||||||
|
if enabled and auth.target_type != "user":
|
||||||
|
return fail("本期仅支持对会会用户开启单聊接管", 400)
|
||||||
|
if enabled and auth.status != "active":
|
||||||
|
return fail("请先启用该授权,再开启聊天接管", 400)
|
||||||
|
|
||||||
|
permissions = list(auth.permissions or [])
|
||||||
|
if enabled:
|
||||||
|
if "chat" not in permissions and "reply" not in permissions:
|
||||||
|
permissions.append("chat")
|
||||||
|
if "takeover" not in permissions:
|
||||||
|
permissions.append("takeover")
|
||||||
|
else:
|
||||||
|
permissions = [permission for permission in permissions if permission != "takeover"]
|
||||||
|
|
||||||
|
auth.permissions = permissions
|
||||||
|
auth.takeover_enabled = enabled
|
||||||
|
auth.takeover_mode = mode
|
||||||
|
auth.takeover_delay_seconds = delay
|
||||||
db.commit()
|
db.commit()
|
||||||
return ok(auth.to_dict())
|
db.refresh(auth)
|
||||||
|
return ok(auth.to_dict(), "接管配置已保存")
|
||||||
|
|||||||
@@ -1,37 +1,346 @@
|
|||||||
from fastapi import APIRouter, Depends, Body
|
import hashlib
|
||||||
|
import hmac
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
|
||||||
|
from urllib.parse import parse_qs
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Request
|
||||||
|
from sqlalchemy import func
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from models import TokenAccount, TokenPlan
|
from models import TokenAccount, TokenPaymentOrder, TokenPlan, TokenUsage, User
|
||||||
from responses import ok, fail
|
from responses import fail, ok
|
||||||
|
from services.huihui_payment import HuihuiPaymentClient, HuihuiPaymentError
|
||||||
|
from services.token_billing import DEFAULT_TOKEN_GRANT, get_or_create_account
|
||||||
|
|
||||||
router = APIRouter(tags=["Token"])
|
router = APIRouter(tags=["Token"])
|
||||||
|
|
||||||
|
PAYMENT_METHODS = {"wechat": "WECHAT", "alipay": "ALIPAY"}
|
||||||
|
PAYMENT_SCENES = {"APP", "LITE", "JSAPI"}
|
||||||
|
SUCCESS_STATUSES = {"SUCCESS", "SUCCEEDED", "PAID", "COMPLETED", "TRADE_SUCCESS"}
|
||||||
|
FAILED_STATUSES = {"FAIL", "FAILED", "CLOSED", "CANCELLED", "CANCELED", "EXPIRED"}
|
||||||
|
|
||||||
|
|
||||||
|
def _require_user(authorization: str | None, db: Session) -> User:
|
||||||
|
if not authorization:
|
||||||
|
raise HTTPException(status_code=401, detail="未登录")
|
||||||
|
token = authorization.replace("Bearer ", "", 1).replace("bearer ", "", 1).strip()
|
||||||
|
user = db.query(User).filter(User.app_token == token).first()
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=401, detail="会话无效或已过期")
|
||||||
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
def _payment_client() -> HuihuiPaymentClient:
|
||||||
|
return HuihuiPaymentClient({
|
||||||
|
"HUIHUI_PAYMENT_BASE_URL": os.getenv(
|
||||||
|
"HUIHUI_PAYMENT_BASE_URL", "https://open.99hui.com/api/payment-v3"
|
||||||
|
),
|
||||||
|
"HUIHUI_APP_ID": os.getenv("HUIHUI_APP_ID", ""),
|
||||||
|
"HUIHUI_ACCESS_ID": os.getenv("HUIHUI_ACCESS_ID", ""),
|
||||||
|
"HUIHUI_ACCESS_SECRET": os.getenv("HUIHUI_ACCESS_SECRET", ""),
|
||||||
|
"HUIHUI_PAYMENT_TIMEOUT_SECONDS": os.getenv("HUIHUI_PAYMENT_TIMEOUT_SECONDS", "30"),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
def _callback_url(order_no: str) -> str:
|
||||||
|
base = os.getenv(
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_BASE_URL", "https://digital.99hui.com"
|
||||||
|
).rstrip("/")
|
||||||
|
secret = os.getenv("HUIHUI_PAYMENT_CALLBACK_SECRET", "").strip()
|
||||||
|
if len(secret) < 16:
|
||||||
|
raise HuihuiPaymentError("会会支付回调密钥未配置")
|
||||||
|
signature = hmac.new(secret.encode(), order_no.encode(), hashlib.sha256).hexdigest()
|
||||||
|
return f"{base}/api/token/payment/callback/{order_no}/{signature}"
|
||||||
|
|
||||||
|
|
||||||
|
def _price_cents(price: float) -> int:
|
||||||
|
return int(
|
||||||
|
(Decimal(str(price)) * Decimal("100")).quantize(
|
||||||
|
Decimal("1"), rounding=ROUND_HALF_UP
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _payment_payload(order: TokenPaymentOrder, account: TokenAccount) -> dict:
|
||||||
|
return {**order.to_dict(), "balance": account.balance}
|
||||||
|
|
||||||
|
|
||||||
|
def _nested_payload(value):
|
||||||
|
if isinstance(value, str):
|
||||||
|
text = value.strip()
|
||||||
|
if text[:1] in ("{", "["):
|
||||||
|
try:
|
||||||
|
return _nested_payload(json.loads(text))
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return value
|
||||||
|
return value
|
||||||
|
if isinstance(value, list):
|
||||||
|
return [_nested_payload(item) for item in value]
|
||||||
|
if isinstance(value, dict):
|
||||||
|
return {key: _nested_payload(item) for key, item in value.items()}
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def _find_value(payload, *names):
|
||||||
|
expected = {name.lower() for name in names}
|
||||||
|
if isinstance(payload, dict):
|
||||||
|
for key, value in payload.items():
|
||||||
|
if key.lower() in expected and value not in (None, ""):
|
||||||
|
return value
|
||||||
|
for value in payload.values():
|
||||||
|
found = _find_value(value, *names)
|
||||||
|
if found not in (None, ""):
|
||||||
|
return found
|
||||||
|
elif isinstance(payload, list):
|
||||||
|
for value in payload:
|
||||||
|
found = _find_value(value, *names)
|
||||||
|
if found not in (None, ""):
|
||||||
|
return found
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _callback_amount_cents(payload) -> int | None:
|
||||||
|
value = _find_value(
|
||||||
|
payload,
|
||||||
|
"actualAmt",
|
||||||
|
"payAmt",
|
||||||
|
"masterOrderAmt",
|
||||||
|
"orderAmt",
|
||||||
|
"amount",
|
||||||
|
"totalAmount",
|
||||||
|
)
|
||||||
|
if value in (None, ""):
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
return int(
|
||||||
|
(Decimal(str(value)) * Decimal("100")).quantize(
|
||||||
|
Decimal("1"), rounding=ROUND_HALF_UP
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except (InvalidOperation, TypeError, ValueError):
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
@router.get("/token/balance")
|
@router.get("/token/balance")
|
||||||
def balance(db: Session = Depends(get_db)):
|
def balance(authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
acc = db.query(TokenAccount).first()
|
user = _require_user(authorization, db)
|
||||||
return ok({"balance": acc.balance if acc else 0})
|
acc = get_or_create_account(db, user.id)
|
||||||
|
return ok({
|
||||||
|
"balance": acc.balance,
|
||||||
|
"totalGranted": acc.total_granted,
|
||||||
|
"totalConsumed": acc.total_consumed,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@router.get("/token/plans")
|
@router.get("/token/plans")
|
||||||
def plans(db: Session = Depends(get_db)):
|
def plans(authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
|
_require_user(authorization, db)
|
||||||
items = db.query(TokenPlan).order_by(TokenPlan.price.asc()).all()
|
items = db.query(TokenPlan).order_by(TokenPlan.price.asc()).all()
|
||||||
return ok([p.to_dict() for p in items])
|
return ok([p.to_dict() for p in items])
|
||||||
|
|
||||||
|
|
||||||
|
# 积分只会在会会支付回调确认成功后到账。
|
||||||
@router.post("/token/charge")
|
@router.post("/token/charge")
|
||||||
def charge(payload: dict = Body(...), db: Session = Depends(get_db)):
|
def charge(payload: dict = Body(...), authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
plan_id = payload.get("planId")
|
user = _require_user(authorization, db)
|
||||||
plan = db.query(TokenPlan).filter(TokenPlan.id == plan_id).first()
|
plan = db.query(TokenPlan).filter(TokenPlan.id == payload.get("planId")).first()
|
||||||
if not plan:
|
if not plan:
|
||||||
return fail("套餐不存在", 404)
|
return fail("套餐不存在", 404)
|
||||||
acc = db.query(TokenAccount).first()
|
|
||||||
if not acc:
|
payment_method = str(payload.get("paymentMethod") or "").lower()
|
||||||
acc = TokenAccount(balance=0)
|
pay_type = PAYMENT_METHODS.get(payment_method)
|
||||||
db.add(acc)
|
if not pay_type:
|
||||||
db.commit()
|
return fail("请选择正确的支付方式", 400)
|
||||||
db.refresh(acc)
|
pay_way = str(payload.get("payScene") or "APP").upper()
|
||||||
acc.balance += plan.amount
|
if pay_way not in PAYMENT_SCENES:
|
||||||
|
return fail("当前支付场景不受支持", 400)
|
||||||
|
|
||||||
|
cents = _price_cents(plan.price)
|
||||||
|
order = TokenPaymentOrder(
|
||||||
|
order_no=f"AV{datetime.utcnow().strftime('%Y%m%d%H%M%S')}{uuid.uuid4().hex[:12].upper()}",
|
||||||
|
user_id=user.id,
|
||||||
|
plan_id=plan.id,
|
||||||
|
payment_method=payment_method,
|
||||||
|
pay_type=pay_type,
|
||||||
|
pay_way=pay_way,
|
||||||
|
points_amount=plan.amount,
|
||||||
|
price_cents=cents,
|
||||||
|
status="pending",
|
||||||
|
)
|
||||||
|
db.add(order)
|
||||||
db.commit()
|
db.commit()
|
||||||
return ok({"balance": acc.balance, "charged": plan.amount})
|
|
||||||
|
try:
|
||||||
|
callback_url = _callback_url(order.order_no)
|
||||||
|
except HuihuiPaymentError as exc:
|
||||||
|
order.status = "failed"
|
||||||
|
order.failure_reason = str(exc)
|
||||||
|
db.commit()
|
||||||
|
return fail(str(exc), 503)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = _payment_client().create_payment(
|
||||||
|
huihui_token=user.huihui_token,
|
||||||
|
huihui_user_id=user.huihui_user_id,
|
||||||
|
real_name=user.nickname,
|
||||||
|
order_no=order.order_no,
|
||||||
|
amount=f"{cents / 100:.2f}",
|
||||||
|
points_amount=plan.amount,
|
||||||
|
pay_type=pay_type,
|
||||||
|
pay_way=pay_way,
|
||||||
|
callback_url=callback_url,
|
||||||
|
)
|
||||||
|
except HuihuiPaymentError as exc:
|
||||||
|
order.status = "failed"
|
||||||
|
order.failure_reason = str(exc)[:500]
|
||||||
|
db.commit()
|
||||||
|
return fail(str(exc), 502)
|
||||||
|
|
||||||
|
db.refresh(order)
|
||||||
|
if order.status != "paid":
|
||||||
|
order.provider_order_id = str(result.get("orderId") or "")
|
||||||
|
order.provider_order_no = str(result.get("orderNo") or "")
|
||||||
|
order.provider_status = str(result.get("status") or "pending")
|
||||||
|
message = result.get("payMessage") or ""
|
||||||
|
order.pay_message = (
|
||||||
|
json.dumps(message, ensure_ascii=False)
|
||||||
|
if isinstance(message, (dict, list))
|
||||||
|
else str(message)
|
||||||
|
)
|
||||||
|
if order.provider_status.upper() in FAILED_STATUSES:
|
||||||
|
order.status = "failed"
|
||||||
|
order.failure_reason = str(result.get("bankReturnMsg") or "支付下单失败")[:500]
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return ok(_payment_payload(order, get_or_create_account(db, user.id)))
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/token/payment/{order_id}")
|
||||||
|
def payment_status(order_id: str, authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
|
user = _require_user(authorization, db)
|
||||||
|
order = db.query(TokenPaymentOrder).filter(
|
||||||
|
TokenPaymentOrder.id == order_id,
|
||||||
|
TokenPaymentOrder.user_id == user.id,
|
||||||
|
).first()
|
||||||
|
if not order:
|
||||||
|
return fail("支付订单不存在", 404)
|
||||||
|
return ok(_payment_payload(order, get_or_create_account(db, user.id)))
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/token/payment/callback/{order_no}/{callback_signature}")
|
||||||
|
async def payment_callback(
|
||||||
|
order_no: str,
|
||||||
|
callback_signature: str,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
secret = os.getenv("HUIHUI_PAYMENT_CALLBACK_SECRET", "").strip()
|
||||||
|
expected = hmac.new(secret.encode(), order_no.encode(), hashlib.sha256).hexdigest()
|
||||||
|
if len(secret) < 16 or not hmac.compare_digest(callback_signature, expected):
|
||||||
|
raise HTTPException(status_code=404, detail="Not found")
|
||||||
|
|
||||||
|
content_type = request.headers.get("content-type", "").lower()
|
||||||
|
if "application/json" in content_type:
|
||||||
|
try:
|
||||||
|
payload = await request.json()
|
||||||
|
except ValueError:
|
||||||
|
return fail("支付回调格式不正确", 400)
|
||||||
|
else:
|
||||||
|
raw = (await request.body()).decode("utf-8", errors="replace")
|
||||||
|
payload = {key: values[-1] for key, values in parse_qs(raw).items()}
|
||||||
|
payload = _nested_payload(payload)
|
||||||
|
|
||||||
|
payload_order_no = str(_find_value(
|
||||||
|
payload,
|
||||||
|
"masterOrderNo",
|
||||||
|
"master_order_no",
|
||||||
|
"orderNo",
|
||||||
|
"order_no",
|
||||||
|
"bizOrderNo",
|
||||||
|
) or "").strip()
|
||||||
|
if payload_order_no and payload_order_no != order_no:
|
||||||
|
return fail("支付回调订单号不匹配", 422)
|
||||||
|
|
||||||
|
order = db.query(TokenPaymentOrder).filter(TokenPaymentOrder.order_no == order_no).first()
|
||||||
|
if not order:
|
||||||
|
return fail("支付订单不存在", 404)
|
||||||
|
if order.status == "paid":
|
||||||
|
return ok({"received": True, "duplicate": True})
|
||||||
|
|
||||||
|
provider_status = str(_find_value(
|
||||||
|
payload, "status", "payStatus", "tradeStatus", "paymentStatus"
|
||||||
|
) or "").upper()
|
||||||
|
order.provider_status = provider_status
|
||||||
|
if provider_status not in SUCCESS_STATUSES:
|
||||||
|
if provider_status in FAILED_STATUSES:
|
||||||
|
order.status = "failed"
|
||||||
|
order.failure_reason = str(
|
||||||
|
_find_value(payload, "message", "errorMsg", "failReason") or "支付失败"
|
||||||
|
)[:500]
|
||||||
|
db.commit()
|
||||||
|
return ok({"received": True, "paid": False})
|
||||||
|
|
||||||
|
paid_cents = _callback_amount_cents(payload)
|
||||||
|
if paid_cents is None or paid_cents != order.price_cents:
|
||||||
|
order.failure_reason = "支付回调金额不匹配"
|
||||||
|
db.commit()
|
||||||
|
return fail("支付金额不匹配", 422)
|
||||||
|
|
||||||
|
updated = db.query(TokenPaymentOrder).filter(
|
||||||
|
TokenPaymentOrder.id == order.id,
|
||||||
|
TokenPaymentOrder.status != "paid",
|
||||||
|
).update({
|
||||||
|
TokenPaymentOrder.status: "paid",
|
||||||
|
TokenPaymentOrder.provider_status: provider_status,
|
||||||
|
TokenPaymentOrder.paid_at: datetime.utcnow(),
|
||||||
|
TokenPaymentOrder.failure_reason: "",
|
||||||
|
}, synchronize_session=False)
|
||||||
|
if updated:
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == order.user_id).first()
|
||||||
|
if account is None:
|
||||||
|
account = TokenAccount(
|
||||||
|
user_id=order.user_id,
|
||||||
|
balance=DEFAULT_TOKEN_GRANT,
|
||||||
|
total_granted=DEFAULT_TOKEN_GRANT,
|
||||||
|
total_consumed=0,
|
||||||
|
)
|
||||||
|
db.add(account)
|
||||||
|
db.flush()
|
||||||
|
account.balance = int(account.balance or 0) + order.points_amount
|
||||||
|
account.total_granted = int(account.total_granted or 0) + order.points_amount
|
||||||
|
db.commit()
|
||||||
|
return ok({"received": True, "paid": True})
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/token/usage")
|
||||||
|
def usage(authorization: str = Header(None), db: Session = Depends(get_db)):
|
||||||
|
user = _require_user(authorization, db)
|
||||||
|
rows = (
|
||||||
|
db.query(
|
||||||
|
TokenUsage.avatar_id,
|
||||||
|
TokenUsage.source,
|
||||||
|
func.sum(TokenUsage.prompt_tokens),
|
||||||
|
func.sum(TokenUsage.completion_tokens),
|
||||||
|
func.sum(TokenUsage.total_tokens),
|
||||||
|
func.count(TokenUsage.id),
|
||||||
|
)
|
||||||
|
.filter(TokenUsage.user_id == user.id, TokenUsage.status == "completed")
|
||||||
|
.group_by(TokenUsage.avatar_id, TokenUsage.source)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
return ok([
|
||||||
|
{
|
||||||
|
"avatarId": avatar_id,
|
||||||
|
"source": source,
|
||||||
|
"promptTokens": int(prompt_tokens or 0),
|
||||||
|
"completionTokens": int(completion_tokens or 0),
|
||||||
|
"totalTokens": int(total_tokens or 0),
|
||||||
|
"requestCount": int(request_count or 0),
|
||||||
|
}
|
||||||
|
for avatar_id, source, prompt_tokens, completion_tokens, total_tokens, request_count in rows
|
||||||
|
])
|
||||||
|
|||||||
@@ -1,76 +1,210 @@
|
|||||||
"""盒子 IM 客户端 — 封装网易云信 IM 接口调用"""
|
"""Client for Huihui's self-hosted BOXIM production APIs."""
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import random
|
import random
|
||||||
|
import secrets
|
||||||
import string
|
import string
|
||||||
from datetime import datetime
|
import time
|
||||||
from typing import Optional
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
|
|
||||||
|
|
||||||
|
_CN_TZ = timezone(timedelta(hours=8))
|
||||||
|
|
||||||
|
|
||||||
|
class BoxIMError(RuntimeError):
|
||||||
|
def __init__(self, message: str, *, code: Any = None, auth_error: bool = False):
|
||||||
|
super().__init__(message)
|
||||||
|
self.code = code
|
||||||
|
self.auth_error = auth_error
|
||||||
|
|
||||||
|
|
||||||
class BoxIMClient:
|
class BoxIMClient:
|
||||||
"""盒子 IM 客户端,通过会会平台网关调用网易云信 IM"""
|
"""Exchange Huihui credentials and call BOXIM's private-message API."""
|
||||||
|
|
||||||
def __init__(self, config: dict):
|
def __init__(self, config: dict):
|
||||||
self.base_url = config.get("HUIHUI_IM_BASE_URL", "http://192.168.1.200:60040")
|
self.platform_base_url = config.get(
|
||||||
|
"HUIHUI_PLATFORM_BASE_URL", "https://open.99hui.com/api"
|
||||||
|
).rstrip("/")
|
||||||
|
self.im_base_url = config.get(
|
||||||
|
"BOXIM_API_BASE_URL", "https://im.99hui.com/api"
|
||||||
|
).rstrip("/")
|
||||||
self.app_id = config.get("HUIHUI_APP_ID", "")
|
self.app_id = config.get("HUIHUI_APP_ID", "")
|
||||||
self.access_id = config.get("HUIHUI_ACCESS_ID", "")
|
self.access_id = config.get("HUIHUI_ACCESS_ID", "")
|
||||||
self.access_secret = config.get("HUIHUI_ACCESS_SECRET", "")
|
self.access_secret = config.get("HUIHUI_ACCESS_SECRET", "")
|
||||||
|
self.timeout = float(config.get("BOXIM_TIMEOUT_SECONDS", 20))
|
||||||
|
|
||||||
def _build_sign_params(self, extra: dict) -> dict:
|
def _build_sign_params(self, extra: dict | None = None) -> dict:
|
||||||
"""构建带签名的请求参数(复用 news_service 签名模式)"""
|
"""Build the same signed form used by Huihui's current production app."""
|
||||||
nonce = "".join(random.choices(string.ascii_lowercase + string.digits, k=12))
|
|
||||||
timestamp = datetime.now().strftime("%Y%m%d%H%M%S") # 24小时制
|
|
||||||
params = {
|
params = {
|
||||||
"appId": self.app_id,
|
"appId": self.app_id,
|
||||||
"accessId": self.access_id,
|
"accessId": self.access_id,
|
||||||
"nonce": nonce,
|
"nonce": "".join(random.choices(string.ascii_lowercase + string.digits, k=12)),
|
||||||
"timestamp": timestamp,
|
"timestamp": datetime.now(_CN_TZ).strftime("%Y%m%d%H%M%S"),
|
||||||
**extra,
|
"signType": "MD5",
|
||||||
|
"signVersion": "1.0",
|
||||||
|
**(extra or {}),
|
||||||
}
|
}
|
||||||
# 计算签名 — 排序 key, 过滤空值, 拼接后加 accessSecret, MD5 大写
|
params.pop("accessSecret", None)
|
||||||
keys = sorted(params.keys())
|
params.pop("signature", None)
|
||||||
sign_parts = []
|
sign_parts = []
|
||||||
for k in keys:
|
for key in sorted(params):
|
||||||
if k in ("signature", "accessSecret"):
|
value = params[key]
|
||||||
|
if value in (None, "", []):
|
||||||
continue
|
continue
|
||||||
v = params.get(k)
|
if isinstance(value, list):
|
||||||
if v and v != "" and v != []:
|
continue
|
||||||
sign_parts.append(f"{k}={v}")
|
sign_parts.append(f"{key}={value}")
|
||||||
sign_str = "&".join(sign_parts) + f"&accessSecret={self.access_secret}"
|
sign_source = "&".join(sign_parts) + f"&accessSecret={self.access_secret}"
|
||||||
signature = hashlib.md5(sign_str.encode("utf-8")).hexdigest().upper()
|
params["signature"] = hashlib.md5(sign_source.encode("utf-8")).hexdigest().upper()
|
||||||
params["signature"] = signature
|
|
||||||
params["signType"] = "MD5"
|
|
||||||
params["signVersion"] = "1.0"
|
|
||||||
return params
|
return params
|
||||||
|
|
||||||
async def get_credentials(self, user_id: str) -> Optional[dict]:
|
@staticmethod
|
||||||
"""获取用户的网易云信 IM 凭证 (accid, token)"""
|
def _response_payload(response: httpx.Response) -> dict:
|
||||||
params = self._build_sign_params({"userId": user_id})
|
try:
|
||||||
async with httpx.AsyncClient(timeout=10) as client:
|
payload = response.json()
|
||||||
r = await client.post(
|
except ValueError as exc:
|
||||||
f"{self.base_url}/box/netease",
|
raise BoxIMError("BOXIM 返回了无效响应") from exc
|
||||||
params=params,
|
if not isinstance(payload, dict):
|
||||||
)
|
raise BoxIMError("BOXIM 返回格式不正确")
|
||||||
data = r.json()
|
return payload
|
||||||
if data.get("code") in (0, 200):
|
|
||||||
return data.get("data", {})
|
|
||||||
return None
|
|
||||||
|
|
||||||
async def send_p2p_message(
|
async def exchange_access_token(self, huihui_token: str) -> dict:
|
||||||
self, from_accid: str, to_accid: str, content: str
|
"""Exchange a production Huihui token for a BOXIM access token."""
|
||||||
) -> bool:
|
if not huihui_token:
|
||||||
"""发送单聊消息(文本)"""
|
raise BoxIMError("缺少会会登录凭证", auth_error=True)
|
||||||
params = self._build_sign_params({
|
if not (self.app_id and self.access_id and self.access_secret):
|
||||||
"from": from_accid,
|
raise BoxIMError("会会开放平台凭证未配置", auth_error=True)
|
||||||
"to": to_accid,
|
|
||||||
"msgType": "text",
|
headers = {
|
||||||
"content": content,
|
"Authorization": f"Bearer {huihui_token}",
|
||||||
})
|
"appId": self.app_id,
|
||||||
async with httpx.AsyncClient(timeout=10) as client:
|
"windowAppId": self.app_id,
|
||||||
r = await client.post(
|
}
|
||||||
f"{self.base_url}/box/message/send/p2p",
|
async with httpx.AsyncClient(timeout=self.timeout, follow_redirects=True) as client:
|
||||||
params=params,
|
response = await client.post(
|
||||||
|
f"{self.platform_base_url}/im/box/netease",
|
||||||
|
headers=headers,
|
||||||
|
data=self._build_sign_params(),
|
||||||
)
|
)
|
||||||
data = r.json()
|
payload = self._response_payload(response)
|
||||||
return data.get("code") in (0, 200)
|
data = payload.get("data") or {}
|
||||||
|
code = payload.get("code")
|
||||||
|
if response.status_code >= 400 or code not in (0, 200, "0", "200"):
|
||||||
|
raise BoxIMError(
|
||||||
|
payload.get("message") or "BOXIM 授权失败",
|
||||||
|
code=code or response.status_code,
|
||||||
|
auth_error=response.status_code in (400, 401, 403)
|
||||||
|
or code in (
|
||||||
|
400,
|
||||||
|
401,
|
||||||
|
40100,
|
||||||
|
40101,
|
||||||
|
403,
|
||||||
|
"400",
|
||||||
|
"401",
|
||||||
|
"40100",
|
||||||
|
"40101",
|
||||||
|
"403",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
if not data.get("accessToken"):
|
||||||
|
raise BoxIMError("会会未返回 BOXIM 访问凭证", auth_error=True)
|
||||||
|
return data
|
||||||
|
|
||||||
|
async def _request(
|
||||||
|
self,
|
||||||
|
method: str,
|
||||||
|
path: str,
|
||||||
|
access_token: str,
|
||||||
|
*,
|
||||||
|
params: dict | None = None,
|
||||||
|
json: dict | None = None,
|
||||||
|
) -> Any:
|
||||||
|
headers = {"accessToken": access_token}
|
||||||
|
async with httpx.AsyncClient(timeout=self.timeout) as client:
|
||||||
|
response = await client.request(
|
||||||
|
method,
|
||||||
|
f"{self.im_base_url}{path}",
|
||||||
|
headers=headers,
|
||||||
|
params=params,
|
||||||
|
json=json,
|
||||||
|
)
|
||||||
|
payload = self._response_payload(response)
|
||||||
|
code = payload.get("code")
|
||||||
|
if response.status_code >= 400 or code not in (200, "200"):
|
||||||
|
raise BoxIMError(
|
||||||
|
payload.get("message") or "BOXIM 请求失败",
|
||||||
|
code=code or response.status_code,
|
||||||
|
auth_error=response.status_code in (400, 401, 403)
|
||||||
|
or code in (400, 401, 40100, 40101, 403, "400", "401", "40100", "40101", "403"),
|
||||||
|
)
|
||||||
|
return payload.get("data")
|
||||||
|
|
||||||
|
async def get_self(self, access_token: str) -> dict:
|
||||||
|
data = await self._request("GET", "/user/self", access_token)
|
||||||
|
if not isinstance(data, dict) or data.get("id") is None:
|
||||||
|
raise BoxIMError("BOXIM 未返回当前用户信息")
|
||||||
|
return data
|
||||||
|
|
||||||
|
async def fetch_private_messages(self, access_token: str, min_id: str = "0") -> list[dict]:
|
||||||
|
data = await self._request(
|
||||||
|
"GET",
|
||||||
|
"/message/private/loadOfflineMessage",
|
||||||
|
access_token,
|
||||||
|
params={"minId": str(min_id or "0")},
|
||||||
|
)
|
||||||
|
if data is None:
|
||||||
|
return []
|
||||||
|
if not isinstance(data, list):
|
||||||
|
raise BoxIMError("BOXIM 私聊消息格式不正确")
|
||||||
|
return [item for item in data if isinstance(item, dict)]
|
||||||
|
|
||||||
|
async def mark_private_messages_read(
|
||||||
|
self,
|
||||||
|
access_token: str,
|
||||||
|
friend_id: int | str,
|
||||||
|
message_id: int | str,
|
||||||
|
) -> None:
|
||||||
|
"""Mark one private conversation read through its latest received message."""
|
||||||
|
friend_id_text = str(friend_id).strip()
|
||||||
|
message_id_text = str(message_id).strip()
|
||||||
|
if not friend_id_text.isdigit() or not message_id_text.isdigit():
|
||||||
|
raise BoxIMError("BOXIM 已读回执参数不正确")
|
||||||
|
await self._request(
|
||||||
|
"PUT",
|
||||||
|
"/message/private/readed",
|
||||||
|
access_token,
|
||||||
|
params={
|
||||||
|
"friendId": int(friend_id_text),
|
||||||
|
"messageId": int(message_id_text),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
async def send_private_message(
|
||||||
|
self,
|
||||||
|
access_token: str,
|
||||||
|
peer_id: str,
|
||||||
|
content: str,
|
||||||
|
*,
|
||||||
|
local_id: int | str | None = None,
|
||||||
|
) -> dict:
|
||||||
|
local_id = int(local_id or (int(time.time() * 1000) * 1000 + secrets.randbelow(1000)))
|
||||||
|
data = await self._request(
|
||||||
|
"POST",
|
||||||
|
"/message/private/send",
|
||||||
|
access_token,
|
||||||
|
json={
|
||||||
|
"localId": local_id,
|
||||||
|
"recvId": int(peer_id) if str(peer_id).isdigit() else peer_id,
|
||||||
|
"content": content,
|
||||||
|
"type": 0,
|
||||||
|
"receipt": False,
|
||||||
|
"atUserIds": [],
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if not isinstance(data, dict):
|
||||||
|
raise BoxIMError("BOXIM 未返回发送结果")
|
||||||
|
return data
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from models import ChatAttachment
|
||||||
|
|
||||||
|
|
||||||
|
def purge_expired_chat_attachments(
|
||||||
|
db: Session,
|
||||||
|
*,
|
||||||
|
now: datetime | None = None,
|
||||||
|
) -> int:
|
||||||
|
"""Remove expired derived image data; raw image bytes are never persisted."""
|
||||||
|
count = db.query(ChatAttachment).filter(
|
||||||
|
ChatAttachment.expires_at < (now or datetime.utcnow())
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
if count:
|
||||||
|
db.commit()
|
||||||
|
db.expire_all()
|
||||||
|
return count
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import threading
|
||||||
|
import time
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class ChatModelConfig:
|
||||||
|
api_base_url: str
|
||||||
|
api_key: str
|
||||||
|
model: str
|
||||||
|
max_tokens: int
|
||||||
|
timeout_seconds: float
|
||||||
|
vision_model: str
|
||||||
|
ocr_model: str
|
||||||
|
vision_max_tokens: int
|
||||||
|
vision_timeout_seconds: float
|
||||||
|
source: str
|
||||||
|
|
||||||
|
|
||||||
|
_cache_lock = threading.Lock()
|
||||||
|
_cached_config: ChatModelConfig | None = None
|
||||||
|
_cache_expires_at = 0.0
|
||||||
|
|
||||||
|
|
||||||
|
def _environment_config() -> ChatModelConfig:
|
||||||
|
return ChatModelConfig(
|
||||||
|
api_base_url=os.getenv(
|
||||||
|
"CHAT_API_URL", "https://dashscope.aliyuncs.com/compatible-mode/v1"
|
||||||
|
).rstrip("/"),
|
||||||
|
api_key=os.getenv("CHAT_API_KEY", ""),
|
||||||
|
model=os.getenv("CHAT_MODEL", "qwen-plus"),
|
||||||
|
max_tokens=max(128, int(os.getenv("CHAT_MAX_OUTPUT_TOKENS", "1024"))),
|
||||||
|
timeout_seconds=max(5.0, float(os.getenv("CHAT_TIMEOUT_SECONDS", "30"))),
|
||||||
|
vision_model=os.getenv("VISION_MODEL", "qwen3.6-flash"),
|
||||||
|
ocr_model=os.getenv("VISION_OCR_MODEL", "qwen-vl-ocr"),
|
||||||
|
vision_max_tokens=max(256, int(os.getenv("VISION_MAX_OUTPUT_TOKENS", "2048"))),
|
||||||
|
vision_timeout_seconds=max(10.0, float(os.getenv("VISION_TIMEOUT_SECONDS", "90"))),
|
||||||
|
source="environment",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _fetch_runtime_config() -> ChatModelConfig | None:
|
||||||
|
url = os.getenv("CHAT_MODEL_CONFIG_URL", "").strip()
|
||||||
|
token = os.getenv("AVATAR_MODEL_CONFIG_TOKEN", "").strip()
|
||||||
|
if not url or not token:
|
||||||
|
return None
|
||||||
|
response = httpx.get(
|
||||||
|
url,
|
||||||
|
headers={"X-Avatar-Config-Token": token},
|
||||||
|
timeout=max(2.0, float(os.getenv("CHAT_MODEL_CONFIG_TIMEOUT_SECONDS", "5"))),
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
payload = response.json().get("data") or {}
|
||||||
|
api_base_url = str(payload.get("api_base_url") or "").rstrip("/")
|
||||||
|
api_key = str(payload.get("api_key") or "")
|
||||||
|
model = str(payload.get("model") or "")
|
||||||
|
if not api_base_url or not api_key or not model:
|
||||||
|
raise ValueError("数字分身专用模型配置不完整")
|
||||||
|
return ChatModelConfig(
|
||||||
|
api_base_url=api_base_url,
|
||||||
|
api_key=api_key,
|
||||||
|
model=model,
|
||||||
|
max_tokens=max(128, int(payload.get("max_tokens") or 1024)),
|
||||||
|
timeout_seconds=max(5.0, float(payload.get("timeout_seconds") or 30)),
|
||||||
|
vision_model=str(
|
||||||
|
payload.get("vision_model")
|
||||||
|
or os.getenv("VISION_MODEL", "qwen3.6-flash")
|
||||||
|
),
|
||||||
|
ocr_model=str(
|
||||||
|
payload.get("ocr_model")
|
||||||
|
or os.getenv("VISION_OCR_MODEL", "qwen-vl-ocr")
|
||||||
|
),
|
||||||
|
vision_max_tokens=max(
|
||||||
|
256, int(os.getenv("VISION_MAX_OUTPUT_TOKENS", "2048"))
|
||||||
|
),
|
||||||
|
vision_timeout_seconds=max(
|
||||||
|
10.0, float(os.getenv("VISION_TIMEOUT_SECONDS", "90"))
|
||||||
|
),
|
||||||
|
source="admin",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_chat_model_config(*, force_refresh: bool = False) -> ChatModelConfig:
|
||||||
|
global _cached_config, _cache_expires_at
|
||||||
|
|
||||||
|
now = time.monotonic()
|
||||||
|
if not force_refresh and _cached_config is not None and now < _cache_expires_at:
|
||||||
|
return _cached_config
|
||||||
|
|
||||||
|
with _cache_lock:
|
||||||
|
now = time.monotonic()
|
||||||
|
if not force_refresh and _cached_config is not None and now < _cache_expires_at:
|
||||||
|
return _cached_config
|
||||||
|
try:
|
||||||
|
config = _fetch_runtime_config() or _environment_config()
|
||||||
|
except (httpx.HTTPError, ValueError, TypeError) as exc:
|
||||||
|
logger.warning("读取数字分身专用模型配置失败,暂时使用环境变量配置: %s", exc)
|
||||||
|
config = _environment_config()
|
||||||
|
_cached_config = config
|
||||||
|
ttl = max(5, int(os.getenv("CHAT_MODEL_CONFIG_CACHE_SECONDS", "60")))
|
||||||
|
_cache_expires_at = now + ttl
|
||||||
|
return config
|
||||||
|
|
||||||
|
|
||||||
|
def clear_chat_model_config_cache() -> None:
|
||||||
|
global _cached_config, _cache_expires_at
|
||||||
|
with _cache_lock:
|
||||||
|
_cached_config = None
|
||||||
|
_cache_expires_at = 0.0
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
"""Signed client for Huihui's production payment-v3 service."""
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import random
|
||||||
|
import string
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
|
||||||
|
_CN_TZ = timezone(timedelta(hours=8))
|
||||||
|
|
||||||
|
|
||||||
|
class HuihuiPaymentError(RuntimeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class HuihuiPaymentClient:
|
||||||
|
def __init__(self, config: dict):
|
||||||
|
self.base_url = config.get(
|
||||||
|
"HUIHUI_PAYMENT_BASE_URL", "https://open.99hui.com/api/payment-v3"
|
||||||
|
).rstrip("/")
|
||||||
|
self.app_id = config.get("HUIHUI_APP_ID", "")
|
||||||
|
self.access_id = config.get("HUIHUI_ACCESS_ID", "")
|
||||||
|
self.access_secret = config.get("HUIHUI_ACCESS_SECRET", "")
|
||||||
|
self.timeout = float(config.get("HUIHUI_PAYMENT_TIMEOUT_SECONDS", 30))
|
||||||
|
|
||||||
|
@property
|
||||||
|
def configured(self) -> bool:
|
||||||
|
return bool(self.base_url and self.app_id and self.access_id and self.access_secret)
|
||||||
|
|
||||||
|
def _signed_params(self, user_id: str) -> dict:
|
||||||
|
params = {
|
||||||
|
"appId": self.app_id,
|
||||||
|
"accessId": self.access_id,
|
||||||
|
"nonce": "".join(random.choices(string.ascii_lowercase + string.digits, k=12)),
|
||||||
|
"timestamp": datetime.now(_CN_TZ).strftime("%Y%m%d%H%M%S"),
|
||||||
|
"signType": "MD5",
|
||||||
|
"signVersion": "1.0",
|
||||||
|
"userId": user_id,
|
||||||
|
}
|
||||||
|
source = "&".join(
|
||||||
|
f"{key}={params[key]}"
|
||||||
|
for key in sorted(params)
|
||||||
|
if params[key] not in (None, "", [])
|
||||||
|
)
|
||||||
|
source += f"&accessSecret={self.access_secret}"
|
||||||
|
params["signature"] = hashlib.md5(source.encode("utf-8")).hexdigest().upper()
|
||||||
|
return params
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _json(response: httpx.Response) -> dict:
|
||||||
|
try:
|
||||||
|
payload = response.json()
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HuihuiPaymentError("会会支付返回了无效响应") from exc
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HuihuiPaymentError("会会支付返回格式不正确")
|
||||||
|
return payload
|
||||||
|
|
||||||
|
def create_payment(
|
||||||
|
self,
|
||||||
|
*,
|
||||||
|
huihui_token: str,
|
||||||
|
huihui_user_id: str,
|
||||||
|
real_name: str,
|
||||||
|
order_no: str,
|
||||||
|
amount: str,
|
||||||
|
points_amount: int,
|
||||||
|
pay_type: str,
|
||||||
|
pay_way: str,
|
||||||
|
callback_url: str,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
if not self.configured:
|
||||||
|
raise HuihuiPaymentError("会会支付服务未配置")
|
||||||
|
if not huihui_token or not huihui_user_id:
|
||||||
|
raise HuihuiPaymentError("当前会会登录凭证无法发起支付")
|
||||||
|
|
||||||
|
now = datetime.now(_CN_TZ)
|
||||||
|
body = {
|
||||||
|
"appId": self.app_id,
|
||||||
|
"callbackUrl": callback_url,
|
||||||
|
"chargeType": 4,
|
||||||
|
"currency": "cny",
|
||||||
|
"description": f"充值 {points_amount} 积分",
|
||||||
|
"expend": {},
|
||||||
|
"masterOrderAmt": amount,
|
||||||
|
"masterOrderNo": order_no,
|
||||||
|
"memberId": huihui_user_id,
|
||||||
|
"orderDesc": "数字分身积分充值",
|
||||||
|
"orderTime": now.isoformat(),
|
||||||
|
"orderTitle": "数字分身积分充值",
|
||||||
|
"payAmt": float(amount),
|
||||||
|
"payType": pay_type,
|
||||||
|
"payWay": pay_way,
|
||||||
|
"realName": real_name or "会会用户",
|
||||||
|
"timeExpire": (now + timedelta(hours=2)).strftime("%Y%m%d%H%M%S"),
|
||||||
|
}
|
||||||
|
headers = {
|
||||||
|
"Authorization": f"Bearer {huihui_token}",
|
||||||
|
"appId": self.app_id,
|
||||||
|
"windowAppId": self.app_id,
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
response = httpx.post(
|
||||||
|
f"{self.base_url}/payment/pay",
|
||||||
|
headers=headers,
|
||||||
|
params=self._signed_params(huihui_user_id),
|
||||||
|
json=body,
|
||||||
|
timeout=self.timeout,
|
||||||
|
follow_redirects=True,
|
||||||
|
)
|
||||||
|
except httpx.HTTPError as exc:
|
||||||
|
raise HuihuiPaymentError("会会支付连接失败,请稍后重试") from exc
|
||||||
|
|
||||||
|
payload = self._json(response)
|
||||||
|
code = payload.get("code")
|
||||||
|
if response.status_code >= 400 or code not in (0, 200, "0", "200"):
|
||||||
|
raise HuihuiPaymentError(payload.get("message") or "会会支付下单失败")
|
||||||
|
data = payload.get("data") or {}
|
||||||
|
if not isinstance(data, dict):
|
||||||
|
raise HuihuiPaymentError("会会支付未返回订单信息")
|
||||||
|
return data
|
||||||
@@ -1,174 +1,759 @@
|
|||||||
"""Takeover service — message listening, decision, reply execution."""
|
"""Restart-safe automatic replies over Huihui's self-hosted BOXIM."""
|
||||||
import json
|
|
||||||
|
import asyncio
|
||||||
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
import os
|
import re
|
||||||
from typing import Optional
|
import secrets
|
||||||
|
import time
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import Callable
|
||||||
|
|
||||||
import httpx
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from models import Avatar, Authorization
|
from models import (
|
||||||
from services.boxim_client import BoxIMClient
|
Avatar,
|
||||||
|
TakeoverCursor,
|
||||||
|
TakeoverMessage,
|
||||||
|
TakeoverReplyTask,
|
||||||
|
User,
|
||||||
|
)
|
||||||
|
from services.boxim_client import BoxIMClient, BoxIMError
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
ACTIVE_TASK_STATUSES = ("pending", "generating", "ready", "sending")
|
||||||
|
GENERATABLE_TASK_STATUSES = ("pending",)
|
||||||
|
MAX_PROMPT_LENGTH = 4000
|
||||||
|
MAX_STALE_SECONDS = 120
|
||||||
|
STUCK_LOCK_SECONDS = 90
|
||||||
|
TAKEOVER_PERMISSION = "takeover"
|
||||||
|
TAKEOVER_DELAY_KEY = "takeoverReplyDelaySeconds"
|
||||||
|
DEFAULT_REPLY_DELAY_SECONDS = 180
|
||||||
|
MIN_REPLY_DELAY_SECONDS = 3
|
||||||
|
MAX_REPLY_DELAY_SECONDS = 86_400
|
||||||
|
HUMAN_PAUSE_SECONDS = 600
|
||||||
|
RATE_LIMIT_WINDOW_SECONDS = 300
|
||||||
|
RATE_LIMIT_MAX_REPLIES = 5
|
||||||
|
AVATAR_LOCAL_ID_PREFIX = "880"
|
||||||
|
|
||||||
|
|
||||||
|
def _utcnow() -> datetime:
|
||||||
|
return datetime.utcnow()
|
||||||
|
|
||||||
|
|
||||||
|
def _takeover_enabled(avatar: Avatar | None) -> bool:
|
||||||
|
if not avatar or avatar.status != "active":
|
||||||
|
return False
|
||||||
|
permissions = (avatar.config or {}).get("authorizationPermissions", [])
|
||||||
|
return isinstance(permissions, list) and TAKEOVER_PERMISSION in permissions
|
||||||
|
|
||||||
|
|
||||||
|
def _boxim_time(value, fallback: datetime) -> datetime:
|
||||||
|
try:
|
||||||
|
timestamp = float(value)
|
||||||
|
if timestamp > 10_000_000_000:
|
||||||
|
timestamp /= 1000
|
||||||
|
return datetime.utcfromtimestamp(timestamp)
|
||||||
|
except (TypeError, ValueError, OSError, OverflowError):
|
||||||
|
return fallback
|
||||||
|
|
||||||
|
|
||||||
|
def _numeric_id(value) -> int:
|
||||||
|
try:
|
||||||
|
return int(value)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def _plain_text_reply(value: str) -> str:
|
||||||
|
"""BOXIM is plain text, so remove Markdown markers without damaging paragraphs."""
|
||||||
|
text = (value or "").replace("\r\n", "\n").replace("\r", "\n")
|
||||||
|
text = re.sub(r"```(?:\w+)?\n?(.*?)```", r"\1", text, flags=re.S)
|
||||||
|
text = re.sub(r"\*\*(.*?)\*\*|__(.*?)__", lambda m: m.group(1) or m.group(2), text)
|
||||||
|
text = re.sub(r"(?<!\*)\*([^*\n]+)\*(?!\*)", r"\1", text)
|
||||||
|
text = re.sub(r"`([^`]+)`", r"\1", text)
|
||||||
|
text = re.sub(r"^\s{0,3}#{1,6}\s*", "", text, flags=re.M)
|
||||||
|
lines = [line.strip() for line in text.split("\n")]
|
||||||
|
return "\n".join(line for line in lines if line).strip()
|
||||||
|
|
||||||
|
|
||||||
|
def _avatar_local_id(owner_id: str, trigger_message_id: str) -> str:
|
||||||
|
"""Build a deterministic BOXIM idempotency key that also marks avatar traffic."""
|
||||||
|
digest = hashlib.sha256(f"{owner_id}:{trigger_message_id}".encode("utf-8")).digest()
|
||||||
|
suffix = int.from_bytes(digest[:8], "big") % (10**15)
|
||||||
|
return f"{AVATAR_LOCAL_ID_PREFIX}{suffix:015d}"
|
||||||
|
|
||||||
|
|
||||||
|
def _is_avatar_local_id(value: str | None) -> bool:
|
||||||
|
local_id = str(value or "").strip()
|
||||||
|
return len(local_id) == 18 and local_id.isdigit() and local_id.startswith(AVATAR_LOCAL_ID_PREFIX)
|
||||||
|
|
||||||
|
|
||||||
|
def _configured_reply_delay(avatar: Avatar, fallback: int | None = None) -> int:
|
||||||
|
raw = (avatar.config or {}).get(
|
||||||
|
TAKEOVER_DELAY_KEY,
|
||||||
|
fallback if fallback is not None else DEFAULT_REPLY_DELAY_SECONDS,
|
||||||
|
)
|
||||||
|
if isinstance(raw, bool):
|
||||||
|
return DEFAULT_REPLY_DELAY_SECONDS
|
||||||
|
try:
|
||||||
|
delay = int(raw)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
return DEFAULT_REPLY_DELAY_SECONDS
|
||||||
|
if not MIN_REPLY_DELAY_SECONDS <= delay <= MAX_REPLY_DELAY_SECONDS:
|
||||||
|
return DEFAULT_REPLY_DELAY_SECONDS
|
||||||
|
return delay
|
||||||
|
|
||||||
|
|
||||||
class TakeoverService:
|
class TakeoverService:
|
||||||
"""Service for handling avatar takeover — generating replies and sending them via IM."""
|
"""Poll BOXIM, honor the owner grace period, then generate and send one reply."""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
db: Session,
|
session_factory: Callable[[], Session],
|
||||||
boxim_client: BoxIMClient,
|
boxim_client: BoxIMClient,
|
||||||
redis_client=None,
|
*,
|
||||||
|
reply_delay_seconds: int | None = None,
|
||||||
|
now: Callable[[], datetime] = _utcnow,
|
||||||
):
|
):
|
||||||
self.db = db
|
self.session_factory = session_factory
|
||||||
self.boxim = boxim_client
|
self.boxim = boxim_client
|
||||||
self.redis = redis_client
|
self.reply_delay_seconds = reply_delay_seconds
|
||||||
self._chat_api_base = os.getenv(
|
self.now = now
|
||||||
"TAKEOVER_CHAT_API_BASE", "http://localhost:8000/api"
|
self._sessions: dict[str, dict] = {}
|
||||||
)
|
self._poll_lock = asyncio.Lock()
|
||||||
|
self._process_lock = asyncio.Lock()
|
||||||
def check_takeover_enabled(
|
|
||||||
self, owner_huihui_id: str, from_user_id: str
|
|
||||||
) -> Optional[Authorization]:
|
|
||||||
"""Check whether takeover is enabled for the given target user."""
|
|
||||||
avatar = self.db.query(Avatar).filter(Avatar.owner_id == owner_huihui_id).first()
|
|
||||||
if not avatar:
|
|
||||||
return None
|
|
||||||
|
|
||||||
auth = (
|
|
||||||
self.db.query(Authorization)
|
|
||||||
.filter(Authorization.avatar_id == avatar.id)
|
|
||||||
.filter(Authorization.target_id == from_user_id)
|
|
||||||
.filter(Authorization.takeover_enabled == True)
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
return auth if auth and auth.takeover_enabled else None
|
|
||||||
|
|
||||||
async def generate_reply(self, avatar_id: str, message: str) -> str:
|
|
||||||
"""Call the avatar chat endpoint to generate a reply."""
|
|
||||||
try:
|
|
||||||
async with httpx.AsyncClient(timeout=30) as client:
|
|
||||||
r = await client.post(
|
|
||||||
f"{self._chat_api_base}/avatar/{avatar_id}/chat",
|
|
||||||
json={"message": message, "history": []},
|
|
||||||
)
|
|
||||||
data = r.json()
|
|
||||||
if data.get("code") in (0, 200):
|
|
||||||
return data.get("data", {}).get("answer", "")
|
|
||||||
logger.warning(f"Avatar chat API returned error code: {data}")
|
|
||||||
return ""
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Failed to call avatar chat API: {e}")
|
|
||||||
return ""
|
|
||||||
|
|
||||||
async def execute_takeover(self, auth: Authorization, message: dict) -> bool:
|
|
||||||
"""Execute takeover: generate a reply and send it as the owner via IM."""
|
|
||||||
try:
|
|
||||||
# Resolve owner through Avatar model
|
|
||||||
avatar = self.db.query(Avatar).filter(Avatar.id == auth.avatar_id).first()
|
|
||||||
if not avatar:
|
|
||||||
logger.warning(f"Avatar not found: {auth.avatar_id}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
owner_huihui_id = avatar.owner_id
|
|
||||||
credentials = await self.boxim.get_credentials(owner_huihui_id)
|
|
||||||
if not credentials:
|
|
||||||
logger.warning(f"Cannot obtain IM credentials for owner: {owner_huihui_id}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
reply = await self.generate_reply(auth.avatar_id, message.get("content", ""))
|
|
||||||
if not reply:
|
|
||||||
logger.warning("Avatar did not generate a reply")
|
|
||||||
return False
|
|
||||||
|
|
||||||
success = await self.boxim.send_p2p_message(
|
|
||||||
from_accid=credentials["accid"],
|
|
||||||
to_accid=message.get("from_accid", ""),
|
|
||||||
content=reply,
|
|
||||||
)
|
|
||||||
if success:
|
|
||||||
logger.info(f"Takeover reply sent successfully: {reply[:50]}...")
|
|
||||||
return success
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Takeover execution failed: {e}")
|
|
||||||
return False
|
|
||||||
|
|
||||||
def enqueue_delayed_message(self, auth: Authorization, message: dict):
|
|
||||||
"""Write a message into the Redis delayed queue (TTL = delay + 10s buffer)."""
|
|
||||||
if not self.redis:
|
|
||||||
logger.warning("Redis not configured, degrading to immediate takeover")
|
|
||||||
return
|
|
||||||
|
|
||||||
avatar = self.db.query(Avatar).filter(Avatar.id == auth.avatar_id).first()
|
|
||||||
owner_huihui_id = avatar.owner_id if avatar else ""
|
|
||||||
key = f"takeover:delayed:{auth.target_id}:{message.get('msg_id', '')}"
|
|
||||||
value = json.dumps({
|
|
||||||
"avatar_id": auth.avatar_id,
|
|
||||||
"from_accid": message.get("from_accid", ""),
|
|
||||||
"content": message.get("content", ""),
|
|
||||||
"owner_huihui_id": owner_huihui_id,
|
|
||||||
})
|
|
||||||
self.redis.setex(key, auth.takeover_delay_seconds + 10, value)
|
|
||||||
logger.info(f"Message enqueued to delayed queue: {key}")
|
|
||||||
|
|
||||||
async def process_delayed_queue(self):
|
|
||||||
"""Process expired messages from the delayed queue.
|
|
||||||
|
|
||||||
Scans Redis keys matching the takeover:delayed: pattern and dispatches
|
|
||||||
each to execute_takeover after resolving the Authorization.
|
|
||||||
"""
|
|
||||||
if not self.redis:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
pattern = "takeover:delayed:*"
|
|
||||||
keys = self.redis.keys(pattern)
|
|
||||||
for key in keys:
|
|
||||||
raw = self.redis.get(key)
|
|
||||||
if not raw:
|
|
||||||
continue
|
|
||||||
data = json.loads(raw)
|
|
||||||
auth = (
|
|
||||||
self.db.query(Authorization)
|
|
||||||
.filter(Authorization.target_id == key.split(":")[2])
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if auth:
|
|
||||||
message = {
|
|
||||||
"msg_id": key.split(":")[-1],
|
|
||||||
"from_accid": data.get("from_accid", ""),
|
|
||||||
"content": data.get("content", ""),
|
|
||||||
}
|
|
||||||
await self.execute_takeover(auth, message)
|
|
||||||
self.redis.delete(key)
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Failed to process delayed queue: {e}")
|
|
||||||
|
|
||||||
async def poll_and_process_messages(self):
|
async def poll_and_process_messages(self):
|
||||||
"""Periodic polling job: fetch unread messages and process each."""
|
"""Run one complete cycle for callers that do not use the split scheduler."""
|
||||||
|
await self.poll_messages()
|
||||||
|
await self.process_reply_tasks()
|
||||||
|
|
||||||
|
async def poll_messages(self):
|
||||||
|
"""Fetch BOXIM events without blocking reply generation and dispatch."""
|
||||||
|
if self._poll_lock.locked():
|
||||||
|
return
|
||||||
|
async with self._poll_lock:
|
||||||
|
self._recover_stuck_tasks()
|
||||||
|
avatar_ids = self._enabled_avatar_ids()
|
||||||
|
self._cancel_disabled_tasks(set(avatar_ids))
|
||||||
|
for avatar_id in avatar_ids:
|
||||||
|
await self._sync_avatar(avatar_id)
|
||||||
|
|
||||||
|
async def process_reply_tasks(self):
|
||||||
|
"""Generate and send replies independently from BOXIM's long poll."""
|
||||||
|
if self._process_lock.locked():
|
||||||
|
return
|
||||||
|
async with self._process_lock:
|
||||||
|
self._recover_stuck_tasks()
|
||||||
|
avatar_ids = set(self._enabled_avatar_ids())
|
||||||
|
self._cancel_disabled_tasks(avatar_ids)
|
||||||
|
await self._prepare_replies()
|
||||||
|
await self._dispatch_ready_replies()
|
||||||
|
|
||||||
|
def _enabled_avatar_ids(self) -> list[str]:
|
||||||
|
db = self.session_factory()
|
||||||
try:
|
try:
|
||||||
messages = await self.fetch_unread_messages()
|
avatars = (
|
||||||
for msg in messages:
|
db.query(Avatar)
|
||||||
await self.process_message(msg)
|
.filter(Avatar.status == "active")
|
||||||
except Exception as e:
|
.order_by(Avatar.updated_at.desc(), Avatar.created_at.desc())
|
||||||
logger.error(f"poll_and_process_messages failed: {e}")
|
.all()
|
||||||
|
)
|
||||||
|
selected = {}
|
||||||
|
for avatar in avatars:
|
||||||
|
if _takeover_enabled(avatar) and avatar.owner_id not in selected:
|
||||||
|
selected[avatar.owner_id] = avatar.id
|
||||||
|
return list(selected.values())
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
async def fetch_unread_messages(self) -> list:
|
def _cancel_disabled_tasks(self, enabled_avatar_ids: set[str]):
|
||||||
"""Fetch unread messages from Box IM. Stub — replace with real API call."""
|
db = self.session_factory()
|
||||||
logger.debug("fetch_unread_messages: no real API wired yet")
|
try:
|
||||||
return []
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(TakeoverReplyTask.status.in_(ACTIVE_TASK_STATUSES))
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
changed = False
|
||||||
|
for task in tasks:
|
||||||
|
if task.avatar_id not in enabled_avatar_ids:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "takeover_disabled"
|
||||||
|
task.locked_at = None
|
||||||
|
changed = True
|
||||||
|
if changed:
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
async def process_message(self, message: dict):
|
def _recover_stuck_tasks(self):
|
||||||
"""Process a single message: check takeover, dispatch immediate or delayed."""
|
db = self.session_factory()
|
||||||
owner_id = message.get("owner_huihui_id", "")
|
try:
|
||||||
from_id = message.get("from_accid", "")
|
threshold = self.now() - timedelta(seconds=STUCK_LOCK_SECONDS)
|
||||||
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.status.in_(("generating", "sending")),
|
||||||
|
TakeoverReplyTask.locked_at.isnot(None),
|
||||||
|
TakeoverReplyTask.locked_at < threshold,
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for task in tasks:
|
||||||
|
task.status = "pending" if task.status == "generating" else "ready"
|
||||||
|
task.locked_at = None
|
||||||
|
task.last_error = "上次处理意外中断,已自动恢复"
|
||||||
|
if tasks:
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
auth = self.check_takeover_enabled(owner_id, from_id)
|
async def _boxim_session(self, user: User) -> dict:
|
||||||
if not auth:
|
token_fingerprint = hashlib.sha256((user.huihui_token or "").encode()).hexdigest()
|
||||||
|
cached = self._sessions.get(user.id)
|
||||||
|
if (
|
||||||
|
cached
|
||||||
|
and cached["expires_at"] > time.monotonic()
|
||||||
|
and cached["token_fingerprint"] == token_fingerprint
|
||||||
|
):
|
||||||
|
return cached
|
||||||
|
|
||||||
|
token_data = await self.boxim.exchange_access_token(user.huihui_token)
|
||||||
|
access_token = token_data["accessToken"]
|
||||||
|
profile = await self.boxim.get_self(access_token)
|
||||||
|
try:
|
||||||
|
expires_in = int(token_data.get("accessTokenExpiresIn") or 3600)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
expires_in = 3600
|
||||||
|
if expires_in > 86_400:
|
||||||
|
expires_in //= 1000
|
||||||
|
cache_for = max(60, min(expires_in - 60, 3600))
|
||||||
|
cached = {
|
||||||
|
"access_token": access_token,
|
||||||
|
"boxim_owner_id": str(profile["id"]),
|
||||||
|
"expires_at": time.monotonic() + cache_for,
|
||||||
|
"token_fingerprint": token_fingerprint,
|
||||||
|
}
|
||||||
|
self._sessions[user.id] = cached
|
||||||
|
return cached
|
||||||
|
|
||||||
|
def _forget_boxim_session(self, user_id: str):
|
||||||
|
self._sessions.pop(user_id, None)
|
||||||
|
|
||||||
|
def _record_connection_failure(
|
||||||
|
self,
|
||||||
|
db: Session,
|
||||||
|
avatar: Avatar,
|
||||||
|
cursor: TakeoverCursor,
|
||||||
|
message: str,
|
||||||
|
*,
|
||||||
|
disable_takeover: bool,
|
||||||
|
):
|
||||||
|
cursor.last_error = message
|
||||||
|
cursor.last_polled_at = self.now()
|
||||||
|
if not disable_takeover:
|
||||||
return
|
return
|
||||||
|
|
||||||
if auth.takeover_mode == "immediate":
|
permissions = (avatar.config or {}).get("authorizationPermissions", [])
|
||||||
await self.execute_takeover(auth, message)
|
avatar.config = {
|
||||||
|
**(avatar.config or {}),
|
||||||
|
"authorizationPermissions": [
|
||||||
|
permission
|
||||||
|
for permission in permissions
|
||||||
|
if permission != TAKEOVER_PERMISSION
|
||||||
|
],
|
||||||
|
}
|
||||||
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.avatar_id == avatar.id,
|
||||||
|
TakeoverReplyTask.status.in_(ACTIVE_TASK_STATUSES),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for task in tasks:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "connection_failed"
|
||||||
|
task.locked_at = None
|
||||||
|
|
||||||
|
async def _sync_avatar(self, avatar_id: str) -> bool:
|
||||||
|
db = self.session_factory()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == avatar_id).first()
|
||||||
|
if not _takeover_enabled(avatar):
|
||||||
|
return False
|
||||||
|
user = db.query(User).filter(User.huihui_user_id == avatar.owner_id).first()
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar.id).first()
|
||||||
|
if not cursor:
|
||||||
|
cursor = TakeoverCursor(avatar_id=avatar.id, owner_id=avatar.owner_id)
|
||||||
|
db.add(cursor)
|
||||||
|
db.flush()
|
||||||
|
if not user or not user.huihui_token:
|
||||||
|
self._record_connection_failure(
|
||||||
|
db,
|
||||||
|
avatar,
|
||||||
|
cursor,
|
||||||
|
"请重新登录会会生产账号后再开启主动接管",
|
||||||
|
disable_takeover=True,
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
session = await self._boxim_session(user)
|
||||||
|
owner_boxim_id = session["boxim_owner_id"]
|
||||||
|
if cursor.boxim_owner_id and cursor.boxim_owner_id != owner_boxim_id:
|
||||||
|
cursor.initialized = False
|
||||||
|
cursor.last_message_id = "0"
|
||||||
|
cursor.boxim_owner_id = owner_boxim_id
|
||||||
|
messages = await self.boxim.fetch_private_messages(
|
||||||
|
session["access_token"], cursor.last_message_id or "0"
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
if isinstance(exc, BoxIMError) and exc.auth_error:
|
||||||
|
self._forget_boxim_session(user.id)
|
||||||
|
message = "BOXIM 授权已失效,请重新登录会会生产账号"
|
||||||
|
disable_takeover = True
|
||||||
|
else:
|
||||||
|
message = f"BOXIM 暂时连接失败:{str(exc)[:160]}"
|
||||||
|
disable_takeover = False
|
||||||
|
self._record_connection_failure(
|
||||||
|
db,
|
||||||
|
avatar,
|
||||||
|
cursor,
|
||||||
|
message,
|
||||||
|
disable_takeover=disable_takeover,
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
logger.warning(
|
||||||
|
"BOXIM sync failed for avatar %s (will_retry=%s): %s",
|
||||||
|
avatar.id,
|
||||||
|
not disable_takeover,
|
||||||
|
exc,
|
||||||
|
)
|
||||||
|
return False
|
||||||
|
|
||||||
|
messages.sort(key=lambda item: (_numeric_id(item.get("id")), item.get("sendTime") or 0))
|
||||||
|
priming = not bool(cursor.initialized)
|
||||||
|
max_message_id = _numeric_id(cursor.last_message_id)
|
||||||
|
read_receipts: dict[str, int] = {}
|
||||||
|
for message in messages:
|
||||||
|
self._record_message(
|
||||||
|
db,
|
||||||
|
avatar,
|
||||||
|
cursor.boxim_owner_id,
|
||||||
|
message,
|
||||||
|
schedule_reply=not priming,
|
||||||
|
)
|
||||||
|
message_id = _numeric_id(message.get("id"))
|
||||||
|
max_message_id = max(max_message_id, message_id)
|
||||||
|
send_id = str(message.get("sendId") or "")
|
||||||
|
recv_id = str(message.get("recvId") or "")
|
||||||
|
if recv_id == cursor.boxim_owner_id and send_id and message_id:
|
||||||
|
read_receipts[send_id] = max(read_receipts.get(send_id, 0), message_id)
|
||||||
|
|
||||||
|
# BOXIM publishes this HTTP state change to connected socket clients.
|
||||||
|
# Do it before advancing the cursor so a failed receipt is retried.
|
||||||
|
for peer_id, message_id in read_receipts.items():
|
||||||
|
await self.boxim.mark_private_messages_read(
|
||||||
|
session["access_token"], peer_id, message_id
|
||||||
|
)
|
||||||
|
|
||||||
|
cursor.last_message_id = str(max_message_id)
|
||||||
|
cursor.initialized = True
|
||||||
|
cursor.last_polled_at = self.now()
|
||||||
|
cursor.last_error = ""
|
||||||
|
db.commit()
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
db.rollback()
|
||||||
|
logger.exception("Failed to persist BOXIM messages for avatar %s", avatar_id)
|
||||||
|
return False
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
def _record_message(
|
||||||
|
self,
|
||||||
|
db: Session,
|
||||||
|
avatar: Avatar,
|
||||||
|
boxim_owner_id: str,
|
||||||
|
message: dict,
|
||||||
|
*,
|
||||||
|
schedule_reply: bool,
|
||||||
|
):
|
||||||
|
message_id = str(message.get("id") or "").strip()
|
||||||
|
if not message_id:
|
||||||
|
return
|
||||||
|
local_id = str(message.get("localId") or "").strip() or None
|
||||||
|
if (
|
||||||
|
db.query(TakeoverMessage)
|
||||||
|
.filter(
|
||||||
|
TakeoverMessage.owner_id == avatar.owner_id,
|
||||||
|
TakeoverMessage.boxim_message_id == message_id,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
):
|
||||||
|
return
|
||||||
|
|
||||||
|
send_id = str(message.get("sendId") or "")
|
||||||
|
recv_id = str(message.get("recvId") or "")
|
||||||
|
if send_id == boxim_owner_id:
|
||||||
|
direction, peer_id = "outgoing", recv_id
|
||||||
|
elif recv_id == boxim_owner_id:
|
||||||
|
direction, peer_id = "incoming", send_id
|
||||||
else:
|
else:
|
||||||
self.enqueue_delayed_message(auth, message)
|
return
|
||||||
|
if not peer_id:
|
||||||
|
return
|
||||||
|
|
||||||
|
now = self.now()
|
||||||
|
send_time = _boxim_time(message.get("sendTime"), now)
|
||||||
|
is_avatar = _is_avatar_local_id(local_id)
|
||||||
|
if not is_avatar and local_id:
|
||||||
|
is_avatar = bool(
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.boxim_local_id == local_id,
|
||||||
|
TakeoverReplyTask.status.in_(("ready", "sending", "sent")),
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not is_avatar:
|
||||||
|
is_avatar = bool(
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.boxim_sent_message_id == message_id,
|
||||||
|
TakeoverReplyTask.status == "sent",
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
|
||||||
|
event = TakeoverMessage(
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
owner_id=avatar.owner_id,
|
||||||
|
boxim_message_id=message_id,
|
||||||
|
boxim_local_id=local_id,
|
||||||
|
peer_id=peer_id,
|
||||||
|
direction=direction,
|
||||||
|
message_type=int(message.get("type") or 0),
|
||||||
|
content=str(message.get("content") or ""),
|
||||||
|
is_avatar=is_avatar,
|
||||||
|
send_time=send_time,
|
||||||
|
)
|
||||||
|
db.add(event)
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
if direction == "outgoing":
|
||||||
|
if not is_avatar:
|
||||||
|
self._cancel_conversation(db, avatar.owner_id, peer_id, "owner_replied")
|
||||||
|
return
|
||||||
|
if not schedule_reply or event.message_type != 0 or not event.content.strip():
|
||||||
|
return
|
||||||
|
if (now - send_time).total_seconds() > MAX_STALE_SECONDS:
|
||||||
|
return
|
||||||
|
if is_avatar:
|
||||||
|
self._cancel_conversation(db, avatar.owner_id, peer_id, "peer_avatar_message")
|
||||||
|
return
|
||||||
|
if self._human_pause_active(db, avatar.owner_id, peer_id, now):
|
||||||
|
self._cancel_conversation(db, avatar.owner_id, peer_id, "owner_active")
|
||||||
|
return
|
||||||
|
if self._conversation_rate_limited(db, avatar.owner_id, peer_id, now):
|
||||||
|
self._cancel_conversation(db, avatar.owner_id, peer_id, "rate_limited")
|
||||||
|
return
|
||||||
|
self._schedule_reply(db, avatar, event)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _human_pause_active(db: Session, owner_id: str, peer_id: str, now: datetime) -> bool:
|
||||||
|
threshold = now - timedelta(seconds=HUMAN_PAUSE_SECONDS)
|
||||||
|
return bool(
|
||||||
|
db.query(TakeoverMessage.id)
|
||||||
|
.filter(
|
||||||
|
TakeoverMessage.owner_id == owner_id,
|
||||||
|
TakeoverMessage.peer_id == peer_id,
|
||||||
|
TakeoverMessage.direction == "outgoing",
|
||||||
|
TakeoverMessage.is_avatar.is_(False),
|
||||||
|
TakeoverMessage.send_time >= threshold,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _conversation_rate_limited(
|
||||||
|
db: Session,
|
||||||
|
owner_id: str,
|
||||||
|
peer_id: str,
|
||||||
|
now: datetime,
|
||||||
|
) -> bool:
|
||||||
|
threshold = now - timedelta(seconds=RATE_LIMIT_WINDOW_SECONDS)
|
||||||
|
return (
|
||||||
|
db.query(TakeoverReplyTask.id)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.owner_id == owner_id,
|
||||||
|
TakeoverReplyTask.peer_id == peer_id,
|
||||||
|
TakeoverReplyTask.status == "sent",
|
||||||
|
TakeoverReplyTask.sent_at >= threshold,
|
||||||
|
)
|
||||||
|
.count()
|
||||||
|
>= RATE_LIMIT_MAX_REPLIES
|
||||||
|
)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _cancel_conversation(db: Session, owner_id: str, peer_id: str, reason: str):
|
||||||
|
tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.owner_id == owner_id,
|
||||||
|
TakeoverReplyTask.peer_id == peer_id,
|
||||||
|
TakeoverReplyTask.status.in_(ACTIVE_TASK_STATUSES),
|
||||||
|
)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
for task in tasks:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = reason
|
||||||
|
task.locked_at = None
|
||||||
|
|
||||||
|
def _schedule_reply(self, db: Session, avatar: Avatar, event: TakeoverMessage):
|
||||||
|
active_tasks = (
|
||||||
|
db.query(TakeoverReplyTask)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.owner_id == avatar.owner_id,
|
||||||
|
TakeoverReplyTask.peer_id == event.peer_id,
|
||||||
|
TakeoverReplyTask.status.in_(("pending", "generating", "ready")),
|
||||||
|
)
|
||||||
|
.order_by(TakeoverReplyTask.created_at.desc())
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
prompt_parts = []
|
||||||
|
source_ids = []
|
||||||
|
if active_tasks:
|
||||||
|
latest = active_tasks[0]
|
||||||
|
prompt_parts.append(latest.prompt)
|
||||||
|
source_ids.extend(latest.source_message_ids or [])
|
||||||
|
for task in active_tasks:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "newer_incoming_message"
|
||||||
|
task.locked_at = None
|
||||||
|
prompt_parts.append(event.content.strip())
|
||||||
|
source_ids.append(event.boxim_message_id)
|
||||||
|
prompt = "\n".join(part for part in prompt_parts if part).strip()[-MAX_PROMPT_LENGTH:]
|
||||||
|
due_at = event.send_time + timedelta(
|
||||||
|
seconds=_configured_reply_delay(avatar, self.reply_delay_seconds)
|
||||||
|
)
|
||||||
|
task_id = secrets.token_hex(16)
|
||||||
|
local_id = _avatar_local_id(avatar.owner_id, event.boxim_message_id)
|
||||||
|
db.add(
|
||||||
|
TakeoverReplyTask(
|
||||||
|
id=task_id,
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
owner_id=avatar.owner_id,
|
||||||
|
peer_id=event.peer_id,
|
||||||
|
trigger_message_id=event.boxim_message_id,
|
||||||
|
source_message_ids=source_ids,
|
||||||
|
prompt=prompt,
|
||||||
|
status="pending",
|
||||||
|
scheduled_at=due_at,
|
||||||
|
boxim_local_id=str(local_id),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
async def _prepare_replies(self) -> int:
|
||||||
|
db = self.session_factory()
|
||||||
|
try:
|
||||||
|
task_ids = [
|
||||||
|
row[0]
|
||||||
|
for row in (
|
||||||
|
db.query(TakeoverReplyTask.id)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.status.in_(GENERATABLE_TASK_STATUSES),
|
||||||
|
TakeoverReplyTask.response_text == "",
|
||||||
|
TakeoverReplyTask.scheduled_at <= self.now(),
|
||||||
|
)
|
||||||
|
.order_by(TakeoverReplyTask.created_at.asc())
|
||||||
|
.limit(10)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
if not task_ids:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
# Each conversation owns its task, so unrelated contacts can generate in
|
||||||
|
# parallel instead of one slow model response delaying every other peer.
|
||||||
|
semaphore = asyncio.Semaphore(4)
|
||||||
|
|
||||||
|
async def generate(task_id: str) -> bool:
|
||||||
|
async with semaphore:
|
||||||
|
return await asyncio.to_thread(self._generate_reply, task_id)
|
||||||
|
|
||||||
|
results = await asyncio.gather(*(generate(task_id) for task_id in task_ids))
|
||||||
|
return sum(bool(result) for result in results)
|
||||||
|
|
||||||
|
def _generate_reply(self, task_id: str) -> bool:
|
||||||
|
db = self.session_factory()
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.id == task_id).first()
|
||||||
|
if not task or task.status != "pending":
|
||||||
|
return False
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == task.avatar_id).first()
|
||||||
|
if not _takeover_enabled(avatar):
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "takeover_disabled"
|
||||||
|
db.commit()
|
||||||
|
return False
|
||||||
|
|
||||||
|
task.status = "generating"
|
||||||
|
task.locked_at = self.now()
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
excluded_ids = set(task.source_message_ids or [])
|
||||||
|
events = (
|
||||||
|
db.query(TakeoverMessage)
|
||||||
|
.filter(
|
||||||
|
TakeoverMessage.owner_id == task.owner_id,
|
||||||
|
TakeoverMessage.peer_id == task.peer_id,
|
||||||
|
TakeoverMessage.avatar_id == task.avatar_id,
|
||||||
|
)
|
||||||
|
.order_by(TakeoverMessage.send_time.desc())
|
||||||
|
.limit(30)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
history = []
|
||||||
|
for event in reversed(events):
|
||||||
|
if event.boxim_message_id in excluded_ids or not event.content.strip():
|
||||||
|
continue
|
||||||
|
if event.direction == "incoming" and event.is_avatar:
|
||||||
|
continue
|
||||||
|
history.append(
|
||||||
|
{
|
||||||
|
"role": "user" if event.direction == "incoming" else "assistant",
|
||||||
|
"content": event.content.strip(),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
history = history[-10:]
|
||||||
|
|
||||||
|
from routers.chat import _resolve_reply
|
||||||
|
|
||||||
|
result = _resolve_reply(db, avatar, task.prompt, history, usage_source="takeover")
|
||||||
|
answer = _plain_text_reply(result.get("answer", ""))
|
||||||
|
db.refresh(task)
|
||||||
|
if task.status != "generating":
|
||||||
|
return False
|
||||||
|
if not answer:
|
||||||
|
raise RuntimeError("分身没有生成有效回复")
|
||||||
|
task.response_text = answer
|
||||||
|
task.status = "ready"
|
||||||
|
task.locked_at = None
|
||||||
|
task.last_error = ""
|
||||||
|
db.commit()
|
||||||
|
return True
|
||||||
|
except Exception as exc:
|
||||||
|
db.rollback()
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.id == task_id).first()
|
||||||
|
if task and task.status in ("pending", "generating"):
|
||||||
|
task.attempts = (task.attempts or 0) + 1
|
||||||
|
task.status = "pending" if task.attempts < 3 else "failed"
|
||||||
|
task.locked_at = None
|
||||||
|
task.last_error = str(exc)[:300]
|
||||||
|
db.commit()
|
||||||
|
logger.warning("Failed to prepare takeover reply %s: %s", task_id, exc)
|
||||||
|
return False
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
async def _dispatch_ready_replies(self):
|
||||||
|
db = self.session_factory()
|
||||||
|
try:
|
||||||
|
task_ids = [
|
||||||
|
row[0]
|
||||||
|
for row in (
|
||||||
|
db.query(TakeoverReplyTask.id)
|
||||||
|
.filter(
|
||||||
|
TakeoverReplyTask.status == "ready",
|
||||||
|
TakeoverReplyTask.scheduled_at <= self.now(),
|
||||||
|
)
|
||||||
|
.order_by(TakeoverReplyTask.scheduled_at.asc())
|
||||||
|
.limit(10)
|
||||||
|
.all()
|
||||||
|
)
|
||||||
|
]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
if task_ids:
|
||||||
|
await asyncio.gather(*(self._send_task(task_id) for task_id in task_ids))
|
||||||
|
|
||||||
|
async def _send_task(self, task_id: str) -> bool:
|
||||||
|
db = self.session_factory()
|
||||||
|
user = None
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.id == task_id).first()
|
||||||
|
if not task or task.status != "ready":
|
||||||
|
return False
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == task.avatar_id).first()
|
||||||
|
if not _takeover_enabled(avatar):
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "takeover_disabled"
|
||||||
|
db.commit()
|
||||||
|
return False
|
||||||
|
if (self.now() - task.scheduled_at).total_seconds() > MAX_STALE_SECONDS:
|
||||||
|
task.status = "cancelled"
|
||||||
|
task.cancel_reason = "stale_reply"
|
||||||
|
db.commit()
|
||||||
|
return False
|
||||||
|
cursor = (
|
||||||
|
db.query(TakeoverCursor)
|
||||||
|
.filter(TakeoverCursor.avatar_id == task.avatar_id)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if not cursor or not cursor.last_polled_at or cursor.last_polled_at < task.scheduled_at:
|
||||||
|
# Do not race the owner's final seconds of the grace period. A
|
||||||
|
# completed poll at/after the due time must confirm no human reply.
|
||||||
|
return False
|
||||||
|
user = db.query(User).filter(User.huihui_user_id == task.owner_id).first()
|
||||||
|
if not user or not user.huihui_token:
|
||||||
|
raise BoxIMError("缺少会会登录凭证", auth_error=True)
|
||||||
|
|
||||||
|
task.status = "sending"
|
||||||
|
task.locked_at = self.now()
|
||||||
|
db.commit()
|
||||||
|
session = await self._boxim_session(user)
|
||||||
|
result = await self.boxim.send_private_message(
|
||||||
|
session["access_token"],
|
||||||
|
task.peer_id,
|
||||||
|
task.response_text,
|
||||||
|
local_id=task.boxim_local_id,
|
||||||
|
)
|
||||||
|
db.refresh(task)
|
||||||
|
if task.status != "sending":
|
||||||
|
return False
|
||||||
|
task.status = "sent"
|
||||||
|
task.sent_at = self.now()
|
||||||
|
task.locked_at = None
|
||||||
|
task.last_error = ""
|
||||||
|
task.boxim_sent_message_id = str(result.get("id") or "")
|
||||||
|
db.commit()
|
||||||
|
logger.info("BOXIM takeover reply sent for task %s", task.id)
|
||||||
|
return True
|
||||||
|
except Exception as exc:
|
||||||
|
db.rollback()
|
||||||
|
if user and isinstance(exc, BoxIMError) and exc.auth_error:
|
||||||
|
self._forget_boxim_session(user.id)
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.id == task_id).first()
|
||||||
|
if task and task.status in ("ready", "sending"):
|
||||||
|
task.attempts = (task.attempts or 0) + 1
|
||||||
|
task.status = "ready" if task.attempts < 3 else "failed"
|
||||||
|
task.locked_at = None
|
||||||
|
task.last_error = str(exc)[:300]
|
||||||
|
if task.status == "ready":
|
||||||
|
task.scheduled_at = self.now() + timedelta(seconds=2 ** task.attempts)
|
||||||
|
db.commit()
|
||||||
|
logger.warning("Failed to send takeover reply %s: %s", task_id, exc)
|
||||||
|
return False
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|||||||
@@ -0,0 +1,203 @@
|
|||||||
|
"""User-scoped token accounting for every avatar model request."""
|
||||||
|
|
||||||
|
import math
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from models import Avatar, TokenAccount, TokenUsage, User
|
||||||
|
|
||||||
|
DEFAULT_TOKEN_GRANT = 1_000_000
|
||||||
|
|
||||||
|
|
||||||
|
class InsufficientTokensError(RuntimeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class TokenReservation:
|
||||||
|
usage_id: str
|
||||||
|
user_id: str
|
||||||
|
reserved_tokens: int
|
||||||
|
|
||||||
|
|
||||||
|
def get_or_create_account(db: Session, user_id: str) -> TokenAccount:
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == user_id).first()
|
||||||
|
if account:
|
||||||
|
return account
|
||||||
|
account = TokenAccount(
|
||||||
|
user_id=user_id,
|
||||||
|
balance=DEFAULT_TOKEN_GRANT,
|
||||||
|
total_granted=DEFAULT_TOKEN_GRANT,
|
||||||
|
total_consumed=0,
|
||||||
|
)
|
||||||
|
db.add(account)
|
||||||
|
try:
|
||||||
|
db.commit()
|
||||||
|
except IntegrityError:
|
||||||
|
# A concurrent first request may have created the same user account.
|
||||||
|
db.rollback()
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == user_id).first()
|
||||||
|
if account is None:
|
||||||
|
raise
|
||||||
|
db.refresh(account)
|
||||||
|
return account
|
||||||
|
|
||||||
|
|
||||||
|
def avatar_owner_user(db: Session, avatar: Avatar) -> User | None:
|
||||||
|
owner_id = (avatar.owner_id or "").strip()
|
||||||
|
if not owner_id:
|
||||||
|
return None
|
||||||
|
return db.query(User).filter(User.huihui_user_id == owner_id).first()
|
||||||
|
|
||||||
|
|
||||||
|
def estimate_request_tokens(messages: list[dict], max_output_tokens: int) -> int:
|
||||||
|
# UTF-8 bytes / 2 deliberately overestimates mixed Chinese/English prompts;
|
||||||
|
# the unused reservation is returned after provider usage is received.
|
||||||
|
content_bytes = sum(
|
||||||
|
len(str(item.get("content", "")).encode("utf-8"))
|
||||||
|
for item in messages
|
||||||
|
)
|
||||||
|
prompt_reserve = max(1, math.ceil(content_bytes / 2) + len(messages) * 6)
|
||||||
|
return prompt_reserve + max(1, int(max_output_tokens))
|
||||||
|
|
||||||
|
|
||||||
|
def estimate_fallback_usage(messages: list[dict], output: str) -> int:
|
||||||
|
content_bytes = sum(
|
||||||
|
len(str(item.get("content", "")).encode("utf-8"))
|
||||||
|
for item in messages
|
||||||
|
) + len((output or "").encode("utf-8"))
|
||||||
|
return max(1, math.ceil(content_bytes / 3) + len(messages) * 4)
|
||||||
|
|
||||||
|
|
||||||
|
def reserve_avatar_tokens(
|
||||||
|
db: Session,
|
||||||
|
avatar: Avatar,
|
||||||
|
source: str,
|
||||||
|
model: str,
|
||||||
|
messages: list[dict],
|
||||||
|
max_output_tokens: int,
|
||||||
|
*,
|
||||||
|
minimum_reserve_tokens: int = 0,
|
||||||
|
) -> TokenReservation:
|
||||||
|
user = avatar_owner_user(db, avatar)
|
||||||
|
if not user:
|
||||||
|
raise InsufficientTokensError("分身尚未关联有效用户,暂时无法使用积分")
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
reserved = max(
|
||||||
|
estimate_request_tokens(messages, max_output_tokens),
|
||||||
|
max(0, int(minimum_reserve_tokens or 0)),
|
||||||
|
)
|
||||||
|
updated = (
|
||||||
|
db.query(TokenAccount)
|
||||||
|
.filter(TokenAccount.id == account.id, TokenAccount.balance >= reserved)
|
||||||
|
.update(
|
||||||
|
{TokenAccount.balance: TokenAccount.balance - reserved},
|
||||||
|
synchronize_session=False,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if updated != 1:
|
||||||
|
db.rollback()
|
||||||
|
raise InsufficientTokensError("积分余额不足,请充值后继续")
|
||||||
|
db.refresh(account)
|
||||||
|
usage = TokenUsage(
|
||||||
|
user_id=user.id,
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
source=source,
|
||||||
|
model=model,
|
||||||
|
status="reserved",
|
||||||
|
reserved_tokens=reserved,
|
||||||
|
)
|
||||||
|
db.add(usage)
|
||||||
|
db.flush()
|
||||||
|
usage.balance_after = account.balance
|
||||||
|
db.commit()
|
||||||
|
return TokenReservation(usage.id, user.id, reserved)
|
||||||
|
|
||||||
|
|
||||||
|
def settle_reservation(
|
||||||
|
db: Session,
|
||||||
|
reservation: TokenReservation,
|
||||||
|
usage: dict | None,
|
||||||
|
*,
|
||||||
|
fallback_total: int,
|
||||||
|
) -> dict:
|
||||||
|
record = db.query(TokenUsage).filter(TokenUsage.id == reservation.usage_id).first()
|
||||||
|
if not record or record.status != "reserved":
|
||||||
|
return {}
|
||||||
|
provider_usage = usage or {}
|
||||||
|
prompt_tokens = max(0, int(provider_usage.get("prompt_tokens") or 0))
|
||||||
|
completion_tokens = max(0, int(provider_usage.get("completion_tokens") or 0))
|
||||||
|
provider_total = max(
|
||||||
|
int(provider_usage.get("total_tokens") or 0),
|
||||||
|
prompt_tokens + completion_tokens,
|
||||||
|
)
|
||||||
|
total_tokens = max(1, provider_total or int(fallback_total or 0))
|
||||||
|
updated = (
|
||||||
|
db.query(TokenAccount)
|
||||||
|
.filter(TokenAccount.user_id == reservation.user_id)
|
||||||
|
.update(
|
||||||
|
{
|
||||||
|
TokenAccount.balance: TokenAccount.balance + reservation.reserved_tokens - total_tokens,
|
||||||
|
TokenAccount.total_consumed: TokenAccount.total_consumed + total_tokens,
|
||||||
|
},
|
||||||
|
synchronize_session=False,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if updated != 1:
|
||||||
|
raise RuntimeError("积分账户不存在")
|
||||||
|
db.expire_all()
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == reservation.user_id).first()
|
||||||
|
record.prompt_tokens = prompt_tokens
|
||||||
|
record.completion_tokens = completion_tokens
|
||||||
|
record.total_tokens = total_tokens
|
||||||
|
record.balance_after = account.balance
|
||||||
|
record.status = "completed"
|
||||||
|
record.settled_at = datetime.utcnow()
|
||||||
|
db.commit()
|
||||||
|
return {
|
||||||
|
"promptTokens": prompt_tokens,
|
||||||
|
"completionTokens": completion_tokens,
|
||||||
|
"totalTokens": total_tokens,
|
||||||
|
"balance": account.balance,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def release_reservation(db: Session, reservation: TokenReservation, reason: str = "") -> None:
|
||||||
|
record = db.query(TokenUsage).filter(TokenUsage.id == reservation.usage_id).first()
|
||||||
|
if not record or record.status != "reserved":
|
||||||
|
return
|
||||||
|
updated = (
|
||||||
|
db.query(TokenAccount)
|
||||||
|
.filter(TokenAccount.user_id == reservation.user_id)
|
||||||
|
.update(
|
||||||
|
{TokenAccount.balance: TokenAccount.balance + reservation.reserved_tokens},
|
||||||
|
synchronize_session=False,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if updated:
|
||||||
|
db.expire_all()
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == reservation.user_id).first()
|
||||||
|
record = db.query(TokenUsage).filter(TokenUsage.id == reservation.usage_id).first()
|
||||||
|
record.balance_after = account.balance
|
||||||
|
record.status = "failed"
|
||||||
|
record.failure_reason = (reason or "model_request_failed")[:255]
|
||||||
|
record.settled_at = datetime.utcnow()
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def release_stale_reservations(db: Session, older_than_minutes: int = 10) -> int:
|
||||||
|
cutoff = datetime.utcnow() - timedelta(minutes=older_than_minutes)
|
||||||
|
stale = db.query(TokenUsage).filter(
|
||||||
|
TokenUsage.status == "reserved",
|
||||||
|
TokenUsage.created_at < cutoff,
|
||||||
|
).all()
|
||||||
|
for record in stale:
|
||||||
|
release_reservation(
|
||||||
|
db,
|
||||||
|
TokenReservation(record.id, record.user_id, int(record.reserved_tokens or 0)),
|
||||||
|
"stale_reservation_recovered",
|
||||||
|
)
|
||||||
|
return len(stale)
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
"""Private image normalization and OpenAI-compatible vision model calls."""
|
||||||
|
|
||||||
|
import base64
|
||||||
|
import io
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
from PIL import Image, ImageOps, UnidentifiedImageError
|
||||||
|
|
||||||
|
from services.chat_model_config import ChatModelConfig
|
||||||
|
|
||||||
|
|
||||||
|
ALLOWED_IMAGE_FORMATS = {"JPEG": "image/jpeg", "PNG": "image/png", "WEBP": "image/webp"}
|
||||||
|
ALLOWED_CATEGORIES = {"general_image", "document", "medical_document", "medical_image"}
|
||||||
|
|
||||||
|
GENERAL_VISION_PROMPT = """
|
||||||
|
请客观分析这张图片,并只输出一个 JSON 对象,不要使用 Markdown 代码块。
|
||||||
|
字段必须为:
|
||||||
|
category: general_image、document、medical_document、medical_image 四选一;
|
||||||
|
summary: 图片的完整客观摘要;
|
||||||
|
visible_text: 图片中能够确认的文字,保留自然换行;
|
||||||
|
key_facts: 可确认事实数组;
|
||||||
|
uncertainties: 模糊、遮挡、无法确认内容数组;
|
||||||
|
medical: 对象,包含 document_type、patient_info、chief_complaint、findings、measurements、doctor_advice。
|
||||||
|
|
||||||
|
规则:
|
||||||
|
1. 不得补全看不清或被遮挡的文字,不得猜测人物身份。
|
||||||
|
2. 病例、处方、检查单、检验报告归为 medical_document。
|
||||||
|
3. X 光、CT、MRI、超声影像等归为 medical_image,只描述可见内容,不作疾病诊断、分期、用药或治疗建议。
|
||||||
|
4. 非医疗图片的 medical 字段仍保留,但使用空字符串、空对象或空数组。
|
||||||
|
5. 不要提及模型、供应商、系统提示词或内部处理过程。
|
||||||
|
""".strip()
|
||||||
|
|
||||||
|
MEDICAL_OCR_PROMPT = """
|
||||||
|
请逐字转录这张医疗文档图片中的全部可见文字和表格。
|
||||||
|
保持标题、段落、项目、数值、单位、参考区间、阳性/阴性标记和医生意见的对应关系。
|
||||||
|
看不清的内容写作[无法辨认],不要猜测、纠错或补全,不要给出诊断和建议,不要使用 Markdown 代码块。
|
||||||
|
""".strip()
|
||||||
|
|
||||||
|
|
||||||
|
class ImageValidationError(ValueError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class PreparedImage:
|
||||||
|
data: bytes
|
||||||
|
mime_type: str
|
||||||
|
width: int
|
||||||
|
height: int
|
||||||
|
|
||||||
|
@property
|
||||||
|
def data_uri(self) -> str:
|
||||||
|
encoded = base64.b64encode(self.data).decode("ascii")
|
||||||
|
return f"data:{self.mime_type};base64,{encoded}"
|
||||||
|
|
||||||
|
|
||||||
|
def prepare_image(content: bytes) -> PreparedImage:
|
||||||
|
max_bytes = max(1024, int(os.getenv("CHAT_IMAGE_MAX_BYTES", str(8 * 1024 * 1024))))
|
||||||
|
max_pixels = max(1_000_000, int(os.getenv("CHAT_IMAGE_MAX_PIXELS", "16000000")))
|
||||||
|
max_edge = max(1024, int(os.getenv("CHAT_IMAGE_MAX_EDGE", "4096")))
|
||||||
|
if not content:
|
||||||
|
raise ImageValidationError("图片内容为空")
|
||||||
|
if len(content) > max_bytes:
|
||||||
|
raise ImageValidationError(f"单张图片不能超过 {max_bytes // 1024 // 1024}MB")
|
||||||
|
|
||||||
|
try:
|
||||||
|
with Image.open(io.BytesIO(content)) as probe:
|
||||||
|
image_format = str(probe.format or "").upper()
|
||||||
|
width, height = probe.size
|
||||||
|
probe.verify()
|
||||||
|
except (UnidentifiedImageError, OSError, SyntaxError) as exc:
|
||||||
|
raise ImageValidationError("图片格式无效或文件已损坏") from exc
|
||||||
|
|
||||||
|
if image_format not in ALLOWED_IMAGE_FORMATS:
|
||||||
|
raise ImageValidationError("仅支持 JPG、PNG、WebP 图片")
|
||||||
|
if width <= 0 or height <= 0 or width * height > max_pixels:
|
||||||
|
raise ImageValidationError("图片像素过大,请压缩后重新上传")
|
||||||
|
|
||||||
|
try:
|
||||||
|
with Image.open(io.BytesIO(content)) as original:
|
||||||
|
image = ImageOps.exif_transpose(original)
|
||||||
|
image.load()
|
||||||
|
if max(image.size) > max_edge:
|
||||||
|
image.thumbnail((max_edge, max_edge), Image.Resampling.LANCZOS)
|
||||||
|
if image.mode in {"RGBA", "LA"}:
|
||||||
|
canvas = Image.new("RGB", image.size, "white")
|
||||||
|
alpha = image.getchannel("A")
|
||||||
|
canvas.paste(image.convert("RGB"), mask=alpha)
|
||||||
|
image = canvas
|
||||||
|
elif image.mode != "RGB":
|
||||||
|
image = image.convert("RGB")
|
||||||
|
output = io.BytesIO()
|
||||||
|
image.save(output, format="JPEG", quality=92, optimize=True)
|
||||||
|
normalized = output.getvalue()
|
||||||
|
normalized_width, normalized_height = image.size
|
||||||
|
except (OSError, ValueError) as exc:
|
||||||
|
raise ImageValidationError("图片解码失败,请重新选择图片") from exc
|
||||||
|
|
||||||
|
return PreparedImage(
|
||||||
|
data=normalized,
|
||||||
|
mime_type="image/jpeg",
|
||||||
|
width=normalized_width,
|
||||||
|
height=normalized_height,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def call_vision_model(
|
||||||
|
prepared: PreparedImage,
|
||||||
|
model_config: ChatModelConfig,
|
||||||
|
*,
|
||||||
|
model: str,
|
||||||
|
prompt: str,
|
||||||
|
json_output: bool,
|
||||||
|
) -> dict:
|
||||||
|
if not model_config.api_key:
|
||||||
|
raise RuntimeError("视觉模型服务未配置")
|
||||||
|
payload: dict[str, Any] = {
|
||||||
|
"model": model,
|
||||||
|
"messages": [
|
||||||
|
{
|
||||||
|
"role": "user",
|
||||||
|
"content": [
|
||||||
|
{"type": "image_url", "image_url": {"url": prepared.data_uri}},
|
||||||
|
{"type": "text", "text": prompt},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"temperature": 0,
|
||||||
|
"max_tokens": model_config.vision_max_tokens,
|
||||||
|
}
|
||||||
|
if json_output:
|
||||||
|
payload["response_format"] = {"type": "json_object"}
|
||||||
|
try:
|
||||||
|
response = httpx.post(
|
||||||
|
f"{model_config.api_base_url}/chat/completions",
|
||||||
|
headers={"Authorization": f"Bearer {model_config.api_key}"},
|
||||||
|
json=payload,
|
||||||
|
timeout=model_config.vision_timeout_seconds,
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
content = data.get("choices", [{}])[0].get("message", {}).get("content", "")
|
||||||
|
except (httpx.HTTPError, ValueError, KeyError, IndexError) as exc:
|
||||||
|
raise RuntimeError("图片识别服务暂时不可用") from exc
|
||||||
|
if not isinstance(content, str) or not content.strip():
|
||||||
|
raise RuntimeError("图片识别服务没有返回有效结果")
|
||||||
|
return {"content": content.strip(), "usage": data.get("usage") or {}}
|
||||||
|
|
||||||
|
|
||||||
|
def parse_vision_analysis(content: str) -> dict:
|
||||||
|
value = (content or "").strip()
|
||||||
|
fenced = re.match(r"^```(?:json)?\s*(.*?)\s*```$", value, re.DOTALL | re.IGNORECASE)
|
||||||
|
if fenced:
|
||||||
|
value = fenced.group(1).strip()
|
||||||
|
try:
|
||||||
|
payload = json.loads(value)
|
||||||
|
except (TypeError, ValueError) as exc:
|
||||||
|
raise RuntimeError("图片识别结果格式无效") from exc
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise RuntimeError("图片识别结果格式无效")
|
||||||
|
|
||||||
|
category = str(payload.get("category") or "general_image").strip().lower()
|
||||||
|
if category not in ALLOWED_CATEGORIES:
|
||||||
|
category = "general_image"
|
||||||
|
medical = payload.get("medical") if isinstance(payload.get("medical"), dict) else {}
|
||||||
|
return {
|
||||||
|
"category": category,
|
||||||
|
"summary": str(payload.get("summary") or "").strip(),
|
||||||
|
"visible_text": str(payload.get("visible_text") or "").strip(),
|
||||||
|
"key_facts": _string_list(payload.get("key_facts")),
|
||||||
|
"uncertainties": _string_list(payload.get("uncertainties")),
|
||||||
|
"medical": medical,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def build_attachment_warning(analysis: dict, *, ocr_failed: bool = False) -> str:
|
||||||
|
warnings = list(analysis.get("uncertainties") or [])
|
||||||
|
category = analysis.get("category")
|
||||||
|
if ocr_failed:
|
||||||
|
warnings.append("精确文字识别暂时不可用,请人工核对图片原文")
|
||||||
|
if category == "medical_document":
|
||||||
|
warnings.append("病例识别结果仅供辅助,不能替代医生诊断,请核对原始文档")
|
||||||
|
elif category == "medical_image":
|
||||||
|
warnings.append("医学影像仅作客观描述,不能替代影像报告和医生诊断")
|
||||||
|
return ";".join(dict.fromkeys(item for item in warnings if item))
|
||||||
|
|
||||||
|
|
||||||
|
def _string_list(value: Any) -> list[str]:
|
||||||
|
if not isinstance(value, list):
|
||||||
|
return []
|
||||||
|
return [str(item).strip() for item in value if str(item).strip()]
|
||||||
@@ -1,6 +1,19 @@
|
|||||||
|
import uuid
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from database import init_db, SessionLocal
|
from database import init_db, SessionLocal
|
||||||
from models import Authorization
|
from models import (
|
||||||
|
Authorization,
|
||||||
|
Avatar,
|
||||||
|
ChatAttachment,
|
||||||
|
TakeoverCursor,
|
||||||
|
TakeoverMessage,
|
||||||
|
TakeoverReplyTask,
|
||||||
|
TokenAccount,
|
||||||
|
TokenPaymentOrder,
|
||||||
|
TokenUsage,
|
||||||
|
User,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session", autouse=True)
|
@pytest.fixture(scope="session", autouse=True)
|
||||||
@@ -24,3 +37,95 @@ def setup_database():
|
|||||||
db.commit()
|
db.commit()
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def authorization_context():
|
||||||
|
"""Create isolated users, avatars, and one authorization for API tests."""
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
owner = User(
|
||||||
|
id=f"owner-{suffix}",
|
||||||
|
huihui_user_id=f"huihui-owner-{suffix}",
|
||||||
|
nickname="授权测试用户",
|
||||||
|
app_token=f"owner-token-{suffix}",
|
||||||
|
)
|
||||||
|
other = User(
|
||||||
|
id=f"other-{suffix}",
|
||||||
|
huihui_user_id=f"huihui-other-{suffix}",
|
||||||
|
nickname="其他用户",
|
||||||
|
app_token=f"other-token-{suffix}",
|
||||||
|
)
|
||||||
|
avatar = Avatar(
|
||||||
|
id=f"avatar-{suffix}",
|
||||||
|
owner_id=owner.huihui_user_id,
|
||||||
|
name="授权测试分身",
|
||||||
|
status="active",
|
||||||
|
config={},
|
||||||
|
)
|
||||||
|
other_avatar = Avatar(
|
||||||
|
id=f"other-avatar-{suffix}",
|
||||||
|
owner_id=other.huihui_user_id,
|
||||||
|
name="其他分身",
|
||||||
|
status="active",
|
||||||
|
config={},
|
||||||
|
)
|
||||||
|
authorization = Authorization(
|
||||||
|
id=f"authorization-{suffix}",
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
target_type="user",
|
||||||
|
target_id=f"contact-{suffix}",
|
||||||
|
target_name="测试联系人",
|
||||||
|
permissions=["chat", "browse"],
|
||||||
|
status="active",
|
||||||
|
)
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.add_all([owner, other, avatar, other_avatar, authorization])
|
||||||
|
db.commit()
|
||||||
|
yield {
|
||||||
|
"owner": owner,
|
||||||
|
"other": other,
|
||||||
|
"avatar": avatar,
|
||||||
|
"other_avatar": other_avatar,
|
||||||
|
"authorization": authorization,
|
||||||
|
"owner_headers": {"Authorization": f"Bearer {owner.app_token}"},
|
||||||
|
"other_headers": {"Authorization": f"Bearer {other.app_token}"},
|
||||||
|
"suffix": suffix,
|
||||||
|
}
|
||||||
|
finally:
|
||||||
|
db.rollback()
|
||||||
|
avatar_ids = [avatar.id, other_avatar.id]
|
||||||
|
db.query(ChatAttachment).filter(
|
||||||
|
ChatAttachment.avatar_id.in_(avatar_ids)
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(TakeoverReplyTask).filter(
|
||||||
|
TakeoverReplyTask.avatar_id.in_(avatar_ids)
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(TakeoverMessage).filter(
|
||||||
|
TakeoverMessage.avatar_id.in_(avatar_ids)
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(TakeoverCursor).filter(
|
||||||
|
TakeoverCursor.avatar_id.in_(avatar_ids)
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(Authorization).filter(
|
||||||
|
Authorization.avatar_id.in_(avatar_ids)
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id.in_(avatar_ids)).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
user_ids = [owner.id, other.id]
|
||||||
|
db.query(TokenPaymentOrder).filter(TokenPaymentOrder.user_id.in_(user_ids)).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id.in_(user_ids)).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id.in_(user_ids)).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
db.query(User).filter(User.id.in_([owner.id, other.id])).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|||||||
@@ -0,0 +1,214 @@
|
|||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from main import app
|
||||||
|
|
||||||
|
|
||||||
|
client = TestClient(app)
|
||||||
|
|
||||||
|
|
||||||
|
def test_authorization_list_is_scoped_to_owned_avatar(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
response = client.get(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
payload = response.json()
|
||||||
|
assert payload["code"] == 200
|
||||||
|
assert [item["id"] for item in payload["data"]] == [context["authorization"].id]
|
||||||
|
|
||||||
|
forbidden = client.get(
|
||||||
|
f"/api/avatar/{context['other_avatar'].id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
)
|
||||||
|
assert forbidden.status_code == 403
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_update_and_delete_authorization(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
target_id = f"new-contact-{context['suffix']}"
|
||||||
|
created = client.post(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"targetType": "user",
|
||||||
|
"targetId": target_id,
|
||||||
|
"targetName": "新联系人",
|
||||||
|
"permissions": ["friend", "chat", "browse"],
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert created["code"] == 200
|
||||||
|
authorization_id = created["data"]["id"]
|
||||||
|
assert created["data"]["permissions"] == ["friend", "chat", "browse"]
|
||||||
|
|
||||||
|
duplicate = client.post(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"targetType": "user",
|
||||||
|
"targetId": target_id,
|
||||||
|
"targetName": "重复联系人",
|
||||||
|
"permissions": ["chat"],
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert duplicate["code"] == 409
|
||||||
|
|
||||||
|
updated = client.put(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"id": authorization_id,
|
||||||
|
"targetName": "联系人新名称",
|
||||||
|
"permissions": ["interact", "publish"],
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert updated["code"] == 200
|
||||||
|
assert updated["data"]["targetName"] == "联系人新名称"
|
||||||
|
assert updated["data"]["permissions"] == ["publish", "interact"]
|
||||||
|
|
||||||
|
deleted = client.delete(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations/{authorization_id}",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
).json()
|
||||||
|
assert deleted["code"] == 200
|
||||||
|
assert deleted["data"]["id"] == authorization_id
|
||||||
|
|
||||||
|
|
||||||
|
def test_authorization_requires_login_and_rejects_unknown_permissions(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
no_session = client.get(f"/api/avatar/{avatar_id}/authorizations")
|
||||||
|
assert no_session.status_code == 401
|
||||||
|
|
||||||
|
invalid = client.post(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"targetType": "user",
|
||||||
|
"targetId": "invalid-target",
|
||||||
|
"targetName": "无效权限",
|
||||||
|
"permissions": ["admin"],
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert invalid["code"] == 400
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_permission_settings_default_and_persist(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
endpoint = f"/api/avatar/{context['avatar'].id}/permission-settings"
|
||||||
|
|
||||||
|
initial = client.get(endpoint, headers=context["owner_headers"]).json()
|
||||||
|
assert initial["code"] == 200
|
||||||
|
assert initial["data"] == {
|
||||||
|
"avatarId": context["avatar"].id,
|
||||||
|
"permissions": ["friend", "chat"],
|
||||||
|
"takeoverReplyDelaySeconds": 180,
|
||||||
|
}
|
||||||
|
|
||||||
|
updated = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["interact", "takeover", "publish", "friend", "friend"]},
|
||||||
|
).json()
|
||||||
|
assert updated["code"] == 200
|
||||||
|
assert updated["data"]["permissions"] == ["friend", "publish", "interact", "takeover"]
|
||||||
|
|
||||||
|
reloaded = client.get(endpoint, headers=context["owner_headers"]).json()
|
||||||
|
assert reloaded["data"]["permissions"] == ["friend", "publish", "interact", "takeover"]
|
||||||
|
assert reloaded["data"]["takeoverReplyDelaySeconds"] == 180
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_permission_settings_allow_all_disabled(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
endpoint = f"/api/avatar/{context['avatar'].id}/permission-settings"
|
||||||
|
|
||||||
|
response = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": []},
|
||||||
|
).json()
|
||||||
|
assert response["code"] == 200
|
||||||
|
assert response["data"]["permissions"] == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_permission_settings_validate_owner_and_permissions(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
endpoint = f"/api/avatar/{context['avatar'].id}/permission-settings"
|
||||||
|
|
||||||
|
invalid = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["admin"]},
|
||||||
|
).json()
|
||||||
|
assert invalid["code"] == 400
|
||||||
|
|
||||||
|
missing = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={},
|
||||||
|
).json()
|
||||||
|
assert missing["code"] == 400
|
||||||
|
|
||||||
|
forbidden = client.get(
|
||||||
|
f"/api/avatar/{context['other_avatar'].id}/permission-settings",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
)
|
||||||
|
assert forbidden.status_code == 403
|
||||||
|
|
||||||
|
unauthenticated = client.get(endpoint)
|
||||||
|
assert unauthenticated.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_takeover_delay_minimum_and_single_active_avatar_per_owner(authorization_context):
|
||||||
|
from database import SessionLocal
|
||||||
|
from models import Avatar
|
||||||
|
|
||||||
|
context = authorization_context
|
||||||
|
endpoint = f"/api/avatar/{context['avatar'].id}/permission-settings"
|
||||||
|
invalid = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["chat"], "takeoverReplyDelaySeconds": 2},
|
||||||
|
).json()
|
||||||
|
assert invalid["code"] == 400
|
||||||
|
|
||||||
|
second_avatar_id = f"second-{context['suffix']}"
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.add(
|
||||||
|
Avatar(
|
||||||
|
id=second_avatar_id,
|
||||||
|
owner_id=context["owner"].huihui_user_id,
|
||||||
|
name="第二个分身",
|
||||||
|
status="active",
|
||||||
|
config={"authorizationPermissions": ["chat", "takeover"]},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
try:
|
||||||
|
updated = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["chat", "takeover"], "takeoverReplyDelaySeconds": 3},
|
||||||
|
).json()
|
||||||
|
assert updated["code"] == 200
|
||||||
|
assert updated["data"]["takeoverReplyDelaySeconds"] == 3
|
||||||
|
assert updated["data"]["disabledAvatarIds"] == [second_avatar_id]
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
second = db.query(Avatar).filter(Avatar.id == second_avatar_id).one()
|
||||||
|
assert "takeover" not in second.config["authorizationPermissions"]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
finally:
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.query(Avatar).filter(Avatar.id == second_avatar_id).delete()
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
"""Ownership and configuration-isolation tests for digital avatars."""
|
||||||
|
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from database import SessionLocal
|
||||||
|
from main import app
|
||||||
|
from models import Avatar
|
||||||
|
|
||||||
|
|
||||||
|
client = TestClient(app)
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_detail_and_update_require_the_owner(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
|
||||||
|
assert client.get(f"/api/avatar/{avatar_id}").status_code == 401
|
||||||
|
assert client.get(
|
||||||
|
f"/api/avatar/{avatar_id}", headers=context["other_headers"]
|
||||||
|
).status_code == 403
|
||||||
|
|
||||||
|
updated = client.put(
|
||||||
|
f"/api/avatar/{avatar_id}",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"description": "独立描述",
|
||||||
|
"config": {"replyStyle": "concise"},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
assert updated.status_code == 200
|
||||||
|
assert updated.json()["data"]["description"] == "独立描述"
|
||||||
|
|
||||||
|
forbidden = client.put(
|
||||||
|
f"/api/avatar/{avatar_id}",
|
||||||
|
headers=context["other_headers"],
|
||||||
|
json={"description": "越权修改"},
|
||||||
|
)
|
||||||
|
assert forbidden.status_code == 403
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_config_updates_do_not_erase_takeover_or_knowledge_scope(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == avatar_id).one()
|
||||||
|
avatar.config = {
|
||||||
|
"authorizationPermissions": ["chat", "takeover"],
|
||||||
|
"takeoverReplyDelaySeconds": 180,
|
||||||
|
}
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
response = client.put(
|
||||||
|
f"/api/avatar/{avatar_id}",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"config": {"replyStyle": "warm", "creativity": 25}},
|
||||||
|
).json()
|
||||||
|
config = response["data"]["config"]
|
||||||
|
assert config["replyStyle"] == "warm"
|
||||||
|
assert config["creativity"] == 25
|
||||||
|
assert config["authorizationPermissions"] == ["chat", "takeover"]
|
||||||
|
assert config["takeoverReplyDelaySeconds"] == 180
|
||||||
|
|
||||||
|
|
||||||
|
def test_avatar_create_and_delete_require_login_and_ownership(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
assert client.post("/api/avatar", json={"name": "匿名分身"}).status_code == 401
|
||||||
|
|
||||||
|
created = client.post(
|
||||||
|
"/api/avatar",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"name": "待删除分身"},
|
||||||
|
)
|
||||||
|
assert created.status_code == 200
|
||||||
|
avatar_id = created.json()["data"]["id"]
|
||||||
|
|
||||||
|
try:
|
||||||
|
assert client.delete(
|
||||||
|
f"/api/avatar/{avatar_id}", headers=context["other_headers"]
|
||||||
|
).status_code == 403
|
||||||
|
deleted = client.delete(
|
||||||
|
f"/api/avatar/{avatar_id}", headers=context["owner_headers"]
|
||||||
|
).json()
|
||||||
|
assert deleted["code"] == 200
|
||||||
|
finally:
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar_id).delete()
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
@@ -1,134 +1,130 @@
|
|||||||
"""Tests for the Box IM client (Netease Yunxin gateway wrapper)."""
|
"""Contract tests for the self-hosted BOXIM client."""
|
||||||
import pytest
|
|
||||||
from unittest.mock import AsyncMock, MagicMock, patch
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from services.boxim_client import BoxIMClient, BoxIMError
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mock_config():
|
def config():
|
||||||
return {
|
return {
|
||||||
"HUIHUI_IM_BASE_URL": "http://192.168.1.200:60040",
|
"HUIHUI_PLATFORM_BASE_URL": "https://open.example/api",
|
||||||
|
"BOXIM_API_BASE_URL": "https://im.example/api",
|
||||||
"HUIHUI_APP_ID": "test_app",
|
"HUIHUI_APP_ID": "test_app",
|
||||||
"HUIHUI_ACCESS_ID": "test_access",
|
"HUIHUI_ACCESS_ID": "test_access",
|
||||||
"HUIHUI_ACCESS_SECRET": "test_secret",
|
"HUIHUI_ACCESS_SECRET": "test_secret",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def _make_mock_response(json_data: dict):
|
def _response(payload: dict, status_code: int = 200):
|
||||||
"""Create a properly configured mock for httpx.Response."""
|
response = MagicMock()
|
||||||
mock_response = MagicMock()
|
response.status_code = status_code
|
||||||
mock_response.json.return_value = json_data
|
response.json.return_value = payload
|
||||||
return mock_response
|
return response
|
||||||
|
|
||||||
|
|
||||||
def _patch_httpx_client(json_data: dict):
|
def _client_patch(*, post_payload=None, request_payload=None, status_code=200):
|
||||||
"""Patch httpx.AsyncClient so that `async with httpx.AsyncClient() as c: await c.post(...)` returns json_data."""
|
client = AsyncMock()
|
||||||
mock_client = AsyncMock()
|
if post_payload is not None:
|
||||||
mock_client.post.return_value = _make_mock_response(json_data)
|
client.post.return_value = _response(post_payload, status_code)
|
||||||
|
if request_payload is not None:
|
||||||
mock_cm = AsyncMock()
|
client.request.return_value = _response(request_payload, status_code)
|
||||||
mock_cm.__aenter__.return_value = mock_client
|
context = AsyncMock()
|
||||||
mock_cm.__aexit__.return_value = None
|
context.__aenter__.return_value = client
|
||||||
|
context.__aexit__.return_value = None
|
||||||
return patch("httpx.AsyncClient", return_value=mock_cm)
|
return patch("services.boxim_client.httpx.AsyncClient", return_value=context), client
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_get_credentials(mock_config):
|
async def test_exchange_access_token_uses_huihui_bearer_and_signed_form(config):
|
||||||
"""get_credentials should return accid and token from the gateway response."""
|
mocked, client = _client_patch(
|
||||||
with _patch_httpx_client({"code": 200, "data": {"accid": "user123", "token": "tok_xyz"}}):
|
post_payload={"code": 0, "data": {"accessToken": "box-token", "accessTokenExpiresIn": 3600}}
|
||||||
from services.boxim_client import BoxIMClient
|
)
|
||||||
|
with mocked:
|
||||||
|
result = await BoxIMClient(config).exchange_access_token("huihui-token")
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
assert result["accessToken"] == "box-token"
|
||||||
result = await client.get_credentials("user123")
|
call = client.post.await_args
|
||||||
|
assert call.args[0] == "https://open.example/api/im/box/netease"
|
||||||
assert result["accid"] == "user123"
|
assert call.kwargs["headers"]["Authorization"] == "Bearer huihui-token"
|
||||||
assert result["token"] == "tok_xyz"
|
assert call.kwargs["data"]["appId"] == "test_app"
|
||||||
|
assert len(call.kwargs["data"]["signature"]) == 32
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_send_p2p_message_success(mock_config):
|
async def test_get_self_and_incremental_private_messages_use_boxim_header(config):
|
||||||
"""send_p2p_message should return True when the gateway responds with code 200."""
|
client_instance = BoxIMClient(config)
|
||||||
with _patch_httpx_client({"code": 200}):
|
mocked, client = _client_patch(
|
||||||
from services.boxim_client import BoxIMClient
|
request_payload={"code": 200, "data": {"id": 42, "nickName": "Owner"}}
|
||||||
|
)
|
||||||
|
with mocked:
|
||||||
|
profile = await client_instance.get_self("box-token")
|
||||||
|
assert profile["id"] == 42
|
||||||
|
assert client.request.await_args.kwargs["headers"] == {"accessToken": "box-token"}
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
mocked, client = _client_patch(
|
||||||
result = await client.send_p2p_message("owner_acc", "target_acc", "Hello")
|
request_payload={"code": 200, "data": [{"id": 101, "sendId": 7, "recvId": 42}]}
|
||||||
|
)
|
||||||
assert result is True
|
with mocked:
|
||||||
|
messages = await client_instance.fetch_private_messages("box-token", "100")
|
||||||
|
assert messages[0]["id"] == 101
|
||||||
|
assert client.request.await_args.kwargs["params"] == {"minId": "100"}
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_send_p2p_message_failure(mock_config):
|
async def test_send_private_message_matches_boxim_payload(config):
|
||||||
"""send_p2p_message should return False when the gateway responds with a non-200 code."""
|
mocked, client = _client_patch(
|
||||||
with _patch_httpx_client({"code": 500, "message": "error"}):
|
request_payload={"code": 200, "data": {"id": 88, "localId": 12345}}
|
||||||
from services.boxim_client import BoxIMClient
|
)
|
||||||
|
with mocked:
|
||||||
|
result = await BoxIMClient(config).send_private_message(
|
||||||
|
"box-token", "77", "你好", local_id="12345"
|
||||||
|
)
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
assert result["id"] == 88
|
||||||
result = await client.send_p2p_message("owner_acc", "target_acc", "Hello")
|
call = client.request.await_args
|
||||||
|
assert call.args[:2] == ("POST", "https://im.example/api/message/private/send")
|
||||||
assert result is False
|
assert call.kwargs["json"] == {
|
||||||
|
"localId": 12345,
|
||||||
|
"recvId": 77,
|
||||||
|
"content": "你好",
|
||||||
|
"type": 0,
|
||||||
|
"receipt": False,
|
||||||
|
"atUserIds": [],
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_get_credentials_returns_none_on_error(mock_config):
|
async def test_mark_private_messages_read_uses_latest_message_id(config):
|
||||||
"""get_credentials should return None when the gateway responds with an error code."""
|
mocked, client = _client_patch(request_payload={"code": 200, "data": None})
|
||||||
with _patch_httpx_client({"code": 500, "message": "user not found"}):
|
with mocked:
|
||||||
from services.boxim_client import BoxIMClient
|
await BoxIMClient(config).mark_private_messages_read("box-token", "77", "101")
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
call = client.request.await_args
|
||||||
result = await client.get_credentials("nonexistent")
|
assert call.args[:2] == ("PUT", "https://im.example/api/message/private/readed")
|
||||||
|
assert call.kwargs["headers"] == {"accessToken": "box-token"}
|
||||||
assert result is None
|
assert call.kwargs["params"] == {"friendId": 77, "messageId": 101}
|
||||||
|
|
||||||
|
|
||||||
def test_build_sign_params_contains_required_fields(mock_config):
|
@pytest.mark.asyncio
|
||||||
"""_build_sign_params should produce appId, accessId, nonce, timestamp, signature, signType, signVersion."""
|
async def test_boxim_auth_error_is_explicit(config):
|
||||||
from services.boxim_client import BoxIMClient
|
mocked, _ = _client_patch(
|
||||||
|
request_payload={"code": 400, "message": "未登录"}, status_code=200
|
||||||
|
)
|
||||||
|
with mocked, pytest.raises(BoxIMError) as exc_info:
|
||||||
|
await BoxIMClient(config).get_self("expired")
|
||||||
|
assert exc_info.value.auth_error is True
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
|
||||||
params = client._build_sign_params({"userId": "u1"})
|
|
||||||
|
|
||||||
assert "appId" in params
|
def test_sign_params_include_production_required_fields(config):
|
||||||
assert "accessId" in params
|
params = BoxIMClient(config)._build_sign_params()
|
||||||
assert "nonce" in params
|
assert params["appId"] == "test_app"
|
||||||
assert "timestamp" in params
|
assert params["accessId"] == "test_access"
|
||||||
assert "signature" in params
|
|
||||||
assert params["signType"] == "MD5"
|
assert params["signType"] == "MD5"
|
||||||
assert params["signVersion"] == "1.0"
|
assert params["signVersion"] == "1.0"
|
||||||
assert len(params["nonce"]) == 12
|
assert len(params["nonce"]) == 12
|
||||||
|
assert len(params["timestamp"]) == 14
|
||||||
|
assert len(params["signature"]) == 32
|
||||||
def test_build_sign_params_excludes_signature_and_accessSecret_from_signing_string(mock_config):
|
assert "accessSecret" not in params
|
||||||
"""signature and accessSecret must be excluded from the signing string to match news_service.py."""
|
|
||||||
from services.boxim_client import BoxIMClient
|
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
|
||||||
|
|
||||||
# Pass params that already contain a stale "signature" value
|
|
||||||
params_with_stale_sig = client._build_sign_params({
|
|
||||||
"userId": "u1",
|
|
||||||
"signature": "OLD_STALE_SIG",
|
|
||||||
})
|
|
||||||
|
|
||||||
# The returned signature must be freshly computed (32-char MD5 uppercase),
|
|
||||||
# NOT the stale value we passed in.
|
|
||||||
assert params_with_stale_sig["signature"] != "OLD_STALE_SIG"
|
|
||||||
assert len(params_with_stale_sig["signature"]) == 32
|
|
||||||
|
|
||||||
# Calling with the same extra params but no stale signature should also work.
|
|
||||||
params_clean = client._build_sign_params({"userId": "u1"})
|
|
||||||
assert len(params_clean["signature"]) == 32
|
|
||||||
|
|
||||||
|
|
||||||
def test_build_sign_params_signature_is_deterministic(mock_config):
|
|
||||||
"""Same inputs should produce valid MD5 signatures."""
|
|
||||||
from services.boxim_client import BoxIMClient
|
|
||||||
|
|
||||||
client = BoxIMClient(mock_config)
|
|
||||||
|
|
||||||
params1 = client._build_sign_params({"userId": "u1"})
|
|
||||||
params2 = client._build_sign_params({"userId": "u1"})
|
|
||||||
|
|
||||||
assert params1["signature"] is not None
|
|
||||||
assert params2["signature"] is not None
|
|
||||||
assert len(params1["signature"]) == 32 # MD5 hex length
|
|
||||||
|
|||||||
@@ -0,0 +1,273 @@
|
|||||||
|
import json
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from fastapi import HTTPException
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from database import SessionLocal
|
||||||
|
from main import app
|
||||||
|
from models import ChatAttachment
|
||||||
|
from routers.chat import (
|
||||||
|
ChatIn,
|
||||||
|
_attachment_contexts,
|
||||||
|
_load_chat_attachments,
|
||||||
|
_resolve_reply,
|
||||||
|
)
|
||||||
|
from services.chat_attachment_service import purge_expired_chat_attachments
|
||||||
|
from services.vision_service import PreparedImage
|
||||||
|
|
||||||
|
|
||||||
|
client = TestClient(app)
|
||||||
|
|
||||||
|
|
||||||
|
GENERAL_RESULT = {
|
||||||
|
"content": json.dumps({
|
||||||
|
"category": "general_image",
|
||||||
|
"summary": "一张包含产品路线图的截图",
|
||||||
|
"visible_text": "产品路线图",
|
||||||
|
"key_facts": ["包含三个阶段"],
|
||||||
|
"uncertainties": [],
|
||||||
|
"medical": {},
|
||||||
|
}, ensure_ascii=False),
|
||||||
|
"usage": {"total_tokens": 120},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_owner_can_upload_and_cache_image_analysis(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
prepared = PreparedImage(b"jpeg", "image/jpeg", 100, 80)
|
||||||
|
with (
|
||||||
|
patch("routers.chat.prepare_image", return_value=prepared),
|
||||||
|
patch("routers.chat._run_billed_vision_call", return_value=GENERAL_RESULT),
|
||||||
|
):
|
||||||
|
response = client.post(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/chat/images",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
files={"file": ("roadmap.png", b"image-bytes", "image/png")},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
payload = response.json()["data"]
|
||||||
|
assert payload["status"] == "ready"
|
||||||
|
assert payload["category"] == "general_image"
|
||||||
|
assert payload["summary"] == "一张包含产品路线图的截图"
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
stored = db.query(ChatAttachment).filter(ChatAttachment.id == payload["id"]).one()
|
||||||
|
assert stored.avatar_id == context["avatar"].id
|
||||||
|
assert stored.extracted_text == "产品路线图"
|
||||||
|
assert stored.structured_data["key_facts"] == ["包含三个阶段"]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_non_owner_cannot_upload_chat_image(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
response = client.post(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/chat/images",
|
||||||
|
headers=context["other_headers"],
|
||||||
|
files={"file": ("private.png", b"image-bytes", "image/png")},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response.status_code == 403
|
||||||
|
|
||||||
|
|
||||||
|
def test_public_share_can_upload_without_exposing_analysis_details(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
avatar = db.get(type(context["avatar"]), context["avatar"].id)
|
||||||
|
avatar.share_token = f"share-{context['suffix']}"
|
||||||
|
db.commit()
|
||||||
|
share_token = avatar.share_token
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
with (
|
||||||
|
patch(
|
||||||
|
"routers.chat.prepare_image",
|
||||||
|
return_value=PreparedImage(b"jpeg", "image/jpeg", 100, 80),
|
||||||
|
),
|
||||||
|
patch("routers.chat._run_billed_vision_call", return_value=GENERAL_RESULT),
|
||||||
|
):
|
||||||
|
response = client.post(
|
||||||
|
f"/api/public/avatar/{share_token}/chat/images",
|
||||||
|
files={"file": ("visitor.png", b"image-bytes", "image/png")},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
payload = response.json()["data"]
|
||||||
|
assert payload["status"] == "ready"
|
||||||
|
assert "structuredData" not in payload
|
||||||
|
assert "extractedText" not in payload
|
||||||
|
assert "visionModel" not in payload
|
||||||
|
assert "ocrModel" not in payload
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
stored = db.get(ChatAttachment, payload["id"])
|
||||||
|
assert stored.uploader_kind == "public"
|
||||||
|
assert stored.avatar_id == context["avatar"].id
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_medical_document_uses_ocr_result(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
general = {
|
||||||
|
"content": json.dumps({
|
||||||
|
"category": "medical_document",
|
||||||
|
"summary": "血常规报告",
|
||||||
|
"visible_text": "初步文字",
|
||||||
|
"key_facts": [],
|
||||||
|
"uncertainties": [],
|
||||||
|
"medical": {"document_type": "检验报告"},
|
||||||
|
}, ensure_ascii=False),
|
||||||
|
"usage": {},
|
||||||
|
}
|
||||||
|
ocr = {"content": "白细胞 11.2 x10^9/L", "usage": {}}
|
||||||
|
with (
|
||||||
|
patch("routers.chat.prepare_image", return_value=PreparedImage(b"jpeg", "image/jpeg", 100, 80)),
|
||||||
|
patch("routers.chat._run_billed_vision_call", side_effect=[general, ocr]) as model,
|
||||||
|
):
|
||||||
|
response = client.post(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/chat/images",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
files={"file": ("report.jpg", b"image-bytes", "image/jpeg")},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
attachment_id = response.json()["data"]["id"]
|
||||||
|
assert model.call_count == 2
|
||||||
|
assert model.call_args_list[1].kwargs["source"] == "vision_medical_ocr"
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
stored = db.query(ChatAttachment).filter(ChatAttachment.id == attachment_id).one()
|
||||||
|
assert stored.extracted_text == "白细胞 11.2 x10^9/L"
|
||||||
|
assert stored.ocr_model == "qwen-vl-ocr"
|
||||||
|
assert "不能替代医生诊断" in stored.warning
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_attachment_cannot_cross_avatar_boundary(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
attachment = ChatAttachment(
|
||||||
|
avatar_id=context["avatar"].id,
|
||||||
|
filename="private.jpg",
|
||||||
|
status="ready",
|
||||||
|
expires_at=datetime.utcnow() + timedelta(hours=1),
|
||||||
|
)
|
||||||
|
db.add(attachment)
|
||||||
|
db.commit()
|
||||||
|
body = ChatIn(message="看看图片", attachmentIds=[attachment.id])
|
||||||
|
with pytest.raises(HTTPException, match="不属于当前分身") as caught:
|
||||||
|
_load_chat_attachments(db, context["other_avatar"].id, body)
|
||||||
|
assert caught.value.status_code == 400
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_expired_attachment_is_removed(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
attachment = ChatAttachment(
|
||||||
|
avatar_id=context["avatar"].id,
|
||||||
|
filename="expired.jpg",
|
||||||
|
status="ready",
|
||||||
|
expires_at=datetime.utcnow() - timedelta(seconds=1),
|
||||||
|
)
|
||||||
|
db.add(attachment)
|
||||||
|
db.commit()
|
||||||
|
attachment_id = attachment.id
|
||||||
|
body = ChatIn(message="看看图片", attachmentIds=[attachment_id])
|
||||||
|
with pytest.raises(HTTPException):
|
||||||
|
_load_chat_attachments(db, context["avatar"].id, body)
|
||||||
|
assert db.query(ChatAttachment).filter(ChatAttachment.id == attachment_id).first() is None
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_cleanup_keeps_unexpired_attachment(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
now = datetime.utcnow()
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
expired = ChatAttachment(
|
||||||
|
avatar_id=context["avatar"].id,
|
||||||
|
filename="expired.jpg",
|
||||||
|
status="ready",
|
||||||
|
expires_at=now - timedelta(seconds=1),
|
||||||
|
)
|
||||||
|
active = ChatAttachment(
|
||||||
|
avatar_id=context["avatar"].id,
|
||||||
|
filename="active.jpg",
|
||||||
|
status="ready",
|
||||||
|
expires_at=now + timedelta(hours=1),
|
||||||
|
)
|
||||||
|
db.add_all([expired, active])
|
||||||
|
db.commit()
|
||||||
|
expired_id, active_id = expired.id, active.id
|
||||||
|
|
||||||
|
assert purge_expired_chat_attachments(db, now=now) == 1
|
||||||
|
assert db.get(ChatAttachment, expired_id) is None
|
||||||
|
assert db.get(ChatAttachment, active_id) is not None
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_image_context_keeps_standard_answer_authoritative():
|
||||||
|
avatar = SimpleNamespace(
|
||||||
|
id="avatar-vision",
|
||||||
|
name="测试分身",
|
||||||
|
description="产品顾问",
|
||||||
|
config={},
|
||||||
|
)
|
||||||
|
model = Mock(return_value="标准退款期限是七天;图片显示的是商品包装。")
|
||||||
|
result = _resolve_reply(
|
||||||
|
None,
|
||||||
|
avatar,
|
||||||
|
"退款期限是多少?",
|
||||||
|
[],
|
||||||
|
qa_pairs=[SimpleNamespace(question="退款期限是多少?", answer="七天", enabled=True)],
|
||||||
|
search_fn=Mock(return_value=[]),
|
||||||
|
model_client=model,
|
||||||
|
image_contexts=[{
|
||||||
|
"id": "attachment",
|
||||||
|
"filename": "product.jpg",
|
||||||
|
"category": "general_image",
|
||||||
|
"summary": "商品包装",
|
||||||
|
"extractedText": "",
|
||||||
|
"structuredData": {},
|
||||||
|
"warning": "",
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
|
||||||
|
assert result["source"] == "qa"
|
||||||
|
system = model.call_args.kwargs["messages"][0]["content"]
|
||||||
|
assert "已确认标准答案" in system
|
||||||
|
assert "七天" in system
|
||||||
|
assert "商品包装" in system
|
||||||
|
assert "标准答题对中的事实优先级高于图片资料" in system
|
||||||
|
|
||||||
|
|
||||||
|
def test_attachment_context_does_not_expose_internal_fields():
|
||||||
|
row = SimpleNamespace(
|
||||||
|
id="attachment",
|
||||||
|
filename="case.jpg",
|
||||||
|
category="medical_document",
|
||||||
|
summary="门诊病例",
|
||||||
|
extracted_text="主诉:咳嗽",
|
||||||
|
structured_data={"medical": {"chief_complaint": "咳嗽"}},
|
||||||
|
warning="请核对原文",
|
||||||
|
)
|
||||||
|
context = _attachment_contexts([row])[0]
|
||||||
|
assert context["filename"] == "case.jpg"
|
||||||
|
assert "avatar_id" not in context
|
||||||
|
assert "vision_model" not in context
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
from services.chat_model_config import (
|
||||||
|
clear_chat_model_config_cache,
|
||||||
|
get_chat_model_config,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def setup_function():
|
||||||
|
clear_chat_model_config_cache()
|
||||||
|
|
||||||
|
|
||||||
|
def teardown_function():
|
||||||
|
clear_chat_model_config_cache()
|
||||||
|
|
||||||
|
|
||||||
|
def test_admin_runtime_config_takes_priority(monkeypatch):
|
||||||
|
monkeypatch.setenv("CHAT_MODEL_CONFIG_URL", "http://config.test/runtime")
|
||||||
|
monkeypatch.setenv("AVATAR_MODEL_CONFIG_TOKEN", "shared-secret")
|
||||||
|
response = Mock()
|
||||||
|
response.raise_for_status.return_value = None
|
||||||
|
response.json.return_value = {
|
||||||
|
"data": {
|
||||||
|
"api_base_url": "https://model.test/v1/",
|
||||||
|
"api_key": "runtime-key",
|
||||||
|
"model": "avatar-model",
|
||||||
|
"vision_model": "avatar-vision-model",
|
||||||
|
"ocr_model": "avatar-ocr-model",
|
||||||
|
"max_tokens": 2048,
|
||||||
|
"timeout_seconds": 42,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("services.chat_model_config.httpx.get", return_value=response) as request:
|
||||||
|
config = get_chat_model_config()
|
||||||
|
|
||||||
|
assert config.source == "admin"
|
||||||
|
assert config.api_base_url == "https://model.test/v1"
|
||||||
|
assert config.model == "avatar-model"
|
||||||
|
assert config.vision_model == "avatar-vision-model"
|
||||||
|
assert config.ocr_model == "avatar-ocr-model"
|
||||||
|
assert config.max_tokens == 2048
|
||||||
|
request.assert_called_once_with(
|
||||||
|
"http://config.test/runtime",
|
||||||
|
headers={"X-Avatar-Config-Token": "shared-secret"},
|
||||||
|
timeout=5.0,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_runtime_failure_falls_back_to_environment(monkeypatch):
|
||||||
|
monkeypatch.setenv("CHAT_MODEL_CONFIG_URL", "http://config.test/runtime")
|
||||||
|
monkeypatch.setenv("AVATAR_MODEL_CONFIG_TOKEN", "shared-secret")
|
||||||
|
monkeypatch.setenv("CHAT_API_URL", "https://fallback.test/v1/")
|
||||||
|
monkeypatch.setenv("CHAT_API_KEY", "fallback-key")
|
||||||
|
monkeypatch.setenv("CHAT_MODEL", "fallback-model")
|
||||||
|
monkeypatch.setenv("VISION_MODEL", "fallback-vision")
|
||||||
|
monkeypatch.setenv("VISION_OCR_MODEL", "fallback-ocr")
|
||||||
|
monkeypatch.setenv("CHAT_MAX_OUTPUT_TOKENS", "1536")
|
||||||
|
|
||||||
|
request = httpx.Request("GET", "http://config.test/runtime")
|
||||||
|
with patch(
|
||||||
|
"services.chat_model_config.httpx.get",
|
||||||
|
side_effect=httpx.ConnectError("offline", request=request),
|
||||||
|
):
|
||||||
|
config = get_chat_model_config()
|
||||||
|
|
||||||
|
assert config.source == "environment"
|
||||||
|
assert config.api_base_url == "https://fallback.test/v1"
|
||||||
|
assert config.api_key == "fallback-key"
|
||||||
|
assert config.model == "fallback-model"
|
||||||
|
assert config.vision_model == "fallback-vision"
|
||||||
|
assert config.ocr_model == "fallback-ocr"
|
||||||
|
assert config.max_tokens == 1536
|
||||||
|
|
||||||
|
|
||||||
|
def test_runtime_config_is_cached(monkeypatch):
|
||||||
|
monkeypatch.setenv("CHAT_MODEL_CONFIG_URL", "")
|
||||||
|
monkeypatch.setenv("CHAT_MODEL", "first-model")
|
||||||
|
first = get_chat_model_config()
|
||||||
|
monkeypatch.setenv("CHAT_MODEL", "second-model")
|
||||||
|
|
||||||
|
second = get_chat_model_config()
|
||||||
|
|
||||||
|
assert first is second
|
||||||
|
assert second.model == "first-model"
|
||||||
@@ -5,7 +5,15 @@ from unittest.mock import Mock
|
|||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from models import Avatar, User
|
from models import Avatar, User
|
||||||
from routers.chat import _build_prompt, _match_standard_qa, _require_owned_avatar, _resolve_reply
|
from routers.chat import (
|
||||||
|
_build_prompt,
|
||||||
|
_iter_text_chunks,
|
||||||
|
_match_standard_qa,
|
||||||
|
_public_avatar_payload,
|
||||||
|
_qa_requires_language_adaptation,
|
||||||
|
_require_owned_avatar,
|
||||||
|
_resolve_reply,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class ChatOrchestrationTests(unittest.TestCase):
|
class ChatOrchestrationTests(unittest.TestCase):
|
||||||
@@ -13,6 +21,12 @@ class ChatOrchestrationTests(unittest.TestCase):
|
|||||||
self.avatar = SimpleNamespace(
|
self.avatar = SimpleNamespace(
|
||||||
id="avatar-1",
|
id="avatar-1",
|
||||||
owner_id="huihui-user-1",
|
owner_id="huihui-user-1",
|
||||||
|
name="冯医生",
|
||||||
|
display_name="冯医生",
|
||||||
|
description="耳鼻喉科领域专家",
|
||||||
|
photo_url="https://example.test/avatar.png",
|
||||||
|
emoji="👨⚕️",
|
||||||
|
status="active",
|
||||||
config={
|
config={
|
||||||
"replyStyle": "professional",
|
"replyStyle": "professional",
|
||||||
"creativity": 50,
|
"creativity": 50,
|
||||||
@@ -20,6 +34,10 @@ class ChatOrchestrationTests(unittest.TestCase):
|
|||||||
"humor": 20,
|
"humor": 20,
|
||||||
"responseLength": "medium",
|
"responseLength": "medium",
|
||||||
"systemPrompt": "不要编造政策。",
|
"systemPrompt": "不要编造政策。",
|
||||||
|
"profession": "医生",
|
||||||
|
"position": "主任医师",
|
||||||
|
"organization": "测试医院",
|
||||||
|
"organizationAddress": "测试路1号",
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.qa = SimpleNamespace(question="公司地址?", answer="标准地址", enabled=True)
|
self.qa = SimpleNamespace(question="公司地址?", answer="标准地址", enabled=True)
|
||||||
@@ -40,6 +58,52 @@ class ChatOrchestrationTests(unittest.TestCase):
|
|||||||
self.assertEqual(result["answer"], "标准地址")
|
self.assertEqual(result["answer"], "标准地址")
|
||||||
fake_model.assert_not_called()
|
fake_model.assert_not_called()
|
||||||
|
|
||||||
|
def test_cross_language_qa_is_faithfully_adapted_by_model(self):
|
||||||
|
fake_model = Mock(return_value="Our address is Test Road 1.")
|
||||||
|
fake_search = Mock(return_value=[])
|
||||||
|
result = _resolve_reply(
|
||||||
|
None,
|
||||||
|
self.avatar,
|
||||||
|
"Where is your office?",
|
||||||
|
[],
|
||||||
|
qa_pairs=[SimpleNamespace(question="Where is your office?", answer="地址是测试路1号。", enabled=True)],
|
||||||
|
search_fn=fake_search,
|
||||||
|
model_client=fake_model,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertEqual(result["source"], "qa")
|
||||||
|
self.assertEqual(result["answer"], "Our address is Test Road 1.")
|
||||||
|
self.assertEqual(fake_model.call_args.kwargs["temperature"], 0.0)
|
||||||
|
system = fake_model.call_args.kwargs["messages"][0]["content"]
|
||||||
|
self.assertIn("已确认标准答案", system)
|
||||||
|
self.assertIn("地址是测试路1号", system)
|
||||||
|
self.assertIn("只使用该语言回答", system)
|
||||||
|
fake_search.assert_not_called()
|
||||||
|
|
||||||
|
def test_qa_language_adaptation_detects_common_writing_system_changes(self):
|
||||||
|
self.assertTrue(_qa_requires_language_adaptation("Hello", "你好"))
|
||||||
|
self.assertTrue(_qa_requires_language_adaptation("こんにちは", "你好"))
|
||||||
|
self.assertTrue(_qa_requires_language_adaptation("안녕하세요", "你好"))
|
||||||
|
self.assertFalse(_qa_requires_language_adaptation("你好", "您好"))
|
||||||
|
|
||||||
|
def test_conversational_paraphrase_matches_standard_qa(self):
|
||||||
|
for question in ("请问一下,你们公司在哪里呀?", "请问去你们那边怎么走"):
|
||||||
|
with self.subTest(question=question):
|
||||||
|
matched = _match_standard_qa(question, [self.disabled_qa, self.qa])
|
||||||
|
self.assertIs(matched, self.qa)
|
||||||
|
|
||||||
|
def test_short_related_question_matches_single_standard_qa(self):
|
||||||
|
matched = _match_standard_qa("地址", [self.qa])
|
||||||
|
self.assertIs(matched, self.qa)
|
||||||
|
|
||||||
|
def test_ambiguous_short_question_does_not_pick_arbitrarily(self):
|
||||||
|
hospital = SimpleNamespace(question="医院地址", answer="医院地址答案", enabled=True)
|
||||||
|
company = SimpleNamespace(question="公司地址", answer="公司地址答案", enabled=True)
|
||||||
|
self.assertIsNone(_match_standard_qa("地址", [hospital, company]))
|
||||||
|
|
||||||
|
def test_unrelated_question_does_not_match_standard_qa(self):
|
||||||
|
self.assertIsNone(_match_standard_qa("今天天气怎么样", [self.qa]))
|
||||||
|
|
||||||
def test_knowledge_context_is_sent_to_qwen_after_qa_miss(self):
|
def test_knowledge_context_is_sent_to_qwen_after_qa_miss(self):
|
||||||
fake_model = Mock(return_value="根据知识库内容回答")
|
fake_model = Mock(return_value="根据知识库内容回答")
|
||||||
knowledge_hit = {
|
knowledge_hit = {
|
||||||
@@ -58,11 +122,54 @@ class ChatOrchestrationTests(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(result["source"], "knowledge")
|
self.assertEqual(result["source"], "knowledge")
|
||||||
self.assertIn("知识库内容", fake_model.call_args.kwargs["messages"][0]["content"])
|
self.assertIn("知识库内容", fake_model.call_args.kwargs["messages"][0]["content"])
|
||||||
|
self.assertIn("只能依据本人资料", fake_model.call_args.kwargs["messages"][0]["content"])
|
||||||
|
|
||||||
def test_prompt_contains_personality_configuration(self):
|
def test_prompt_contains_personality_configuration(self):
|
||||||
messages = _build_prompt(self.avatar, [], "你好", [])
|
messages = _build_prompt(self.avatar, [], "你好", [])
|
||||||
self.assertIn("严谨度", messages[0]["content"])
|
self.assertIn("严谨度", messages[0]["content"])
|
||||||
|
self.assertNotIn("冯医生", messages[0]["content"])
|
||||||
|
self.assertIn("耳鼻喉科领域专家", messages[0]["content"])
|
||||||
|
self.assertIn("职业:医生", messages[0]["content"])
|
||||||
|
self.assertIn("职位:主任医师", messages[0]["content"])
|
||||||
|
self.assertIn("单位:测试医院", messages[0]["content"])
|
||||||
|
self.assertIn("单位地址:测试路1号", messages[0]["content"])
|
||||||
self.assertIn("不要编造政策", messages[0]["content"])
|
self.assertIn("不要编造政策", messages[0]["content"])
|
||||||
|
self.assertIn("模型供应商", messages[0]["content"])
|
||||||
|
self.assertIn("不要称自己为数字人", messages[0]["content"])
|
||||||
|
self.assertIn("输出排版规范", messages[0]["content"])
|
||||||
|
self.assertIn("任何回答都不要说出自己的姓名", messages[0]["content"])
|
||||||
|
self.assertIn("不要自我介绍", messages[0]["content"])
|
||||||
|
self.assertIn("像熟人之间微信聊天一样", messages[0]["content"])
|
||||||
|
self.assertIn("不隶属于任何机构", messages[0]["content"])
|
||||||
|
self.assertIn("不要连续输出空行", messages[0]["content"])
|
||||||
|
self.assertIn("回答语言规则", messages[0]["content"])
|
||||||
|
self.assertIn("当前最后一条用户消息", messages[0]["content"])
|
||||||
|
self.assertIn("历史消息", messages[0]["content"])
|
||||||
|
|
||||||
|
def test_prompt_blocks_ungrounded_factual_answers(self):
|
||||||
|
messages = _build_prompt(self.avatar, [], "聊聊国际新闻", [])
|
||||||
|
system = messages[0]["content"]
|
||||||
|
self.assertIn("没有检索到可靠资料", system)
|
||||||
|
self.assertIn("不要凭通用知识", system)
|
||||||
|
self.assertIn("不要提及知识库", system)
|
||||||
|
self.assertIn("不得推断服务对象", system)
|
||||||
|
self.assertIn("工作场所", system)
|
||||||
|
|
||||||
|
def test_public_avatar_payload_excludes_internal_configuration(self):
|
||||||
|
payload = _public_avatar_payload(self.avatar)
|
||||||
|
self.assertEqual(payload["displayName"], "冯医生")
|
||||||
|
self.assertEqual(payload["photoUrl"], "https://example.test/avatar.png")
|
||||||
|
self.assertNotIn("config", payload)
|
||||||
|
self.assertNotIn("ownerId", payload)
|
||||||
|
|
||||||
|
def test_unshared_avatars_do_not_reuse_a_unique_share_token(self):
|
||||||
|
first = Avatar(name="first")
|
||||||
|
second = Avatar(name="second")
|
||||||
|
self.assertIsNone(first.share_token)
|
||||||
|
self.assertIsNone(second.share_token)
|
||||||
|
|
||||||
|
def test_standard_answer_can_be_emitted_as_sse_chunks(self):
|
||||||
|
self.assertEqual(list(_iter_text_chunks("标准答案内容", size=2)), ["标准", "答案", "内容"])
|
||||||
|
|
||||||
def test_chat_rejects_avatar_owned_by_another_user(self):
|
def test_chat_rejects_avatar_owned_by_another_user(self):
|
||||||
class Query:
|
class Query:
|
||||||
|
|||||||
@@ -1,10 +1,26 @@
|
|||||||
|
import json
|
||||||
import os
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import unittest
|
import unittest
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
import embeddings
|
import embeddings
|
||||||
|
|
||||||
|
|
||||||
|
class FakeResponse:
|
||||||
|
def __init__(self, payload):
|
||||||
|
self.payload = payload
|
||||||
|
|
||||||
|
def __enter__(self):
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __exit__(self, *_):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def read(self):
|
||||||
|
return json.dumps(self.payload).encode("utf-8")
|
||||||
|
|
||||||
|
|
||||||
class TextExtractionTests(unittest.TestCase):
|
class TextExtractionTests(unittest.TestCase):
|
||||||
def write_text(self, suffix, content):
|
def write_text(self, suffix, content):
|
||||||
handle = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
|
handle = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
|
||||||
@@ -28,5 +44,45 @@ class TextExtractionTests(unittest.TestCase):
|
|||||||
embeddings.extract_text(path, ".csv")
|
embeddings.extract_text(path, ".csv")
|
||||||
|
|
||||||
|
|
||||||
|
class RemoteEmbeddingTests(unittest.TestCase):
|
||||||
|
def test_large_input_is_split_into_provider_safe_batches(self):
|
||||||
|
texts = [f"chunk-{index}" for index in range(14)]
|
||||||
|
batch_sizes = []
|
||||||
|
requested_urls = []
|
||||||
|
|
||||||
|
def fake_urlopen(request, timeout):
|
||||||
|
self.assertEqual(timeout, 30)
|
||||||
|
requested_urls.append(request.full_url)
|
||||||
|
payload = json.loads(request.data.decode("utf-8"))
|
||||||
|
batch_sizes.append(len(payload["input"]))
|
||||||
|
return FakeResponse({
|
||||||
|
"data": [
|
||||||
|
{"index": index, "embedding": [float(text.split("-")[1])]}
|
||||||
|
for index, text in enumerate(payload["input"])
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
with patch.dict(os.environ, {
|
||||||
|
"EMBEDDING_API_URL": "https://embedding.example/v1",
|
||||||
|
"EMBEDDING_API_KEY": "test-key",
|
||||||
|
"EMBEDDING_MODEL": "text-embedding-v4",
|
||||||
|
"EMBEDDING_BATCH_SIZE": "10",
|
||||||
|
}), patch("embeddings.urllib.request.urlopen", side_effect=fake_urlopen):
|
||||||
|
result = embeddings.embed(texts)
|
||||||
|
|
||||||
|
self.assertEqual(batch_sizes, [10, 4])
|
||||||
|
self.assertEqual(requested_urls, [
|
||||||
|
"https://embedding.example/v1/embeddings",
|
||||||
|
"https://embedding.example/v1/embeddings",
|
||||||
|
])
|
||||||
|
self.assertEqual(result, [[float(index)] for index in range(14)])
|
||||||
|
|
||||||
|
def test_full_embedding_endpoint_is_not_modified(self):
|
||||||
|
self.assertEqual(
|
||||||
|
embeddings._embedding_endpoint("https://embedding.example/v1/embeddings/"),
|
||||||
|
"https://embedding.example/v1/embeddings",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
@@ -0,0 +1,191 @@
|
|||||||
|
"""Tests for preserving local avatar ownership when Huihui IDs change."""
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from unittest.mock import AsyncMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
from sqlalchemy.pool import StaticPool
|
||||||
|
|
||||||
|
from database import Base
|
||||||
|
from models import Avatar, TakeoverCursor, TakeoverMessage, TakeoverReplyTask, User
|
||||||
|
from routers.huihui_auth import _issue_session, token_login
|
||||||
|
from services.boxim_client import BoxIMError
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def db():
|
||||||
|
engine = create_engine(
|
||||||
|
"sqlite://",
|
||||||
|
connect_args={"check_same_thread": False},
|
||||||
|
poolclass=StaticPool,
|
||||||
|
)
|
||||||
|
Base.metadata.create_all(engine)
|
||||||
|
session = sessionmaker(bind=engine, autoflush=False, expire_on_commit=False)()
|
||||||
|
try:
|
||||||
|
yield session
|
||||||
|
finally:
|
||||||
|
session.close()
|
||||||
|
|
||||||
|
|
||||||
|
def _add_avatar_data(db, owner_id: str, suffix: str = "1") -> Avatar:
|
||||||
|
avatar = Avatar(id=f"avatar-{suffix}", owner_id=owner_id, name="冯医生")
|
||||||
|
db.add_all(
|
||||||
|
[
|
||||||
|
avatar,
|
||||||
|
TakeoverCursor(id=f"cursor-{suffix}", avatar_id=avatar.id, owner_id=owner_id),
|
||||||
|
TakeoverMessage(
|
||||||
|
id=f"message-{suffix}",
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
owner_id=owner_id,
|
||||||
|
boxim_message_id=f"box-{suffix}",
|
||||||
|
peer_id="peer",
|
||||||
|
direction="incoming",
|
||||||
|
send_time=datetime(2026, 8, 20, 12, 0, 0),
|
||||||
|
),
|
||||||
|
TakeoverReplyTask(
|
||||||
|
id=f"task-{suffix}",
|
||||||
|
avatar_id=avatar.id,
|
||||||
|
owner_id=owner_id,
|
||||||
|
peer_id="peer",
|
||||||
|
trigger_message_id=f"trigger-{suffix}",
|
||||||
|
scheduled_at=datetime(2026, 8, 20, 12, 0, 3),
|
||||||
|
boxim_local_id=f"local-{suffix}",
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
return avatar
|
||||||
|
|
||||||
|
|
||||||
|
def _assert_avatar_data_owner(db, avatar_id: str, owner_id: str):
|
||||||
|
assert db.query(Avatar).filter_by(id=avatar_id).one().owner_id == owner_id
|
||||||
|
assert db.query(TakeoverCursor).filter_by(avatar_id=avatar_id).one().owner_id == owner_id
|
||||||
|
assert db.query(TakeoverMessage).filter_by(avatar_id=avatar_id).one().owner_id == owner_id
|
||||||
|
assert db.query(TakeoverReplyTask).filter_by(avatar_id=avatar_id).one().owner_id == owner_id
|
||||||
|
|
||||||
|
|
||||||
|
def test_unique_phone_user_is_reused_when_huihui_id_changes(db):
|
||||||
|
legacy = User(
|
||||||
|
id="legacy-local",
|
||||||
|
huihui_user_id="fat-user-id",
|
||||||
|
phone="18500000000",
|
||||||
|
app_token="old-session",
|
||||||
|
)
|
||||||
|
db.add(legacy)
|
||||||
|
db.commit()
|
||||||
|
avatar = _add_avatar_data(db, legacy.huihui_user_id)
|
||||||
|
|
||||||
|
response = _issue_session(
|
||||||
|
db,
|
||||||
|
"18500000000",
|
||||||
|
{"userId": "prod-user-id", "nickname": "用户", "token": "prod-token"},
|
||||||
|
)
|
||||||
|
|
||||||
|
users = db.query(User).all()
|
||||||
|
assert len(users) == 1
|
||||||
|
assert users[0].id == "legacy-local"
|
||||||
|
assert users[0].huihui_user_id == "prod-user-id"
|
||||||
|
assert response["data"]["token"] == users[0].app_token
|
||||||
|
_assert_avatar_data_owner(db, avatar.id, "prod-user-id")
|
||||||
|
|
||||||
|
|
||||||
|
def test_existing_production_user_claims_one_legacy_phone_account(db):
|
||||||
|
current = User(
|
||||||
|
id="prod-local",
|
||||||
|
huihui_user_id="prod-user-id",
|
||||||
|
phone="18500000000",
|
||||||
|
)
|
||||||
|
legacy = User(
|
||||||
|
id="legacy-local",
|
||||||
|
huihui_user_id="fat-user-id",
|
||||||
|
phone="18500000000",
|
||||||
|
app_token="old-session",
|
||||||
|
huihui_token="fat-token",
|
||||||
|
)
|
||||||
|
db.add_all([current, legacy])
|
||||||
|
db.commit()
|
||||||
|
avatar = _add_avatar_data(db, legacy.huihui_user_id)
|
||||||
|
|
||||||
|
_issue_session(
|
||||||
|
db,
|
||||||
|
"18500000000",
|
||||||
|
{"userId": "prod-user-id", "nickname": "用户", "token": "prod-token"},
|
||||||
|
)
|
||||||
|
|
||||||
|
db.refresh(legacy)
|
||||||
|
assert legacy.app_token == ""
|
||||||
|
assert legacy.huihui_token == ""
|
||||||
|
_assert_avatar_data_owner(db, avatar.id, "prod-user-id")
|
||||||
|
|
||||||
|
|
||||||
|
def test_ambiguous_phone_matches_do_not_move_existing_avatars(db):
|
||||||
|
first = User(id="first", huihui_user_id="fat-1", phone="18500000000")
|
||||||
|
second = User(id="second", huihui_user_id="fat-2", phone="18500000000")
|
||||||
|
db.add_all([first, second])
|
||||||
|
db.commit()
|
||||||
|
first_avatar = _add_avatar_data(db, first.huihui_user_id, "1")
|
||||||
|
second_avatar = _add_avatar_data(db, second.huihui_user_id, "2")
|
||||||
|
|
||||||
|
_issue_session(
|
||||||
|
db,
|
||||||
|
"18500000000",
|
||||||
|
{"userId": "prod-user-id", "nickname": "用户", "token": "prod-token"},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert db.query(User).count() == 3
|
||||||
|
_assert_avatar_data_owner(db, first_avatar.id, "fat-1")
|
||||||
|
_assert_avatar_data_owner(db, second_avatar.id, "fat-2")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_token_login_uses_huihui_user_id_and_keeps_upstream_token_server_side(db):
|
||||||
|
existing = User(
|
||||||
|
id="existing-local",
|
||||||
|
huihui_user_id="huihui-user-88",
|
||||||
|
app_token="existing-app-session",
|
||||||
|
)
|
||||||
|
db.add(existing)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
client = AsyncMock()
|
||||||
|
client.exchange_access_token.return_value = {"accessToken": "boxim-token"}
|
||||||
|
client.get_self.return_value = {
|
||||||
|
"id": 998877,
|
||||||
|
"huihuiUserId": "huihui-user-88",
|
||||||
|
"nickName": "会会用户",
|
||||||
|
"headImage": "https://cdn.example/avatar.jpg",
|
||||||
|
}
|
||||||
|
with patch("routers.huihui_auth._cfg_ready", return_value=True), patch(
|
||||||
|
"routers.huihui_auth._create_boxim_client", return_value=client
|
||||||
|
):
|
||||||
|
response = await token_login({"token": "production-huihui-token"}, db)
|
||||||
|
|
||||||
|
assert response["code"] == 200
|
||||||
|
assert response["data"]["token"] == "existing-app-session"
|
||||||
|
assert "token" not in response["data"]["huihui"]
|
||||||
|
user = db.query(User).one()
|
||||||
|
assert user.huihui_user_id == "huihui-user-88"
|
||||||
|
assert user.huihui_user_id != "998877"
|
||||||
|
assert user.huihui_token == "production-huihui-token"
|
||||||
|
assert user.nickname == "会会用户"
|
||||||
|
assert user.avatar_url == "https://cdn.example/avatar.jpg"
|
||||||
|
client.exchange_access_token.assert_awaited_once_with("production-huihui-token")
|
||||||
|
client.get_self.assert_awaited_once_with("boxim-token")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_token_login_rejects_expired_huihui_token_without_creating_user(db):
|
||||||
|
client = AsyncMock()
|
||||||
|
client.exchange_access_token.side_effect = BoxIMError(
|
||||||
|
"expired", auth_error=True
|
||||||
|
)
|
||||||
|
with patch("routers.huihui_auth._cfg_ready", return_value=True), patch(
|
||||||
|
"routers.huihui_auth._create_boxim_client", return_value=client
|
||||||
|
):
|
||||||
|
response = await token_login({"token": "expired-token"}, db)
|
||||||
|
|
||||||
|
assert response["code"] == 401
|
||||||
|
assert response["message"] == "会会登录凭证无效或已过期"
|
||||||
|
assert db.query(User).count() == 0
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
|
from services.huihui_payment import HuihuiPaymentClient
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_payment_uses_huihui_payment_v3_contract():
|
||||||
|
client = HuihuiPaymentClient({
|
||||||
|
"HUIHUI_PAYMENT_BASE_URL": "https://open.example/api/payment-v3",
|
||||||
|
"HUIHUI_APP_ID": "app-id",
|
||||||
|
"HUIHUI_ACCESS_ID": "access-id",
|
||||||
|
"HUIHUI_ACCESS_SECRET": "access-secret",
|
||||||
|
})
|
||||||
|
response = Mock()
|
||||||
|
response.status_code = 200
|
||||||
|
response.json.return_value = {
|
||||||
|
"code": 0,
|
||||||
|
"data": {"orderId": "provider-id", "status": "pending", "payMessage": "mock"},
|
||||||
|
}
|
||||||
|
|
||||||
|
with patch("services.huihui_payment.httpx.post", return_value=response) as post:
|
||||||
|
result = client.create_payment(
|
||||||
|
huihui_token="user-token",
|
||||||
|
huihui_user_id="user-id",
|
||||||
|
real_name="测试用户",
|
||||||
|
order_no="AV202608260001",
|
||||||
|
amount="10.00",
|
||||||
|
points_amount=2_000_000,
|
||||||
|
pay_type="WECHAT",
|
||||||
|
pay_way="APP",
|
||||||
|
callback_url="https://digital.example/api/token/payment/callback/secret",
|
||||||
|
)
|
||||||
|
|
||||||
|
assert result["orderId"] == "provider-id"
|
||||||
|
assert post.call_args.args[0] == "https://open.example/api/payment-v3/payment/pay"
|
||||||
|
assert post.call_args.kwargs["headers"] == {
|
||||||
|
"Authorization": "Bearer user-token",
|
||||||
|
"appId": "app-id",
|
||||||
|
"windowAppId": "app-id",
|
||||||
|
}
|
||||||
|
params = post.call_args.kwargs["params"]
|
||||||
|
assert params["appId"] == "app-id"
|
||||||
|
assert params["accessId"] == "access-id"
|
||||||
|
assert params["userId"] == "user-id"
|
||||||
|
assert params["signature"]
|
||||||
|
assert "accessSecret" not in params
|
||||||
|
body = post.call_args.kwargs["json"]
|
||||||
|
assert body["payType"] == "WECHAT"
|
||||||
|
assert body["payWay"] == "APP"
|
||||||
|
assert body["masterOrderAmt"] == "10.00"
|
||||||
|
assert body["payAmt"] == 10.0
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from types import SimpleNamespace
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from database import SessionLocal
|
||||||
|
from main import app
|
||||||
|
from models import Avatar, KnowledgeChunk, KnowledgeDoc, QAPair
|
||||||
|
from routers.knowledge import _doc_payload
|
||||||
|
|
||||||
|
|
||||||
|
client = TestClient(app)
|
||||||
|
|
||||||
|
|
||||||
|
def test_doc_payload_reports_whether_the_persisted_file_exists(tmp_path: Path):
|
||||||
|
avatar_id = "avatar-1"
|
||||||
|
stored_name = "knowledge.md"
|
||||||
|
doc = SimpleNamespace(
|
||||||
|
avatar_id=avatar_id,
|
||||||
|
file_url=f"/api/files/{avatar_id}/{stored_name}",
|
||||||
|
to_dict=lambda: {"id": "doc-1", "fileUrl": f"/api/files/{avatar_id}/{stored_name}"},
|
||||||
|
)
|
||||||
|
stored_dir = tmp_path / avatar_id
|
||||||
|
stored_dir.mkdir()
|
||||||
|
stored_file = stored_dir / stored_name
|
||||||
|
|
||||||
|
with patch("routers.knowledge.UPLOAD_DIR", str(tmp_path)):
|
||||||
|
assert _doc_payload(doc)["filePresent"] is False
|
||||||
|
stored_file.write_text("knowledge", encoding="utf-8")
|
||||||
|
assert _doc_payload(doc)["filePresent"] is True
|
||||||
|
|
||||||
|
|
||||||
|
def test_upload_marks_vectorization_failure_instead_of_staying_processing(
|
||||||
|
tmp_path: Path,
|
||||||
|
authorization_context,
|
||||||
|
):
|
||||||
|
context = authorization_context
|
||||||
|
with (
|
||||||
|
patch("routers.knowledge.UPLOAD_DIR", str(tmp_path)),
|
||||||
|
patch("routers.knowledge.embeddings.embed", side_effect=RuntimeError("provider unavailable")),
|
||||||
|
):
|
||||||
|
response = client.post(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/knowledge/docs",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
files={"file": ("knowledge.md", b"# Knowledge\n\nTest content", "text/markdown")},
|
||||||
|
)
|
||||||
|
|
||||||
|
payload = response.json()["data"]
|
||||||
|
assert payload["status"] == "failed"
|
||||||
|
assert payload["vectorized"] is False
|
||||||
|
assert payload["chunkCount"] == 0
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
stored = db.query(KnowledgeDoc).filter(KnowledgeDoc.id == payload["id"]).one()
|
||||||
|
assert stored.status == "failed"
|
||||||
|
assert db.query(KnowledgeChunk).filter(KnowledgeChunk.doc_id == stored.id).count() == 0
|
||||||
|
db.delete(stored)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_markdown_upload_commits_ready_document_and_chunks_together(
|
||||||
|
tmp_path: Path,
|
||||||
|
authorization_context,
|
||||||
|
):
|
||||||
|
context = authorization_context
|
||||||
|
with (
|
||||||
|
patch("routers.knowledge.UPLOAD_DIR", str(tmp_path)),
|
||||||
|
patch("routers.knowledge.embeddings.embed", return_value=[[1.0, 0.0]]),
|
||||||
|
):
|
||||||
|
response = client.post(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/knowledge/docs",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
files={"file": ("knowledge.md", b"# Knowledge\n\nTest content", "text/markdown")},
|
||||||
|
)
|
||||||
|
|
||||||
|
payload = response.json()["data"]
|
||||||
|
assert payload["status"] == "ready"
|
||||||
|
assert payload["vectorized"] is True
|
||||||
|
assert payload["chunkCount"] == 1
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
stored = db.query(KnowledgeDoc).filter(KnowledgeDoc.id == payload["id"]).one()
|
||||||
|
assert stored.status == "ready"
|
||||||
|
assert db.query(KnowledgeChunk).filter(KnowledgeChunk.doc_id == stored.id).count() == 1
|
||||||
|
db.query(KnowledgeChunk).filter(KnowledgeChunk.doc_id == stored.id).delete()
|
||||||
|
db.delete(stored)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_each_avatar_has_an_independent_document_and_qa_scope(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
first_avatar_id = context["avatar"].id
|
||||||
|
second_avatar_id = f"knowledge-second-{context['suffix']}"
|
||||||
|
first_doc_id = f"knowledge-first-doc-{context['suffix']}"
|
||||||
|
second_doc_id = f"knowledge-second-doc-{context['suffix']}"
|
||||||
|
first_qa_id = f"knowledge-first-qa-{context['suffix']}"
|
||||||
|
second_qa_id = f"knowledge-second-qa-{context['suffix']}"
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.add_all(
|
||||||
|
[
|
||||||
|
Avatar(
|
||||||
|
id=second_avatar_id,
|
||||||
|
owner_id=context["owner"].huihui_user_id,
|
||||||
|
name="独立知识库分身",
|
||||||
|
status="active",
|
||||||
|
config={},
|
||||||
|
),
|
||||||
|
KnowledgeDoc(
|
||||||
|
id=first_doc_id,
|
||||||
|
avatar_id=first_avatar_id,
|
||||||
|
filename="first.md",
|
||||||
|
status="ready",
|
||||||
|
vectorized=True,
|
||||||
|
),
|
||||||
|
KnowledgeDoc(
|
||||||
|
id=second_doc_id,
|
||||||
|
avatar_id=second_avatar_id,
|
||||||
|
filename="second.md",
|
||||||
|
status="ready",
|
||||||
|
vectorized=True,
|
||||||
|
),
|
||||||
|
QAPair(
|
||||||
|
id=first_qa_id,
|
||||||
|
avatar_id=first_avatar_id,
|
||||||
|
question="第一个分身问题",
|
||||||
|
answer="第一个分身答案",
|
||||||
|
),
|
||||||
|
QAPair(
|
||||||
|
id=second_qa_id,
|
||||||
|
avatar_id=second_avatar_id,
|
||||||
|
question="第二个分身问题",
|
||||||
|
answer="第二个分身答案",
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
try:
|
||||||
|
first_docs = client.get(
|
||||||
|
f"/api/avatar/{first_avatar_id}/knowledge/docs",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
).json()["data"]
|
||||||
|
second_docs = client.get(
|
||||||
|
f"/api/avatar/{second_avatar_id}/knowledge/docs",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
).json()["data"]
|
||||||
|
first_qa = client.get(
|
||||||
|
f"/api/avatar/{first_avatar_id}/knowledge/qa",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
).json()["data"]
|
||||||
|
second_qa = client.get(
|
||||||
|
f"/api/avatar/{second_avatar_id}/knowledge/qa",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
).json()["data"]
|
||||||
|
|
||||||
|
assert [item["id"] for item in first_docs if item["id"] == first_doc_id] == [first_doc_id]
|
||||||
|
assert second_doc_id not in {item["id"] for item in first_docs}
|
||||||
|
assert [item["id"] for item in second_docs] == [second_doc_id]
|
||||||
|
assert first_qa_id in {item["id"] for item in first_qa}
|
||||||
|
assert second_qa_id not in {item["id"] for item in first_qa}
|
||||||
|
assert [item["id"] for item in second_qa] == [second_qa_id]
|
||||||
|
finally:
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.query(QAPair).filter(QAPair.id.in_([first_qa_id, second_qa_id])).delete(
|
||||||
|
synchronize_session=False
|
||||||
|
)
|
||||||
|
db.query(KnowledgeDoc).filter(
|
||||||
|
KnowledgeDoc.id.in_([first_doc_id, second_doc_id])
|
||||||
|
).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == second_avatar_id).delete()
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
@@ -1,105 +1,253 @@
|
|||||||
"""Tests for PUT /api/avatar/{avatar_id}/authorizations/takeover endpoint."""
|
"""Tests for takeover configuration and BOXIM connection status."""
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from database import SessionLocal
|
||||||
from main import app
|
from main import app
|
||||||
from database import SessionLocal, Base, engine
|
from models import Authorization, Avatar, TakeoverCursor, TakeoverReplyTask, User
|
||||||
from models import Authorization, Avatar
|
|
||||||
|
|
||||||
|
|
||||||
def setup_test_db():
|
client = TestClient(app)
|
||||||
Base.metadata.create_all(bind=engine)
|
|
||||||
|
|
||||||
|
def test_update_takeover_accepts_camel_case_and_persists(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
response = client.put(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/authorizations/takeover",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"authorizationId": context["authorization"].id,
|
||||||
|
"takeoverEnabled": True,
|
||||||
|
"takeoverMode": "delayed",
|
||||||
|
"takeoverDelaySeconds": 60,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
payload = response.json()
|
||||||
|
assert payload["code"] == 200
|
||||||
|
assert payload["data"]["takeoverEnabled"] is True
|
||||||
|
assert payload["data"]["takeoverMode"] == "delayed"
|
||||||
|
assert payload["data"]["takeoverDelaySeconds"] == 60
|
||||||
|
assert "takeover" in payload["data"]["permissions"]
|
||||||
|
|
||||||
db = SessionLocal()
|
db = SessionLocal()
|
||||||
avatar = Avatar(name="test", status="active", config={})
|
|
||||||
db.add(avatar)
|
|
||||||
db.commit()
|
|
||||||
db.refresh(avatar)
|
|
||||||
auth = Authorization(avatar_id=avatar.id, target_id="user1", target_name="测试用户")
|
|
||||||
db.add(auth)
|
|
||||||
db.commit()
|
|
||||||
db.refresh(auth)
|
|
||||||
return db, auth.id
|
|
||||||
|
|
||||||
|
|
||||||
def test_update_takeover_config():
|
|
||||||
db, auth_id = setup_test_db()
|
|
||||||
try:
|
try:
|
||||||
client = TestClient(app)
|
stored = db.query(Authorization).filter(
|
||||||
response = client.put(
|
Authorization.id == context["authorization"].id
|
||||||
f"/api/avatar/test_avatar_id/authorizations/takeover",
|
).first()
|
||||||
json={
|
assert stored.takeover_enabled is True
|
||||||
"authorization_id": auth_id,
|
assert stored.takeover_mode == "delayed"
|
||||||
"takeover_enabled": True,
|
assert stored.takeover_delay_seconds == 60
|
||||||
"takeover_mode": "delayed",
|
|
||||||
"takeover_delay_seconds": 60,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
assert data["code"] == 200
|
|
||||||
assert data["data"]["takeoverEnabled"] is True
|
|
||||||
assert data["data"]["takeoverMode"] == "delayed"
|
|
||||||
assert data["data"]["takeoverDelaySeconds"] == 60
|
|
||||||
# 验证数据库已更新
|
|
||||||
auth = db.query(Authorization).filter(Authorization.id == auth_id).first()
|
|
||||||
assert auth.takeover_enabled is True
|
|
||||||
assert auth.takeover_mode == "delayed"
|
|
||||||
assert auth.takeover_delay_seconds == 60
|
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
def test_update_takeover_invalid_mode():
|
def test_disabling_authorization_also_disables_takeover(authorization_context):
|
||||||
db, auth_id = setup_test_db()
|
context = authorization_context
|
||||||
try:
|
endpoint = f"/api/avatar/{context['avatar'].id}/authorizations/takeover"
|
||||||
client = TestClient(app)
|
client.put(
|
||||||
response = client.put(
|
endpoint,
|
||||||
f"/api/avatar/test/authorizations/takeover",
|
headers=context["owner_headers"],
|
||||||
json={
|
json={
|
||||||
"authorization_id": auth_id,
|
"authorizationId": context["authorization"].id,
|
||||||
"takeover_mode": "invalid_mode",
|
"takeoverEnabled": True,
|
||||||
},
|
},
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
assert data["code"] == 400
|
|
||||||
finally:
|
|
||||||
db.close()
|
|
||||||
|
|
||||||
|
|
||||||
def test_update_takeover_invalid_delay():
|
|
||||||
db, auth_id = setup_test_db()
|
|
||||||
try:
|
|
||||||
client = TestClient(app)
|
|
||||||
response = client.put(
|
|
||||||
f"/api/avatar/test/authorizations/takeover",
|
|
||||||
json={
|
|
||||||
"authorization_id": auth_id,
|
|
||||||
"takeover_delay_seconds": 2,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
|
||||||
assert data["code"] == 400
|
|
||||||
finally:
|
|
||||||
db.close()
|
|
||||||
|
|
||||||
|
|
||||||
def test_update_takeover_missing_auth_id():
|
|
||||||
client = TestClient(app)
|
|
||||||
response = client.put(
|
|
||||||
f"/api/avatar/test/authorizations/takeover",
|
|
||||||
json={"takeover_enabled": True},
|
|
||||||
)
|
)
|
||||||
assert response.status_code == 200
|
|
||||||
data = response.json()
|
updated = client.put(
|
||||||
assert data["code"] == 400
|
f"/api/avatar/{context['avatar'].id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"id": context["authorization"].id, "status": "inactive"},
|
||||||
|
).json()
|
||||||
|
assert updated["code"] == 200
|
||||||
|
assert updated["data"]["status"] == "inactive"
|
||||||
|
assert updated["data"]["takeoverEnabled"] is False
|
||||||
|
assert "takeover" not in updated["data"]["permissions"]
|
||||||
|
|
||||||
|
|
||||||
def test_update_takeover_not_found():
|
def test_takeover_rejects_invalid_values_and_cross_avatar_access(authorization_context):
|
||||||
client = TestClient(app)
|
context = authorization_context
|
||||||
response = client.put(
|
endpoint = f"/api/avatar/{context['avatar'].id}/authorizations/takeover"
|
||||||
f"/api/avatar/test/authorizations/takeover",
|
|
||||||
json={"authorization_id": "nonexistent"},
|
invalid_mode = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"authorization_id": context["authorization"].id,
|
||||||
|
"takeover_mode": "invalid",
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert invalid_mode["code"] == 400
|
||||||
|
|
||||||
|
invalid_delay = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"authorization_id": context["authorization"].id,
|
||||||
|
"takeover_delay_seconds": 2,
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert invalid_delay["code"] == 400
|
||||||
|
|
||||||
|
forbidden = client.put(
|
||||||
|
endpoint,
|
||||||
|
headers=context["other_headers"],
|
||||||
|
json={
|
||||||
|
"authorizationId": context["authorization"].id,
|
||||||
|
"takeoverEnabled": True,
|
||||||
|
},
|
||||||
)
|
)
|
||||||
assert response.status_code == 200
|
assert forbidden.status_code == 403
|
||||||
data = response.json()
|
|
||||||
assert data["code"] == 404
|
|
||||||
|
def test_takeover_is_limited_to_active_user_authorizations(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
created = client.post(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"targetType": "organization",
|
||||||
|
"targetId": f"org-{context['suffix']}",
|
||||||
|
"targetName": "测试组织",
|
||||||
|
"permissions": ["chat"],
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
response = client.put(
|
||||||
|
f"/api/avatar/{avatar_id}/authorizations/takeover",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={
|
||||||
|
"authorizationId": created["data"]["id"],
|
||||||
|
"takeoverEnabled": True,
|
||||||
|
},
|
||||||
|
).json()
|
||||||
|
assert response["code"] == 400
|
||||||
|
assert "单聊接管" in response["message"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_takeover_status_reports_disabled_and_requires_owner_login(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
endpoint = f"/api/avatar/{context['avatar'].id}/takeover/status"
|
||||||
|
|
||||||
|
disabled = client.get(endpoint, headers=context["owner_headers"])
|
||||||
|
assert disabled.status_code == 200
|
||||||
|
assert disabled.json()["data"]["status"] == "disabled"
|
||||||
|
|
||||||
|
client.put(
|
||||||
|
f"/api/avatar/{context['avatar'].id}/permission-settings",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["chat", "takeover"]},
|
||||||
|
)
|
||||||
|
needs_login = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert needs_login["enabled"] is True
|
||||||
|
assert needs_login["status"] == "needs_login"
|
||||||
|
assert "BOXIM" in needs_login["message"]
|
||||||
|
|
||||||
|
assert client.get(endpoint).status_code == 401
|
||||||
|
assert client.get(endpoint, headers=context["other_headers"]).status_code == 403
|
||||||
|
|
||||||
|
|
||||||
|
def test_takeover_status_reports_ready_pending_count_and_errors(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
avatar_id = context["avatar"].id
|
||||||
|
endpoint = f"/api/avatar/{avatar_id}/takeover/status"
|
||||||
|
client.put(
|
||||||
|
f"/api/avatar/{avatar_id}/permission-settings",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["chat", "takeover"]},
|
||||||
|
)
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
owner = db.query(User).filter(User.id == context["owner"].id).one()
|
||||||
|
owner.huihui_token = "production-login-token"
|
||||||
|
cursor = TakeoverCursor(
|
||||||
|
avatar_id=avatar_id,
|
||||||
|
owner_id=owner.huihui_user_id,
|
||||||
|
boxim_owner_id="100",
|
||||||
|
last_message_id="10",
|
||||||
|
initialized=True,
|
||||||
|
last_polled_at=datetime.utcnow(),
|
||||||
|
)
|
||||||
|
task = TakeoverReplyTask(
|
||||||
|
avatar_id=avatar_id,
|
||||||
|
owner_id=owner.huihui_user_id,
|
||||||
|
peer_id="200",
|
||||||
|
trigger_message_id="11",
|
||||||
|
source_message_ids=["11"],
|
||||||
|
prompt="你好",
|
||||||
|
status="pending",
|
||||||
|
scheduled_at=datetime.utcnow(),
|
||||||
|
boxim_local_id="123",
|
||||||
|
)
|
||||||
|
db.add_all([cursor, task])
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
ready = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert ready["status"] == "ready"
|
||||||
|
assert ready["pendingCount"] == 1
|
||||||
|
assert ready["lastPolledAt"]
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar_id).one()
|
||||||
|
cursor.last_polled_at = datetime.utcnow() - timedelta(seconds=30)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
long_polling = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert long_polling["status"] == "ready"
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar_id).one()
|
||||||
|
cursor.last_polled_at = datetime.utcnow() - timedelta(seconds=61)
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
stale = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert stale["status"] == "connecting"
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar_id).one()
|
||||||
|
cursor.last_error = "BOXIM 暂时不可用"
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
failed = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert failed["status"] == "error"
|
||||||
|
assert failed["message"] == "BOXIM 暂时不可用"
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).filter(Avatar.id == avatar_id).one()
|
||||||
|
avatar.config = {"authorizationPermissions": ["chat"]}
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
auto_disabled = client.get(endpoint, headers=context["owner_headers"]).json()["data"]
|
||||||
|
assert auto_disabled["enabled"] is False
|
||||||
|
assert auto_disabled["status"] == "error"
|
||||||
|
|
||||||
|
client.put(
|
||||||
|
f"/api/avatar/{avatar_id}/permission-settings",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"permissions": ["chat", "takeover"]},
|
||||||
|
)
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
cursor = db.query(TakeoverCursor).filter(TakeoverCursor.avatar_id == avatar_id).one()
|
||||||
|
assert cursor.initialized is False
|
||||||
|
assert cursor.last_message_id == "0"
|
||||||
|
assert cursor.last_error == ""
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ def test_authorization_takeover_fields():
|
|||||||
assert hasattr(auth, 'takeover_delay_seconds')
|
assert hasattr(auth, 'takeover_delay_seconds')
|
||||||
assert auth.takeover_enabled == False
|
assert auth.takeover_enabled == False
|
||||||
assert auth.takeover_mode == 'immediate'
|
assert auth.takeover_mode == 'immediate'
|
||||||
assert auth.takeover_delay_seconds == 30
|
assert auth.takeover_delay_seconds == 180
|
||||||
finally:
|
finally:
|
||||||
db.close()
|
db.close()
|
||||||
|
|
||||||
|
|||||||
@@ -1,197 +1,100 @@
|
|||||||
"""Tests for the scheduled takeover message polling."""
|
"""Tests for the BOXIM takeover scheduler lifecycle."""
|
||||||
import json
|
|
||||||
import pytest
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
from unittest.mock import MagicMock, patch, AsyncMock
|
|
||||||
|
|
||||||
|
|
||||||
def test_app_has_startup_event():
|
def test_app_has_startup_and_shutdown_events():
|
||||||
"""Verify the app has a startup event configured."""
|
|
||||||
from main import app
|
from main import app
|
||||||
startup_handlers = [handler for handler in app.router.on_startup]
|
|
||||||
assert len(startup_handlers) > 0
|
assert app.router.on_startup
|
||||||
|
assert app.router.on_shutdown
|
||||||
|
|
||||||
|
|
||||||
@patch("services.takeover_service.TakeoverService")
|
@patch("services.takeover_service.TakeoverService")
|
||||||
@patch("services.boxim_client.BoxIMClient")
|
@patch("services.boxim_client.BoxIMClient")
|
||||||
@patch("main.redis_lib.from_url")
|
@patch("main.AsyncIOScheduler")
|
||||||
@patch("main.BackgroundScheduler")
|
def test_scheduler_uses_boxim_and_restart_safe_service(
|
||||||
def test_scheduler_initialized_with_redis(mock_scheduler_class, mock_redis_from_url, mock_boxim_cls, mock_takeover_cls):
|
mock_scheduler_class,
|
||||||
"""Verify scheduler is initialized when Redis is available."""
|
mock_boxim_class,
|
||||||
mock_redis = MagicMock()
|
mock_takeover_class,
|
||||||
mock_redis.ping.return_value = None
|
):
|
||||||
mock_redis_from_url.return_value = mock_redis
|
import main
|
||||||
|
|
||||||
mock_boxim = MagicMock()
|
maintenance_scheduler = MagicMock()
|
||||||
mock_boxim_cls.return_value = mock_boxim
|
scheduler = MagicMock()
|
||||||
|
mock_scheduler_class.side_effect = [maintenance_scheduler, scheduler]
|
||||||
|
boxim = MagicMock()
|
||||||
|
mock_boxim_class.return_value = boxim
|
||||||
|
takeover = MagicMock()
|
||||||
|
takeover.poll_messages = AsyncMock()
|
||||||
|
takeover.process_reply_tasks = AsyncMock()
|
||||||
|
mock_takeover_class.return_value = takeover
|
||||||
|
|
||||||
mock_takeover = MagicMock()
|
environment = {
|
||||||
mock_takeover_cls.return_value = mock_takeover
|
"HUIHUI_PLATFORM_BASE_URL": "https://open.example/api",
|
||||||
|
"BOXIM_API_BASE_URL": "https://im.example/api",
|
||||||
|
"HUIHUI_APP_ID": "app-id",
|
||||||
|
"HUIHUI_ACCESS_ID": "access-id",
|
||||||
|
"HUIHUI_ACCESS_SECRET": "secret",
|
||||||
|
"BOXIM_POLL_INTERVAL_SECONDS": "1",
|
||||||
|
}
|
||||||
|
with patch("main.init_db"), patch("main.seed"), patch.dict(
|
||||||
|
"os.environ", environment, clear=False
|
||||||
|
):
|
||||||
|
main.on_startup()
|
||||||
|
|
||||||
with patch("main.init_db"), patch("main.seed"), patch.dict("os.environ", {"REDIS_URL": "redis://localhost:6379"}):
|
config = mock_boxim_class.call_args.args[0]
|
||||||
from main import on_startup
|
assert config["HUIHUI_PLATFORM_BASE_URL"] == "https://open.example/api"
|
||||||
on_startup()
|
assert config["BOXIM_API_BASE_URL"] == "https://im.example/api"
|
||||||
|
mock_takeover_class.assert_called_once_with(main.SessionLocal, boxim)
|
||||||
|
|
||||||
mock_scheduler_class.return_value.add_job.assert_called_once()
|
maintenance_scheduler.add_job.assert_called_once()
|
||||||
call_kwargs = mock_scheduler_class.return_value.add_job.call_args[1]
|
assert maintenance_scheduler.add_job.call_args.kwargs["id"] == "chat_attachment_cleanup"
|
||||||
assert call_kwargs["id"] == "takeover_message_poll"
|
maintenance_scheduler.start.assert_called_once_with()
|
||||||
|
|
||||||
|
assert scheduler.add_job.call_count == 2
|
||||||
|
poll_call, process_call = scheduler.add_job.call_args_list
|
||||||
|
assert poll_call.args[0] is takeover.poll_messages
|
||||||
|
assert poll_call.kwargs["id"] == "takeover_message_poll"
|
||||||
|
assert poll_call.kwargs["trigger"].interval.total_seconds() == 1
|
||||||
|
assert poll_call.kwargs["max_instances"] == 1
|
||||||
|
assert poll_call.kwargs["coalesce"] is True
|
||||||
|
assert process_call.args[0] is takeover.process_reply_tasks
|
||||||
|
assert process_call.kwargs["id"] == "takeover_reply_process"
|
||||||
|
assert process_call.kwargs["trigger"].interval.total_seconds() == 0.5
|
||||||
|
assert process_call.kwargs["max_instances"] == 1
|
||||||
|
assert process_call.kwargs["coalesce"] is True
|
||||||
|
scheduler.start.assert_called_once_with()
|
||||||
|
|
||||||
|
main.takeover_scheduler = None
|
||||||
|
main.maintenance_scheduler = None
|
||||||
|
|
||||||
|
|
||||||
@patch("services.takeover_service.TakeoverService")
|
@patch("main.AsyncIOScheduler")
|
||||||
@patch("services.boxim_client.BoxIMClient")
|
def test_scheduler_failure_does_not_stop_the_api(mock_scheduler_class):
|
||||||
@patch("main.BackgroundScheduler")
|
import main
|
||||||
def test_scheduler_starts_without_redis(mock_scheduler_class, mock_boxim_cls, mock_takeover_cls):
|
|
||||||
"""App should start even when REDIS_URL is not set."""
|
|
||||||
mock_boxim = MagicMock()
|
|
||||||
mock_boxim_cls.return_value = mock_boxim
|
|
||||||
|
|
||||||
mock_takeover = MagicMock()
|
|
||||||
mock_takeover_cls.return_value = mock_takeover
|
|
||||||
|
|
||||||
with patch("main.init_db"), patch("main.seed"), patch.dict("os.environ", {"REDIS_URL": ""}, clear=False):
|
|
||||||
from main import on_startup
|
|
||||||
on_startup()
|
|
||||||
|
|
||||||
mock_scheduler_class.return_value.add_job.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
@patch("services.takeover_service.TakeoverService")
|
|
||||||
@patch("services.boxim_client.BoxIMClient")
|
|
||||||
@patch("main.redis_lib.from_url")
|
|
||||||
@patch("main.BackgroundScheduler")
|
|
||||||
def test_scheduler_starts_when_redis_fails(mock_scheduler_class, mock_redis_from_url, mock_boxim_cls, mock_takeover_cls):
|
|
||||||
"""App should start even when Redis ping fails."""
|
|
||||||
mock_redis_from_url.side_effect = ConnectionError("Connection refused")
|
|
||||||
|
|
||||||
mock_boxim = MagicMock()
|
|
||||||
mock_boxim_cls.return_value = mock_boxim
|
|
||||||
|
|
||||||
mock_takeover = MagicMock()
|
|
||||||
mock_takeover_cls.return_value = mock_takeover
|
|
||||||
|
|
||||||
with patch("main.init_db"), patch("main.seed"), patch.dict("os.environ", {"REDIS_URL": "redis://badhost:6379"}):
|
|
||||||
from main import on_startup
|
|
||||||
on_startup()
|
|
||||||
|
|
||||||
mock_scheduler_class.return_value.add_job.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
@patch("main.BackgroundScheduler")
|
|
||||||
def test_scheduler_fails_gracefully(mock_scheduler_class):
|
|
||||||
"""If scheduler init raises, the app should still start (exception caught)."""
|
|
||||||
mock_scheduler_class.side_effect = RuntimeError("Scheduler crash")
|
|
||||||
|
|
||||||
|
mock_scheduler_class.side_effect = RuntimeError("scheduler crash")
|
||||||
with patch("main.init_db"), patch("main.seed"):
|
with patch("main.init_db"), patch("main.seed"):
|
||||||
from main import on_startup
|
main.on_startup()
|
||||||
on_startup()
|
|
||||||
|
|
||||||
# No exception should propagate
|
assert main.takeover_scheduler is None
|
||||||
|
assert main.maintenance_scheduler is None
|
||||||
|
|
||||||
|
|
||||||
# --- poll_and_process_messages ---
|
def test_shutdown_stops_only_the_scheduler():
|
||||||
|
import main
|
||||||
|
|
||||||
|
scheduler = MagicMock()
|
||||||
|
scheduler.running = True
|
||||||
|
maintenance_scheduler = MagicMock()
|
||||||
|
maintenance_scheduler.running = True
|
||||||
|
main.takeover_scheduler = scheduler
|
||||||
|
main.maintenance_scheduler = maintenance_scheduler
|
||||||
|
|
||||||
@pytest.fixture
|
main.on_shutdown()
|
||||||
def mock_db():
|
|
||||||
return MagicMock()
|
|
||||||
|
|
||||||
|
scheduler.shutdown.assert_called_once_with(wait=False)
|
||||||
@pytest.fixture
|
maintenance_scheduler.shutdown.assert_called_once_with(wait=False)
|
||||||
def mock_boxim():
|
assert main.takeover_scheduler is None
|
||||||
return AsyncMock()
|
assert main.maintenance_scheduler is None
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_poll_and_process_messages_calls_fetch_and_process(mock_db, mock_boxim):
|
|
||||||
"""poll_and_process_messages should fetch messages and process each."""
|
|
||||||
from services.takeover_service import TakeoverService
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.fetch_unread_messages = AsyncMock(return_value=[
|
|
||||||
{"owner_huihui_id": "owner_1", "from_accid": "user_1", "content": "hi"},
|
|
||||||
{"owner_huihui_id": "owner_2", "from_accid": "user_2", "content": "hello"},
|
|
||||||
])
|
|
||||||
service.process_message = AsyncMock()
|
|
||||||
|
|
||||||
await service.poll_and_process_messages()
|
|
||||||
|
|
||||||
service.fetch_unread_messages.assert_awaited_once()
|
|
||||||
assert service.process_message.await_count == 2
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_poll_and_process_messages_handles_errors(mock_db, mock_boxim):
|
|
||||||
"""poll_and_process_messages should not crash on fetch failure."""
|
|
||||||
from services.takeover_service import TakeoverService
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.fetch_unread_messages = AsyncMock(side_effect=ConnectionError("Box IM down"))
|
|
||||||
|
|
||||||
await service.poll_and_process_messages()
|
|
||||||
# No exception should propagate
|
|
||||||
|
|
||||||
|
|
||||||
# --- process_message ---
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_auth():
|
|
||||||
auth = MagicMock()
|
|
||||||
auth.takeover_enabled = True
|
|
||||||
auth.takeover_mode = "immediate"
|
|
||||||
auth.takeover_delay_seconds = 30
|
|
||||||
auth.avatar_id = "avatar_123"
|
|
||||||
auth.target_id = "target_user_123"
|
|
||||||
return auth
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_process_message_immediate_mode(mock_db, mock_boxim, mock_auth):
|
|
||||||
"""When takeover_mode is 'immediate', execute_takeover should be called."""
|
|
||||||
from services.takeover_service import TakeoverService
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.check_takeover_enabled = MagicMock(return_value=mock_auth)
|
|
||||||
service.execute_takeover = AsyncMock(return_value=True)
|
|
||||||
service.enqueue_delayed_message = MagicMock()
|
|
||||||
|
|
||||||
message = {"owner_huihui_id": "owner_1", "from_accid": "user_1", "content": "hi"}
|
|
||||||
await service.process_message(message)
|
|
||||||
|
|
||||||
service.execute_takeover.assert_awaited_once_with(mock_auth, message)
|
|
||||||
service.enqueue_delayed_message.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_process_message_delayed_mode(mock_db, mock_boxim, mock_auth):
|
|
||||||
"""When takeover_mode is not 'immediate', message should be enqueued."""
|
|
||||||
from services.takeover_service import TakeoverService
|
|
||||||
|
|
||||||
mock_auth.takeover_mode = "delayed"
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.check_takeover_enabled = MagicMock(return_value=mock_auth)
|
|
||||||
service.execute_takeover = AsyncMock()
|
|
||||||
service.enqueue_delayed_message = MagicMock()
|
|
||||||
|
|
||||||
message = {"owner_huihui_id": "owner_1", "from_accid": "user_1", "content": "hi"}
|
|
||||||
await service.process_message(message)
|
|
||||||
|
|
||||||
service.enqueue_delayed_message.assert_called_once_with(mock_auth, message)
|
|
||||||
service.execute_takeover.assert_not_awaited()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_process_message_no_takeover(mock_db, mock_boxim):
|
|
||||||
"""When takeover is not enabled, nothing should happen."""
|
|
||||||
from services.takeover_service import TakeoverService
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.check_takeover_enabled = MagicMock(return_value=None)
|
|
||||||
service.execute_takeover = AsyncMock()
|
|
||||||
service.enqueue_delayed_message = MagicMock()
|
|
||||||
|
|
||||||
message = {"owner_huihui_id": "owner_1", "from_accid": "user_1", "content": "hi"}
|
|
||||||
await service.process_message(message)
|
|
||||||
|
|
||||||
service.execute_takeover.assert_not_awaited()
|
|
||||||
service.enqueue_delayed_message.assert_not_called()
|
|
||||||
|
|||||||
@@ -1,318 +1,491 @@
|
|||||||
"""Tests for the TakeoverService — message listening, decision, reply execution."""
|
"""End-to-end service tests for BOXIM takeover timing and human priority."""
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from threading import Barrier
|
||||||
|
from unittest.mock import AsyncMock, patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from unittest.mock import AsyncMock, patch, MagicMock
|
from sqlalchemy import create_engine
|
||||||
from services.takeover_service import TakeoverService
|
from sqlalchemy.orm import sessionmaker
|
||||||
from models import Authorization, Avatar
|
|
||||||
|
from database import Base
|
||||||
|
from models import Avatar, TakeoverCursor, TakeoverMessage, TakeoverReplyTask, User
|
||||||
|
from services.boxim_client import BoxIMError
|
||||||
|
from services.takeover_service import (
|
||||||
|
AVATAR_LOCAL_ID_PREFIX,
|
||||||
|
TakeoverService,
|
||||||
|
_avatar_local_id,
|
||||||
|
_plain_text_reply,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Clock:
|
||||||
|
def __init__(self):
|
||||||
|
self.value = datetime(2026, 8, 19, 10, 0, 0)
|
||||||
|
|
||||||
|
def now(self):
|
||||||
|
return self.value
|
||||||
|
|
||||||
|
def advance(self, seconds: int):
|
||||||
|
self.value += timedelta(seconds=seconds)
|
||||||
|
|
||||||
|
def millis(self):
|
||||||
|
return int(self.value.replace(tzinfo=timezone.utc).timestamp() * 1000)
|
||||||
|
|
||||||
|
|
||||||
|
class FakeBoxIM:
|
||||||
|
def __init__(self):
|
||||||
|
self.messages = []
|
||||||
|
self.sent = []
|
||||||
|
self.read_receipts = []
|
||||||
|
|
||||||
|
async def exchange_access_token(self, huihui_token):
|
||||||
|
assert huihui_token == "prod-huihui-token"
|
||||||
|
return {"accessToken": "box-token", "accessTokenExpiresIn": 3600}
|
||||||
|
|
||||||
|
async def get_self(self, access_token):
|
||||||
|
assert access_token == "box-token"
|
||||||
|
return {"id": 100}
|
||||||
|
|
||||||
|
async def fetch_private_messages(self, access_token, min_id="0"):
|
||||||
|
assert access_token == "box-token"
|
||||||
|
return [item.copy() for item in self.messages if int(item["id"]) > int(min_id)]
|
||||||
|
|
||||||
|
async def mark_private_messages_read(self, access_token, friend_id, message_id):
|
||||||
|
assert access_token == "box-token"
|
||||||
|
self.read_receipts.append(
|
||||||
|
{"friendId": str(friend_id), "messageId": str(message_id)}
|
||||||
|
)
|
||||||
|
|
||||||
|
async def send_private_message(self, access_token, peer_id, content, *, local_id=None):
|
||||||
|
self.sent.append({"peerId": str(peer_id), "content": content, "localId": str(local_id)})
|
||||||
|
return {"id": 900 + len(self.sent), "localId": int(local_id)}
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def mock_db():
|
def service_context(tmp_path):
|
||||||
db = MagicMock()
|
engine = create_engine(
|
||||||
return db
|
f"sqlite:///{tmp_path / 'takeover.db'}",
|
||||||
|
connect_args={"check_same_thread": False},
|
||||||
|
)
|
||||||
|
session_factory = sessionmaker(bind=engine, autoflush=False, expire_on_commit=False)
|
||||||
|
Base.metadata.create_all(engine)
|
||||||
|
db = session_factory()
|
||||||
|
user = User(
|
||||||
|
id="owner-local",
|
||||||
|
huihui_user_id="owner-huihui",
|
||||||
|
huihui_token="prod-huihui-token",
|
||||||
|
app_token="app-token",
|
||||||
|
)
|
||||||
|
avatar = Avatar(
|
||||||
|
id="avatar-1",
|
||||||
|
owner_id=user.huihui_user_id,
|
||||||
|
name="分身",
|
||||||
|
status="active",
|
||||||
|
config={
|
||||||
|
"authorizationPermissions": ["chat", "takeover"],
|
||||||
|
"takeoverReplyDelaySeconds": 3,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
clock = Clock()
|
||||||
@pytest.fixture
|
boxim = FakeBoxIM()
|
||||||
def mock_boxim():
|
service = TakeoverService(session_factory, boxim, now=clock.now)
|
||||||
client = AsyncMock()
|
return session_factory, service, boxim, clock
|
||||||
client.get_credentials.return_value = {"accid": "owner_acc", "token": "tok"}
|
|
||||||
client.send_p2p_message.return_value = True
|
|
||||||
return client
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_auth():
|
|
||||||
auth = MagicMock(spec=Authorization)
|
|
||||||
auth.takeover_enabled = True
|
|
||||||
auth.takeover_mode = "immediate"
|
|
||||||
auth.takeover_delay_seconds = 30
|
|
||||||
auth.avatar_id = "avatar_123"
|
|
||||||
auth.target_id = "target_user_123"
|
|
||||||
return auth
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_avatar():
|
|
||||||
avatar = MagicMock(spec=Avatar)
|
|
||||||
avatar.id = "avatar_123"
|
|
||||||
avatar.owner_id = "owner_huihui_123"
|
|
||||||
return avatar
|
|
||||||
|
|
||||||
|
|
||||||
# --- check_takeover_enabled ---
|
|
||||||
|
|
||||||
|
|
||||||
def test_check_takeover_enabled_returns_auth_when_enabled(mock_db, mock_auth, mock_boxim, mock_avatar):
|
|
||||||
avatar_filter = MagicMock()
|
|
||||||
avatar_filter.first.return_value = mock_avatar
|
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
|
|
||||||
auth_filter = MagicMock()
|
|
||||||
auth_filter.filter.return_value = auth_filter
|
|
||||||
auth_filter.first.return_value = mock_auth
|
|
||||||
|
|
||||||
def query_side_effect(model):
|
|
||||||
if model == Avatar:
|
|
||||||
return avatar_query
|
|
||||||
return auth_filter
|
|
||||||
|
|
||||||
mock_db.query.side_effect = query_side_effect
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
result = service.check_takeover_enabled("owner_huihui_123", "target_user_123")
|
|
||||||
assert result == mock_auth
|
|
||||||
|
|
||||||
|
|
||||||
def test_check_takeover_enabled_returns_none_when_no_avatar(mock_db, mock_boxim):
|
|
||||||
avatar_filter = MagicMock()
|
|
||||||
avatar_filter.first.return_value = None
|
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
mock_db.query.return_value = avatar_query
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
result = service.check_takeover_enabled("owner_123", "target_123")
|
|
||||||
assert result is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_check_takeover_enabled_returns_none_when_disabled(mock_db, mock_boxim, mock_avatar):
|
|
||||||
avatar_filter = MagicMock()
|
|
||||||
avatar_filter.first.return_value = mock_avatar
|
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
|
|
||||||
disabled_auth = MagicMock(spec=Authorization)
|
|
||||||
disabled_auth.takeover_enabled = False
|
|
||||||
auth_filter = MagicMock()
|
|
||||||
auth_filter.filter.return_value = auth_filter
|
|
||||||
auth_filter.first.return_value = disabled_auth
|
|
||||||
|
|
||||||
def query_side_effect(model):
|
|
||||||
if model == Avatar:
|
|
||||||
return avatar_query
|
|
||||||
return auth_filter
|
|
||||||
|
|
||||||
mock_db.query.side_effect = query_side_effect
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
result = service.check_takeover_enabled("owner_123", "target_123")
|
|
||||||
assert result is None
|
|
||||||
|
|
||||||
|
|
||||||
def test_check_takeover_enabled_filters_by_owner_and_target(mock_db, mock_boxim, mock_avatar, mock_auth):
|
|
||||||
"""Verify that queries use the correct filter arguments."""
|
|
||||||
avatar_filter = MagicMock()
|
|
||||||
avatar_filter.first.return_value = mock_avatar
|
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
|
|
||||||
auth_filter = MagicMock()
|
|
||||||
auth_filter.filter.return_value = auth_filter
|
|
||||||
auth_filter.first.return_value = mock_auth
|
|
||||||
|
|
||||||
call_order = []
|
|
||||||
|
|
||||||
def query_side_effect(model):
|
|
||||||
if model == Avatar:
|
|
||||||
call_order.append("Avatar")
|
|
||||||
return avatar_query
|
|
||||||
call_order.append("Authorization")
|
|
||||||
return auth_filter
|
|
||||||
|
|
||||||
mock_db.query.side_effect = query_side_effect
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
service.check_takeover_enabled("owner_huihui_123", "target_user_123")
|
|
||||||
|
|
||||||
assert "Avatar" in call_order
|
|
||||||
assert "Authorization" in call_order
|
|
||||||
|
|
||||||
|
|
||||||
# --- generate_reply ---
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_generate_reply_returns_answer(mock_boxim):
|
async def test_first_sync_primes_cursor_without_replying_to_history(service_context):
|
||||||
mock_db = MagicMock()
|
session_factory, service, boxim, clock = service_context
|
||||||
with patch("services.takeover_service.httpx.AsyncClient") as mock_client_class:
|
boxim.messages = [
|
||||||
mock_response = MagicMock()
|
{"id": 10, "localId": 1, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "旧消息"}
|
||||||
mock_response.json.return_value = {"code": 200, "data": {"answer": "Hello back"}}
|
]
|
||||||
mock_client_class.return_value.__aenter__.return_value.post.return_value = mock_response
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
with patch("routers.chat._resolve_reply", return_value={"answer": "不应发送"}):
|
||||||
result = await service.generate_reply("avatar_123", "Hello")
|
await service.poll_and_process_messages()
|
||||||
assert result == "Hello back"
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
cursor = db.query(TakeoverCursor).one()
|
||||||
|
assert cursor.initialized is True
|
||||||
|
assert cursor.last_message_id == "10"
|
||||||
|
assert db.query(TakeoverMessage).count() == 1
|
||||||
|
assert db.query(TakeoverReplyTask).count() == 0
|
||||||
|
assert boxim.sent == []
|
||||||
|
assert boxim.read_receipts == [{"friendId": "200", "messageId": "10"}]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_generate_reply_handles_empty_answer(mock_boxim):
|
async def test_incoming_message_is_prepared_then_sent_at_three_seconds(service_context):
|
||||||
"""generate_reply should return empty string when answer is missing."""
|
session_factory, service, boxim, clock = service_context
|
||||||
mock_db = MagicMock()
|
await service.poll_and_process_messages()
|
||||||
with patch("services.takeover_service.httpx.AsyncClient") as mock_client_class:
|
boxim.messages.append(
|
||||||
mock_response = MagicMock()
|
{"id": 11, "localId": 2, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "你好"}
|
||||||
mock_response.json.return_value = {"code": 200, "data": {}}
|
)
|
||||||
mock_client_class.return_value.__aenter__.return_value.post.return_value = mock_response
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
await service.poll_and_process_messages()
|
||||||
result = await service.generate_reply("avatar_123", "Hello")
|
assert boxim.sent == []
|
||||||
assert result == ""
|
assert boxim.read_receipts == [{"friendId": "200", "messageId": "11"}]
|
||||||
|
|
||||||
|
clock.advance(2)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
assert boxim.sent == []
|
||||||
|
|
||||||
|
clock.advance(1)
|
||||||
|
with patch("routers.chat._resolve_reply", return_value={"answer": "**你好**\n\n很高兴见到你"}):
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
assert boxim.sent == [{"peerId": "200", "content": "你好\n很高兴见到你", "localId": boxim.sent[0]["localId"]}]
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).one()
|
||||||
|
assert task.status == "sent"
|
||||||
|
assert task.sent_at == clock.now()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_generate_reply_handles_error_code(mock_boxim):
|
async def test_default_reply_delay_is_three_minutes(service_context):
|
||||||
"""generate_reply should return empty string when API returns error code."""
|
session_factory, service, boxim, clock = service_context
|
||||||
mock_db = MagicMock()
|
db = session_factory()
|
||||||
with patch("services.takeover_service.httpx.AsyncClient") as mock_client_class:
|
try:
|
||||||
mock_response = MagicMock()
|
avatar = db.query(Avatar).one()
|
||||||
mock_response.json.return_value = {"code": 500, "message": "Internal error"}
|
avatar.config = {"authorizationPermissions": ["chat", "takeover"]}
|
||||||
mock_client_class.return_value.__aenter__.return_value.post.return_value = mock_response
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
await service.poll_and_process_messages()
|
||||||
result = await service.generate_reply("avatar_123", "Hello")
|
boxim.messages.append(
|
||||||
assert result == ""
|
{"id": 12, "localId": 12, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "三分钟后回复"}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).one()
|
||||||
|
assert task.scheduled_at == clock.now() + timedelta(seconds=180)
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
# --- execute_takeover ---
|
clock.advance(179)
|
||||||
|
await service.process_reply_tasks()
|
||||||
|
assert boxim.sent == []
|
||||||
|
clock.advance(1)
|
||||||
|
with patch("routers.chat._resolve_reply", return_value={"answer": "好的"}):
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
assert [item["content"] for item in boxim.sent] == ["好的"]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_execute_takeover_success(mock_db, mock_boxim, mock_auth, mock_avatar):
|
async def test_avatar_origin_message_never_schedules_a_reply(service_context):
|
||||||
avatar_filter = MagicMock()
|
session_factory, service, boxim, clock = service_context
|
||||||
avatar_filter.first.return_value = mock_avatar
|
await service.poll_and_process_messages()
|
||||||
avatar_query = MagicMock()
|
local_id = _avatar_local_id("peer-owner", "peer-trigger")
|
||||||
avatar_query.filter.return_value = avatar_filter
|
boxim.messages.append(
|
||||||
mock_db.query.return_value = avatar_query
|
{"id": 15, "localId": local_id, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "另一端分身回复"}
|
||||||
|
)
|
||||||
|
|
||||||
with patch("services.takeover_service.httpx.AsyncClient") as mock_client_class:
|
with patch("routers.chat._resolve_reply") as resolver:
|
||||||
mock_response = MagicMock()
|
await service.poll_and_process_messages()
|
||||||
mock_response.json.return_value = {"code": 200, "data": {"answer": "Hello back"}}
|
|
||||||
mock_client_class.return_value.__aenter__.return_value.post.return_value = mock_response
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
resolver.assert_not_called()
|
||||||
message = {"from_accid": "user_acc", "content": "Hello"}
|
db = session_factory()
|
||||||
|
try:
|
||||||
result = await service.execute_takeover(mock_auth, message)
|
event = db.query(TakeoverMessage).filter(TakeoverMessage.boxim_message_id == "15").one()
|
||||||
|
assert event.is_avatar is True
|
||||||
assert result is True
|
assert db.query(TakeoverReplyTask).count() == 0
|
||||||
mock_boxim.get_credentials.assert_called_once_with("owner_huihui_123")
|
finally:
|
||||||
mock_boxim.send_p2p_message.assert_called_once()
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_execute_takeover_fails_when_avatar_not_found(mock_db, mock_boxim, mock_auth):
|
async def test_peer_avatar_messages_are_excluded_from_later_human_context(service_context):
|
||||||
"""execute_takeover should return False when Avatar is not found."""
|
_session_factory, service, boxim, clock = service_context
|
||||||
avatar_filter = MagicMock()
|
await service.poll_and_process_messages()
|
||||||
avatar_filter.first.return_value = None
|
boxim.messages.append(
|
||||||
avatar_query = MagicMock()
|
{
|
||||||
avatar_query.filter.return_value = avatar_filter
|
"id": 16,
|
||||||
mock_db.query.return_value = avatar_query
|
"localId": _avatar_local_id("peer-owner", "peer-trigger"),
|
||||||
|
"sendId": 200,
|
||||||
|
"recvId": 100,
|
||||||
|
"sendTime": clock.millis(),
|
||||||
|
"type": 0,
|
||||||
|
"content": "分身生成的夸张长文",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
clock.advance(1)
|
||||||
message = {"from_accid": "user_acc", "content": "Hello"}
|
boxim.messages.append(
|
||||||
|
{
|
||||||
|
"id": 17,
|
||||||
|
"localId": 17,
|
||||||
|
"sendId": 200,
|
||||||
|
"recvId": 100,
|
||||||
|
"sendTime": clock.millis(),
|
||||||
|
"type": 0,
|
||||||
|
"content": "真人的新问题",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
clock.advance(3)
|
||||||
|
with patch("routers.chat._resolve_reply", return_value={"answer": "正常回复"}) as resolver:
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
result = await service.execute_takeover(mock_auth, message)
|
assert resolver.call_args.args[3] == []
|
||||||
|
|
||||||
assert result is False
|
|
||||||
mock_boxim.get_credentials.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_execute_takeover_fails_when_no_credentials(mock_db, mock_boxim, mock_auth, mock_avatar):
|
async def test_owner_message_pauses_future_takeover_for_ten_minutes(service_context):
|
||||||
"""execute_takeover should return False when boxim.get_credentials returns None."""
|
session_factory, service, boxim, clock = service_context
|
||||||
avatar_filter = MagicMock()
|
await service.poll_and_process_messages()
|
||||||
avatar_filter.first.return_value = mock_avatar
|
boxim.messages.append(
|
||||||
avatar_query = MagicMock()
|
{"id": 18, "localId": 18, "sendId": 100, "recvId": 200, "sendTime": clock.millis(), "type": 0, "content": "我先来回复"}
|
||||||
avatar_query.filter.return_value = avatar_filter
|
)
|
||||||
mock_db.query.return_value = avatar_query
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
mock_boxim.get_credentials.return_value = None
|
clock.advance(30)
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
boxim.messages.append(
|
||||||
message = {"from_accid": "user_acc", "content": "Hello"}
|
{"id": 19, "localId": 19, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "收到"}
|
||||||
|
)
|
||||||
|
with patch("routers.chat._resolve_reply") as resolver:
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
result = await service.execute_takeover(mock_auth, message)
|
resolver.assert_not_called()
|
||||||
|
db = session_factory()
|
||||||
assert result is False
|
try:
|
||||||
|
assert db.query(TakeoverReplyTask).count() == 0
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
# --- enqueue_delayed_message ---
|
def test_avatar_local_id_is_deterministic_and_self_describing():
|
||||||
|
first = _avatar_local_id("owner", "message-1")
|
||||||
|
assert first == _avatar_local_id("owner", "message-1")
|
||||||
def test_enqueue_delayed_message_with_redis(mock_db, mock_boxim, mock_auth, mock_avatar):
|
assert first != _avatar_local_id("owner", "message-2")
|
||||||
mock_redis = MagicMock()
|
assert first.startswith(AVATAR_LOCAL_ID_PREFIX)
|
||||||
avatar_filter = MagicMock()
|
assert len(first) == 18
|
||||||
avatar_filter.first.return_value = mock_avatar
|
assert first.isdigit()
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
mock_db.query.return_value = avatar_query
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim, mock_redis)
|
|
||||||
message = {"msg_id": "msg_1", "from_accid": "user_acc", "content": "Hello"}
|
|
||||||
|
|
||||||
service.enqueue_delayed_message(mock_auth, message)
|
|
||||||
|
|
||||||
mock_redis.setex.assert_called_once()
|
|
||||||
call_args = mock_redis.setex.call_args
|
|
||||||
value = call_args[0][1]
|
|
||||||
import json
|
|
||||||
payload = json.loads(call_args[0][2])
|
|
||||||
assert payload["owner_huihui_id"] == "owner_huihui_123"
|
|
||||||
|
|
||||||
|
|
||||||
def test_enqueue_delayed_message_without_redis_logs_warning(mock_db, mock_boxim, mock_auth, mock_avatar):
|
|
||||||
"""When Redis is not configured, enqueue_delayed_message should log a warning and not crash."""
|
|
||||||
avatar_filter = MagicMock()
|
|
||||||
avatar_filter.first.return_value = mock_avatar
|
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
mock_db.query.return_value = avatar_query
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
|
||||||
message = {"msg_id": "msg_1", "from_accid": "user_acc", "content": "Hello"}
|
|
||||||
|
|
||||||
service.enqueue_delayed_message(mock_auth, message)
|
|
||||||
|
|
||||||
|
|
||||||
# --- process_delayed_queue ---
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_process_delayed_queue_no_redis(mock_db, mock_boxim):
|
async def test_different_contacts_generate_without_blocking_each_other(service_context):
|
||||||
"""process_delayed_queue should return immediately without Redis."""
|
session_factory, service, boxim, clock = service_context
|
||||||
service = TakeoverService(mock_db, mock_boxim)
|
await service.poll_and_process_messages()
|
||||||
await service.process_delayed_queue()
|
boxim.messages.extend(
|
||||||
mock_db.query.assert_not_called()
|
[
|
||||||
|
{"id": 13, "localId": 31, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "联系人甲"},
|
||||||
|
{"id": 14, "localId": 32, "sendId": 300, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "联系人乙"},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
both_generating = Barrier(2, timeout=2)
|
||||||
|
|
||||||
|
def resolve(_db, _avatar, prompt, _history, **_kwargs):
|
||||||
|
both_generating.wait()
|
||||||
|
return {"answer": f"回复{prompt[-1]}"}
|
||||||
|
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
clock.advance(3)
|
||||||
|
with patch("routers.chat._resolve_reply", side_effect=resolve):
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
assert {(item["peerId"], item["content"]) for item in boxim.sent} == {
|
||||||
|
("200", "回复甲"),
|
||||||
|
("300", "回复乙"),
|
||||||
|
}
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
assert {task.status for task in db.query(TakeoverReplyTask).all()} == {"sent"}
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_process_delayed_queue_processes_messages(mock_db, mock_boxim, mock_auth, mock_avatar):
|
async def test_read_receipt_failure_does_not_advance_cursor(service_context):
|
||||||
"""process_delayed_queue should read from Redis, resolve auth, and execute takeover."""
|
session_factory, service, boxim, clock = service_context
|
||||||
mock_redis = MagicMock()
|
await service.poll_and_process_messages()
|
||||||
mock_redis.keys.return_value = ["takeover:delayed:target_user_123:msg_1"]
|
boxim.messages.append(
|
||||||
mock_redis.get.return_value = '{"from_accid": "user_acc", "content": "Hello"}'
|
{"id": 12, "localId": 3, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "未读消息"}
|
||||||
|
)
|
||||||
|
boxim.mark_private_messages_read = AsyncMock(side_effect=BoxIMError("回执失败"))
|
||||||
|
|
||||||
avatar_filter = MagicMock()
|
with patch("routers.chat._resolve_reply", return_value={"answer": "稍后回复"}):
|
||||||
avatar_filter.first.return_value = mock_avatar
|
await service.poll_and_process_messages()
|
||||||
avatar_query = MagicMock()
|
|
||||||
avatar_query.filter.return_value = avatar_filter
|
|
||||||
|
|
||||||
auth_filter = MagicMock()
|
db = session_factory()
|
||||||
auth_filter.filter.return_value = auth_filter
|
try:
|
||||||
auth_filter.first.return_value = mock_auth
|
cursor = db.query(TakeoverCursor).one()
|
||||||
|
assert cursor.last_message_id == "0"
|
||||||
|
assert db.query(TakeoverMessage).count() == 0
|
||||||
|
assert db.query(TakeoverReplyTask).count() == 0
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
def query_side_effect(model):
|
boxim.mark_private_messages_read = AsyncMock(return_value=None)
|
||||||
if model == Avatar:
|
with patch("routers.chat._resolve_reply", return_value={"answer": "稍后回复"}):
|
||||||
return avatar_query
|
await service.poll_and_process_messages()
|
||||||
return auth_filter
|
|
||||||
|
|
||||||
mock_db.query.side_effect = query_side_effect
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
assert db.query(TakeoverCursor).one().last_message_id == "12"
|
||||||
|
assert db.query(TakeoverMessage).count() == 1
|
||||||
|
assert db.query(TakeoverReplyTask).count() == 1
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
with patch("services.takeover_service.httpx.AsyncClient") as mock_client_class:
|
|
||||||
mock_response = MagicMock()
|
|
||||||
mock_response.json.return_value = {"code": 200, "data": {"answer": "Hello back"}}
|
|
||||||
mock_client_class.return_value.__aenter__.return_value.post.return_value = mock_response
|
|
||||||
|
|
||||||
service = TakeoverService(mock_db, mock_boxim, mock_redis)
|
@pytest.mark.asyncio
|
||||||
await service.process_delayed_queue()
|
async def test_owner_message_cancels_pending_reply(service_context):
|
||||||
|
session_factory, service, boxim, clock = service_context
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
boxim.messages.append(
|
||||||
|
{"id": 21, "localId": 3, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "在吗"}
|
||||||
|
)
|
||||||
|
with patch("routers.chat._resolve_reply", return_value={"answer": "在的"}):
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
mock_boxim.send_p2p_message.assert_called_once()
|
clock.advance(2)
|
||||||
mock_redis.delete.assert_called_once()
|
boxim.messages.append(
|
||||||
|
{"id": 22, "localId": 4, "sendId": 100, "recvId": 200, "sendTime": clock.millis(), "type": 0, "content": "我来回复"}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
clock.advance(2)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.trigger_message_id == "21").one()
|
||||||
|
assert task.status == "cancelled"
|
||||||
|
assert task.cancel_reason == "owner_replied"
|
||||||
|
assert boxim.sent == []
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_owner_message_in_final_second_wins_before_generation(service_context):
|
||||||
|
session_factory, service, boxim, clock = service_context
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
boxim.messages.append(
|
||||||
|
{"id": 23, "localId": 23, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "还在吗"}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
clock.advance(2)
|
||||||
|
boxim.messages.append(
|
||||||
|
{"id": 24, "localId": 24, "sendId": 100, "recvId": 200, "sendTime": clock.millis(), "type": 0, "content": "我来处理"}
|
||||||
|
)
|
||||||
|
clock.advance(1)
|
||||||
|
with patch("routers.chat._resolve_reply") as resolver:
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
resolver.assert_not_called()
|
||||||
|
assert boxim.sent == []
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
task = db.query(TakeoverReplyTask).filter(TakeoverReplyTask.trigger_message_id == "23").one()
|
||||||
|
assert task.status == "cancelled"
|
||||||
|
assert task.cancel_reason == "owner_replied"
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_quick_successive_messages_are_coalesced_into_one_reply(service_context):
|
||||||
|
session_factory, service, boxim, clock = service_context
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
boxim.messages.append(
|
||||||
|
{"id": 31, "localId": 5, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "第一句"}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
clock.advance(1)
|
||||||
|
boxim.messages.append(
|
||||||
|
{"id": 32, "localId": 6, "sendId": 200, "recvId": 100, "sendTime": clock.millis(), "type": 0, "content": "第二句"}
|
||||||
|
)
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
clock.advance(3)
|
||||||
|
with patch("routers.chat._resolve_reply", return_value={"answer": "合并回复"}) as resolver:
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
assert resolver.call_args.args[2] == "第一句\n第二句"
|
||||||
|
assert [item["content"] for item in boxim.sent] == ["合并回复"]
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
tasks = db.query(TakeoverReplyTask).order_by(TakeoverReplyTask.created_at).all()
|
||||||
|
assert [task.status for task in tasks] == ["cancelled", "sent"]
|
||||||
|
assert tasks[0].cancel_reason == "newer_incoming_message"
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_connection_failure_disables_takeover_and_stops_retrying(service_context):
|
||||||
|
session_factory, service, boxim, _ = service_context
|
||||||
|
boxim.exchange_access_token = AsyncMock(
|
||||||
|
side_effect=BoxIMError("无效的访问令牌", code=40101, auth_error=True)
|
||||||
|
)
|
||||||
|
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
await service.poll_and_process_messages()
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).one()
|
||||||
|
cursor = db.query(TakeoverCursor).one()
|
||||||
|
assert "takeover" not in avatar.config["authorizationPermissions"]
|
||||||
|
assert cursor.initialized is False
|
||||||
|
assert "重新登录" in cursor.last_error
|
||||||
|
assert db.query(TakeoverReplyTask).count() == 0
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
boxim.exchange_access_token.assert_awaited_once_with("prod-huihui-token")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_transient_connection_failure_keeps_takeover_and_recovers(service_context):
|
||||||
|
session_factory, service, boxim, _ = service_context
|
||||||
|
boxim.exchange_access_token = AsyncMock(
|
||||||
|
side_effect=[
|
||||||
|
BoxIMError("连接超时"),
|
||||||
|
{"accessToken": "box-token", "accessTokenExpiresIn": 3600},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
await service.poll_messages()
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).one()
|
||||||
|
cursor = db.query(TakeoverCursor).one()
|
||||||
|
assert "takeover" in avatar.config["authorizationPermissions"]
|
||||||
|
assert cursor.initialized is False
|
||||||
|
assert "暂时连接失败" in cursor.last_error
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
await service.poll_messages()
|
||||||
|
|
||||||
|
db = session_factory()
|
||||||
|
try:
|
||||||
|
avatar = db.query(Avatar).one()
|
||||||
|
cursor = db.query(TakeoverCursor).one()
|
||||||
|
assert "takeover" in avatar.config["authorizationPermissions"]
|
||||||
|
assert cursor.initialized is True
|
||||||
|
assert cursor.last_error == ""
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
assert boxim.exchange_access_token.await_count == 2
|
||||||
|
|
||||||
|
|
||||||
|
def test_plain_text_reply_removes_markdown_and_empty_lines():
|
||||||
|
assert _plain_text_reply("## 建议\n\n**不能自行用药**\n`必要时就医`") == "建议\n不能自行用药\n必要时就医"
|
||||||
|
|||||||
@@ -0,0 +1,430 @@
|
|||||||
|
import uuid
|
||||||
|
import os
|
||||||
|
import hashlib
|
||||||
|
import hmac
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
from threading import Barrier
|
||||||
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from database import SessionLocal
|
||||||
|
from main import app, seed
|
||||||
|
from models import Avatar, TokenAccount, TokenPaymentOrder, TokenPlan, TokenUsage, User
|
||||||
|
from routers.chat import _resolve_reply, _stream_reply
|
||||||
|
from services.token_billing import (
|
||||||
|
DEFAULT_TOKEN_GRANT,
|
||||||
|
InsufficientTokensError,
|
||||||
|
get_or_create_account,
|
||||||
|
release_reservation,
|
||||||
|
reserve_avatar_tokens,
|
||||||
|
settle_reservation,
|
||||||
|
)
|
||||||
|
|
||||||
|
client = TestClient(app)
|
||||||
|
|
||||||
|
|
||||||
|
def _enable_huihui_payment_login(context):
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
user = db.query(User).filter(User.id == context["owner"].id).one()
|
||||||
|
user.huihui_token = f"huihui-payment-{context['suffix']}"
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_balance_is_user_scoped_and_defaults_to_one_million(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
owner = client.get("/api/token/balance", headers=context["owner_headers"])
|
||||||
|
other = client.get("/api/token/balance", headers=context["other_headers"])
|
||||||
|
|
||||||
|
assert owner.status_code == 200
|
||||||
|
assert owner.json()["data"] == {
|
||||||
|
"balance": DEFAULT_TOKEN_GRANT,
|
||||||
|
"totalGranted": DEFAULT_TOKEN_GRANT,
|
||||||
|
"totalConsumed": 0,
|
||||||
|
}
|
||||||
|
assert other.json()["data"]["balance"] == DEFAULT_TOKEN_GRANT
|
||||||
|
assert client.get("/api/token/balance").status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_seed_synchronizes_requested_recharge_plans():
|
||||||
|
seed()
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
plans = db.query(TokenPlan).order_by(TokenPlan.price.asc()).all()
|
||||||
|
assert [(plan.price, plan.amount) for plan in plans] == [
|
||||||
|
(10, 2_000_000),
|
||||||
|
(100, 20_000_000),
|
||||||
|
(1000, 250_000_000),
|
||||||
|
(10000, 2_500_000_000),
|
||||||
|
]
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_charge_creates_huihui_order_without_early_points(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
_enable_huihui_payment_login(context)
|
||||||
|
payment_client = Mock()
|
||||||
|
payment_client.create_payment.return_value = {
|
||||||
|
"orderId": "huihui-payment-id",
|
||||||
|
"orderNo": "huihui-payment-no",
|
||||||
|
"payMessage": {"mock": "payment-params"},
|
||||||
|
"payType": "WECHAT",
|
||||||
|
"paySubType": "APP",
|
||||||
|
"status": "pending",
|
||||||
|
}
|
||||||
|
env = {
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_BASE_URL": "https://digital.example",
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_SECRET": "test-callback-secret-123456",
|
||||||
|
}
|
||||||
|
with patch.dict(os.environ, env), patch("routers.tokens._payment_client", return_value=payment_client):
|
||||||
|
response = client.post(
|
||||||
|
"/api/token/charge",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"planId": "1", "paymentMethod": "wechat", "payScene": "APP"},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
result = response.json()["data"]
|
||||||
|
assert result["status"] == "pending"
|
||||||
|
assert result["payType"] == "WECHAT"
|
||||||
|
assert result["payWay"] == "APP"
|
||||||
|
assert result["balance"] == DEFAULT_TOKEN_GRANT
|
||||||
|
assert payment_client.create_payment.call_args.kwargs["amount"] == "10.00"
|
||||||
|
callback_url = payment_client.create_payment.call_args.kwargs["callback_url"]
|
||||||
|
assert callback_url.startswith("https://digital.example/api/token/payment/callback/AV")
|
||||||
|
assert "test-callback-secret-123456" not in callback_url
|
||||||
|
|
||||||
|
|
||||||
|
def test_success_callback_credits_once_and_status_is_user_scoped(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
_enable_huihui_payment_login(context)
|
||||||
|
payment_client = Mock()
|
||||||
|
payment_client.create_payment.return_value = {
|
||||||
|
"orderId": "huihui-payment-id",
|
||||||
|
"orderNo": "huihui-payment-no",
|
||||||
|
"payMessage": "payment-message",
|
||||||
|
"status": "pending",
|
||||||
|
}
|
||||||
|
secret = "test-callback-secret-123456"
|
||||||
|
env = {
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_BASE_URL": "https://digital.example",
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_SECRET": secret,
|
||||||
|
}
|
||||||
|
with patch.dict(os.environ, env), patch("routers.tokens._payment_client", return_value=payment_client):
|
||||||
|
created = client.post(
|
||||||
|
"/api/token/charge",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"planId": "1", "paymentMethod": "alipay", "payScene": "APP"},
|
||||||
|
).json()["data"]
|
||||||
|
callback_body = {
|
||||||
|
"data": {
|
||||||
|
"masterOrderNo": created["orderNo"],
|
||||||
|
"status": "succeeded",
|
||||||
|
"payAmt": "10.00",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
signature = hmac.new(
|
||||||
|
secret.encode(), created["orderNo"].encode(), hashlib.sha256
|
||||||
|
).hexdigest()
|
||||||
|
callback_path = f"/api/token/payment/callback/{created['orderNo']}/{signature}"
|
||||||
|
first = client.post(callback_path, json=callback_body)
|
||||||
|
second = client.post(callback_path, json=callback_body)
|
||||||
|
|
||||||
|
assert first.json()["data"] == {"received": True, "paid": True}
|
||||||
|
assert second.json()["data"] == {"received": True, "duplicate": True}
|
||||||
|
status = client.get(
|
||||||
|
f"/api/token/payment/{created['id']}", headers=context["owner_headers"]
|
||||||
|
).json()["data"]
|
||||||
|
assert status["status"] == "paid"
|
||||||
|
assert status["balance"] == DEFAULT_TOKEN_GRANT + 2_000_000
|
||||||
|
assert client.get(
|
||||||
|
f"/api/token/payment/{created['id']}", headers=context["other_headers"]
|
||||||
|
).json()["code"] == 404
|
||||||
|
|
||||||
|
|
||||||
|
def test_callback_amount_mismatch_never_credits_points(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
_enable_huihui_payment_login(context)
|
||||||
|
payment_client = Mock()
|
||||||
|
payment_client.create_payment.return_value = {"status": "pending", "payMessage": "mock"}
|
||||||
|
secret = "test-callback-secret-123456"
|
||||||
|
env = {
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_BASE_URL": "https://digital.example",
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_SECRET": secret,
|
||||||
|
}
|
||||||
|
with patch.dict(os.environ, env), patch("routers.tokens._payment_client", return_value=payment_client):
|
||||||
|
created = client.post(
|
||||||
|
"/api/token/charge",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"planId": "1", "paymentMethod": "wechat", "payScene": "APP"},
|
||||||
|
).json()["data"]
|
||||||
|
signature = hmac.new(
|
||||||
|
secret.encode(), created["orderNo"].encode(), hashlib.sha256
|
||||||
|
).hexdigest()
|
||||||
|
callback = client.post(
|
||||||
|
f"/api/token/payment/callback/{created['orderNo']}/{signature}",
|
||||||
|
json={
|
||||||
|
"masterOrderNo": created["orderNo"],
|
||||||
|
"status": "success",
|
||||||
|
"actualAmt": "9.99",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert callback.json()["code"] == 422
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
order = db.query(TokenPaymentOrder).filter(TokenPaymentOrder.id == created["id"]).one()
|
||||||
|
account = get_or_create_account(db, context["owner"].id)
|
||||||
|
assert order.status == "pending"
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_payment_callback_creates_missing_account_in_same_settlement(authorization_context):
|
||||||
|
context = authorization_context
|
||||||
|
_enable_huihui_payment_login(context)
|
||||||
|
payment_client = Mock()
|
||||||
|
payment_client.create_payment.return_value = {"status": "pending", "payMessage": "mock"}
|
||||||
|
secret = "test-callback-secret-123456"
|
||||||
|
env = {
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_BASE_URL": "https://digital.example",
|
||||||
|
"HUIHUI_PAYMENT_CALLBACK_SECRET": secret,
|
||||||
|
}
|
||||||
|
with patch.dict(os.environ, env), patch("routers.tokens._payment_client", return_value=payment_client):
|
||||||
|
created = client.post(
|
||||||
|
"/api/token/charge",
|
||||||
|
headers=context["owner_headers"],
|
||||||
|
json={"planId": "1", "paymentMethod": "alipay", "payScene": "APP"},
|
||||||
|
).json()["data"]
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == context["owner"].id).delete()
|
||||||
|
db.commit()
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
signature = hmac.new(
|
||||||
|
secret.encode(), created["orderNo"].encode(), hashlib.sha256
|
||||||
|
).hexdigest()
|
||||||
|
callback = client.post(
|
||||||
|
f"/api/token/payment/callback/{created['orderNo']}/{signature}",
|
||||||
|
json={
|
||||||
|
"masterOrderNo": created["orderNo"],
|
||||||
|
"status": "success",
|
||||||
|
"payAmt": "10.00",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert callback.json()["data"] == {"received": True, "paid": True}
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
account = db.query(TokenAccount).filter(TokenAccount.user_id == context["owner"].id).one()
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT + 2_000_000
|
||||||
|
assert account.total_granted == DEFAULT_TOKEN_GRANT + 2_000_000
|
||||||
|
finally:
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_multiple_avatars_share_owner_balance_and_usage_is_itemized():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"token-user-{suffix}", huihui_user_id=f"token-huihui-{suffix}")
|
||||||
|
first = Avatar(id=f"token-avatar-a-{suffix}", owner_id=user.huihui_user_id, name="甲")
|
||||||
|
second = Avatar(id=f"token-avatar-b-{suffix}", owner_id=user.huihui_user_id, name="乙")
|
||||||
|
db.add_all([user, first, second])
|
||||||
|
db.commit()
|
||||||
|
try:
|
||||||
|
first_reservation = reserve_avatar_tokens(db, first, "chat", "qwen-test", [{"content": "问题一"}], 128)
|
||||||
|
settle_reservation(
|
||||||
|
db,
|
||||||
|
first_reservation,
|
||||||
|
{"prompt_tokens": 60, "completion_tokens": 40, "total_tokens": 100},
|
||||||
|
fallback_total=999,
|
||||||
|
)
|
||||||
|
second_reservation = reserve_avatar_tokens(db, second, "takeover", "qwen-test", [{"content": "问题二"}], 128)
|
||||||
|
settle_reservation(
|
||||||
|
db,
|
||||||
|
second_reservation,
|
||||||
|
{"prompt_tokens": 120, "completion_tokens": 80, "total_tokens": 200},
|
||||||
|
fallback_total=999,
|
||||||
|
)
|
||||||
|
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT - 300
|
||||||
|
assert account.total_consumed == 300
|
||||||
|
usages = db.query(TokenUsage).filter(TokenUsage.user_id == user.id).order_by(TokenUsage.total_tokens).all()
|
||||||
|
assert [(row.avatar_id, row.source, row.total_tokens) for row in usages] == [
|
||||||
|
(first.id, "chat", 100),
|
||||||
|
(second.id, "takeover", 200),
|
||||||
|
]
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id.in_([first.id, second.id])).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_concurrent_settlements_do_not_overwrite_each_other():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"concurrent-user-{suffix}", huihui_user_id=f"concurrent-huihui-{suffix}")
|
||||||
|
avatar = Avatar(id=f"concurrent-avatar-{suffix}", owner_id=user.huihui_user_id, name="并发测试")
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
first = reserve_avatar_tokens(db, avatar, "takeover", "qwen-test", [{"content": "甲"}], 128)
|
||||||
|
second = reserve_avatar_tokens(db, avatar, "takeover", "qwen-test", [{"content": "乙"}], 128)
|
||||||
|
db.close()
|
||||||
|
barrier = Barrier(2, timeout=3)
|
||||||
|
|
||||||
|
def settle(reservation, total):
|
||||||
|
thread_db = SessionLocal()
|
||||||
|
try:
|
||||||
|
barrier.wait()
|
||||||
|
settle_reservation(
|
||||||
|
thread_db,
|
||||||
|
reservation,
|
||||||
|
{"prompt_tokens": total - 20, "completion_tokens": 20, "total_tokens": total},
|
||||||
|
fallback_total=999,
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
thread_db.close()
|
||||||
|
|
||||||
|
with ThreadPoolExecutor(max_workers=2) as pool:
|
||||||
|
list(pool.map(lambda args: settle(*args), [(first, 100), (second, 200)]))
|
||||||
|
|
||||||
|
db = SessionLocal()
|
||||||
|
try:
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT - 300
|
||||||
|
assert account.total_consumed == 300
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar.id).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_failed_model_request_returns_the_full_reservation():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"refund-user-{suffix}", huihui_user_id=f"refund-huihui-{suffix}")
|
||||||
|
avatar = Avatar(id=f"refund-avatar-{suffix}", owner_id=user.huihui_user_id, name="退款测试")
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
try:
|
||||||
|
reservation = reserve_avatar_tokens(db, avatar, "chat", "qwen-test", [{"content": "问题"}], 128)
|
||||||
|
release_reservation(db, reservation, "provider error")
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
usage = db.query(TokenUsage).filter(TokenUsage.id == reservation.usage_id).one()
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT
|
||||||
|
assert account.total_consumed == 0
|
||||||
|
assert usage.status == "failed"
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar.id).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_insufficient_balance_rejects_before_model_usage_is_created():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"empty-user-{suffix}", huihui_user_id=f"empty-huihui-{suffix}")
|
||||||
|
avatar = Avatar(id=f"empty-avatar-{suffix}", owner_id=user.huihui_user_id, name="余额不足")
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
try:
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
account.balance = 1
|
||||||
|
db.commit()
|
||||||
|
with pytest.raises(InsufficientTokensError):
|
||||||
|
reserve_avatar_tokens(db, avatar, "chat", "qwen-test", [{"content": "问题"}], 128)
|
||||||
|
db.refresh(account)
|
||||||
|
assert account.balance == 1
|
||||||
|
assert db.query(TokenUsage).filter(TokenUsage.user_id == user.id).count() == 0
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar.id).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_chat_settles_from_provider_usage_not_fallback_estimate():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"chat-user-{suffix}", huihui_user_id=f"chat-huihui-{suffix}")
|
||||||
|
avatar = Avatar(id=f"chat-avatar-{suffix}", owner_id=user.huihui_user_id, name="聊天测试", config={})
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
try:
|
||||||
|
with patch(
|
||||||
|
"routers.chat._call_qwen",
|
||||||
|
return_value={
|
||||||
|
"answer": "测试回答",
|
||||||
|
"usage": {"prompt_tokens": 80, "completion_tokens": 20, "total_tokens": 100},
|
||||||
|
},
|
||||||
|
):
|
||||||
|
result = _resolve_reply(
|
||||||
|
db,
|
||||||
|
avatar,
|
||||||
|
"测试问题",
|
||||||
|
[],
|
||||||
|
qa_pairs=[],
|
||||||
|
search_fn=lambda *_args: [],
|
||||||
|
)
|
||||||
|
assert result["tokenUsage"]["totalTokens"] == 100
|
||||||
|
assert result["tokenUsage"]["balance"] == DEFAULT_TOKEN_GRANT - 100
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar.id).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_streaming_chat_settles_final_provider_usage():
|
||||||
|
suffix = uuid.uuid4().hex
|
||||||
|
db = SessionLocal()
|
||||||
|
user = User(id=f"stream-user-{suffix}", huihui_user_id=f"stream-huihui-{suffix}")
|
||||||
|
avatar = Avatar(id=f"stream-avatar-{suffix}", owner_id=user.huihui_user_id, name="流式测试", config={})
|
||||||
|
db.add_all([user, avatar])
|
||||||
|
db.commit()
|
||||||
|
try:
|
||||||
|
chunks = iter([
|
||||||
|
{"content": "流式"},
|
||||||
|
{"content": "回答"},
|
||||||
|
{"usage": {"prompt_tokens": 90, "completion_tokens": 10, "total_tokens": 100}},
|
||||||
|
])
|
||||||
|
with patch("routers.chat._iter_qwen_stream", return_value=chunks):
|
||||||
|
response = _stream_reply(db, avatar, "测试问题", [])
|
||||||
|
body = []
|
||||||
|
async for chunk in response.body_iterator:
|
||||||
|
body.append(chunk.decode() if isinstance(chunk, bytes) else chunk)
|
||||||
|
assert "流式" in "".join(body)
|
||||||
|
account = get_or_create_account(db, user.id)
|
||||||
|
usage = db.query(TokenUsage).filter(TokenUsage.user_id == user.id).one()
|
||||||
|
assert account.balance == DEFAULT_TOKEN_GRANT - 100
|
||||||
|
assert usage.source == "chat_stream"
|
||||||
|
assert usage.total_tokens == 100
|
||||||
|
finally:
|
||||||
|
db.query(TokenUsage).filter(TokenUsage.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(TokenAccount).filter(TokenAccount.user_id == user.id).delete(synchronize_session=False)
|
||||||
|
db.query(Avatar).filter(Avatar.id == avatar.id).delete(synchronize_session=False)
|
||||||
|
db.query(User).filter(User.id == user.id).delete(synchronize_session=False)
|
||||||
|
db.commit()
|
||||||
|
db.close()
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import io
|
||||||
|
import json
|
||||||
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from PIL import Image
|
||||||
|
|
||||||
|
from services.chat_model_config import ChatModelConfig
|
||||||
|
from services.vision_service import (
|
||||||
|
ImageValidationError,
|
||||||
|
build_attachment_warning,
|
||||||
|
call_vision_model,
|
||||||
|
parse_vision_analysis,
|
||||||
|
prepare_image,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _image_bytes(fmt="PNG", size=(120, 80)):
|
||||||
|
output = io.BytesIO()
|
||||||
|
Image.new("RGB", size, "#f97316").save(output, format=fmt)
|
||||||
|
return output.getvalue()
|
||||||
|
|
||||||
|
|
||||||
|
def _config():
|
||||||
|
return ChatModelConfig(
|
||||||
|
api_base_url="https://model.test/v1",
|
||||||
|
api_key="secret-key",
|
||||||
|
model="chat-model",
|
||||||
|
max_tokens=1024,
|
||||||
|
timeout_seconds=30,
|
||||||
|
vision_model="vision-model",
|
||||||
|
ocr_model="ocr-model",
|
||||||
|
vision_max_tokens=2048,
|
||||||
|
vision_timeout_seconds=90,
|
||||||
|
source="test",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_prepare_image_validates_and_reencodes_without_metadata():
|
||||||
|
prepared = prepare_image(_image_bytes())
|
||||||
|
|
||||||
|
assert prepared.mime_type == "image/jpeg"
|
||||||
|
assert prepared.width == 120
|
||||||
|
assert prepared.height == 80
|
||||||
|
with Image.open(io.BytesIO(prepared.data)) as image:
|
||||||
|
assert image.format == "JPEG"
|
||||||
|
assert not image.getexif()
|
||||||
|
|
||||||
|
|
||||||
|
def test_prepare_image_rejects_non_image_content():
|
||||||
|
with pytest.raises(ImageValidationError, match="格式无效"):
|
||||||
|
prepare_image(b"not-an-image")
|
||||||
|
|
||||||
|
|
||||||
|
def test_vision_request_uses_openai_compatible_image_content():
|
||||||
|
response = Mock()
|
||||||
|
response.raise_for_status.return_value = None
|
||||||
|
response.json.return_value = {
|
||||||
|
"choices": [{"message": {"content": '{"category":"general_image"}'}}],
|
||||||
|
"usage": {"total_tokens": 88},
|
||||||
|
}
|
||||||
|
prepared = prepare_image(_image_bytes())
|
||||||
|
|
||||||
|
with patch("services.vision_service.httpx.post", return_value=response) as request:
|
||||||
|
result = call_vision_model(
|
||||||
|
prepared,
|
||||||
|
_config(),
|
||||||
|
model="vision-model",
|
||||||
|
prompt="describe",
|
||||||
|
json_output=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
payload = request.call_args.kwargs["json"]
|
||||||
|
content = payload["messages"][0]["content"]
|
||||||
|
assert payload["model"] == "vision-model"
|
||||||
|
assert payload["response_format"] == {"type": "json_object"}
|
||||||
|
assert content[0]["type"] == "image_url"
|
||||||
|
assert content[0]["image_url"]["url"].startswith("data:image/jpeg;base64,")
|
||||||
|
assert content[1] == {"type": "text", "text": "describe"}
|
||||||
|
assert result["usage"]["total_tokens"] == 88
|
||||||
|
|
||||||
|
|
||||||
|
def test_parse_medical_analysis_and_build_warning():
|
||||||
|
analysis = parse_vision_analysis(json.dumps({
|
||||||
|
"category": "medical_document",
|
||||||
|
"summary": "血常规报告",
|
||||||
|
"visible_text": "白细胞 11.2",
|
||||||
|
"key_facts": ["白细胞偏高"],
|
||||||
|
"uncertainties": ["日期模糊"],
|
||||||
|
"medical": {"document_type": "检验报告"},
|
||||||
|
}, ensure_ascii=False))
|
||||||
|
|
||||||
|
assert analysis["category"] == "medical_document"
|
||||||
|
assert analysis["medical"]["document_type"] == "检验报告"
|
||||||
|
warning = build_attachment_warning(analysis, ocr_failed=True)
|
||||||
|
assert "日期模糊" in warning
|
||||||
|
assert "人工核对" in warning
|
||||||
|
assert "不能替代医生诊断" in warning
|
||||||
@@ -7,6 +7,14 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: sqlite:////data/avatar.db
|
||||||
|
UPLOAD_DIR: /data/uploads
|
||||||
|
CHAT_MODEL_CONFIG_URL: http://host.docker.internal:8000/api/ai-models/runtime/digital-avatar
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
|
volumes:
|
||||||
|
- avatar-data:/data
|
||||||
expose:
|
expose:
|
||||||
- "8000"
|
- "8000"
|
||||||
ports:
|
ports:
|
||||||
@@ -29,3 +37,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
avatar-net:
|
avatar-net:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
avatar-data:
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
# 数字分身 H5 生产接入与部署
|
||||||
|
|
||||||
|
## 1. 接入方式
|
||||||
|
|
||||||
|
生产会会在用户已登录后打开以下地址:
|
||||||
|
|
||||||
|
```text
|
||||||
|
https://digital.99hui.com/#/avatar/manage?token=<encodeURIComponent(会会 access token)>
|
||||||
|
```
|
||||||
|
|
||||||
|
测试环境示例:
|
||||||
|
|
||||||
|
```text
|
||||||
|
http://192.168.1.188:8099/#/avatar/manage?token=<encodeURIComponent(token)>
|
||||||
|
```
|
||||||
|
|
||||||
|
兼容参数位于域名查询串的形式,但生产统一使用上面的 hash 路由形式。必须对 token 调用 `encodeURIComponent`,不能拼接用户 ID 代替 token。
|
||||||
|
|
||||||
|
免登录流程如下:
|
||||||
|
|
||||||
|
1. H5 在页面渲染前读取 `token`,立即通过 `history.replaceState` 从地址栏和浏览器历史中移除。
|
||||||
|
2. H5 调用 `POST /api/huihui/token/login`,不会把会会 token 当作数字分身接口 token 直接使用。
|
||||||
|
3. 后端通过会会生产接口 `/im/box/netease` 换取 BOXIM 凭证,再调用 BOXIM `/user/self` 校验用户身份。
|
||||||
|
4. 后端以返回的 `huihuiUserId` 绑定本地用户,保存会会凭证供 BOXIM 接管功能使用,并签发本系统 `app_token`。
|
||||||
|
5. 浏览器只保存 `app_token` 和非敏感用户资料。会会原始 token 不返回浏览器存储。
|
||||||
|
6. token 无效、过期或上游校验失败时清除旧会话并进入登录页,不会沿用上一位用户的缓存身份。
|
||||||
|
|
||||||
|
## 2. 生产配置
|
||||||
|
|
||||||
|
后端 `.env` 至少配置以下内容,密钥由部署平台注入,禁止提交 Git:
|
||||||
|
|
||||||
|
```dotenv
|
||||||
|
HUIHUI_DEV_MOCK=false
|
||||||
|
HUIHUI_AUTH_BASE_URL=https://99hui.com/api/usercenter
|
||||||
|
HUIHUI_PLATFORM_BASE_URL=https://open.99hui.com/api
|
||||||
|
BOXIM_API_BASE_URL=https://im.99hui.com/api
|
||||||
|
HUIHUI_APP_ID=<production-app-id>
|
||||||
|
HUIHUI_ACCESS_ID=<production-access-id>
|
||||||
|
HUIHUI_ACCESS_SECRET=<production-access-secret>
|
||||||
|
HUIHUI_CLIENT_CODE=<production-client-code>
|
||||||
|
BOXIM_TIMEOUT_SECONDS=20
|
||||||
|
HUIHUI_PAYMENT_BASE_URL=https://open.99hui.com/api/payment-v3
|
||||||
|
HUIHUI_PAYMENT_CALLBACK_BASE_URL=https://digital.99hui.com
|
||||||
|
HUIHUI_PAYMENT_CALLBACK_SECRET=<至少32位随机密钥>
|
||||||
|
HUIHUI_PAYMENT_TIMEOUT_SECONDS=30
|
||||||
|
|
||||||
|
DATABASE_URL=sqlite:////data/avatar.db
|
||||||
|
UPLOAD_DIR=/data/uploads
|
||||||
|
CHAT_MODEL_CONFIG_URL=http://<huihuisquare-api>/api/ai-models/runtime/digital-avatar
|
||||||
|
EMBEDDING_API_URL=https://dashscope.aliyuncs.com/compatible-mode/v1
|
||||||
|
EMBEDDING_API_KEY=<production-embedding-api-key>
|
||||||
|
EMBEDDING_MODEL=text-embedding-v3
|
||||||
|
EMBEDDING_BATCH_SIZE=10
|
||||||
|
|
||||||
|
VISION_MODEL=qwen3.6-flash
|
||||||
|
VISION_OCR_MODEL=qwen-vl-ocr
|
||||||
|
VISION_MAX_OUTPUT_TOKENS=2048
|
||||||
|
VISION_TIMEOUT_SECONDS=90
|
||||||
|
VISION_TOKEN_RESERVE=12000
|
||||||
|
CHAT_IMAGE_MAX_BYTES=8388608
|
||||||
|
CHAT_IMAGE_MAX_PIXELS=16000000
|
||||||
|
CHAT_ATTACHMENT_RETENTION_HOURS=24
|
||||||
|
CHAT_ATTACHMENT_CLEANUP_MINUTES=60
|
||||||
|
```
|
||||||
|
|
||||||
|
如生产 AI 配置中心不可用,还应提供当前项目支持的 `OPENAI_API_KEY`、`OPENAI_BASE_URL`、`CHAT_MODEL` 等兜底配置。`/data` 必须挂载持久卷,数据库与知识库文件不可存放在容器临时层。
|
||||||
|
|
||||||
|
`EMBEDDING_API_URL` 同时支持 OpenAI 兼容基础地址(如上面的 `/v1`)和完整的 `/v1/embeddings` 地址,后端会统一请求 `/embeddings`。发布后必须在后端容器内执行一次最小向量探针,确认返回向量数量和维度,而不能只检查 `/api/health`。
|
||||||
|
|
||||||
|
积分充值使用会会支付体系的 `payment-v3/payment/pay`,渠道值为 `WECHAT` / `ALIPAY`,端内支付场景为 `APP`,微信内 H5 使用 `JSAPI`。`HUIHUI_PAYMENT_CALLBACK_SECRET` 只用于为每笔订单生成 HMAC 回调签名,不会发送到前端或直接出现在回调地址中。支付回调确认状态成功且金额与套餐价格完全一致后才增加积分,重复回调不会重复到账。
|
||||||
|
|
||||||
|
## 3. 构建与发布
|
||||||
|
|
||||||
|
首次发布前备份数据:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
BACKUP_DIR="backups/$(date +%Y%m%d-%H%M%S)"
|
||||||
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
cp /srv/digital-avatar/data/avatar.db "$BACKUP_DIR/"
|
||||||
|
tar -C /srv/digital-avatar/data -czf "$BACKUP_DIR/uploads.tgz" uploads
|
||||||
|
```
|
||||||
|
|
||||||
|
在发布目录执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git fetch origin
|
||||||
|
git checkout <已验收的提交SHA>
|
||||||
|
cd digital-avatar-app
|
||||||
|
docker compose build --pull avatar-backend avatar-frontend
|
||||||
|
docker compose up -d avatar-backend avatar-frontend
|
||||||
|
docker compose ps
|
||||||
|
curl -fsS http://127.0.0.1:8099/api/health
|
||||||
|
docker compose exec avatar-backend python -c 'import embeddings; v=embeddings.embed(["部署向量探针"]); print(len(v), len(v[0]))'
|
||||||
|
```
|
||||||
|
|
||||||
|
生产编排应把示例中的测试端口改为内网暴露,由统一 HTTPS 网关接入。后端暂时使用 SQLite,必须保持单实例写入;若扩展为多后端实例,应先迁移到 PostgreSQL,并把延迟接管任务改为共享队列。
|
||||||
|
|
||||||
|
## 4. 网关要求
|
||||||
|
|
||||||
|
必须使用 HTTPS。同域部署时,H5 静态资源与 `/api/` 由同一域名提供,可避免跨域和 Cookie/来源策略问题。Nginx 关键配置示例:
|
||||||
|
|
||||||
|
```nginx
|
||||||
|
server_name digital.99hui.com;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://avatar-backend:8000;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
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_buffering off;
|
||||||
|
proxy_read_timeout 300s;
|
||||||
|
client_max_body_size 20m;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`proxy_buffering off` 用于数字分身 SSE 流式吐字,`client_max_body_size` 同时用于知识库文件和聊天图片上传。应用只保存图片识别结果,不保存原图;识别结果 24 小时失效,后台默认每小时清理一次。公开分享图片识别会消耗分身所有者积分,生产网关应针对 `/api/public/avatar/*/chat/images` 设置每 IP 和每分享令牌的上传频率限制,防止恶意消耗。
|
||||||
|
|
||||||
|
网关和应用日志必须关闭完整 URL 查询参数记录,任何异常日志都不得输出 token、Authorization、图片 Base64、病例正文或平台密钥。建议同时设置严格的 `Referrer-Policy: no-referrer`。
|
||||||
|
|
||||||
|
## 5. 发布验收
|
||||||
|
|
||||||
|
1. 已登录会会用户通过带 token 链接打开后直接进入 `/avatar/manage`,不出现登录页或创建新账号页。
|
||||||
|
2. 页面加载后地址栏中不再包含 `token`,刷新页面仍使用本地 `app_token` 正常访问。
|
||||||
|
3. 后端用户绑定的是 BOXIM 返回的 `huihuiUserId`,不是 BOXIM 内部 `id`;原有数字分身、独立知识库和积分余额均存在。
|
||||||
|
4. A、B 两个会会用户分别进入时只能看到各自的数字分身与知识库,不会继承上一用户缓存。
|
||||||
|
5. 使用过期或伪造 token 时进入登录页并显示凭证失效,不得继续访问旧用户数据。
|
||||||
|
6. 分身聊天 SSE 逐段输出正常,Markdown 正常渲染,知识库优先级和积分扣费正常。
|
||||||
|
7. 开启 BOXIM 主动接管后保持在线,默认三分钟回复、自定义等待时间、已读回执、分身防回环和主人发言暂停均正常。
|
||||||
|
8. 重建容器后数据库、头像、知识库文档仍存在,`/api/health` 返回成功。
|
||||||
|
9. `https://digital.99hui.com/api/health` 可访问,证书域名和有效期正确,HTTP 自动跳转 HTTPS。
|
||||||
|
10. 微信和支付宝各创建一笔最小套餐订单,未付款时积分不变;支付成功后回调到账一次,重复回调积分不重复增加。
|
||||||
|
11. 私聊和公开分享各上传 JPG、PNG、WebP 图片并完成追问;上传非图片、超过 8MB 或跨分身附件时必须拒绝。
|
||||||
|
12. 病例图片可以提取可见文字并标记待核对内容,医学影像不作确定诊断;视觉与 OCR 调用分别扣减积分。
|
||||||
|
13. 检查服务器上传目录不残留聊天原图,数据库过期图片识别记录在清理周期后删除,日志不出现 Base64 或病例正文。
|
||||||
|
|
||||||
|
## 6. 回滚
|
||||||
|
|
||||||
|
保留上一版前后端镜像标签和发布前数据库/上传文件备份。代码回滚优先切回上一镜像;只有新版本执行了不可逆数据变更时才恢复数据库。恢复前先停止后端写入,恢复后对比用户数、分身数、知识库文档数并完成一次免登录和聊天验收。
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
# 数字分身图片与病例理解详细设计
|
||||||
|
|
||||||
|
## 1. 目标与边界
|
||||||
|
|
||||||
|
本功能让数字分身在私聊和公开分享聊天中接收图片,并围绕图片内容继续使用现有的“标准答题对 -> 分身独立知识库 -> Qwen 兼容模型”链路回答。
|
||||||
|
|
||||||
|
第一期支持 JPEG、PNG、WebP,覆盖以下场景:
|
||||||
|
|
||||||
|
1. 普通照片、截图、图表和界面图片的内容理解。
|
||||||
|
2. 病例、处方、检查单、检验报告等图片文档的文字和表格提取。
|
||||||
|
3. X 光、CT、MRI 等医学影像的客观可见内容描述。
|
||||||
|
|
||||||
|
第一期不把通用视觉模型的输出当作医学诊断,不自动把图片或病例写入知识库,不保存原图供长期访问,也不支持 DICOM 原始影像。
|
||||||
|
|
||||||
|
## 2. 核心原则
|
||||||
|
|
||||||
|
- **资料优先级不变**:标准答题对最高,分身独立知识库其次,图片识别结果属于待核对的会话资料,最后才由模型组织表达。
|
||||||
|
- **病例最小留存**:应用不把原图写入业务存储,上传内容在内存中归一化并调用视觉服务;数据库只保存结构化结果和必要元数据。
|
||||||
|
- **严格隔离**:每条图片记录必须绑定 `avatar_id`,私聊校验分身所有者,公开聊天校验分享令牌对应的分身。
|
||||||
|
- **不确定性显式化**:OCR 看不清、表格列错位、医学影像无法确认时必须指出待核对项,不允许补齐缺失内容。
|
||||||
|
- **可计量**:视觉理解和病例 OCR 分别计入分身所有者的积分消耗,失败时释放预留积分。
|
||||||
|
- **可降级**:OCR 失败但通用视觉结果有效时仍可回答;视觉主调用失败则不进入聊天发送。
|
||||||
|
|
||||||
|
## 3. 总体流程
|
||||||
|
|
||||||
|
```text
|
||||||
|
用户选择图片
|
||||||
|
-> 前端本地预览
|
||||||
|
-> 私聊/公开图片上传接口
|
||||||
|
-> 文件大小、MIME、真实格式、像素数校验
|
||||||
|
-> 自动旋转、缩放、去 EXIF、统一 JPEG
|
||||||
|
-> 通用视觉模型分类并输出结构化 JSON
|
||||||
|
-> 若为病例/检查单,再调用 OCR 模型精确转录
|
||||||
|
-> 保存结构化结果,不持久化原图
|
||||||
|
-> 返回 attachmentId
|
||||||
|
-> 用户发送文字 + attachmentIds
|
||||||
|
-> 标准答题对匹配
|
||||||
|
-> 用文字 + 图片提取结果检索独立知识库
|
||||||
|
-> 把标准答案、知识片段、图片资料注入系统上下文
|
||||||
|
-> Qwen SSE 流式回答
|
||||||
|
```
|
||||||
|
|
||||||
|
## 4. 模型编排
|
||||||
|
|
||||||
|
### 4.1 通用视觉模型
|
||||||
|
|
||||||
|
默认 `qwen3.6-flash`,可在后台数字分身专用模型配置中修改。输入为归一化后的 Base64 Data URL,要求返回 JSON:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"category": "general_image|document|medical_document|medical_image",
|
||||||
|
"summary": "客观、完整的图片描述",
|
||||||
|
"visible_text": "图片中可确认的文字",
|
||||||
|
"key_facts": ["事实1", "事实2"],
|
||||||
|
"uncertainties": ["无法确认的内容"],
|
||||||
|
"medical": {
|
||||||
|
"document_type": "",
|
||||||
|
"patient_info": {},
|
||||||
|
"chief_complaint": "",
|
||||||
|
"findings": [],
|
||||||
|
"measurements": [],
|
||||||
|
"doctor_advice": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
模型提示词禁止诊断、补全被遮挡文字、猜测患者身份和输出模型信息。
|
||||||
|
|
||||||
|
### 4.2 病例 OCR
|
||||||
|
|
||||||
|
当 `category=medical_document` 时追加调用 `qwen-vl-ocr`,按原布局转录文字和表格。OCR 文本优先替换通用视觉输出中的 `visible_text`,但保留通用视觉模型提供的分类、摘要和不确定项。
|
||||||
|
|
||||||
|
### 4.3 医学影像
|
||||||
|
|
||||||
|
当 `category=medical_image` 时只保存客观描述,不输出疾病结论、分期、用药或治疗方案。聊天提示词必须要求结合正规影像报告和医生意见,并显示“图片识别结果仅供辅助,不能替代医生诊断”。
|
||||||
|
|
||||||
|
## 5. 数据模型
|
||||||
|
|
||||||
|
新增 `chat_attachments`:
|
||||||
|
|
||||||
|
| 字段 | 说明 |
|
||||||
|
|---|---|
|
||||||
|
| `id` | 不可猜测的附件 ID |
|
||||||
|
| `avatar_id` | 所属数字分身,强制隔离 |
|
||||||
|
| `filename` | 原文件名,去除路径 |
|
||||||
|
| `mime_type` / `file_size` | 上传元数据 |
|
||||||
|
| `status` | `processing / ready / failed` |
|
||||||
|
| `category` | 图片分类 |
|
||||||
|
| `summary` | 通用视觉摘要 |
|
||||||
|
| `extracted_text` | 可确认文字/OCR 结果 |
|
||||||
|
| `structured_data` | 结构化 JSON |
|
||||||
|
| `warning` | 不确定项和医学提示 |
|
||||||
|
| `vision_model` / `ocr_model` | 实际调用模型 |
|
||||||
|
| `created_at` / `used_at` | 创建和最近使用时间 |
|
||||||
|
|
||||||
|
不保存公开原图 URL。应用层不落盘原图;框架上传缓冲在请求结束时关闭,处理结果在 24 小时后自动清理。
|
||||||
|
|
||||||
|
## 6. API 设计
|
||||||
|
|
||||||
|
### 6.1 上传并解析
|
||||||
|
|
||||||
|
- `POST /api/avatar/{avatar_id}/chat/images`
|
||||||
|
- `POST /api/public/avatar/{share_token}/chat/images`
|
||||||
|
- `multipart/form-data: file`
|
||||||
|
|
||||||
|
成功返回:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "attachment-id",
|
||||||
|
"filename": "病例.jpg",
|
||||||
|
"status": "ready",
|
||||||
|
"category": "medical_document",
|
||||||
|
"summary": "门诊检查单",
|
||||||
|
"warning": "部分手写内容需要人工核对"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 6.2 聊天
|
||||||
|
|
||||||
|
原聊天接口增加:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"message": "请帮我看看异常指标",
|
||||||
|
"attachmentIds": ["attachment-id"],
|
||||||
|
"history": [
|
||||||
|
{"role": "user", "content": "上一条问题", "attachmentIds": ["attachment-id"]}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
当前消息最多 3 张图,历史最多引用最近 3 个不同附件。后端只读取与当前 `avatar_id` 相同且状态为 `ready` 的记录。
|
||||||
|
|
||||||
|
## 7. 安全与隐私
|
||||||
|
|
||||||
|
- 单图最大 8MB,解码后最大 1600 万像素,最长边归一化到 4096 像素以内。
|
||||||
|
- 使用 Pillow 验证真实图片格式并防止解压炸弹;重新编码时清除 EXIF、GPS 和其他元数据。
|
||||||
|
- 图片不会写入 FastAPI `StaticFiles` 或知识库目录,模型请求和日志不得输出 Base64 内容。
|
||||||
|
- 日志只记录附件 ID、分身 ID、状态、耗时和模型,不记录图片 Base64、OCR 全文、病例内容或 API Key。
|
||||||
|
- 公开分享上传仍消耗分身所有者积分;余额不足时拒绝视觉调用。
|
||||||
|
- 生产环境需要补充用户授权、数据处理协议、存储地域和模型供应商留存策略确认。
|
||||||
|
|
||||||
|
## 8. 前端交互
|
||||||
|
|
||||||
|
- 输入框左侧增加图片按钮,支持相册选择和移动端拍照。
|
||||||
|
- 选择后显示本地缩略图和“正在识别图片”,识别完成前禁止发送。
|
||||||
|
- 用户可删除待发送图片;发送后图片保留在当前会话气泡中,但刷新页面后不恢复原图。
|
||||||
|
- 病例和医学影像在输入区及回答下方显示辅助提示,不使用恐吓式红色告警。
|
||||||
|
- 上传或识别失败时保留文字输入,明确提示重新选择图片,不产生空白消息。
|
||||||
|
|
||||||
|
## 9. 配置
|
||||||
|
|
||||||
|
数字分身专用模型配置新增:
|
||||||
|
|
||||||
|
- `vision_model_version`,默认 `qwen3.6-flash`
|
||||||
|
- `ocr_model_version`,默认 `qwen-vl-ocr`
|
||||||
|
|
||||||
|
环境变量兜底:
|
||||||
|
|
||||||
|
```dotenv
|
||||||
|
VISION_MODEL=qwen3.6-flash
|
||||||
|
VISION_OCR_MODEL=qwen-vl-ocr
|
||||||
|
VISION_MAX_OUTPUT_TOKENS=2048
|
||||||
|
VISION_TIMEOUT_SECONDS=90
|
||||||
|
VISION_TOKEN_RESERVE=12000
|
||||||
|
CHAT_IMAGE_MAX_BYTES=8388608
|
||||||
|
CHAT_IMAGE_MAX_PIXELS=16000000
|
||||||
|
CHAT_ATTACHMENT_RETENTION_HOURS=24
|
||||||
|
CHAT_ATTACHMENT_CLEANUP_MINUTES=60
|
||||||
|
```
|
||||||
|
|
||||||
|
视觉调用复用数字分身专用配置的 `api_base_url` 和 `api_key`,不额外复制密钥。
|
||||||
|
|
||||||
|
## 10. 验收标准
|
||||||
|
|
||||||
|
1. 普通照片、截图和图表能够返回与图片一致的描述并支持追问。
|
||||||
|
2. 病例图片可以提取标题、患者字段、检查结果、异常指标和医生意见,模糊内容明确标记待核对。
|
||||||
|
3. 上传后服务器业务目录不残留原图,响应和日志不包含 Base64 或完整病例正文。
|
||||||
|
4. A 分身无法引用 B 分身附件;公开分享令牌无法访问其他分身附件。
|
||||||
|
5. 有图片时标准答题对仍作为最高优先级事实,知识库命中次之。
|
||||||
|
6. 视觉与 OCR 积分分别结算,失败调用释放预留积分。
|
||||||
|
7. SSE 打字效果、Markdown、用户头像、公开分享和纯文本聊天均无回归。
|
||||||
|
8. CT、MRI、X 光回答不作确定诊断,并显示人工复核提示。
|
||||||
@@ -7,10 +7,9 @@
|
|||||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
|
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
|
||||||
/>
|
/>
|
||||||
<title>会会数字分身</title>
|
<title>会会数字分身</title>
|
||||||
<!-- uniapp web-view 桥接:加载后全局出现 window.uni.webView,H5 才能与原生壳通信 -->
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
<script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.10/index.js"></script>
|
<!-- digital.99hui.com 同域部署保持 apiBase 为空,接口使用 /api。
|
||||||
<!-- 混合架构部署配置:web-view 内请把 apiBase 设为后端公网地址(如 'https://geo.99hui.com/api')。
|
仅跨域部署时才显式配置后端公网地址。 -->
|
||||||
留空则回退为 '/api'(开发态由 Vite 代理到 :8000)。 -->
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.__APP_CONFIG__ = { apiBase: '' }
|
window.__APP_CONFIG__ = { apiBase: '' }
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# 完整主配置:覆盖 nginx:alpine 默认 /etc/nginx/nginx.conf
|
# 完整主配置:覆盖 nginx:alpine 默认 /etc/nginx/nginx.conf
|
||||||
# 新版 nginx 在受限容器内写 /run/nginx.pid 会报 Operation not permitted 并致命退出,
|
# 新版 nginx 在受限容器内写 /run/nginx.pid 会报 Operation not permitted 并致命退出,
|
||||||
# 这里把 pid 显式改到可写的 /tmp(main 上下文唯一一处),避免前端容器反复重启。
|
# 这里把 pid 显式改到可写的 /tmp(main 上下文唯一一处),避免前端容器反复重启。
|
||||||
pid /dev/null;
|
pid /tmp/nginx.pid;
|
||||||
worker_processes auto;
|
worker_processes auto;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
@@ -14,6 +14,9 @@ http {
|
|||||||
sendfile on;
|
sendfile on;
|
||||||
keepalive_timeout 65;
|
keepalive_timeout 65;
|
||||||
|
|
||||||
|
# Docker 容器重建后 IP 可能变化;按内置 DNS 周期解析服务名,避免 Nginx 缓存旧地址导致 /api 502。
|
||||||
|
resolver 127.0.0.11 valid=10s ipv6=off;
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name _;
|
server_name _;
|
||||||
@@ -28,7 +31,8 @@ http {
|
|||||||
|
|
||||||
# 后端 API:保留 /api 前缀转发到 avatar-backend:8000
|
# 后端 API:保留 /api 前缀转发到 avatar-backend:8000
|
||||||
location /api/ {
|
location /api/ {
|
||||||
proxy_pass http://avatar-backend:8000;
|
set $avatar_backend http://avatar-backend:8000;
|
||||||
|
proxy_pass $avatar_backend;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
|||||||
Generated
+74
-134
@@ -8,6 +8,7 @@
|
|||||||
"name": "digital-avatar-app",
|
"name": "digital-avatar-app",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dcloudio/uni-webview-js": "^0.0.3",
|
||||||
"axios": "^1.6.0",
|
"axios": "^1.6.0",
|
||||||
"pinia": "^2.1.0",
|
"pinia": "^2.1.0",
|
||||||
"vue": "^3.3.0",
|
"vue": "^3.3.0",
|
||||||
@@ -17,7 +18,7 @@
|
|||||||
"@vitejs/plugin-vue": "^5.0.0",
|
"@vitejs/plugin-vue": "^5.0.0",
|
||||||
"typescript": "^5.3.0",
|
"typescript": "^5.3.0",
|
||||||
"vite": "^5.0.0",
|
"vite": "^5.0.0",
|
||||||
"vue-tsc": "^1.8.0"
|
"vue-tsc": "3.3.10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@babel/helper-string-parser": {
|
"node_modules/@babel/helper-string-parser": {
|
||||||
@@ -66,6 +67,12 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@dcloudio/uni-webview-js": {
|
||||||
|
"version": "0.0.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@dcloudio/uni-webview-js/-/uni-webview-js-0.0.3.tgz",
|
||||||
|
"integrity": "sha512-3XDnLXg22QKC/aTLtGim6zbOK+euiDYoRf98BjGDE0lqMm1U4SLFHAvOlAHa0qck91phaceKwo73ScQQgSojQg==",
|
||||||
|
"license": "Apache-2.0"
|
||||||
|
},
|
||||||
"node_modules/@esbuild/aix-ppc64": {
|
"node_modules/@esbuild/aix-ppc64": {
|
||||||
"version": "0.21.5",
|
"version": "0.21.5",
|
||||||
"resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
|
"resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
|
||||||
@@ -835,34 +842,32 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@volar/language-core": {
|
"node_modules/@volar/language-core": {
|
||||||
"version": "1.11.1",
|
"version": "2.4.28",
|
||||||
"resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.11.1.tgz",
|
"resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-2.4.28.tgz",
|
||||||
"integrity": "sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==",
|
"integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/source-map": "1.11.1"
|
"@volar/source-map": "2.4.28"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@volar/source-map": {
|
"node_modules/@volar/source-map": {
|
||||||
"version": "1.11.1",
|
"version": "2.4.28",
|
||||||
"resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.11.1.tgz",
|
"resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-2.4.28.tgz",
|
||||||
"integrity": "sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==",
|
"integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"dependencies": {
|
|
||||||
"muggle-string": "^0.3.1"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"node_modules/@volar/typescript": {
|
"node_modules/@volar/typescript": {
|
||||||
"version": "1.11.1",
|
"version": "2.4.28",
|
||||||
"resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.11.1.tgz",
|
"resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-2.4.28.tgz",
|
||||||
"integrity": "sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==",
|
"integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/language-core": "1.11.1",
|
"@volar/language-core": "2.4.28",
|
||||||
"path-browserify": "^1.0.1"
|
"path-browserify": "^1.0.1",
|
||||||
|
"vscode-uri": "^3.0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/compiler-core": {
|
"node_modules/@vue/compiler-core": {
|
||||||
@@ -922,29 +927,19 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@vue/language-core": {
|
"node_modules/@vue/language-core": {
|
||||||
"version": "1.8.27",
|
"version": "3.3.10",
|
||||||
"resolved": "https://registry.npmmirror.com/@vue/language-core/-/language-core-1.8.27.tgz",
|
"resolved": "https://registry.npmmirror.com/@vue/language-core/-/language-core-3.3.10.tgz",
|
||||||
"integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
|
"integrity": "sha512-CR7ByBbgPHqhxrioKPOcZBqttaozzLNwtkCzXQ+uF8gLPHnUe03srPnGpdtHD3zp+bq5iyVkZ1WNx7W564RPwg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/language-core": "~1.11.1",
|
"@volar/language-core": "2.4.28",
|
||||||
"@volar/source-map": "~1.11.1",
|
"@vue/compiler-dom": "^3.5.0",
|
||||||
"@vue/compiler-dom": "^3.3.0",
|
"@vue/shared": "^3.5.0",
|
||||||
"@vue/shared": "^3.3.0",
|
"alien-signals": "^3.2.1",
|
||||||
"computeds": "^0.0.1",
|
"muggle-string": "^0.4.1",
|
||||||
"minimatch": "^9.0.3",
|
|
||||||
"muggle-string": "^0.3.1",
|
|
||||||
"path-browserify": "^1.0.1",
|
"path-browserify": "^1.0.1",
|
||||||
"vue-template-compiler": "^2.7.14"
|
"picomatch": "^4.0.4"
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"typescript": "*"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"typescript": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/reactivity": {
|
"node_modules/@vue/reactivity": {
|
||||||
@@ -1009,6 +1004,13 @@
|
|||||||
"node": ">= 6.0.0"
|
"node": ">= 6.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/alien-signals": {
|
||||||
|
"version": "3.2.1",
|
||||||
|
"resolved": "https://registry.npmmirror.com/alien-signals/-/alien-signals-3.2.1.tgz",
|
||||||
|
"integrity": "sha512-I8FjmltrfnDFoZedi5CG8DghVYNhzb/Ijluz7tCSJH0xpd0484Kowhbb1XDYOxfJpU1p5wnM2X54dA+IfGyD1g==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/asynckit": {
|
"node_modules/asynckit": {
|
||||||
"version": "0.4.0",
|
"version": "0.4.0",
|
||||||
"resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
|
"resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
|
||||||
@@ -1027,23 +1029,6 @@
|
|||||||
"proxy-from-env": "^2.1.0"
|
"proxy-from-env": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/balanced-match": {
|
|
||||||
"version": "1.0.2",
|
|
||||||
"resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
|
|
||||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/brace-expansion": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"balanced-match": "^1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/call-bind-apply-helpers": {
|
"node_modules/call-bind-apply-helpers": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
|
"resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
|
||||||
@@ -1069,26 +1054,12 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/computeds": {
|
|
||||||
"version": "0.0.1",
|
|
||||||
"resolved": "https://registry.npmmirror.com/computeds/-/computeds-0.0.1.tgz",
|
|
||||||
"integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/csstype": {
|
"node_modules/csstype": {
|
||||||
"version": "3.2.3",
|
"version": "3.2.3",
|
||||||
"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz",
|
"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz",
|
||||||
"integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
|
"integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/de-indent": {
|
|
||||||
"version": "1.0.2",
|
|
||||||
"resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
|
|
||||||
"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/debug": {
|
"node_modules/debug": {
|
||||||
"version": "4.4.3",
|
"version": "4.4.3",
|
||||||
"resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
|
"resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
|
||||||
@@ -1379,16 +1350,6 @@
|
|||||||
"node": ">= 0.4"
|
"node": ">= 0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/he": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
|
||||||
"he": "bin/he"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/https-proxy-agent": {
|
"node_modules/https-proxy-agent": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
"resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
||||||
@@ -1441,22 +1402,6 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
|
||||||
"version": "9.0.9",
|
|
||||||
"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.9.tgz",
|
|
||||||
"integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"brace-expansion": "^2.0.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16 || 14 >=14.17"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ms": {
|
"node_modules/ms": {
|
||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
|
||||||
@@ -1464,16 +1409,16 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/muggle-string": {
|
"node_modules/muggle-string": {
|
||||||
"version": "0.3.1",
|
"version": "0.4.1",
|
||||||
"resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.3.1.tgz",
|
"resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.4.1.tgz",
|
||||||
"integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
|
"integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/nanoid": {
|
"node_modules/nanoid": {
|
||||||
"version": "3.3.15",
|
"version": "3.3.18",
|
||||||
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.15.tgz",
|
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.18.tgz",
|
||||||
"integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
|
"integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@@ -1501,6 +1446,19 @@
|
|||||||
"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
|
"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/picomatch": {
|
||||||
|
"version": "4.0.5",
|
||||||
|
"resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.5.tgz",
|
||||||
|
"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/jonschlinkert"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/pinia": {
|
"node_modules/pinia": {
|
||||||
"version": "2.3.1",
|
"version": "2.3.1",
|
||||||
"resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.3.1.tgz",
|
"resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.3.1.tgz",
|
||||||
@@ -1524,9 +1482,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.16",
|
"version": "8.5.26",
|
||||||
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.16.tgz",
|
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.26.tgz",
|
||||||
"integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==",
|
"integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "opencollective",
|
"type": "opencollective",
|
||||||
@@ -1543,7 +1501,7 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.12",
|
"nanoid": "^3.3.17",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
"source-map-js": "^1.2.1"
|
"source-map-js": "^1.2.1"
|
||||||
},
|
},
|
||||||
@@ -1605,19 +1563,6 @@
|
|||||||
"fsevents": "~2.3.2"
|
"fsevents": "~2.3.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/semver": {
|
|
||||||
"version": "7.8.5",
|
|
||||||
"resolved": "https://registry.npmmirror.com/semver/-/semver-7.8.5.tgz",
|
|
||||||
"integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"bin": {
|
|
||||||
"semver": "bin/semver.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/source-map-js": {
|
"node_modules/source-map-js": {
|
||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
|
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
|
||||||
@@ -1701,6 +1646,13 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/vscode-uri": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/vue": {
|
"node_modules/vue": {
|
||||||
"version": "3.5.39",
|
"version": "3.5.39",
|
||||||
"resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.39.tgz",
|
"resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.39.tgz",
|
||||||
@@ -1763,33 +1715,21 @@
|
|||||||
"vue": "^3.5.0"
|
"vue": "^3.5.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-template-compiler": {
|
|
||||||
"version": "2.7.16",
|
|
||||||
"resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
|
|
||||||
"integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"de-indent": "^1.0.2",
|
|
||||||
"he": "^1.2.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-tsc": {
|
"node_modules/vue-tsc": {
|
||||||
"version": "1.8.27",
|
"version": "3.3.10",
|
||||||
"resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.8.27.tgz",
|
"resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-3.3.10.tgz",
|
||||||
"integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
|
"integrity": "sha512-YaDVxcW+CGtaOt3pZahMG5jYPx0hsUTxyEoPOTSMebcGUXP9lIBabQ14vfKMORb2CqqK5CxsNo/d1d+4IQwiKg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/typescript": "~1.11.1",
|
"@volar/typescript": "2.4.28",
|
||||||
"@vue/language-core": "1.8.27",
|
"@vue/language-core": "3.3.10"
|
||||||
"semver": "^7.5.4"
|
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"vue-tsc": "bin/vue-tsc.js"
|
"vue-tsc": "bin/vue-tsc.js"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"typescript": "*"
|
"typescript": ">=5.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "digital-avatar-app",
|
"name": "digital-avatar-app",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
"type": "module",
|
||||||
"description": "会会数字分身 Web App",
|
"description": "会会数字分身 Web App",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -8,15 +9,20 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vue": "^3.3.0",
|
"@dcloudio/uni-webview-js": "^0.0.3",
|
||||||
"vue-router": "^4.2.0",
|
"axios": "^1.6.0",
|
||||||
"pinia": "^2.1.0",
|
"pinia": "^2.1.0",
|
||||||
"axios": "^1.6.0"
|
"vue": "^3.3.0",
|
||||||
|
"vue-router": "^4.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vitejs/plugin-vue": "^5.0.0",
|
"@vitejs/plugin-vue": "^5.0.0",
|
||||||
"typescript": "^5.3.0",
|
"typescript": "^5.3.0",
|
||||||
"vite": "^5.0.0",
|
"vite": "^5.0.0",
|
||||||
"vue-tsc": "^1.8.0"
|
"vue-tsc": "3.3.10"
|
||||||
|
},
|
||||||
|
"overrides": {
|
||||||
|
"nanoid": "3.3.18",
|
||||||
|
"postcss": "8.5.26"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
8f54097b01d5b0433f8aa5ea70ca930b
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
8f54097b01d5b0433f8aa5ea70ca930b
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="avatar-gradient" x1="8" y1="8" x2="56" y2="56" gradientUnits="userSpaceOnUse">
|
||||||
|
<stop stop-color="#fb923c"/>
|
||||||
|
<stop offset="1" stop-color="#f97316"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="64" height="64" rx="16" fill="url(#avatar-gradient)"/>
|
||||||
|
<circle cx="32" cy="24" r="10" fill="#fff"/>
|
||||||
|
<path d="M15 52c1.8-10 8-15 17-15s15.2 5 17 15" fill="#fff"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 474 B |
@@ -8,6 +8,7 @@ import {
|
|||||||
pickAvatarId,
|
pickAvatarId,
|
||||||
unwrapListData,
|
unwrapListData,
|
||||||
} from '../src/utils/avatar-page-data.js'
|
} from '../src/utils/avatar-page-data.js'
|
||||||
|
import { renderChatMarkdownCharacters } from '../src/utils/chat-markdown.js'
|
||||||
|
|
||||||
assert.deepEqual(unwrapListData([{ id: 'a1' }]), [{ id: 'a1' }], 'unwrapListData should return raw arrays')
|
assert.deepEqual(unwrapListData([{ id: 'a1' }]), [{ id: 'a1' }], 'unwrapListData should return raw arrays')
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
@@ -29,6 +30,23 @@ assert.equal(
|
|||||||
)
|
)
|
||||||
assert.equal(pickAvatarId('', []), null, 'pickAvatarId should return null when no avatar exists')
|
assert.equal(pickAvatarId('', []), null, 'pickAvatarId should return null when no avatar exists')
|
||||||
|
|
||||||
|
const boldReply = renderChatMarkdownCharacters('请注意:**不能自行诊断或随意用药**。')
|
||||||
|
assert.equal(
|
||||||
|
boldReply.map((character) => character.text).join(''),
|
||||||
|
'请注意:不能自行诊断或随意用药。',
|
||||||
|
'chat markdown should hide bold markers'
|
||||||
|
)
|
||||||
|
assert.equal(
|
||||||
|
boldReply.filter((character) => character.bold).map((character) => character.text).join(''),
|
||||||
|
'不能自行诊断或随意用药',
|
||||||
|
'chat markdown should style bold text'
|
||||||
|
)
|
||||||
|
assert.equal(
|
||||||
|
renderChatMarkdownCharacters('****重点****').map((character) => character.text).join(''),
|
||||||
|
'重点',
|
||||||
|
'chat markdown should tolerate repeated bold markers'
|
||||||
|
)
|
||||||
|
|
||||||
assert.deepEqual(
|
assert.deepEqual(
|
||||||
normalizeAvatarEditForm({
|
normalizeAvatarEditForm({
|
||||||
name: '我的分身',
|
name: '我的分身',
|
||||||
@@ -36,7 +54,19 @@ assert.deepEqual(
|
|||||||
description: '描述',
|
description: '描述',
|
||||||
status: 'inactive',
|
status: 'inactive',
|
||||||
photoUrl: 'https://img.example/avatar.png',
|
photoUrl: 'https://img.example/avatar.png',
|
||||||
config: { replyStyle: 'friendly', creativity: 72, rigor: 88, humor: 16, responseLength: 'short', systemPrompt: '不要编造', autoReply: false },
|
config: {
|
||||||
|
replyStyle: 'friendly',
|
||||||
|
creativity: 72,
|
||||||
|
rigor: 88,
|
||||||
|
humor: 16,
|
||||||
|
responseLength: 'short',
|
||||||
|
systemPrompt: '不要编造',
|
||||||
|
profession: '医生',
|
||||||
|
position: '主任医师',
|
||||||
|
organization: '测试医院',
|
||||||
|
organizationAddress: '测试路 1 号',
|
||||||
|
autoReply: false
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
name: '我的分身',
|
name: '我的分身',
|
||||||
@@ -50,6 +80,10 @@ assert.deepEqual(
|
|||||||
humor: 16,
|
humor: 16,
|
||||||
responseLength: 'short',
|
responseLength: 'short',
|
||||||
systemPrompt: '不要编造',
|
systemPrompt: '不要编造',
|
||||||
|
profession: '医生',
|
||||||
|
position: '主任医师',
|
||||||
|
organization: '测试医院',
|
||||||
|
organizationAddress: '测试路 1 号',
|
||||||
autoReply: false,
|
autoReply: false,
|
||||||
},
|
},
|
||||||
'normalizeAvatarEditForm should map API avatars into edit form state'
|
'normalizeAvatarEditForm should map API avatars into edit form state'
|
||||||
@@ -68,6 +102,10 @@ assert.deepEqual(
|
|||||||
humor: 25,
|
humor: 25,
|
||||||
responseLength: 'medium',
|
responseLength: 'medium',
|
||||||
systemPrompt: '回答简洁',
|
systemPrompt: '回答简洁',
|
||||||
|
profession: '医生',
|
||||||
|
position: '主任医师',
|
||||||
|
organization: '测试医院',
|
||||||
|
organizationAddress: '测试路 1 号',
|
||||||
autoReply: true,
|
autoReply: true,
|
||||||
}),
|
}),
|
||||||
{
|
{
|
||||||
@@ -83,6 +121,10 @@ assert.deepEqual(
|
|||||||
humor: 25,
|
humor: 25,
|
||||||
responseLength: 'medium',
|
responseLength: 'medium',
|
||||||
systemPrompt: '回答简洁',
|
systemPrompt: '回答简洁',
|
||||||
|
profession: '医生',
|
||||||
|
position: '主任医师',
|
||||||
|
organization: '测试医院',
|
||||||
|
organizationAddress: '测试路 1 号',
|
||||||
autoReply: true,
|
autoReply: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -94,6 +136,45 @@ assert.match(knowledgeView, /文档知识库/, 'knowledge page should expose the
|
|||||||
assert.match(knowledgeView, /标准问答对/, 'knowledge page should expose the QA tab')
|
assert.match(knowledgeView, /标准问答对/, 'knowledge page should expose the QA tab')
|
||||||
assert.match(knowledgeView, /activeTab/, 'knowledge page should switch active tabs')
|
assert.match(knowledgeView, /activeTab/, 'knowledge page should switch active tabs')
|
||||||
assert.match(knowledgeView, /accept="\.md,\.txt,\.pdf,\.doc,\.docx,\.xlsx"/, 'knowledge page should accept md and txt')
|
assert.match(knowledgeView, /accept="\.md,\.txt,\.pdf,\.doc,\.docx,\.xlsx"/, 'knowledge page should accept md and txt')
|
||||||
assert.match(knowledgeView, /table-scroll/, 'knowledge page should use a scrollable table wrapper')
|
assert.match(knowledgeView, /mobile-card-list/, 'knowledge page should render mobile-first card lists')
|
||||||
|
assert.match(knowledgeView, /knowledge-card/, 'knowledge page should expose document and QA cards')
|
||||||
|
|
||||||
|
const chatView = fs.readFileSync(path.resolve('src/views/AvatarChat.vue'), 'utf8')
|
||||||
|
assert.match(chatView, /avatar\?\.photoUrl/, 'chat should render the active avatar photo when available')
|
||||||
|
assert.match(chatView, /userAvatarUrl/, 'chat should render the logged-in user photo when available')
|
||||||
|
assert.match(chatView, /avatarStatus/, 'chat should synchronize the visible status indicator with avatar status')
|
||||||
|
assert.match(chatView, /document\.title = avatar\.value/, 'chat should use the avatar name as the page title')
|
||||||
|
assert.match(chatView, /position: sticky/, 'chat header should remain visible while the message list scrolls')
|
||||||
|
assert.match(chatView, /typing-character/, 'chat replies should animate one character at a time')
|
||||||
|
assert.match(chatView, /renderChatMarkdownCharacters/, 'chat replies should render markdown as safe web text')
|
||||||
|
assert.match(chatView, /markdown-bold/, 'chat replies should style markdown emphasis without showing markers')
|
||||||
|
assert.match(chatView, /streamAvatarChat/, 'private chat should consume SSE response chunks')
|
||||||
|
assert.match(chatView, /streamPublicAvatarChat/, 'public chat should consume SSE response chunks')
|
||||||
|
assert.match(chatView, /scrollDuringStream/, 'streaming replies should throttle scrolling to animation frames')
|
||||||
|
assert.match(chatView, /typing-character\.newline/, 'streaming replies should render sentence line breaks')
|
||||||
|
assert.match(chatView, /let attached = false/, 'assistant bubble should wait for the first streamed text chunk')
|
||||||
|
assert.match(chatView, /reactive<DisplayMessage>/, 'every streamed character should update through a reactive reply object')
|
||||||
|
assert.doesNotMatch(chatView, /你好,我是\{\{/, 'chat welcome card should not introduce the avatar by name')
|
||||||
|
assert.doesNotMatch(chatView, /\/\[。!?;\]\/\.test\(character\)/, 'chat should not force a line break after every sentence')
|
||||||
|
assert.match(chatView, /previous === '\\n'/, 'streaming text should collapse whitespace at line boundaries')
|
||||||
|
assert.match(chatView, /welcome-avatar/, 'chat welcome should use the active avatar image instead of a generic icon')
|
||||||
|
assert.doesNotMatch(chatView, /我会优先参考标准问答和知识库/, 'chat welcome should not expose internal answer sources')
|
||||||
|
assert.match(chatView, /welcome-description/, 'chat welcome should render the avatar description')
|
||||||
|
assert.doesNotMatch(chatView, /介绍一下你自己/, 'chat welcome should not contain fixed starter questions')
|
||||||
|
|
||||||
|
const editView = fs.readFileSync(path.resolve('src/views/AvatarEdit.vue'), 'utf8')
|
||||||
|
assert.match(editView, />分身微调</, 'avatar edit page should use the requested title')
|
||||||
|
assert.match(editView, /uploadAvatarPhoto/, 'avatar edit page should upload a clicked replacement photo')
|
||||||
|
assert.doesNotMatch(editView, />头像链接</, 'avatar edit page should not expose a photo URL input')
|
||||||
|
for (const field of ['profession', 'position', 'organization', 'organizationAddress']) {
|
||||||
|
assert.match(editView, new RegExp(`formData\\.${field}`), `avatar edit page should expose ${field}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const manageView = fs.readFileSync(path.resolve('src/views/AvatarManage.vue'), 'utf8')
|
||||||
|
assert.match(manageView, /shareAvatar/, 'avatar management should offer a share action')
|
||||||
|
assert.match(manageView, /createAvatarShareLink/, 'share action should create a public share link')
|
||||||
|
|
||||||
|
const router = fs.readFileSync(path.resolve('src/router/index.ts'), 'utf8')
|
||||||
|
assert.match(router, /path: '\/share\/:shareToken'/, 'router should expose a public chat route')
|
||||||
|
|
||||||
console.log('avatar-page-data tests passed')
|
console.log('avatar-page-data tests passed')
|
||||||
|
|||||||
@@ -1,71 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<router-view />
|
<router-view />
|
||||||
<!-- 底部导航栏 -->
|
<!-- 底部菜单暂不展示,多分身能力统一从分身卡片进入。 -->
|
||||||
<nav class="bottom-nav" v-if="showNav">
|
|
||||||
<button
|
|
||||||
class="nav-item"
|
|
||||||
:class="{ active: currentRoute === '/' || currentRoute === '/avatar/manage' }"
|
|
||||||
@click="navigateTo('/avatar/manage')"
|
|
||||||
>
|
|
||||||
<span class="nav-icon">🤖</span>
|
|
||||||
<span class="nav-label">我的分身</span>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="nav-item"
|
|
||||||
:class="{ active: currentRoute === '/authorization' }"
|
|
||||||
@click="navigateTo('/authorization')"
|
|
||||||
>
|
|
||||||
<span class="nav-icon">🔑</span>
|
|
||||||
<span class="nav-label">授权管理</span>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="nav-item"
|
|
||||||
:class="{ active: currentRoute === '/token/charge' }"
|
|
||||||
@click="navigateTo('/token/charge')"
|
|
||||||
>
|
|
||||||
<span class="nav-icon">💰</span>
|
|
||||||
<span class="nav-label">Token</span>
|
|
||||||
</button>
|
|
||||||
</nav>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { ref, onMounted, watch } from 'vue'
|
|
||||||
import { useRouter, useRoute } from 'vue-router'
|
|
||||||
|
|
||||||
const router = useRouter()
|
|
||||||
const route = useRoute()
|
|
||||||
|
|
||||||
const currentRoute = ref<string>(route.path)
|
|
||||||
const showNav = ref<boolean>(shouldShowNav(route.path))
|
|
||||||
|
|
||||||
function shouldShowNav(path: string) {
|
|
||||||
return path !== '/'
|
|
||||||
&& path !== '/avatar/create'
|
|
||||||
&& path !== '/login/sms'
|
|
||||||
&& !path.startsWith('/avatar/edit')
|
|
||||||
&& !path.startsWith('/avatar/chat')
|
|
||||||
}
|
|
||||||
|
|
||||||
// 监听路由变化
|
|
||||||
watch(() => route.path, (newPath) => {
|
|
||||||
currentRoute.value = newPath
|
|
||||||
showNav.value = shouldShowNav(newPath)
|
|
||||||
})
|
|
||||||
|
|
||||||
// 导航
|
|
||||||
const navigateTo = (path: string) => {
|
|
||||||
router.push(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
currentRoute.value = route.path
|
|
||||||
showNav.value = shouldShowNav(route.path)
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
* {
|
* {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -79,48 +18,4 @@ onMounted(() => {
|
|||||||
background: #F8F9FA;
|
background: #F8F9FA;
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 底部导航栏 */
|
|
||||||
.bottom-nav {
|
|
||||||
position: fixed;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
display: flex;
|
|
||||||
background: white;
|
|
||||||
border-top: 1px solid #EDEEF1;
|
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
|
||||||
z-index: 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
padding: 8px 0;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-icon {
|
|
||||||
font-size: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-label {
|
|
||||||
font-size: 11px;
|
|
||||||
color: #9398AE;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item.active .nav-label {
|
|
||||||
color: #F97316;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item.active .nav-icon {
|
|
||||||
filter: none;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,9 +1,16 @@
|
|||||||
import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'
|
import axios, { AxiosRequestConfig } from 'axios'
|
||||||
|
|
||||||
|
interface ApiClient {
|
||||||
|
get<T>(url: string, config?: AxiosRequestConfig): Promise<T>
|
||||||
|
post<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T>
|
||||||
|
put<T = unknown>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T>
|
||||||
|
delete<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T>
|
||||||
|
}
|
||||||
|
|
||||||
// API 基址:优先级 window.__APP_CONFIG__.apiBase > 环境变量 > 默认 '/api'
|
// API 基址:优先级 window.__APP_CONFIG__.apiBase > 环境变量 > 默认 '/api'
|
||||||
// - 开发/Vite 代理:'/api'(由 vite.config 代理到后端 :8000)
|
// - 开发/Vite 代理:'/api'(由 vite.config 代理到后端 :8000)
|
||||||
// - web-view 内(混合架构):需配置为后端公网地址,例如 'https://geo.99hui.com/api'
|
// - digital.99hui.com 同域部署:保持 '/api'
|
||||||
// - 同域部署的构建产物:可保持 '/api'
|
// - 仅跨域部署时配置后端公网地址
|
||||||
function resolveBaseURL(): string {
|
function resolveBaseURL(): string {
|
||||||
const cfg = (window as any).__APP_CONFIG__
|
const cfg = (window as any).__APP_CONFIG__
|
||||||
if (cfg && cfg.apiBase) return cfg.apiBase as string
|
if (cfg && cfg.apiBase) return cfg.apiBase as string
|
||||||
@@ -22,7 +29,7 @@ export function getAuthToken(): string | null {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 创建 axios 实例(复用现有项目模式)
|
// 创建 axios 实例(复用现有项目模式)
|
||||||
const createRequest = (config?: AxiosRequestConfig): AxiosInstance => {
|
const createRequest = (config?: AxiosRequestConfig): ApiClient => {
|
||||||
const request = axios.create({
|
const request = axios.create({
|
||||||
baseURL: resolveBaseURL(),
|
baseURL: resolveBaseURL(),
|
||||||
timeout: 30000,
|
timeout: 30000,
|
||||||
@@ -59,7 +66,8 @@ const createRequest = (config?: AxiosRequestConfig): AxiosInstance => {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
return request
|
// The response interceptor unwraps the API envelope before callers receive it.
|
||||||
|
return request as unknown as ApiClient
|
||||||
}
|
}
|
||||||
|
|
||||||
// 递归修复时区标识(复用现有项目逻辑)
|
// 递归修复时区标识(复用现有项目逻辑)
|
||||||
@@ -90,6 +98,7 @@ export interface Avatar {
|
|||||||
tokenBalance: number
|
tokenBalance: number
|
||||||
createdAt: string
|
createdAt: string
|
||||||
updatedAt: string
|
updatedAt: string
|
||||||
|
config?: Record<string, any>
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取分身列表
|
// 获取分身列表
|
||||||
@@ -108,26 +117,108 @@ export const createAvatar = (data: Partial<Avatar>) =>
|
|||||||
export const updateAvatar = (id: string, data: Partial<Avatar>) =>
|
export const updateAvatar = (id: string, data: Partial<Avatar>) =>
|
||||||
request.put<Avatar>(`/avatar/${id}`, data)
|
request.put<Avatar>(`/avatar/${id}`, data)
|
||||||
|
|
||||||
|
export const uploadAvatarPhoto = (id: string, file: File) => {
|
||||||
|
const form = new FormData()
|
||||||
|
form.append('file', file)
|
||||||
|
return request.post<{ photoUrl: string }>(`/avatar/${id}/photo`, form, {
|
||||||
|
headers: { 'Content-Type': 'multipart/form-data' }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// 删除分身
|
// 删除分身
|
||||||
export const deleteAvatar = (id: string) =>
|
export const deleteAvatar = (id: string) =>
|
||||||
request.delete(`/avatar/${id}`)
|
request.delete(`/avatar/${id}`)
|
||||||
|
|
||||||
// ==================== Token 管理 API ====================
|
// ==================== Token 管理 API ====================
|
||||||
|
|
||||||
|
export interface TokenBalance {
|
||||||
|
balance: number
|
||||||
|
totalGranted: number
|
||||||
|
totalConsumed: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TokenUsageSummary {
|
||||||
|
avatarId: string
|
||||||
|
source: string
|
||||||
|
promptTokens: number
|
||||||
|
completionTokens: number
|
||||||
|
totalTokens: number
|
||||||
|
requestCount: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface TokenPaymentOrder {
|
||||||
|
id: string
|
||||||
|
orderNo: string
|
||||||
|
planId: string
|
||||||
|
paymentMethod: 'wechat' | 'alipay'
|
||||||
|
payType: 'WECHAT' | 'ALIPAY'
|
||||||
|
payWay: 'APP' | 'LITE' | 'JSAPI'
|
||||||
|
pointsAmount: number
|
||||||
|
price: number
|
||||||
|
status: 'pending' | 'paid' | 'failed'
|
||||||
|
providerStatus: string
|
||||||
|
payMessage: string
|
||||||
|
failureReason: string
|
||||||
|
balance: number
|
||||||
|
}
|
||||||
|
|
||||||
// 获取 Token 余额
|
// 获取 Token 余额
|
||||||
export const getTokenBalance = () =>
|
export const getTokenBalance = () =>
|
||||||
request.get<{ balance: number }>('/token/balance')
|
request.get<TokenBalance>('/token/balance')
|
||||||
|
|
||||||
// 获取充值套餐
|
// 获取充值套餐
|
||||||
export const getRechargePlans = () =>
|
export const getRechargePlans = () =>
|
||||||
request.get<Array<{ id: string; name: string; amount: number; price: number }>>('/token/plans')
|
request.get<Array<{ id: string; name: string; amount: number; price: number }>>('/token/plans')
|
||||||
|
|
||||||
// 执行充值
|
// 创建会会支付订单;支付回调成功后积分到账。
|
||||||
export const chargeToken = (planId: string) =>
|
export const chargeToken = (
|
||||||
request.post<{ balance: number; charged: number }>('/token/charge', { planId })
|
planId: string,
|
||||||
|
paymentMethod: 'wechat' | 'alipay',
|
||||||
|
payScene: 'APP' | 'LITE' | 'JSAPI'
|
||||||
|
) => request.post<TokenPaymentOrder>('/token/charge', { planId, paymentMethod, payScene })
|
||||||
|
|
||||||
|
export const getTokenPaymentStatus = (orderId: string) =>
|
||||||
|
request.get<TokenPaymentOrder>(`/token/payment/${orderId}`)
|
||||||
|
|
||||||
|
// 按分身和使用场景汇总 Token 消耗
|
||||||
|
export const getTokenUsage = () =>
|
||||||
|
request.get<TokenUsageSummary[]>('/token/usage')
|
||||||
|
|
||||||
// ==================== 授权管理 API ====================
|
// ==================== 授权管理 API ====================
|
||||||
|
|
||||||
|
export type AvatarPermission = 'friend' | 'chat' | 'publish' | 'browse' | 'interact' | 'takeover'
|
||||||
|
|
||||||
|
export interface AvatarPermissionSettings {
|
||||||
|
avatarId: string
|
||||||
|
permissions: AvatarPermission[]
|
||||||
|
takeoverReplyDelaySeconds: number
|
||||||
|
disabledAvatarIds?: string[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getAvatarPermissionSettings = (avatarId: string) =>
|
||||||
|
request.get<AvatarPermissionSettings>(`/avatar/${avatarId}/permission-settings`)
|
||||||
|
|
||||||
|
export const updateAvatarPermissionSettings = (
|
||||||
|
avatarId: string,
|
||||||
|
permissions: AvatarPermission[],
|
||||||
|
takeoverReplyDelaySeconds: number
|
||||||
|
) => request.put<AvatarPermissionSettings>(`/avatar/${avatarId}/permission-settings`, {
|
||||||
|
permissions,
|
||||||
|
takeoverReplyDelaySeconds,
|
||||||
|
})
|
||||||
|
|
||||||
|
export interface TakeoverStatus {
|
||||||
|
enabled: boolean
|
||||||
|
status: 'disabled' | 'connecting' | 'ready' | 'needs_login' | 'error'
|
||||||
|
message: string
|
||||||
|
pendingCount: number
|
||||||
|
takeoverReplyDelaySeconds: number
|
||||||
|
lastPolledAt: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getTakeoverStatus = (avatarId: string) =>
|
||||||
|
request.get<TakeoverStatus>(`/avatar/${avatarId}/takeover/status`)
|
||||||
|
|
||||||
export interface Authorization {
|
export interface Authorization {
|
||||||
id: string
|
id: string
|
||||||
avatarId: string
|
avatarId: string
|
||||||
@@ -136,16 +227,41 @@ export interface Authorization {
|
|||||||
targetName: string
|
targetName: string
|
||||||
permissions: string[]
|
permissions: string[]
|
||||||
status: 'active' | 'inactive'
|
status: 'active' | 'inactive'
|
||||||
|
takeoverEnabled: boolean
|
||||||
|
takeoverMode: 'immediate' | 'delayed'
|
||||||
|
takeoverDelaySeconds: number
|
||||||
createdAt: string
|
createdAt: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type AuthorizationInput = Pick<
|
||||||
|
Authorization,
|
||||||
|
'targetType' | 'targetId' | 'targetName' | 'permissions'
|
||||||
|
>
|
||||||
|
|
||||||
// 获取授权列表
|
// 获取授权列表
|
||||||
export const getAuthorizationList = (avatarId: string) =>
|
export const getAuthorizationList = (avatarId: string) =>
|
||||||
request.get<Authorization[]>(`/avatar/${avatarId}/authorizations`)
|
request.get<Authorization[]>(`/avatar/${avatarId}/authorizations`)
|
||||||
|
|
||||||
|
// 添加授权
|
||||||
|
export const createAuthorization = (avatarId: string, data: AuthorizationInput) =>
|
||||||
|
request.post<Authorization>(`/avatar/${avatarId}/authorizations`, data)
|
||||||
|
|
||||||
// 更新授权
|
// 更新授权
|
||||||
export const updateAuthorization = (avatarId: string, data: Partial<Authorization>) =>
|
export const updateAuthorization = (avatarId: string, data: Partial<Authorization> & { id: string }) =>
|
||||||
request.put(`/avatar/${avatarId}/authorizations`, data)
|
request.put<Authorization>(`/avatar/${avatarId}/authorizations`, data)
|
||||||
|
|
||||||
|
// 删除授权
|
||||||
|
export const deleteAuthorization = (avatarId: string, authorizationId: string) =>
|
||||||
|
request.delete<{ id: string }>(`/avatar/${avatarId}/authorizations/${authorizationId}`)
|
||||||
|
|
||||||
|
// 更新单聊接管配置
|
||||||
|
export const updateTakeoverConfig = (avatarId: string, data: {
|
||||||
|
authorizationId: string
|
||||||
|
takeoverEnabled: boolean
|
||||||
|
takeoverMode?: 'immediate' | 'delayed'
|
||||||
|
takeoverDelaySeconds?: number
|
||||||
|
}) =>
|
||||||
|
request.put<Authorization>(`/avatar/${avatarId}/authorizations/takeover`, data)
|
||||||
|
|
||||||
// ==================== 组织管理 API ====================
|
// ==================== 组织管理 API ====================
|
||||||
|
|
||||||
@@ -153,17 +269,26 @@ export interface Organization {
|
|||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
description: string
|
description: string
|
||||||
|
emoji: string
|
||||||
|
type: 'team' | 'company' | 'community'
|
||||||
role: 'admin' | 'member' | 'viewer'
|
role: 'admin' | 'member' | 'viewer'
|
||||||
memberCount: number
|
memberCount: number
|
||||||
createdAt: string
|
createdAt: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CreateOrganizationInput {
|
||||||
|
name: string
|
||||||
|
desc?: string
|
||||||
|
emoji?: string
|
||||||
|
type?: 'team' | 'company' | 'community'
|
||||||
|
}
|
||||||
|
|
||||||
// 获取组织列表
|
// 获取组织列表
|
||||||
export const getOrganizationList = (params?: any) =>
|
export const getOrganizationList = (params?: any) =>
|
||||||
request.get<{ data: Organization[]; total: number }>('/organizations', { params })
|
request.get<{ data: Organization[]; total: number }>('/organizations', { params })
|
||||||
|
|
||||||
// 创建组织
|
// 创建组织
|
||||||
export const createOrganization = (data: Partial<Organization>) =>
|
export const createOrganization = (data: CreateOrganizationInput) =>
|
||||||
request.post<Organization>('/organizations', data)
|
request.post<Organization>('/organizations', data)
|
||||||
|
|
||||||
// ==================== 知识库管理 API ====================
|
// ==================== 知识库管理 API ====================
|
||||||
@@ -176,6 +301,7 @@ export interface KnowledgeDoc {
|
|||||||
fileSize: number
|
fileSize: number
|
||||||
fileUrl: string
|
fileUrl: string
|
||||||
status: string
|
status: string
|
||||||
|
filePresent?: boolean
|
||||||
vectorized?: boolean
|
vectorized?: boolean
|
||||||
embeddingModel?: string
|
embeddingModel?: string
|
||||||
chunkCount?: number
|
chunkCount?: number
|
||||||
@@ -248,17 +374,116 @@ export const searchKnowledge = (avatarId: string, q: string, topK = 5) =>
|
|||||||
export interface ChatMessage {
|
export interface ChatMessage {
|
||||||
role: 'user' | 'assistant'
|
role: 'user' | 'assistant'
|
||||||
content: string
|
content: string
|
||||||
|
attachmentIds?: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ChatResponse {
|
export interface ChatResponse {
|
||||||
answer: string
|
answer: string
|
||||||
source: 'qa' | 'knowledge' | 'qwen'
|
source: 'qa' | 'knowledge' | 'vision' | 'qwen'
|
||||||
references?: Array<{ docId?: string; filename?: string; fileType?: string; snippet?: string; score?: number }>
|
references?: Array<{ docId?: string; filename?: string; fileType?: string; snippet?: string; score?: number }>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const sendAvatarChat = (avatarId: string, payload: { message: string; history?: ChatMessage[] }) =>
|
export interface ChatAttachment {
|
||||||
|
id: string
|
||||||
|
avatarId: string
|
||||||
|
filename: string
|
||||||
|
mimeType: string
|
||||||
|
fileSize: number
|
||||||
|
status: 'processing' | 'ready' | 'failed'
|
||||||
|
category: 'general_image' | 'document' | 'medical_document' | 'medical_image'
|
||||||
|
summary: string
|
||||||
|
warning: string
|
||||||
|
expiresAt: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ChatPayload {
|
||||||
|
message: string
|
||||||
|
attachmentIds?: string[]
|
||||||
|
history?: ChatMessage[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export const sendAvatarChat = (avatarId: string, payload: ChatPayload) =>
|
||||||
request.post<ChatResponse>(`/avatar/${avatarId}/chat`, payload)
|
request.post<ChatResponse>(`/avatar/${avatarId}/chat`, payload)
|
||||||
|
|
||||||
|
export interface PublicAvatar {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
displayName: string
|
||||||
|
description?: string
|
||||||
|
photoUrl?: string
|
||||||
|
emoji?: string
|
||||||
|
status: 'active' | 'inactive' | 'training'
|
||||||
|
}
|
||||||
|
|
||||||
|
export const createAvatarShareLink = (avatarId: string) =>
|
||||||
|
request.post<{ shareToken: string }>(`/avatar/${avatarId}/share`)
|
||||||
|
|
||||||
|
export const getPublicAvatar = (shareToken: string) =>
|
||||||
|
request.get<PublicAvatar>(`/public/avatar/${shareToken}`)
|
||||||
|
|
||||||
|
export const sendPublicAvatarChat = (shareToken: string, payload: ChatPayload) =>
|
||||||
|
request.post<ChatResponse>(`/public/avatar/${shareToken}/chat`, payload)
|
||||||
|
|
||||||
|
const imageForm = (file: File) => {
|
||||||
|
const form = new FormData()
|
||||||
|
form.append('file', file)
|
||||||
|
return form
|
||||||
|
}
|
||||||
|
|
||||||
|
export const uploadAvatarChatImage = (avatarId: string, file: File) =>
|
||||||
|
request.post<ChatAttachment>(`/avatar/${avatarId}/chat/images`, imageForm(file), {
|
||||||
|
headers: { 'Content-Type': 'multipart/form-data' },
|
||||||
|
timeout: 120000
|
||||||
|
})
|
||||||
|
|
||||||
|
export const uploadPublicAvatarChatImage = (shareToken: string, file: File) =>
|
||||||
|
request.post<ChatAttachment>(`/public/avatar/${shareToken}/chat/images`, imageForm(file), {
|
||||||
|
headers: { 'Content-Type': 'multipart/form-data' },
|
||||||
|
timeout: 120000
|
||||||
|
})
|
||||||
|
|
||||||
|
type ChatStreamHandlers = {
|
||||||
|
onMeta: (meta: Pick<ChatResponse, 'source' | 'references'>) => void
|
||||||
|
onDelta: (content: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
const streamChat = async (path: string, payload: ChatPayload, handlers: ChatStreamHandlers) => {
|
||||||
|
const headers: Record<string, string> = { 'Content-Type': 'application/json', Accept: 'text/event-stream' }
|
||||||
|
if (_authToken) headers.Authorization = `Bearer ${_authToken}`
|
||||||
|
const response = await fetch(`${resolveBaseURL()}${path}`, { method: 'POST', headers, body: JSON.stringify(payload) })
|
||||||
|
if (!response.ok) {
|
||||||
|
const errorBody = await response.json().catch(() => null)
|
||||||
|
throw new Error(errorBody?.detail || errorBody?.message || `对话请求失败(${response.status})`)
|
||||||
|
}
|
||||||
|
if (!response.body) throw new Error('对话响应为空,请稍后重试')
|
||||||
|
|
||||||
|
const reader = response.body.getReader()
|
||||||
|
const decoder = new TextDecoder()
|
||||||
|
let buffer = ''
|
||||||
|
while (true) {
|
||||||
|
const { done, value } = await reader.read()
|
||||||
|
buffer += decoder.decode(value || new Uint8Array(), { stream: !done })
|
||||||
|
const events = buffer.split('\n\n')
|
||||||
|
buffer = events.pop() || ''
|
||||||
|
for (const eventBlock of events) {
|
||||||
|
const event = eventBlock.match(/^event:\s*(.+)$/m)?.[1] || 'message'
|
||||||
|
const data = eventBlock.match(/^data:\s*(.+)$/m)?.[1]
|
||||||
|
if (!data) continue
|
||||||
|
const parsed = JSON.parse(data)
|
||||||
|
if (event === 'meta') handlers.onMeta(parsed)
|
||||||
|
if (event === 'delta') handlers.onDelta(parsed.content || '')
|
||||||
|
if (event === 'error') throw new Error(parsed.message || '对话暂时不可用')
|
||||||
|
}
|
||||||
|
if (done) break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const streamAvatarChat = (avatarId: string, payload: ChatPayload, handlers: ChatStreamHandlers) =>
|
||||||
|
streamChat(`/avatar/${avatarId}/chat/stream`, payload, handlers)
|
||||||
|
|
||||||
|
export const streamPublicAvatarChat = (shareToken: string, payload: ChatPayload, handlers: ChatStreamHandlers) =>
|
||||||
|
streamChat(`/public/avatar/${shareToken}/chat/stream`, payload, handlers)
|
||||||
|
|
||||||
// ==================== 会会用户资料 API ====================
|
// ==================== 会会用户资料 API ====================
|
||||||
|
|
||||||
export interface UserProfile {
|
export interface UserProfile {
|
||||||
@@ -276,7 +501,7 @@ export const getUserProfile = () =>
|
|||||||
export interface SmsLoginResult {
|
export interface SmsLoginResult {
|
||||||
token: string
|
token: string
|
||||||
user: UserProfile & { huihuiUserId: string; phone: string; createdAt?: string; lastLoginAt?: string }
|
user: UserProfile & { huihuiUserId: string; phone: string; createdAt?: string; lastLoginAt?: string }
|
||||||
huihui: { userId: string; nickname: string; avatarUrl: string; token: string }
|
huihui: { userId: string; nickname: string; avatarUrl: string }
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送短信验证码(演示模式会额外返回 devCode / dev 标记)
|
// 发送短信验证码(演示模式会额外返回 devCode / dev 标记)
|
||||||
@@ -291,6 +516,10 @@ export const loginBySms = (phone: string, code: string) =>
|
|||||||
export const loginByPassword = (account: string, password: string) =>
|
export const loginByPassword = (account: string, password: string) =>
|
||||||
request.post<SmsLoginResult>('/huihui/pwd/login', { account, password })
|
request.post<SmsLoginResult>('/huihui/pwd/login', { account, password })
|
||||||
|
|
||||||
|
// Validate a production Huihui access token and exchange it for an app session.
|
||||||
|
export const loginByHuihuiToken = (token: string) =>
|
||||||
|
request.post<SmsLoginResult>('/huihui/token/login', { token })
|
||||||
|
|
||||||
// 当前登录用户
|
// 当前登录用户
|
||||||
export const getCurrentUser = () =>
|
export const getCurrentUser = () =>
|
||||||
request.get<UserProfile & { huihuiUserId: string; phone: string }>('/huihui/me')
|
request.get<UserProfile & { huihuiUserId: string; phone: string }>('/huihui/me')
|
||||||
@@ -299,13 +528,4 @@ export const getCurrentUser = () =>
|
|||||||
export const logoutUser = () =>
|
export const logoutUser = () =>
|
||||||
request.post('/huihui/logout')
|
request.post('/huihui/logout')
|
||||||
|
|
||||||
// 更新接管配置
|
|
||||||
export const updateTakeoverConfig = (avatarId: string, data: {
|
|
||||||
authorizationId: string
|
|
||||||
takeoverEnabled: boolean
|
|
||||||
takeoverMode?: 'immediate' | 'delayed'
|
|
||||||
takeoverDelaySeconds?: number
|
|
||||||
}) =>
|
|
||||||
request.put(`/avatar/${avatarId}/authorizations/takeover`, data)
|
|
||||||
|
|
||||||
export default request
|
export default request
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<svg fill="#1677FF" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<title>支付宝</title>
|
||||||
|
<path d="M19.695 15.07c3.426 1.158 4.203 1.22 4.203 1.22V3.846c0-2.124-1.705-3.845-3.81-3.845H3.914C1.808.001.102 1.722.102 3.846v16.31c0 2.123 1.706 3.845 3.813 3.845h16.173c2.105 0 3.81-1.722 3.81-3.845v-.157s-6.19-2.602-9.315-4.119c-2.096 2.602-4.8 4.181-7.607 4.181-4.75 0-6.361-4.19-4.112-6.949.49-.602 1.324-1.175 2.617-1.497 2.025-.502 5.247.313 8.266 1.317a16.796 16.796 0 0 0 1.341-3.302H5.781v-.952h4.799V6.975H4.77v-.953h5.81V3.591s0-.409.411-.409h2.347v2.84h5.744v.951h-5.744v1.704h4.69a19.453 19.453 0 0 1-1.986 5.06c1.424.52 2.702 1.011 3.654 1.333m-13.81-2.032c-.596.06-1.71.325-2.321.869-1.83 1.608-.735 4.55 2.968 4.55 2.151 0 4.301-1.388 5.99-3.61-2.403-1.182-4.438-2.028-6.637-1.809"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 828 B |
@@ -0,0 +1,4 @@
|
|||||||
|
<svg fill="#07C160" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<title>微信支付</title>
|
||||||
|
<path d="M8.691 2.188C3.891 2.188 0 5.476 0 9.53c0 2.212 1.17 4.203 3.002 5.55a.59.59 0 0 1 .213.665l-.39 1.48c-.019.07-.048.141-.048.213 0 .163.13.295.29.295a.326.326 0 0 0 .167-.054l1.903-1.114a.864.864 0 0 1 .717-.098 10.16 10.16 0 0 0 2.837.403c.276 0 .543-.027.811-.05-.857-2.578.157-4.972 1.932-6.446 1.703-1.415 3.882-1.98 5.853-1.838-.576-3.583-4.196-6.348-8.596-6.348zM5.785 5.991c.642 0 1.162.529 1.162 1.18a1.17 1.17 0 0 1-1.162 1.178A1.17 1.17 0 0 1 4.623 7.17c0-.651.52-1.18 1.162-1.18zm5.813 0c.642 0 1.162.529 1.162 1.18a1.17 1.17 0 0 1-1.162 1.178 1.17 1.17 0 0 1-1.162-1.178c0-.651.52-1.18 1.162-1.18zm5.34 2.867c-1.797-.052-3.746.512-5.28 1.786-1.72 1.428-2.687 3.72-1.78 6.22.942 2.453 3.666 4.229 6.884 4.229.826 0 1.622-.12 2.361-.336a.722.722 0 0 1 .598.082l1.584.926a.272.272 0 0 0 .14.047c.134 0 .24-.111.24-.247 0-.06-.023-.12-.038-.177l-.327-1.233a.582.582 0 0 1-.023-.156.49.49 0 0 1 .201-.398C23.024 18.48 24 16.82 24 14.98c0-3.21-2.931-5.837-6.656-6.088V8.89c-.135-.01-.27-.027-.407-.03zm-2.53 3.274c.535 0 .969.44.969.982a.976.976 0 0 1-.969.983.976.976 0 0 1-.969-.983c0-.542.434-.982.97-.982zm4.844 0c.535 0 .969.44.969.982a.976.976 0 0 1-.969.983.976.976 0 0 1-.969-.983c0-.542.434-.982.969-.982z"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
@@ -1,14 +1,16 @@
|
|||||||
import { createApp } from 'vue'
|
import { createApp } from 'vue'
|
||||||
|
import uniWebView from '@dcloudio/uni-webview-js'
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
import pinia from './store'
|
import pinia from './store'
|
||||||
import { getLaunchParams, onNativeMessage, UniEvents } from '@/utils/uniapp-bridge'
|
import { getLaunchParams, onNativeMessage, stripLaunchToken, UniEvents } from '@/utils/uniapp-bridge'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
import { useUserStore } from '@/store/user'
|
import { useUserStore } from '@/store/user'
|
||||||
import { setAuthToken } from '@/api'
|
|
||||||
|
// Bundle the bridge locally so the H5 does not depend on an external CDN.
|
||||||
|
;(window as any).uni = (window as any).uni || uniWebView
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
app.use(router)
|
|
||||||
app.use(pinia)
|
app.use(pinia)
|
||||||
|
|
||||||
// —— 混合架构:在挂载前注入 uniapp 壳传入的认证与会会资料 ——
|
// —— 混合架构:在挂载前注入 uniapp 壳传入的认证与会会资料 ——
|
||||||
@@ -16,10 +18,8 @@ const params = getLaunchParams()
|
|||||||
const avatarStore = useAvatarStore(pinia)
|
const avatarStore = useAvatarStore(pinia)
|
||||||
const userStore = useUserStore(pinia)
|
const userStore = useUserStore(pinia)
|
||||||
|
|
||||||
// 恢复本地短信登录会话(会会 userId ↔ 本系统用户)
|
function syncAvatarProfile() {
|
||||||
userStore.loadFromStorage()
|
if (!userStore.isLogin || !userStore.user) return
|
||||||
if (userStore.isLogin && userStore.user) {
|
|
||||||
setAuthToken(userStore.token)
|
|
||||||
avatarStore.setNativeProfile({
|
avatarStore.setNativeProfile({
|
||||||
userId: (userStore.user as any).huihuiUserId || '',
|
userId: (userStore.user as any).huihuiUserId || '',
|
||||||
nickname: userStore.user.nickname || '',
|
nickname: userStore.user.nickname || '',
|
||||||
@@ -27,29 +27,55 @@ if (userStore.isLogin && userStore.user) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params.token) {
|
async function exchangeInjectedToken(token: string) {
|
||||||
setAuthToken(params.token)
|
stripLaunchToken()
|
||||||
}
|
userStore.clearSession()
|
||||||
if (params.userId || params.nickname || params.avatar) {
|
await userStore.loginByToken(token)
|
||||||
avatarStore.setNativeProfile({
|
syncAvatarProfile()
|
||||||
userId: params.userId || '',
|
|
||||||
nickname: params.nickname || '',
|
|
||||||
avatarUrl: params.avatar || ''
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 原生 → H5:注册消息处理(壳通过 web-view.evalJS 调用)
|
// 原生 → H5:注册消息处理(壳通过 web-view.evalJS 调用)
|
||||||
onNativeMessage((msg) => {
|
onNativeMessage((msg) => {
|
||||||
if (!msg || !msg.type) return
|
if (!msg || !msg.type) return
|
||||||
if (msg.type === 'tokenRefresh' && msg.token) {
|
if (msg.type === 'tokenRefresh' && msg.token) {
|
||||||
setAuthToken(msg.token)
|
void exchangeInjectedToken(msg.token).catch(() => {
|
||||||
|
sessionStorage.setItem('hh_sso_error', '会会登录凭证无效或已过期,请重新进入')
|
||||||
|
void router.replace('/login/sms')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
if (msg.type === 'userUpdate' && msg.user) {
|
if (msg.type === 'userUpdate' && msg.user) {
|
||||||
avatarStore.setNativeProfile(msg.user)
|
avatarStore.setNativeProfile(msg.user)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
app.mount('#app')
|
async function bootstrap() {
|
||||||
|
// A URL token represents the current production user and must override stale storage.
|
||||||
|
if (params.token) {
|
||||||
|
try {
|
||||||
|
await exchangeInjectedToken(params.token)
|
||||||
|
await router.replace(window.location.hash.slice(1) || '/avatar/manage')
|
||||||
|
} catch {
|
||||||
|
sessionStorage.setItem('hh_sso_error', '会会登录凭证无效或已过期,请重新进入')
|
||||||
|
await router.replace('/login/sms')
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
userStore.loadFromStorage()
|
||||||
|
syncAvatarProfile()
|
||||||
|
}
|
||||||
|
|
||||||
// 通知原生壳:H5 已就绪
|
if (params.userId || params.nickname || params.avatar) {
|
||||||
UniEvents.ready()
|
avatarStore.setNativeProfile({
|
||||||
|
userId: params.userId || '',
|
||||||
|
nickname: params.nickname || '',
|
||||||
|
avatarUrl: params.avatar || ''
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
app.use(router)
|
||||||
|
app.mount('#app')
|
||||||
|
|
||||||
|
// 通知原生壳:H5 已就绪
|
||||||
|
UniEvents.ready()
|
||||||
|
}
|
||||||
|
|
||||||
|
void bootstrap()
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const routes: RouteRecordRaw[] = [
|
|||||||
path: '/avatar/edit/:id',
|
path: '/avatar/edit/:id',
|
||||||
name: 'AvatarEdit',
|
name: 'AvatarEdit',
|
||||||
component: () => import('@/views/AvatarEdit.vue'),
|
component: () => import('@/views/AvatarEdit.vue'),
|
||||||
meta: { title: '形象微调编辑', requiresAuth: true }
|
meta: { title: '分身微调', requiresAuth: true }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/avatar/chat/:id',
|
path: '/avatar/chat/:id',
|
||||||
@@ -33,17 +33,29 @@ const routes: RouteRecordRaw[] = [
|
|||||||
component: () => import('@/views/AvatarChat.vue'),
|
component: () => import('@/views/AvatarChat.vue'),
|
||||||
meta: { title: '和分身对话', requiresAuth: true }
|
meta: { title: '和分身对话', requiresAuth: true }
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/share/:shareToken',
|
||||||
|
name: 'AvatarPublicChat',
|
||||||
|
component: () => import('@/views/AvatarChat.vue'),
|
||||||
|
meta: { title: '和我聊聊' }
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/authorization',
|
path: '/authorization',
|
||||||
name: 'AuthorizationManage',
|
name: 'AuthorizationManage',
|
||||||
component: () => import('@/views/AuthorizationManage.vue'),
|
component: () => import('@/views/AuthorizationManage.vue'),
|
||||||
meta: { title: '授权管理', requiresAuth: true }
|
meta: { title: '授权管理', requiresAuth: true }
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/avatar/:avatarId/authorization',
|
||||||
|
name: 'AvatarAuthorizationManage',
|
||||||
|
component: () => import('@/views/AuthorizationManage.vue'),
|
||||||
|
meta: { title: '授权管理', requiresAuth: true }
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/token/charge',
|
path: '/token/charge',
|
||||||
name: 'TokenCharge',
|
name: 'TokenCharge',
|
||||||
component: () => import('@/views/TokenCharge.vue'),
|
component: () => import('@/views/TokenCharge.vue'),
|
||||||
meta: { title: 'Token充值', requiresAuth: true }
|
meta: { title: '积分充值', requiresAuth: true }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/avatar/card',
|
path: '/avatar/card',
|
||||||
@@ -75,6 +87,12 @@ const routes: RouteRecordRaw[] = [
|
|||||||
component: () => import('@/views/KnowledgeManage.vue'),
|
component: () => import('@/views/KnowledgeManage.vue'),
|
||||||
meta: { title: '知识库管理', requiresAuth: true }
|
meta: { title: '知识库管理', requiresAuth: true }
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/avatar/:avatarId/knowledge',
|
||||||
|
name: 'AvatarKnowledgeManage',
|
||||||
|
component: () => import('@/views/KnowledgeManage.vue'),
|
||||||
|
meta: { title: '知识库管理', requiresAuth: true }
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/knowledge/qa/create',
|
path: '/knowledge/qa/create',
|
||||||
name: 'QaPairCreate',
|
name: 'QaPairCreate',
|
||||||
@@ -87,11 +105,23 @@ const routes: RouteRecordRaw[] = [
|
|||||||
component: () => import('@/views/QaPairEdit.vue'),
|
component: () => import('@/views/QaPairEdit.vue'),
|
||||||
meta: { title: '编辑问答对', requiresAuth: true }
|
meta: { title: '编辑问答对', requiresAuth: true }
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: '/avatar/:avatarId/knowledge/qa/create',
|
||||||
|
name: 'AvatarQaPairCreate',
|
||||||
|
component: () => import('@/views/QaPairEdit.vue'),
|
||||||
|
meta: { title: '添加问答对', requiresAuth: true }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/avatar/:avatarId/knowledge/qa/:qaId/edit',
|
||||||
|
name: 'AvatarQaPairEdit',
|
||||||
|
component: () => import('@/views/QaPairEdit.vue'),
|
||||||
|
meta: { title: '编辑问答对', requiresAuth: true }
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '/login/sms',
|
path: '/login/sms',
|
||||||
name: 'SmsLogin',
|
name: 'SmsLogin',
|
||||||
component: () => import('@/views/SmsLogin.vue'),
|
component: () => import('@/views/SmsLogin.vue'),
|
||||||
meta: { title: '短信验证码登录' }
|
meta: { title: '会会数字分身登录' }
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
import { getAvatarList, createAvatar as apiCreate, deleteAvatar as apiDelete, getTokenBalance, getUserProfile } from '@/api'
|
import { getAvatarList, createAvatar as apiCreate, deleteAvatar as apiDelete, getTokenBalance, getTokenUsage, getUserProfile } from '@/api'
|
||||||
import { unwrapListData } from '@/utils/avatar-page-data'
|
import { unwrapListData } from '@/utils/avatar-page-data'
|
||||||
|
|
||||||
export const useAvatarStore = defineStore('avatar', () => {
|
export const useAvatarStore = defineStore('avatar', () => {
|
||||||
// 已创建的分身列表(来自后端)
|
// 已创建的分身列表(来自后端)
|
||||||
const avatars = ref<any[]>([])
|
const avatars = ref<any[]>([])
|
||||||
// 全局 Token 余额(来自后端)
|
// 当前用户所有分身共享的 Token 账户
|
||||||
const tokenBalance = ref<number>(0)
|
const tokenBalance = ref<number>(0)
|
||||||
|
const tokenConsumed = ref<number>(0)
|
||||||
|
const tokenUsageByAvatar = ref<Record<string, number>>({})
|
||||||
// 当前选中分身 id
|
// 当前选中分身 id
|
||||||
const currentAvatarId = ref<string | null>(null)
|
const currentAvatarId = ref<string | null>(null)
|
||||||
// 会会用户资料(头像/昵称,来自会会接口)
|
// 会会用户资料(头像/昵称,来自会会接口)
|
||||||
@@ -29,11 +31,24 @@ export const useAvatarStore = defineStore('avatar', () => {
|
|||||||
try {
|
try {
|
||||||
const res = await getTokenBalance()
|
const res = await getTokenBalance()
|
||||||
tokenBalance.value = (res as any)?.balance ?? 0
|
tokenBalance.value = (res as any)?.balance ?? 0
|
||||||
|
tokenConsumed.value = (res as any)?.totalConsumed ?? 0
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('加载余额失败', e)
|
console.error('加载余额失败', e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const loadTokenUsage = async () => {
|
||||||
|
try {
|
||||||
|
const rows = await getTokenUsage()
|
||||||
|
tokenUsageByAvatar.value = rows.reduce<Record<string, number>>((result, row) => {
|
||||||
|
result[row.avatarId] = (result[row.avatarId] || 0) + row.totalTokens
|
||||||
|
return result
|
||||||
|
}, {})
|
||||||
|
} catch (e) {
|
||||||
|
console.error('加载 Token 用量失败', e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 拉取会会用户资料(头像/昵称)
|
// 拉取会会用户资料(头像/昵称)
|
||||||
const loadUserProfile = async () => {
|
const loadUserProfile = async () => {
|
||||||
// 若已通过 uniapp 壳注入(混合架构),优先保留,不回退到后端 mock
|
// 若已通过 uniapp 壳注入(混合架构),优先保留,不回退到后端 mock
|
||||||
@@ -82,10 +97,13 @@ export const useAvatarStore = defineStore('avatar', () => {
|
|||||||
return {
|
return {
|
||||||
avatars,
|
avatars,
|
||||||
tokenBalance,
|
tokenBalance,
|
||||||
|
tokenConsumed,
|
||||||
|
tokenUsageByAvatar,
|
||||||
currentAvatarId,
|
currentAvatarId,
|
||||||
userProfile,
|
userProfile,
|
||||||
loadAvatars,
|
loadAvatars,
|
||||||
loadTokenBalance,
|
loadTokenBalance,
|
||||||
|
loadTokenUsage,
|
||||||
loadUserProfile,
|
loadUserProfile,
|
||||||
setNativeProfile,
|
setNativeProfile,
|
||||||
addAvatar,
|
addAvatar,
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
import { setAuthToken, sendSmsCode, loginBySms, loginByPassword, logoutUser, type UserProfile } from '@/api'
|
import {
|
||||||
|
setAuthToken,
|
||||||
|
sendSmsCode,
|
||||||
|
loginBySms,
|
||||||
|
loginByPassword,
|
||||||
|
loginByHuihuiToken,
|
||||||
|
logoutUser,
|
||||||
|
type SmsLoginResult,
|
||||||
|
type UserProfile
|
||||||
|
} from '@/api'
|
||||||
|
import { clearHuihuiEmbeddedMode, markHuihuiEmbeddedMode } from '@/utils/embed-mode'
|
||||||
|
|
||||||
const TOKEN_KEY = 'hh_app_token'
|
const TOKEN_KEY = 'hh_app_token'
|
||||||
const USER_KEY = 'hh_app_user'
|
const USER_KEY = 'hh_app_user'
|
||||||
@@ -37,6 +47,23 @@ export const useUserStore = defineStore('smsuser', () => {
|
|||||||
localStorage.removeItem(USER_KEY)
|
localStorage.removeItem(USER_KEY)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const clearSession = () => {
|
||||||
|
token.value = ''
|
||||||
|
user.value = null
|
||||||
|
isLogin.value = false
|
||||||
|
setAuthToken(null)
|
||||||
|
clearLocal()
|
||||||
|
}
|
||||||
|
|
||||||
|
const acceptLogin = (res: SmsLoginResult) => {
|
||||||
|
token.value = res.token
|
||||||
|
user.value = { ...(res.user || {}), ...(res.huihui || {}) }
|
||||||
|
isLogin.value = true
|
||||||
|
setAuthToken(res.token)
|
||||||
|
persist()
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
// 发送验证码(返回结果,演示模式含 devCode)
|
// 发送验证码(返回结果,演示模式含 devCode)
|
||||||
const sendCode = async (phone: string) => {
|
const sendCode = async (phone: string) => {
|
||||||
return await sendSmsCode(phone)
|
return await sendSmsCode(phone)
|
||||||
@@ -44,24 +71,22 @@ export const useUserStore = defineStore('smsuser', () => {
|
|||||||
|
|
||||||
// 短信登录
|
// 短信登录
|
||||||
const login = async (phone: string, code: string) => {
|
const login = async (phone: string, code: string) => {
|
||||||
const res: any = await loginBySms(phone, code)
|
const result = await loginBySms(phone, code)
|
||||||
token.value = res.token
|
clearHuihuiEmbeddedMode()
|
||||||
user.value = { ...(res.user || {}), ...(res.huihui || {}) }
|
return acceptLogin(result)
|
||||||
isLogin.value = true
|
|
||||||
setAuthToken(res.token)
|
|
||||||
persist()
|
|
||||||
return res
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 账号密码登录
|
// 账号密码登录
|
||||||
const loginByPwd = async (account: string, password: string) => {
|
const loginByPwd = async (account: string, password: string) => {
|
||||||
const res: any = await loginByPassword(account, password)
|
const result = await loginByPassword(account, password)
|
||||||
token.value = res.token
|
clearHuihuiEmbeddedMode()
|
||||||
user.value = { ...(res.user || {}), ...(res.huihui || {}) }
|
return acceptLogin(result)
|
||||||
isLogin.value = true
|
}
|
||||||
setAuthToken(res.token)
|
|
||||||
persist()
|
const loginByToken = async (huihuiToken: string) => {
|
||||||
return res
|
const result = await loginByHuihuiToken(huihuiToken)
|
||||||
|
markHuihuiEmbeddedMode()
|
||||||
|
return acceptLogin(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 退出
|
// 退出
|
||||||
@@ -71,12 +96,20 @@ export const useUserStore = defineStore('smsuser', () => {
|
|||||||
} catch {
|
} catch {
|
||||||
/* 忽略网络错误,本地清除即可 */
|
/* 忽略网络错误,本地清除即可 */
|
||||||
}
|
}
|
||||||
token.value = ''
|
clearHuihuiEmbeddedMode()
|
||||||
user.value = null
|
clearSession()
|
||||||
isLogin.value = false
|
|
||||||
setAuthToken(null)
|
|
||||||
clearLocal()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return { token, user, isLogin, loadFromStorage, sendCode, login, loginByPwd, logout }
|
return {
|
||||||
|
token,
|
||||||
|
user,
|
||||||
|
isLogin,
|
||||||
|
loadFromStorage,
|
||||||
|
clearSession,
|
||||||
|
sendCode,
|
||||||
|
login,
|
||||||
|
loginByPwd,
|
||||||
|
loginByToken,
|
||||||
|
logout
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
declare module '@dcloudio/uni-webview-js' {
|
||||||
|
const uniWebView: unknown
|
||||||
|
export default uniWebView
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
export interface AvatarPageRecord {
|
||||||
|
id?: string | null
|
||||||
|
name?: string
|
||||||
|
displayName?: string
|
||||||
|
description?: string
|
||||||
|
status?: 'active' | 'inactive' | 'training'
|
||||||
|
photoUrl?: string
|
||||||
|
config?: Partial<AvatarEditForm>
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AvatarEditForm {
|
||||||
|
name: string
|
||||||
|
displayName: string
|
||||||
|
description: string
|
||||||
|
status: 'active' | 'inactive' | 'training'
|
||||||
|
photoUrl: string
|
||||||
|
replyStyle: string
|
||||||
|
creativity: number
|
||||||
|
rigor: number
|
||||||
|
humor: number
|
||||||
|
responseLength: string
|
||||||
|
systemPrompt: string
|
||||||
|
profession: string
|
||||||
|
position: string
|
||||||
|
organization: string
|
||||||
|
organizationAddress: string
|
||||||
|
autoReply: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AvatarUpdatePayload {
|
||||||
|
name: string
|
||||||
|
displayName: string
|
||||||
|
description: string
|
||||||
|
status: AvatarEditForm['status']
|
||||||
|
photoUrl: string
|
||||||
|
config: Omit<AvatarEditForm, 'name' | 'displayName' | 'description' | 'status' | 'photoUrl'>
|
||||||
|
}
|
||||||
|
|
||||||
|
export function unwrapListData<T>(value: T[] | { data?: T[] } | null | undefined): T[]
|
||||||
|
export function pickAvatarId(
|
||||||
|
currentAvatarId: string | null | undefined,
|
||||||
|
avatars?: AvatarPageRecord[]
|
||||||
|
): string | null
|
||||||
|
export function pickScopedAvatarId(
|
||||||
|
routeAvatarId: string | string[] | null | undefined,
|
||||||
|
currentAvatarId: string | null | undefined,
|
||||||
|
avatars?: AvatarPageRecord[]
|
||||||
|
): string | null
|
||||||
|
export function normalizeAvatarEditForm(avatar?: AvatarPageRecord): AvatarEditForm
|
||||||
|
export function buildAvatarUpdatePayload(form: AvatarEditForm): AvatarUpdatePayload
|
||||||
@@ -8,6 +8,11 @@ export function pickAvatarId(currentAvatarId, avatars) {
|
|||||||
return currentAvatarId || avatars?.[0]?.id || null
|
return currentAvatarId || avatars?.[0]?.id || null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function pickScopedAvatarId(routeAvatarId, currentAvatarId, avatars) {
|
||||||
|
const requested = Array.isArray(routeAvatarId) ? routeAvatarId[0] : routeAvatarId
|
||||||
|
return requested ? String(requested) : pickAvatarId(currentAvatarId, avatars)
|
||||||
|
}
|
||||||
|
|
||||||
export function normalizeAvatarEditForm(avatar = {}) {
|
export function normalizeAvatarEditForm(avatar = {}) {
|
||||||
const config = avatar.config || {}
|
const config = avatar.config || {}
|
||||||
return {
|
return {
|
||||||
@@ -22,6 +27,10 @@ export function normalizeAvatarEditForm(avatar = {}) {
|
|||||||
humor: Number.isFinite(config.humor) ? config.humor : 30,
|
humor: Number.isFinite(config.humor) ? config.humor : 30,
|
||||||
responseLength: config.responseLength || 'medium',
|
responseLength: config.responseLength || 'medium',
|
||||||
systemPrompt: config.systemPrompt || '',
|
systemPrompt: config.systemPrompt || '',
|
||||||
|
profession: config.profession || '',
|
||||||
|
position: config.position || '',
|
||||||
|
organization: config.organization || '',
|
||||||
|
organizationAddress: config.organizationAddress || '',
|
||||||
autoReply: config.autoReply !== false,
|
autoReply: config.autoReply !== false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,6 +49,10 @@ export function buildAvatarUpdatePayload(form) {
|
|||||||
humor: Number(form.humor),
|
humor: Number(form.humor),
|
||||||
responseLength: form.responseLength,
|
responseLength: form.responseLength,
|
||||||
systemPrompt: form.systemPrompt.trim(),
|
systemPrompt: form.systemPrompt.trim(),
|
||||||
|
profession: (form.profession || '').trim(),
|
||||||
|
position: (form.position || '').trim(),
|
||||||
|
organization: (form.organization || '').trim(),
|
||||||
|
organizationAddress: (form.organizationAddress || '').trim(),
|
||||||
autoReply: !!form.autoReply,
|
autoReply: !!form.autoReply,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
+11
@@ -0,0 +1,11 @@
|
|||||||
|
export interface ChatMarkdownCharacter {
|
||||||
|
text: string
|
||||||
|
key: string | number
|
||||||
|
bold: boolean
|
||||||
|
italic: boolean
|
||||||
|
code: boolean
|
||||||
|
heading: boolean
|
||||||
|
newline: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderChatMarkdownCharacters(value: string | string[]): ChatMarkdownCharacter[]
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
const markerRunLength = (characters, start, marker) => {
|
||||||
|
let length = 0
|
||||||
|
while (characters[start + length] === marker) length += 1
|
||||||
|
return length
|
||||||
|
}
|
||||||
|
|
||||||
|
export const renderChatMarkdownCharacters = (value) => {
|
||||||
|
const characters = Array.isArray(value) ? value : Array.from(String(value || ''))
|
||||||
|
const output = []
|
||||||
|
let bold = false
|
||||||
|
let italic = false
|
||||||
|
let code = false
|
||||||
|
let heading = false
|
||||||
|
let lineStart = true
|
||||||
|
|
||||||
|
const push = (text, key) => {
|
||||||
|
output.push({
|
||||||
|
text,
|
||||||
|
key,
|
||||||
|
bold,
|
||||||
|
italic,
|
||||||
|
code,
|
||||||
|
heading,
|
||||||
|
newline: text === '\n',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let index = 0; index < characters.length; index += 1) {
|
||||||
|
const character = characters[index]
|
||||||
|
|
||||||
|
if (lineStart && character === '#') {
|
||||||
|
const length = markerRunLength(characters, index, '#')
|
||||||
|
if (characters[index + length] === ' ') {
|
||||||
|
heading = true
|
||||||
|
index += length
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lineStart && (character === '-' || character === '*') && characters[index + 1] === ' ') {
|
||||||
|
push('•', `${index}-bullet`)
|
||||||
|
push(' ', `${index}-space`)
|
||||||
|
index += 1
|
||||||
|
lineStart = false
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!code && (character === '*' || character === '_')) {
|
||||||
|
const length = markerRunLength(characters, index, character)
|
||||||
|
if (length >= 2) {
|
||||||
|
bold = !bold
|
||||||
|
index += length - 1
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
italic = !italic
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (character === '`') {
|
||||||
|
code = !code
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
push(character, index)
|
||||||
|
if (character === '\n') {
|
||||||
|
heading = false
|
||||||
|
lineStart = true
|
||||||
|
} else {
|
||||||
|
lineStart = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return output
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
const HUIHUI_EMBED_MODE_KEY = 'hh_huihui_embed_mode'
|
||||||
|
|
||||||
|
export function markHuihuiEmbeddedMode(): void {
|
||||||
|
sessionStorage.setItem(HUIHUI_EMBED_MODE_KEY, '1')
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearHuihuiEmbeddedMode(): void {
|
||||||
|
sessionStorage.removeItem(HUIHUI_EMBED_MODE_KEY)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isHuihuiEmbeddedMode(): boolean {
|
||||||
|
return sessionStorage.getItem(HUIHUI_EMBED_MODE_KEY) === '1'
|
||||||
|
}
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
// 会会数字分身 H5 ↔ uniapp 原生壳 桥接工具
|
// 会会数字分身 H5 ↔ uniapp 原生壳 桥接工具
|
||||||
// 协议详见 uniapp-avatar/README.md
|
// 协议详见 uniapp-avatar/README.md
|
||||||
//
|
//
|
||||||
// 引入方式:在 index.html 中加载 uniapp web-view bridge:
|
// uni-webview bridge is bundled by main.ts; no external CDN is required.
|
||||||
// <script src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.10/index.js"></script>
|
|
||||||
// 引入后全局会出现 window.uni.webView,H5 即可用 postMessage 与原生通信。
|
|
||||||
|
|
||||||
const BRIDGE_HANDLER = '__uniBridgeHandle__'
|
const BRIDGE_HANDLER = '__uniBridgeHandle__'
|
||||||
|
const nativeMessageHandlers = new Set<(message: any) => void>()
|
||||||
|
|
||||||
export interface UniLaunchParams {
|
export interface UniLaunchParams {
|
||||||
token?: string
|
token?: string
|
||||||
@@ -15,28 +14,64 @@ export interface UniLaunchParams {
|
|||||||
ts?: string
|
ts?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const PARAM_KEYS: (keyof UniLaunchParams)[] = ['token', 'userId', 'nickname', 'avatar', 'ts']
|
||||||
|
|
||||||
|
function readParams(search: string, target: UniLaunchParams): void {
|
||||||
|
const sp = new URLSearchParams(search)
|
||||||
|
for (const key of PARAM_KEYS) {
|
||||||
|
const value = sp.get(key)
|
||||||
|
if (value) target[key] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 是否运行在 uniapp web-view 环境中
|
// 是否运行在 uniapp web-view 环境中
|
||||||
export function isInUniWebView(): boolean {
|
export function isInUniWebView(): boolean {
|
||||||
return !!(window as any).uni?.webView
|
const runtime = window as any
|
||||||
|
const userAgent = navigator.userAgent
|
||||||
|
const isDCloudApp = Boolean(
|
||||||
|
runtime.plus ||
|
||||||
|
runtime.__dcloud_weex_postMessage ||
|
||||||
|
runtime.__dcloud_weex_ ||
|
||||||
|
/uni-app|Html5Plus/i.test(userAgent)
|
||||||
|
)
|
||||||
|
const isMiniProgram = Boolean(
|
||||||
|
(/miniProgram/i.test(userAgent) && (runtime.wx?.miniProgram || runtime.qq?.miniProgram)) ||
|
||||||
|
runtime.my ||
|
||||||
|
runtime.swan?.webView ||
|
||||||
|
runtime.tt?.miniProgram
|
||||||
|
)
|
||||||
|
return Boolean(runtime.uni?.webView && (isDCloudApp || isMiniProgram))
|
||||||
}
|
}
|
||||||
|
|
||||||
// 解析 web-view 加载 URL 时原生注入的参数(token / 会会用户)
|
// 解析 web-view 加载 URL 时原生注入的参数(token / 会会用户)
|
||||||
export function getLaunchParams(): UniLaunchParams {
|
export function getLaunchParams(): UniLaunchParams {
|
||||||
const sp = new URLSearchParams(window.location.search)
|
|
||||||
const params: UniLaunchParams = {}
|
const params: UniLaunchParams = {}
|
||||||
const token = sp.get('token')
|
readParams(window.location.search, params)
|
||||||
const userId = sp.get('userId')
|
const hashQueryIndex = window.location.hash.indexOf('?')
|
||||||
const nickname = sp.get('nickname')
|
if (hashQueryIndex >= 0) {
|
||||||
const avatar = sp.get('avatar')
|
readParams(window.location.hash.slice(hashQueryIndex + 1), params)
|
||||||
const ts = sp.get('ts')
|
}
|
||||||
if (token) params.token = token
|
|
||||||
if (userId) params.userId = userId
|
|
||||||
if (nickname) params.nickname = decodeURIComponent(nickname)
|
|
||||||
if (avatar) params.avatar = decodeURIComponent(avatar)
|
|
||||||
if (ts) params.ts = ts
|
|
||||||
return params
|
return params
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove the one-time login credential before any route is rendered or logged.
|
||||||
|
export function stripLaunchToken(): void {
|
||||||
|
const url = new URL(window.location.href)
|
||||||
|
url.searchParams.delete('token')
|
||||||
|
|
||||||
|
const hash = url.hash.slice(1)
|
||||||
|
const queryIndex = hash.indexOf('?')
|
||||||
|
if (queryIndex >= 0) {
|
||||||
|
const path = hash.slice(0, queryIndex)
|
||||||
|
const hashParams = new URLSearchParams(hash.slice(queryIndex + 1))
|
||||||
|
hashParams.delete('token')
|
||||||
|
const query = hashParams.toString()
|
||||||
|
url.hash = `${path}${query ? `?${query}` : ''}`
|
||||||
|
}
|
||||||
|
|
||||||
|
window.history.replaceState(window.history.state, '', `${url.pathname}${url.search}${url.hash}`)
|
||||||
|
}
|
||||||
|
|
||||||
// H5 → 原生:发送事件(需引入 uniapp web-view bridge)
|
// H5 → 原生:发送事件(需引入 uniapp web-view bridge)
|
||||||
export function postToNative(message: Record<string, any>): boolean {
|
export function postToNative(message: Record<string, any>): boolean {
|
||||||
if (!isInUniWebView()) return false
|
if (!isInUniWebView()) return false
|
||||||
@@ -45,14 +80,18 @@ export function postToNative(message: Record<string, any>): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 原生 → H5:注册消息处理(原生通过 web-view.evalJS 调用 window.__uniBridgeHandle__)
|
// 原生 → H5:注册消息处理(原生通过 web-view.evalJS 调用 window.__uniBridgeHandle__)
|
||||||
export function onNativeMessage(handler: (message: any) => void): void {
|
export function onNativeMessage(handler: (message: any) => void): () => void {
|
||||||
|
nativeMessageHandlers.add(handler)
|
||||||
;(window as any)[BRIDGE_HANDLER] = (message: any) => {
|
;(window as any)[BRIDGE_HANDLER] = (message: any) => {
|
||||||
try {
|
for (const listener of nativeMessageHandlers) {
|
||||||
handler(message)
|
try {
|
||||||
} catch (e) {
|
listener(message)
|
||||||
console.error('[uniBridge] handler error', e)
|
} catch (e) {
|
||||||
|
console.error('[uniBridge] handler error', e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return () => nativeMessageHandlers.delete(handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 便捷事件
|
// 便捷事件
|
||||||
@@ -61,5 +100,6 @@ export const UniEvents = {
|
|||||||
needLogin: () => postToNative({ type: 'needLogin' }),
|
needLogin: () => postToNative({ type: 'needLogin' }),
|
||||||
setTitle: (title: string) => postToNative({ type: 'setTitle', title }),
|
setTitle: (title: string) => postToNative({ type: 'setTitle', title }),
|
||||||
navigate: (path: string) => postToNative({ type: 'navigate', path }),
|
navigate: (path: string) => postToNative({ type: 'navigate', path }),
|
||||||
|
payment: (payment: Record<string, any>) => postToNative({ type: 'payment', payment }),
|
||||||
back: () => postToNative({ type: 'back' })
|
back: () => postToNative({ type: 'back' })
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,154 +1,465 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="chat-page">
|
<div class="chat-page" :class="{ 'has-pending-images': pendingImages.length }">
|
||||||
<header class="chat-header">
|
<header class="chat-header">
|
||||||
<button class="back-btn" @click="router.back()">‹</button>
|
<button v-if="!isPublic" class="back-btn" @click="router.back()">‹</button>
|
||||||
<div class="avatar-heading">
|
<div class="avatar-heading">
|
||||||
<div class="avatar-mark">{{ avatar?.emoji || '🤖' }}</div>
|
<div class="avatar-mark">
|
||||||
|
<img v-if="avatar?.photoUrl" :src="avatar.photoUrl" alt="" referrerpolicy="no-referrer" />
|
||||||
|
<span v-else>{{ avatar?.emoji || '🤖' }}</span>
|
||||||
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h1>{{ avatar?.displayName || avatar?.name || '数字分身' }}</h1>
|
<h1>{{ avatar?.displayName || avatar?.name || '数字分身' }}</h1>
|
||||||
<span class="online-state">● 随时可以和我聊聊</span>
|
<span class="online-state" :class="avatarStatus.tone"><i></i>{{ avatarStatus.label }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button class="settings-btn" title="编辑分身" @click="router.push(`/avatar/edit/${avatarId}`)">⚙</button>
|
<button v-if="!isPublic" class="settings-btn" title="编辑分身" @click="router.push(`/avatar/edit/${avatarId}`)">⚙</button>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<main ref="messageList" class="message-list">
|
<main ref="messageList" class="message-list">
|
||||||
<div v-if="!messages.length" class="welcome-card">
|
<div v-if="!messages.length" class="welcome-card">
|
||||||
<div class="welcome-icon">✦</div>
|
<div class="welcome-avatar">
|
||||||
<h2>你好,我是{{ avatar?.displayName || '你的数字分身' }}</h2>
|
<img v-if="avatar?.photoUrl" :src="avatar.photoUrl" alt="" referrerpolicy="no-referrer" />
|
||||||
<p>我会优先参考标准问答和知识库,再结合自己的理解回答你。</p>
|
<span v-else>{{ avatar?.emoji || '🤖' }}</span>
|
||||||
<div class="starter-list">
|
|
||||||
<button v-for="starter in starters" :key="starter" @click="sendMessage(starter)">{{ starter }}</button>
|
|
||||||
</div>
|
</div>
|
||||||
|
<h2>有什么想聊的?</h2>
|
||||||
|
<p class="welcome-description">{{ avatar?.description || '很高兴和你聊聊。' }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<article v-for="(message, index) in messages" :key="`${message.role}-${index}`" class="message-row" :class="message.role">
|
<article v-for="(message, index) in messages" :key="`${message.role}-${index}`" class="message-row" :class="message.role">
|
||||||
<div v-if="message.role === 'assistant'" class="message-avatar">{{ avatar?.emoji || '🤖' }}</div>
|
<div v-if="message.role === 'assistant'" class="message-avatar avatar-message-face">
|
||||||
|
<img v-if="avatar?.photoUrl" :src="avatar.photoUrl" alt="" referrerpolicy="no-referrer" />
|
||||||
|
<span v-else>{{ avatar?.emoji || '🤖' }}</span>
|
||||||
|
</div>
|
||||||
<div class="message-column">
|
<div class="message-column">
|
||||||
<div class="message-bubble">{{ message.content }}</div>
|
<div v-if="message.attachments?.length" class="message-images">
|
||||||
|
<figure v-for="attachment in message.attachments" :key="attachment.id" class="message-image-card">
|
||||||
|
<img :src="attachment.previewUrl" :alt="attachment.filename" />
|
||||||
|
<figcaption v-if="attachment.warning">{{ attachment.warning }}</figcaption>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
<div class="message-bubble" :class="{ streaming: sending && message.role === 'assistant' && index === messages.length - 1 }">
|
||||||
|
<template v-if="message.role === 'assistant'">
|
||||||
|
<span
|
||||||
|
v-for="character in renderChatMarkdownCharacters(message.characters?.length ? message.characters : message.content)"
|
||||||
|
:key="character.key"
|
||||||
|
class="typing-character"
|
||||||
|
:class="{
|
||||||
|
newline: character.newline,
|
||||||
|
'markdown-bold': character.bold,
|
||||||
|
'markdown-italic': character.italic,
|
||||||
|
'markdown-code': character.code,
|
||||||
|
'markdown-heading': character.heading
|
||||||
|
}"
|
||||||
|
>{{ character.text }}</span>
|
||||||
|
</template>
|
||||||
|
<template v-else>{{ message.content }}</template>
|
||||||
|
</div>
|
||||||
<div v-if="message.source || message.references?.length" class="message-source">
|
<div v-if="message.source || message.references?.length" class="message-source">
|
||||||
{{ sourceLabel(message.source) }}
|
{{ sourceLabel(message.source) }}
|
||||||
<span v-if="message.references?.length"> · {{ message.references.map((item) => item.filename).filter(Boolean).join('、') }}</span>
|
<span v-if="message.references?.length"> · {{ message.references.map((item) => item.filename).filter(Boolean).join('、') }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="message.role === 'user'" class="message-avatar user-message-face">
|
||||||
|
<img v-if="userAvatarUrl" :src="userAvatarUrl" alt="" referrerpolicy="no-referrer" />
|
||||||
|
<span v-else>{{ userAvatarInitial }}</span>
|
||||||
|
</div>
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
<div v-if="sending" class="message-row assistant">
|
<div v-if="thinking" class="message-row assistant">
|
||||||
<div class="message-avatar">{{ avatar?.emoji || '🤖' }}</div>
|
<div class="message-avatar avatar-message-face">
|
||||||
|
<img v-if="avatar?.photoUrl" :src="avatar.photoUrl" alt="" referrerpolicy="no-referrer" />
|
||||||
|
<span v-else>{{ avatar?.emoji || '🤖' }}</span>
|
||||||
|
</div>
|
||||||
<div class="message-bubble typing"><i></i><i></i><i></i></div>
|
<div class="message-bubble typing"><i></i><i></i><i></i></div>
|
||||||
</div>
|
</div>
|
||||||
<p v-if="errorMessage" class="chat-error">{{ errorMessage }} <button @click="retryLast">重试</button></p>
|
<p v-if="errorMessage" class="chat-error">{{ errorMessage }} <button @click="retryLast">重试</button></p>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<form class="composer" @submit.prevent="sendMessage(inputText)">
|
<form class="composer" @submit.prevent="sendMessage(inputText)">
|
||||||
<textarea v-model="inputText" rows="1" :disabled="sending" placeholder="输入你想聊的内容…" @keydown.enter.exact.prevent="sendMessage(inputText)"></textarea>
|
<div v-if="pendingImages.length" class="pending-images">
|
||||||
<button class="send-btn" type="submit" :disabled="sending || !inputText.trim()">发送</button>
|
<div v-for="image in pendingImages" :key="image.localId" class="pending-image" :class="image.status">
|
||||||
|
<img :src="image.previewUrl" :alt="image.filename" />
|
||||||
|
<div class="pending-image-copy">
|
||||||
|
<strong>{{ image.status === 'uploading' ? '正在识别图片…' : image.summary || image.filename }}</strong>
|
||||||
|
<span>{{ image.status === 'uploading' ? '正在提取图片中的可见内容' : categoryLabel(image.category) }}</span>
|
||||||
|
</div>
|
||||||
|
<button type="button" aria-label="移除图片" :disabled="sending" @click="removePendingImage(image.localId)">×</button>
|
||||||
|
</div>
|
||||||
|
<p v-if="hasPendingMedicalImage" class="medical-note">病例与医学影像识别仅供辅助,请以原始资料和医生意见为准。</p>
|
||||||
|
</div>
|
||||||
|
<div class="composer-row">
|
||||||
|
<button class="image-btn" type="button" :disabled="sending || uploadingImage || pendingImages.length >= 3" aria-label="选择图片" @click="imageInput?.click()">
|
||||||
|
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 5.5A2.5 2.5 0 0 1 6.5 3h11A2.5 2.5 0 0 1 20 5.5v13a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 4 18.5v-13Zm2 12.7 3.8-4.2 2.7 2.8 1.7-1.8 3.8 3.2V5.5a.5.5 0 0 0-.5-.5h-11a.5.5 0 0 0-.5.5v12.7Zm8.3-7.8a1.7 1.7 0 1 0 0-3.4 1.7 1.7 0 0 0 0 3.4Z"/></svg>
|
||||||
|
</button>
|
||||||
|
<input ref="imageInput" class="image-input" type="file" accept="image/jpeg,image/png,image/webp" multiple @change="selectImages" />
|
||||||
|
<textarea v-model="inputText" rows="1" :disabled="sending" placeholder="输入问题,或选择一张图片…" @keydown.enter.exact.prevent="sendMessage(inputText)"></textarea>
|
||||||
|
<button class="send-btn" type="submit" :disabled="sending || uploadingImage || (!inputText.trim() && !readyPendingImages.length)">发送</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { nextTick, onMounted, ref } from 'vue'
|
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { getAvatarDetail, sendAvatarChat, type ChatMessage } from '@/api'
|
import {
|
||||||
|
getAvatarDetail,
|
||||||
|
getPublicAvatar,
|
||||||
|
streamAvatarChat,
|
||||||
|
streamPublicAvatarChat,
|
||||||
|
uploadAvatarChatImage,
|
||||||
|
uploadPublicAvatarChatImage,
|
||||||
|
type ChatAttachment,
|
||||||
|
type ChatMessage
|
||||||
|
} from '@/api'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
|
import { useUserStore } from '@/store/user'
|
||||||
|
import { renderChatMarkdownCharacters } from '@/utils/chat-markdown.js'
|
||||||
|
|
||||||
type DisplayMessage = ChatMessage & {
|
type DisplayMessage = ChatMessage & {
|
||||||
source?: 'qa' | 'knowledge' | 'qwen'
|
source?: 'qa' | 'knowledge' | 'vision' | 'qwen' | 'public'
|
||||||
references?: Array<{ filename?: string }>
|
references?: Array<{ filename?: string }>
|
||||||
|
characters?: string[]
|
||||||
|
attachments?: MessageAttachment[]
|
||||||
|
}
|
||||||
|
|
||||||
|
type MessageAttachment = {
|
||||||
|
id: string
|
||||||
|
filename: string
|
||||||
|
previewUrl: string
|
||||||
|
category?: ChatAttachment['category']
|
||||||
|
summary?: string
|
||||||
|
warning?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
type PendingImage = MessageAttachment & {
|
||||||
|
localId: string
|
||||||
|
attachmentId?: string
|
||||||
|
status: 'uploading' | 'ready'
|
||||||
}
|
}
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const store = useAvatarStore()
|
const store = useAvatarStore()
|
||||||
const avatarId = String(route.params.id || '')
|
const userStore = useUserStore()
|
||||||
|
const shareToken = String(route.params.shareToken || '')
|
||||||
|
const isPublic = Boolean(shareToken)
|
||||||
|
const avatarId = ref(String(route.params.id || ''))
|
||||||
const avatar = ref<any>(null)
|
const avatar = ref<any>(null)
|
||||||
const messages = ref<DisplayMessage[]>([])
|
const messages = ref<DisplayMessage[]>([])
|
||||||
const inputText = ref('')
|
const inputText = ref('')
|
||||||
const sending = ref(false)
|
const sending = ref(false)
|
||||||
|
const thinking = ref(false)
|
||||||
const errorMessage = ref('')
|
const errorMessage = ref('')
|
||||||
const lastQuestion = ref('')
|
const lastRequest = ref<{ question: string; attachments: MessageAttachment[] } | null>(null)
|
||||||
const messageList = ref<HTMLElement | null>(null)
|
const messageList = ref<HTMLElement | null>(null)
|
||||||
const starters = ['介绍一下你自己', '你能帮我做什么?', '请根据我的知识库回答一个问题']
|
const imageInput = ref<HTMLInputElement | null>(null)
|
||||||
|
const pendingImages = ref<PendingImage[]>([])
|
||||||
|
const previewUrls = new Set<string>()
|
||||||
|
let scrollFrame: number | null = null
|
||||||
|
|
||||||
const sourceLabel = (source?: DisplayMessage['source']) => ({
|
const userAvatarUrl = computed(() => userStore.user?.avatarUrl || store.userProfile?.avatarUrl || '')
|
||||||
|
const userAvatarInitial = computed(() => (userStore.user?.nickname || store.userProfile?.nickname || '我').trim().slice(0, 1))
|
||||||
|
const avatarStatus = computed(() => {
|
||||||
|
const status = avatar.value?.status || 'active'
|
||||||
|
if (status === 'inactive') return { tone: 'inactive', label: '当前已停用' }
|
||||||
|
if (status === 'training') return { tone: 'training', label: '知识训练中' }
|
||||||
|
return { tone: 'active', label: '在线,随时可以和我聊聊' }
|
||||||
|
})
|
||||||
|
const readyPendingImages = computed(() => pendingImages.value.filter((image) => image.status === 'ready' && image.attachmentId))
|
||||||
|
const uploadingImage = computed(() => pendingImages.value.some((image) => image.status === 'uploading'))
|
||||||
|
const hasPendingMedicalImage = computed(() => readyPendingImages.value.some((image) => ['medical_document', 'medical_image'].includes(image.category || '')))
|
||||||
|
|
||||||
|
const sourceLabels: Record<NonNullable<DisplayMessage['source']>, string> = {
|
||||||
qa: '标准问答对',
|
qa: '标准问答对',
|
||||||
knowledge: '参考文件知识库',
|
knowledge: '参考文件知识库',
|
||||||
qwen: 'Qwen 智能回答'
|
vision: '图片理解',
|
||||||
}[source || ''] || '')
|
qwen: '智能回答',
|
||||||
|
public: ''
|
||||||
|
}
|
||||||
|
const sourceLabel = (source?: DisplayMessage['source']) => source ? sourceLabels[source] : ''
|
||||||
|
const categoryLabels: Record<ChatAttachment['category'], string> = {
|
||||||
|
general_image: '图片内容已识别',
|
||||||
|
document: '文档图片已识别',
|
||||||
|
medical_document: '病例文字已提取,请核对原文',
|
||||||
|
medical_image: '医学影像已作客观描述'
|
||||||
|
}
|
||||||
|
const categoryLabel = (category?: ChatAttachment['category']) => category ? categoryLabels[category] : '图片内容已识别'
|
||||||
|
|
||||||
const scrollToBottom = async () => {
|
const scrollToBottom = async () => {
|
||||||
await nextTick()
|
await nextTick()
|
||||||
if (messageList.value) messageList.value.scrollTop = messageList.value.scrollHeight
|
if (messageList.value) messageList.value.scrollTop = messageList.value.scrollHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
const loadAvatar = async () => {
|
const scrollDuringStream = () => {
|
||||||
avatar.value = store.avatars.find((item) => String(item.id) === avatarId)
|
if (scrollFrame !== null) return
|
||||||
if (!avatar.value) avatar.value = await getAvatarDetail(avatarId)
|
scrollFrame = window.requestAnimationFrame(() => {
|
||||||
|
if (messageList.value) messageList.value.scrollTop = messageList.value.scrollHeight
|
||||||
|
scrollFrame = null
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const sendMessage = async (value: string) => {
|
const sleep = (delay: number) => new Promise<void>((resolve) => window.setTimeout(resolve, delay))
|
||||||
const question = value.trim()
|
|
||||||
if (!question || sending.value) return
|
const createStreamReply = () => {
|
||||||
lastQuestion.value = question
|
const reply = reactive<DisplayMessage>({
|
||||||
|
role: 'assistant',
|
||||||
|
content: '',
|
||||||
|
characters: []
|
||||||
|
})
|
||||||
|
let attached = false
|
||||||
|
const attach = () => {
|
||||||
|
if (attached) return
|
||||||
|
messages.value.push(reply)
|
||||||
|
attached = true
|
||||||
|
}
|
||||||
|
const reduceMotion = window.matchMedia?.('(prefers-reduced-motion: reduce)').matches
|
||||||
|
const queue: string[] = []
|
||||||
|
let draining: Promise<void> | null = null
|
||||||
|
|
||||||
|
const drain = async () => {
|
||||||
|
while (queue.length) {
|
||||||
|
let character = queue.shift() || ''
|
||||||
|
if (character === '\r') continue
|
||||||
|
if (/\s/.test(character) && character !== '\n') character = ' '
|
||||||
|
const previous = reply.characters?.[reply.characters.length - 1] || ''
|
||||||
|
if (character === ' ' && (!previous || previous === ' ' || previous === '\n')) continue
|
||||||
|
if (character === '\n') {
|
||||||
|
while (reply.characters?.[reply.characters.length - 1] === ' ') {
|
||||||
|
reply.characters.pop()
|
||||||
|
reply.content = reply.content.slice(0, -1)
|
||||||
|
}
|
||||||
|
if (!reply.characters?.length || reply.characters[reply.characters.length - 1] === '\n') continue
|
||||||
|
}
|
||||||
|
reply.content += character
|
||||||
|
reply.characters?.push(character)
|
||||||
|
scrollDuringStream()
|
||||||
|
await sleep(/[,。!?;:\n]/.test(character) ? 140 : 28)
|
||||||
|
}
|
||||||
|
draining = null
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
reply,
|
||||||
|
append: (content: string) => {
|
||||||
|
if (!content) return
|
||||||
|
attach()
|
||||||
|
if (reduceMotion) {
|
||||||
|
reply.content += content
|
||||||
|
void scrollToBottom()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
queue.push(...Array.from(content))
|
||||||
|
if (!draining) draining = drain()
|
||||||
|
},
|
||||||
|
finish: async () => {
|
||||||
|
if (draining) await draining
|
||||||
|
while (reply.characters?.length && /[\s\n]/.test(reply.characters[reply.characters.length - 1])) {
|
||||||
|
reply.characters.pop()
|
||||||
|
reply.content = reply.content.slice(0, -1)
|
||||||
|
}
|
||||||
|
if (reduceMotion) reply.characters = []
|
||||||
|
if (attached) await scrollToBottom()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadAvatar = async () => {
|
||||||
|
if (isPublic) {
|
||||||
|
avatar.value = await getPublicAvatar(shareToken)
|
||||||
|
avatarId.value = String(avatar.value?.id || '')
|
||||||
|
document.title = avatar.value?.displayName || avatar.value?.name || '会会数字分身'
|
||||||
|
return
|
||||||
|
}
|
||||||
|
avatar.value = store.avatars.find((item) => String(item.id) === avatarId.value)
|
||||||
|
if (!avatar.value) avatar.value = await getAvatarDetail(avatarId.value)
|
||||||
|
document.title = avatar.value?.displayName || avatar.value?.name || '会会数字分身'
|
||||||
|
}
|
||||||
|
|
||||||
|
const removePendingImage = (localId: string) => {
|
||||||
|
const target = pendingImages.value.find((image) => image.localId === localId)
|
||||||
|
if (target) {
|
||||||
|
URL.revokeObjectURL(target.previewUrl)
|
||||||
|
previewUrls.delete(target.previewUrl)
|
||||||
|
}
|
||||||
|
pendingImages.value = pendingImages.value.filter((image) => image.localId !== localId)
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectImages = async (event: Event) => {
|
||||||
|
const input = event.target as HTMLInputElement
|
||||||
|
const slots = Math.max(0, 3 - pendingImages.value.length)
|
||||||
|
const files = Array.from(input.files || []).slice(0, slots)
|
||||||
|
input.value = ''
|
||||||
|
for (const file of files) {
|
||||||
|
if (!['image/jpeg', 'image/png', 'image/webp'].includes(file.type)) {
|
||||||
|
errorMessage.value = '仅支持 JPG、PNG、WebP 图片'
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (file.size > 8 * 1024 * 1024) {
|
||||||
|
errorMessage.value = '单张图片不能超过 8MB'
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const previewUrl = URL.createObjectURL(file)
|
||||||
|
previewUrls.add(previewUrl)
|
||||||
|
const localId = `local-${Date.now()}-${Math.random().toString(16).slice(2)}`
|
||||||
|
pendingImages.value.push({
|
||||||
|
id: localId,
|
||||||
|
localId,
|
||||||
|
filename: file.name,
|
||||||
|
previewUrl,
|
||||||
|
status: 'uploading'
|
||||||
|
})
|
||||||
|
errorMessage.value = ''
|
||||||
|
try {
|
||||||
|
const result = isPublic
|
||||||
|
? await uploadPublicAvatarChatImage(shareToken, file)
|
||||||
|
: await uploadAvatarChatImage(avatarId.value, file)
|
||||||
|
const pending = pendingImages.value.find((image) => image.localId === localId)
|
||||||
|
if (!pending) continue
|
||||||
|
Object.assign(pending, {
|
||||||
|
id: result.id,
|
||||||
|
attachmentId: result.id,
|
||||||
|
status: 'ready',
|
||||||
|
category: result.category,
|
||||||
|
summary: result.summary,
|
||||||
|
warning: result.warning
|
||||||
|
})
|
||||||
|
} catch (error: any) {
|
||||||
|
removePendingImage(localId)
|
||||||
|
errorMessage.value = error?.response?.data?.detail || error?.message || '图片识别失败,请重新选择图片'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const sendMessage = async (value: string, retryAttachments?: MessageAttachment[]) => {
|
||||||
|
const selectedAttachments = retryAttachments || readyPendingImages.value.map((image) => ({
|
||||||
|
id: image.attachmentId || image.id,
|
||||||
|
filename: image.filename,
|
||||||
|
previewUrl: image.previewUrl,
|
||||||
|
category: image.category,
|
||||||
|
summary: image.summary,
|
||||||
|
warning: image.warning
|
||||||
|
}))
|
||||||
|
const question = value.trim() || (selectedAttachments.length ? '请帮我看看这张图片。' : '')
|
||||||
|
if (!question || sending.value || (!retryAttachments && uploadingImage.value)) return
|
||||||
|
const history = messages.value.slice(-10).map(({ role, content, attachments }) => ({
|
||||||
|
role,
|
||||||
|
content,
|
||||||
|
attachmentIds: attachments?.map((attachment) => attachment.id) || []
|
||||||
|
}))
|
||||||
|
lastRequest.value = { question, attachments: selectedAttachments }
|
||||||
inputText.value = ''
|
inputText.value = ''
|
||||||
errorMessage.value = ''
|
errorMessage.value = ''
|
||||||
messages.value.push({ role: 'user', content: question })
|
if (!retryAttachments) pendingImages.value = []
|
||||||
|
messages.value.push({ role: 'user', content: question, attachments: selectedAttachments })
|
||||||
sending.value = true
|
sending.value = true
|
||||||
|
thinking.value = true
|
||||||
await scrollToBottom()
|
await scrollToBottom()
|
||||||
try {
|
try {
|
||||||
const response = await sendAvatarChat(avatarId, {
|
const payload = {
|
||||||
message: question,
|
message: question,
|
||||||
history: messages.value.slice(-10).map(({ role, content }) => ({ role, content }))
|
attachmentIds: selectedAttachments.map((attachment) => attachment.id),
|
||||||
})
|
history
|
||||||
messages.value.push({ role: 'assistant', content: response.answer, source: response.source, references: response.references })
|
}
|
||||||
await scrollToBottom()
|
const streamed = createStreamReply()
|
||||||
|
const handlers = {
|
||||||
|
onMeta: (meta: Pick<DisplayMessage, 'source' | 'references'>) => {
|
||||||
|
streamed.reply.source = meta.source
|
||||||
|
streamed.reply.references = meta.references
|
||||||
|
},
|
||||||
|
onDelta: (content: string) => {
|
||||||
|
thinking.value = false
|
||||||
|
streamed.append(content)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isPublic) {
|
||||||
|
await streamPublicAvatarChat(shareToken, payload, handlers)
|
||||||
|
} else {
|
||||||
|
await streamAvatarChat(avatarId.value, payload, handlers)
|
||||||
|
}
|
||||||
|
thinking.value = false
|
||||||
|
await streamed.finish()
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
errorMessage.value = error?.message || '暂时无法回答,请稍后重试'
|
errorMessage.value = error?.message || '暂时无法回答,请稍后重试'
|
||||||
} finally {
|
} finally {
|
||||||
|
thinking.value = false
|
||||||
sending.value = false
|
sending.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const retryLast = () => {
|
const retryLast = () => {
|
||||||
if (!lastQuestion.value || sending.value) return
|
if (!lastRequest.value || sending.value) return
|
||||||
const last = messages.value[messages.value.length - 1]
|
while (messages.value[messages.value.length - 1]?.role === 'assistant') messages.value.pop()
|
||||||
if (last?.role === 'user') messages.value.pop()
|
if (messages.value[messages.value.length - 1]?.role === 'user') messages.value.pop()
|
||||||
sendMessage(lastQuestion.value)
|
void sendMessage(lastRequest.value.question, lastRequest.value.attachments)
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(loadAvatar)
|
onMounted(loadAvatar)
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
previewUrls.forEach((url) => URL.revokeObjectURL(url))
|
||||||
|
previewUrls.clear()
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.chat-page { min-height: 100dvh; display: flex; flex-direction: column; background: #FFF8F1; color: #3B2417; }
|
.chat-page { height: 100dvh; min-height: 0; display: flex; flex-direction: column; overflow: hidden; background: #FFF8F1; color: #3B2417; }
|
||||||
.chat-header { flex: 0 0 auto; display: flex; align-items: center; gap: 12px; padding: 14px 18px; color: white; background: linear-gradient(135deg, #F97316, #FB923C); box-shadow: 0 5px 18px rgba(249, 115, 22, .2); }
|
.chat-header { position: sticky; top: 0; z-index: 10; flex: 0 0 auto; display: flex; align-items: center; gap: 12px; padding: 14px 18px; color: white; background: linear-gradient(135deg, #F97316, #FB923C); box-shadow: 0 5px 18px rgba(249, 115, 22, .2); }
|
||||||
.back-btn, .settings-btn { border: 0; background: transparent; color: white; cursor: pointer; font-size: 25px; padding: 2px 6px; }
|
.back-btn, .settings-btn { border: 0; background: transparent; color: white; cursor: pointer; font-size: 25px; padding: 2px 6px; }
|
||||||
.settings-btn { font-size: 20px; margin-left: auto; }
|
.settings-btn { font-size: 20px; margin-left: auto; }
|
||||||
.avatar-heading { display: flex; align-items: center; gap: 10px; }
|
.avatar-heading { display: flex; align-items: center; gap: 10px; }
|
||||||
.avatar-mark { width: 38px; height: 38px; display: grid; place-items: center; border-radius: 13px; background: rgba(255,255,255,.24); font-size: 23px; }
|
.avatar-mark { width: 38px; height: 38px; display: grid; place-items: center; overflow: hidden; border-radius: 13px; background: rgba(255,255,255,.24); font-size: 23px; }.avatar-mark img { width: 100%; height: 100%; object-fit: cover; }
|
||||||
.avatar-heading h1 { margin: 0; font-size: 17px; }
|
.avatar-heading h1 { margin: 0; font-size: 17px; }
|
||||||
.online-state { display: block; margin-top: 3px; font-size: 11px; opacity: .86; }
|
.online-state { display: flex; align-items: center; gap: 4px; margin-top: 3px; font-size: 11px; opacity: .9; }.online-state i { width: 7px; height: 7px; border-radius: 50%; background: #86EFAC; box-shadow: 0 0 0 2px rgba(255,255,255,.22); }.online-state.training i { background: #FDE68A; }.online-state.inactive i { background: #FDA4AF; }
|
||||||
.message-list { flex: 1 1 auto; width: min(760px, 100%); box-sizing: border-box; margin: 0 auto; padding: 24px 18px 120px; overflow-y: auto; }
|
.message-list { min-height: 0; flex: 1 1 auto; width: min(760px, 100%); box-sizing: border-box; margin: 0 auto; padding: 24px 18px 120px; overflow-y: auto; overscroll-behavior: contain; }
|
||||||
|
.chat-page.has-pending-images .message-list { padding-bottom: min(330px, 42vh); }
|
||||||
.welcome-card { padding: 28px 20px; text-align: center; background: rgba(255,255,255,.72); border: 1px solid #FFE1C2; border-radius: 22px; box-shadow: 0 10px 28px rgba(181, 99, 35, .08); }
|
.welcome-card { padding: 28px 20px; text-align: center; background: rgba(255,255,255,.72); border: 1px solid #FFE1C2; border-radius: 22px; box-shadow: 0 10px 28px rgba(181, 99, 35, .08); }
|
||||||
.welcome-icon { color: #F97316; font-size: 30px; }
|
.welcome-avatar { width: 64px; height: 64px; display: grid; place-items: center; margin: 0 auto 14px; overflow: hidden; border: 3px solid #fff; border-radius: 50%; background: #FFE4C7; box-shadow: 0 7px 16px rgba(181, 99, 35, .18); font-size: 32px; }.welcome-avatar img { width: 100%; height: 100%; object-fit: cover; }
|
||||||
.welcome-card h2 { margin: 9px 0 8px; font-size: 20px; }
|
.welcome-card h2 { margin: 0 0 8px; font-size: 20px; }.welcome-description { max-width: 340px; margin: 0 auto; color: #8B6B58; font-size: 14px; line-height: 1.65; }
|
||||||
.welcome-card p { margin: 0 auto 20px; max-width: 420px; color: #8B6B58; line-height: 1.6; font-size: 14px; }
|
.message-row { display: flex; gap: 10px; margin: 18px 0; align-items: flex-start; }
|
||||||
.starter-list { display: flex; flex-wrap: wrap; justify-content: center; gap: 8px; }
|
|
||||||
.starter-list button { border: 1px solid #FFD1A8; color: #C15F18; background: #FFF4E8; border-radius: 20px; padding: 8px 12px; cursor: pointer; }
|
|
||||||
.message-row { display: flex; gap: 9px; margin: 18px 0; align-items: flex-end; }
|
|
||||||
.message-row.user { justify-content: flex-end; }
|
.message-row.user { justify-content: flex-end; }
|
||||||
.message-avatar { flex: 0 0 auto; width: 30px; height: 30px; display: grid; place-items: center; border-radius: 10px; background: #FFE4C7; }
|
.message-avatar { flex: 0 0 auto; width: 42px; height: 42px; display: grid; place-items: center; overflow: hidden; border: 2px solid rgba(255,255,255,.9); border-radius: 14px; background: #FFE4C7; box-shadow: 0 3px 10px rgba(96, 52, 21, .12); font-size: 16px; }.message-avatar img { width: 100%; height: 100%; object-fit: cover; }.user-message-face { color: #fff; background: #D97706; }
|
||||||
.message-column { max-width: min(78%, 560px); }
|
.message-column { max-width: min(78%, 560px); }
|
||||||
.message-bubble { padding: 12px 14px; white-space: pre-wrap; line-height: 1.6; font-size: 15px; border-radius: 16px 16px 16px 4px; background: white; box-shadow: 0 3px 12px rgba(96, 52, 21, .07); }
|
.message-images { display: grid; grid-template-columns: repeat(2, minmax(0, 150px)); gap: 8px; margin-bottom: 8px; }
|
||||||
.user .message-bubble { color: white; border-radius: 16px 16px 4px 16px; background: #F97316; }
|
.message-image-card { margin: 0; overflow: hidden; border: 1px solid #F4D4B8; border-radius: 14px; background: #fff; box-shadow: 0 4px 14px rgba(96, 52, 21, .08); }
|
||||||
|
.message-image-card img { display: block; width: 100%; max-height: 210px; object-fit: cover; }
|
||||||
|
.message-image-card figcaption { padding: 7px 9px; color: #8A5A3B; background: #FFF6ED; font-size: 10px; line-height: 1.45; }
|
||||||
|
.message-bubble { padding: 12px 14px; white-space: pre-wrap; line-height: 1.6; font-size: 15px; border-radius: 4px 16px 16px 16px; background: white; box-shadow: 0 3px 12px rgba(96, 52, 21, .07); }
|
||||||
|
.message-bubble.streaming::after { content: ''; display: inline-block; width: 2px; height: 1.05em; margin-left: 3px; vertical-align: -0.16em; background: currentColor; animation: type-cursor .75s step-end infinite; }
|
||||||
|
.typing-character { display: inline-block; animation: character-in .24s cubic-bezier(.2,.72,.25,1) both; }.typing-character.newline { display: block; height: 0; }
|
||||||
|
.typing-character.markdown-bold { font-weight: 750; color: #2F1A10; }
|
||||||
|
.typing-character.markdown-italic { font-style: italic; }
|
||||||
|
.typing-character.markdown-code { margin: 0 1px; padding: 0 3px; border-radius: 4px; color: #9A3412; background: #FFF0E3; font-family: "SFMono-Regular", Consolas, monospace; font-size: .92em; }
|
||||||
|
.typing-character.markdown-heading { font-weight: 750; font-size: 1.08em; }
|
||||||
|
.user .message-bubble { color: white; border-radius: 16px 4px 16px 16px; background: #F97316; }
|
||||||
.message-source { margin: 5px 4px 0; font-size: 11px; color: #A77A5B; }
|
.message-source { margin: 5px 4px 0; font-size: 11px; color: #A77A5B; }
|
||||||
.typing { display: flex; gap: 4px; padding: 14px 16px; }
|
.typing { display: flex; gap: 4px; padding: 14px 16px; }
|
||||||
.typing i { width: 5px; height: 5px; border-radius: 50%; background: #F97316; animation: blink 1s infinite alternate; }
|
.typing i { width: 5px; height: 5px; border-radius: 50%; background: #F97316; animation: blink 1s infinite alternate; }
|
||||||
.typing i:nth-child(2) { animation-delay: .2s; }.typing i:nth-child(3) { animation-delay: .4s; }
|
.typing i:nth-child(2) { animation-delay: .2s; }.typing i:nth-child(3) { animation-delay: .4s; }
|
||||||
@keyframes blink { from { opacity: .25; } to { opacity: 1; } }
|
@keyframes blink { from { opacity: .25; } to { opacity: 1; } }
|
||||||
|
@keyframes type-cursor { 50% { opacity: 0; } }
|
||||||
|
@keyframes character-in { from { opacity: 0; transform: translateY(3px); } to { opacity: 1; transform: translateY(0); } }
|
||||||
.chat-error { margin: 4px auto; color: #B42318; font-size: 13px; }.chat-error button { border: 0; background: none; color: #C15F18; cursor: pointer; text-decoration: underline; }
|
.chat-error { margin: 4px auto; color: #B42318; font-size: 13px; }.chat-error button { border: 0; background: none; color: #C15F18; cursor: pointer; text-decoration: underline; }
|
||||||
.composer { position: fixed; left: 0; right: 0; bottom: 0; display: flex; gap: 10px; padding: 12px max(18px, calc((100vw - 760px) / 2 + 18px)); background: rgba(255,255,255,.92); border-top: 1px solid #F4DCC7; backdrop-filter: blur(12px); }
|
.composer { position: fixed; left: 0; right: 0; bottom: 0; display: flex; flex-direction: column; gap: 9px; padding: 10px max(18px, calc((100vw - 760px) / 2 + 18px)) 12px; background: rgba(255,255,255,.94); border-top: 1px solid #F4DCC7; backdrop-filter: blur(14px); }
|
||||||
|
.composer-row { display: flex; align-items: flex-end; gap: 9px; }
|
||||||
.composer textarea { flex: 1; resize: none; min-height: 22px; max-height: 100px; padding: 11px 13px; border: 1px solid #EED8C5; border-radius: 13px; font: inherit; color: #3B2417; outline: none; }.composer textarea:focus { border-color: #F97316; }
|
.composer textarea { flex: 1; resize: none; min-height: 22px; max-height: 100px; padding: 11px 13px; border: 1px solid #EED8C5; border-radius: 13px; font: inherit; color: #3B2417; outline: none; }.composer textarea:focus { border-color: #F97316; }
|
||||||
|
.image-input { display: none; }
|
||||||
|
.image-btn { flex: 0 0 auto; width: 44px; height: 44px; display: grid; place-items: center; border: 1px solid #EED8C5; border-radius: 13px; color: #C65A11; background: #FFF8F1; cursor: pointer; }
|
||||||
|
.image-btn svg { width: 22px; height: 22px; fill: currentColor; }
|
||||||
|
.image-btn:disabled { opacity: .4; cursor: not-allowed; }
|
||||||
|
.pending-images { display: grid; gap: 7px; }
|
||||||
|
.pending-image { display: grid; grid-template-columns: 48px minmax(0, 1fr) 30px; align-items: center; gap: 9px; min-height: 48px; padding: 6px 8px; border: 1px solid #F1D4BB; border-radius: 14px; background: #FFF9F3; }
|
||||||
|
.pending-image img { width: 48px; height: 48px; object-fit: cover; border-radius: 10px; }
|
||||||
|
.pending-image-copy { min-width: 0; display: flex; flex-direction: column; gap: 2px; }
|
||||||
|
.pending-image-copy strong { overflow: hidden; color: #4B2B19; font-size: 12px; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.pending-image-copy span { color: #9A7159; font-size: 10px; }
|
||||||
|
.pending-image.uploading strong::after { content: ''; display: inline-block; width: 7px; height: 7px; margin-left: 7px; border: 2px solid #F6B889; border-top-color: #F97316; border-radius: 50%; animation: image-spin .7s linear infinite; }
|
||||||
|
.pending-image > button { width: 28px; height: 28px; border: 0; border-radius: 9px; color: #9A7159; background: #F8E8D9; font-size: 19px; cursor: pointer; }
|
||||||
|
.medical-note { margin: 0; padding: 0 2px; color: #9A5A2E; font-size: 10px; line-height: 1.45; }
|
||||||
.send-btn { align-self: flex-end; padding: 11px 18px; border: 0; border-radius: 12px; color: white; background: #F97316; cursor: pointer; }.send-btn:disabled { opacity: .45; cursor: not-allowed; }
|
.send-btn { align-self: flex-end; padding: 11px 18px; border: 0; border-radius: 12px; color: white; background: #F97316; cursor: pointer; }.send-btn:disabled { opacity: .45; cursor: not-allowed; }
|
||||||
|
@keyframes image-spin { to { transform: rotate(360deg); } }
|
||||||
|
@media (max-width: 520px) {
|
||||||
|
.message-images { grid-template-columns: minmax(0, 220px); }
|
||||||
|
.message-column { max-width: 80%; }
|
||||||
|
.send-btn { padding-inline: 14px; }
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="edit-avatar-page">
|
<div class="edit-avatar-page">
|
||||||
<!-- 顶部导航 -->
|
<!-- 顶部导航 -->
|
||||||
<header class="page-header">
|
<header v-if="!isEmbedded" class="page-header">
|
||||||
<button class="back-btn" @click="goBack">‹</button>
|
<button class="back-btn" @click="goBack">‹</button>
|
||||||
<h1 class="page-title">形象微调编辑</h1>
|
<h1 class="page-title">分身微调</h1>
|
||||||
<button class="save-btn" :disabled="loading || saving" @click="saveChanges">
|
<span class="header-spacer" aria-hidden="true"></span>
|
||||||
{{ saving ? '保存中...' : '保存' }}
|
|
||||||
</button>
|
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div v-if="loading" class="status-banner">加载中...</div>
|
<div v-if="loading" class="status-banner">加载中...</div>
|
||||||
@@ -14,13 +12,15 @@
|
|||||||
|
|
||||||
<!-- 头像预览 -->
|
<!-- 头像预览 -->
|
||||||
<section class="photo-section">
|
<section class="photo-section">
|
||||||
<div class="photo-container">
|
<label class="photo-container" for="avatar-photo-input">
|
||||||
<div class="photo-preview">
|
<div class="photo-preview">
|
||||||
<img v-if="formData.photoUrl" :src="formData.photoUrl" alt="" class="photo-image" referrerpolicy="no-referrer" />
|
<img v-if="formData.photoUrl" :src="formData.photoUrl" alt="" class="photo-image" referrerpolicy="no-referrer" />
|
||||||
<div v-else class="photo-placeholder">🤖</div>
|
<div v-else class="photo-placeholder">🤖</div>
|
||||||
|
<span class="photo-edit-mark">更换</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="photo-hint">可直接修改下方头像链接</span>
|
<span class="photo-hint">{{ uploadingPhoto ? '头像上传中...' : '点击头像上传新图片' }}</span>
|
||||||
</div>
|
</label>
|
||||||
|
<input id="avatar-photo-input" class="photo-input" type="file" accept="image/jpeg,image/png,image/webp,image/gif" :disabled="uploadingPhoto" @change="selectPhoto" />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- 基本信息表单 -->
|
<!-- 基本信息表单 -->
|
||||||
@@ -56,12 +56,23 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-item">
|
<div class="form-item">
|
||||||
<label class="form-label">头像链接</label>
|
<label class="form-label">职业</label>
|
||||||
<input
|
<input v-model="formData.profession" class="form-input" placeholder="例如:医生、律师、产品经理" />
|
||||||
v-model="formData.photoUrl"
|
</div>
|
||||||
class="form-input"
|
|
||||||
placeholder="请输入头像图片 URL"
|
<div class="form-item">
|
||||||
/>
|
<label class="form-label">职位</label>
|
||||||
|
<input v-model="formData.position" class="form-input" placeholder="例如:主任医师、部门负责人" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-item">
|
||||||
|
<label class="form-label">单位</label>
|
||||||
|
<input v-model="formData.organization" class="form-input" placeholder="请输入所在单位" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-item">
|
||||||
|
<label class="form-label">单位地址</label>
|
||||||
|
<input v-model="formData.organizationAddress" class="form-input" placeholder="请输入单位详细地址" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-item">
|
<div class="form-item">
|
||||||
@@ -146,20 +157,29 @@
|
|||||||
{{ deleting ? '删除中...' : '删除数字分身' }}
|
{{ deleting ? '删除中...' : '删除数字分身' }}
|
||||||
</button>
|
</button>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<footer class="edit-action-bar">
|
||||||
|
<button class="action-back-btn" type="button" :disabled="saving" @click="goBack">返回</button>
|
||||||
|
<button class="action-save-btn" type="button" :disabled="loading || saving || uploadingPhoto" @click="saveChanges">
|
||||||
|
{{ saving ? '保存中...' : '保存修改' }}
|
||||||
|
</button>
|
||||||
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { onMounted, reactive, ref } from 'vue'
|
import { onMounted, reactive, ref } from 'vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { deleteAvatar as apiDeleteAvatar, getAvatarDetail, updateAvatar } from '@/api'
|
import { deleteAvatar as apiDeleteAvatar, getAvatarDetail, updateAvatar, uploadAvatarPhoto } from '@/api'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
import { buildAvatarUpdatePayload, normalizeAvatarEditForm } from '@/utils/avatar-page-data.js'
|
import { buildAvatarUpdatePayload, normalizeAvatarEditForm } from '@/utils/avatar-page-data.js'
|
||||||
|
import { isHuihuiEmbeddedMode } from '@/utils/embed-mode'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const avatarStore = useAvatarStore()
|
const avatarStore = useAvatarStore()
|
||||||
const avatarId = route.params.id as string
|
const avatarId = route.params.id as string
|
||||||
|
const isEmbedded = isHuihuiEmbeddedMode()
|
||||||
|
|
||||||
// 表单数据
|
// 表单数据
|
||||||
const formData = reactive({
|
const formData = reactive({
|
||||||
@@ -174,6 +194,10 @@ const formData = reactive({
|
|||||||
humor: 30,
|
humor: 30,
|
||||||
responseLength: 'medium',
|
responseLength: 'medium',
|
||||||
systemPrompt: '',
|
systemPrompt: '',
|
||||||
|
profession: '',
|
||||||
|
position: '',
|
||||||
|
organization: '',
|
||||||
|
organizationAddress: '',
|
||||||
autoReply: true
|
autoReply: true
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -185,6 +209,7 @@ const responseLengths = [
|
|||||||
|
|
||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
|
const uploadingPhoto = ref(false)
|
||||||
const deleting = ref(false)
|
const deleting = ref(false)
|
||||||
const errorMsg = ref('')
|
const errorMsg = ref('')
|
||||||
|
|
||||||
@@ -201,6 +226,23 @@ const loadAvatar = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const selectPhoto = async (event: Event) => {
|
||||||
|
const input = event.target as HTMLInputElement
|
||||||
|
const file = input.files?.[0]
|
||||||
|
input.value = ''
|
||||||
|
if (!file || uploadingPhoto.value) return
|
||||||
|
uploadingPhoto.value = true
|
||||||
|
errorMsg.value = ''
|
||||||
|
try {
|
||||||
|
const result = await uploadAvatarPhoto(avatarId, file)
|
||||||
|
formData.photoUrl = result.photoUrl
|
||||||
|
} catch (e: any) {
|
||||||
|
errorMsg.value = e?.message || '头像上传失败,请重试'
|
||||||
|
} finally {
|
||||||
|
uploadingPhoto.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 保存修改
|
// 保存修改
|
||||||
const saveChanges = async () => {
|
const saveChanges = async () => {
|
||||||
if (loading.value || saving.value) return
|
if (loading.value || saving.value) return
|
||||||
@@ -253,7 +295,7 @@ onMounted(async () => {
|
|||||||
.edit-avatar-page {
|
.edit-avatar-page {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background: #F8F9FA;
|
background: #F8F9FA;
|
||||||
padding-bottom: 40px;
|
padding-bottom: calc(104px + env(safe-area-inset-bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 顶部导航 */
|
/* 顶部导航 */
|
||||||
@@ -296,16 +338,7 @@ onMounted(async () => {
|
|||||||
color: #B91C1C;
|
color: #B91C1C;
|
||||||
}
|
}
|
||||||
|
|
||||||
.save-btn {
|
.header-spacer { width: 40px; }
|
||||||
background: #F97316;
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
padding: 8px 20px;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 头像上传 */
|
/* 头像上传 */
|
||||||
.photo-section {
|
.photo-section {
|
||||||
@@ -323,6 +356,7 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.photo-preview {
|
.photo-preview {
|
||||||
|
position: relative;
|
||||||
width: 100px;
|
width: 100px;
|
||||||
height: 100px;
|
height: 100px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
@@ -331,6 +365,7 @@ onMounted(async () => {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
box-shadow: 0 4px 12px rgba(249, 115, 22, 0.3);
|
box-shadow: 0 4px 12px rgba(249, 115, 22, 0.3);
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.photo-image {
|
.photo-image {
|
||||||
@@ -349,6 +384,19 @@ onMounted(async () => {
|
|||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo-input { display: none; }
|
||||||
|
.photo-edit-mark {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
padding: 5px 0 7px;
|
||||||
|
color: white;
|
||||||
|
background: rgba(47, 26, 16, .68);
|
||||||
|
font-size: 12px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
/* 表单区域 */
|
/* 表单区域 */
|
||||||
.form-section {
|
.form-section {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
@@ -530,4 +578,47 @@ onMounted(async () => {
|
|||||||
background: #EF4444;
|
background: #EF4444;
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.edit-action-bar {
|
||||||
|
position: fixed;
|
||||||
|
z-index: 30;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px 20px calc(14px + env(safe-area-inset-bottom));
|
||||||
|
border-top: 1px solid rgba(229, 231, 235, .9);
|
||||||
|
background: rgba(248, 249, 250, .96);
|
||||||
|
box-shadow: 0 -8px 24px rgba(56, 38, 24, .06);
|
||||||
|
backdrop-filter: blur(12px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-back-btn,
|
||||||
|
.action-save-btn {
|
||||||
|
height: 48px;
|
||||||
|
border-radius: 14px;
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-back-btn {
|
||||||
|
flex: 0 0 104px;
|
||||||
|
border: 1px solid #E4E0DC;
|
||||||
|
color: #655E58;
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-save-btn {
|
||||||
|
min-width: 0;
|
||||||
|
flex: 1;
|
||||||
|
border: 0;
|
||||||
|
color: #fff;
|
||||||
|
background: linear-gradient(105deg, #F79A38, #F97316);
|
||||||
|
box-shadow: 0 8px 18px rgba(249, 115, 22, .18);
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-back-btn:disabled,
|
||||||
|
.action-save-btn:disabled { opacity: .6; cursor: not-allowed; }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="avatar-manage-page">
|
<div class="avatar-manage-page">
|
||||||
<!-- 顶部导航 -->
|
<!-- 顶部导航 -->
|
||||||
<header class="page-header">
|
<header v-if="!isEmbedded" class="page-header">
|
||||||
<div class="header-left">
|
<div class="header-left">
|
||||||
<button class="back-btn" @click="goBack">‹</button>
|
<button class="back-btn" @click="goBack">‹</button>
|
||||||
<h1 class="page-title">数字分身管理</h1>
|
<h1 class="page-title">数字分身管理</h1>
|
||||||
</div>
|
</div>
|
||||||
<!-- 右上角创建入口 -->
|
|
||||||
<div class="header-right">
|
|
||||||
<button class="icon-btn" @click="goCreate" title="创建数字分身">➕</button>
|
|
||||||
</div>
|
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<!-- 用户资料头(会会登录账号的头像 / 昵称) -->
|
<!-- 用户资料头(会会登录账号的头像 / 昵称) -->
|
||||||
@@ -24,12 +20,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- Token 余额条 -->
|
<!-- 积分余额条:暂时隐藏,保留完整实现便于后续恢复。 -->
|
||||||
<section class="token-section">
|
<section v-if="SHOW_POINTS_BALANCE_CARD" class="token-section">
|
||||||
<div class="token-card">
|
<div class="token-card">
|
||||||
<div class="token-info">
|
<div class="token-info">
|
||||||
<span class="token-label">Token 余额</span>
|
<span class="token-label">积分余额</span>
|
||||||
<span class="token-amount">{{ tokenBalance.toLocaleString() }}</span>
|
<span class="token-amount">{{ tokenBalance.toLocaleString() }}</span>
|
||||||
|
<span class="token-used">累计使用 {{ tokenConsumed.toLocaleString() }}</span>
|
||||||
</div>
|
</div>
|
||||||
<button class="recharge-btn" @click="goToRecharge">充值</button>
|
<button class="recharge-btn" @click="goToRecharge">充值</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -38,28 +35,36 @@
|
|||||||
<!-- 数字分身列表(只放分身相关) -->
|
<!-- 数字分身列表(只放分身相关) -->
|
||||||
<section class="avatar-list-section">
|
<section class="avatar-list-section">
|
||||||
<div class="section-head">
|
<div class="section-head">
|
||||||
<h3 class="section-title">我的数字分身</h3>
|
<div class="section-heading-copy">
|
||||||
<span class="count-badge">{{ avatars.length }}</span>
|
<h3 class="section-title">我的数字分身</h3>
|
||||||
|
<span class="count-badge">{{ avatars.length }}</span>
|
||||||
|
</div>
|
||||||
|
<button class="section-create-btn" type="button" @click="goCreate">
|
||||||
|
<span aria-hidden="true">+</span> 添加分身
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="avatars.length" class="avatar-list">
|
<div v-if="avatars.length" class="avatar-list">
|
||||||
<div class="avatar-card" v-for="a in avatars" :key="a.id">
|
<div class="avatar-card" v-for="a in avatars" :key="a.id">
|
||||||
<div class="avatar-photo">
|
<button class="card-edit" @click="goToEdit(a.id)" :aria-label="`编辑${a.displayName || a.name}`">
|
||||||
<img v-if="a.photoUrl" :src="a.photoUrl" alt="" referrerpolicy="no-referrer" class="avatar-img" />
|
<span aria-hidden="true">✎</span> 编辑
|
||||||
<div v-else class="avatar-placeholder">{{ a.emoji || '🤖' }}</div>
|
</button>
|
||||||
</div>
|
<div class="avatar-card-main">
|
||||||
<div class="avatar-details">
|
<div class="avatar-photo">
|
||||||
<h2 class="avatar-name">{{ a.displayName || a.name }}</h2>
|
<img v-if="a.photoUrl" :src="a.photoUrl" alt="" referrerpolicy="no-referrer" class="avatar-img" />
|
||||||
<p class="avatar-desc">{{ a.description || '暂无描述' }}</p>
|
<div v-else class="avatar-placeholder">{{ a.emoji || '🤖' }}</div>
|
||||||
<div class="avatar-status">
|
</div>
|
||||||
<span class="status-dot" :class="a.status"></span>
|
<div class="avatar-details">
|
||||||
<span class="status-text">{{ statusText(a.status) }}</span>
|
<div class="avatar-name-row"><h2 class="avatar-name">{{ a.displayName || a.name }}</h2><span class="avatar-status"><i class="status-dot" :class="a.status"></i>{{ statusText(a.status) }}</span></div>
|
||||||
|
<p class="avatar-desc">{{ a.description || '暂无描述' }}</p>
|
||||||
|
<span class="avatar-token-usage">累计使用 {{ avatarTokenUsage(a.id).toLocaleString() }} 积分</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="avatar-actions">
|
<div class="avatar-actions">
|
||||||
<button class="chat-link" @click="goToChat(a.id)">对话</button>
|
<button class="chat-link" @click="goToChat(a.id)"><span>💬</span> 对话</button>
|
||||||
<button class="edit-link" @click="goToEdit(a.id)">编辑</button>
|
<button class="knowledge-link" @click="goToKnowledge(a.id)"><span>📚</span> 知识库</button>
|
||||||
<button class="del-link" @click="askDelete(a)">删除</button>
|
<button class="authorization-link" @click="goToAuthorization(a.id)"><span>🔑</span> 授权</button>
|
||||||
|
<button class="share-link" @click="shareAvatar(a)"><span>↗</span> 分享</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -71,88 +76,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- 分身工具入口 -->
|
<p v-if="shareToast" class="share-toast">{{ shareToast }}</p>
|
||||||
<section class="tools-section">
|
|
||||||
<h3 class="section-title">分身工具</h3>
|
|
||||||
<div class="tools-grid">
|
|
||||||
<div class="tool-card" @click="goToKnowledge">
|
|
||||||
<div class="tool-icon">📚</div>
|
|
||||||
<div class="tool-info">
|
|
||||||
<span class="tool-name">知识库管理</span>
|
|
||||||
<span class="tool-desc">上传文档与标准问答</span>
|
|
||||||
</div>
|
|
||||||
<span class="tool-arrow">›</span>
|
|
||||||
</div>
|
|
||||||
<div class="tool-card" @click="goToAvatarCard">
|
|
||||||
<div class="tool-icon">🪪</div>
|
|
||||||
<div class="tool-info">
|
|
||||||
<span class="tool-name">分身名片</span>
|
|
||||||
<span class="tool-desc">生成并分享名片</span>
|
|
||||||
</div>
|
|
||||||
<span class="tool-arrow">›</span>
|
|
||||||
</div>
|
|
||||||
<div class="tool-card" @click="goToAvatarContacts">
|
|
||||||
<div class="tool-icon">🤝</div>
|
|
||||||
<div class="tool-info">
|
|
||||||
<span class="tool-name">分身人脉</span>
|
|
||||||
<span class="tool-desc">管理社交关系</span>
|
|
||||||
</div>
|
|
||||||
<span class="tool-arrow">›</span>
|
|
||||||
</div>
|
|
||||||
<div class="tool-card" @click="goToMyProjects">
|
|
||||||
<div class="tool-icon">📁</div>
|
|
||||||
<div class="tool-info">
|
|
||||||
<span class="tool-name">我的项目</span>
|
|
||||||
<span class="tool-desc">查看参与项目</span>
|
|
||||||
</div>
|
|
||||||
<span class="tool-arrow">›</span>
|
|
||||||
</div>
|
|
||||||
<div class="tool-card" @click="goToCreateOrg">
|
|
||||||
<div class="tool-icon">🏢</div>
|
|
||||||
<div class="tool-info">
|
|
||||||
<span class="tool-name">创建组织</span>
|
|
||||||
<span class="tool-desc">新建组织团队</span>
|
|
||||||
</div>
|
|
||||||
<span class="tool-arrow">›</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 分身动态列表 -->
|
<!-- 分身工具和分身动态暂不展示,入口统一收拢到每张分身卡片。 -->
|
||||||
<section class="activities-section">
|
|
||||||
<h3 class="section-title">分身动态</h3>
|
|
||||||
<div class="activity-list" v-if="activities.length > 0">
|
|
||||||
<div class="activity-item" v-for="activity in activities" :key="activity.id">
|
|
||||||
<div class="activity-icon" :class="activity.type">{{ activityIcon(activity.type) }}</div>
|
|
||||||
<div class="activity-content">
|
|
||||||
<p class="activity-text">{{ activity.text }}</p>
|
|
||||||
<span class="activity-time">{{ formatTime(activity.createdAt) }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="empty-state" v-else>
|
|
||||||
<span class="empty-icon">📭</span>
|
|
||||||
<p class="empty-text">暂无动态</p>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<!-- 删除确认弹窗 -->
|
|
||||||
<div v-if="showDelete" class="modal-mask" @click.self="cancelDelete">
|
|
||||||
<div class="modal">
|
|
||||||
<div class="modal-icon">⚠️</div>
|
|
||||||
<h3 class="modal-title">删除数字分身</h3>
|
|
||||||
<p class="modal-text">
|
|
||||||
确认删除「{{ pendingDelete?.displayName || pendingDelete?.name }}」?<br />
|
|
||||||
其知识库、问答对、授权等关联数据将一并清除,且<b>不可恢复</b>。
|
|
||||||
</p>
|
|
||||||
<div class="modal-actions">
|
|
||||||
<button class="modal-cancel" @click="cancelDelete">取消</button>
|
|
||||||
<button class="modal-confirm" :disabled="deleting" @click="confirmDelete">
|
|
||||||
{{ deleting ? '删除中...' : '确认删除' }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -161,28 +87,27 @@ import { ref, computed, onMounted } from 'vue'
|
|||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
import { useUserStore } from '@/store/user'
|
import { useUserStore } from '@/store/user'
|
||||||
|
import { createAvatarShareLink } from '@/api'
|
||||||
|
import { isHuihuiEmbeddedMode } from '@/utils/embed-mode'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const avatarStore = useAvatarStore()
|
const avatarStore = useAvatarStore()
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
|
const isEmbedded = isHuihuiEmbeddedMode()
|
||||||
|
|
||||||
|
// 临时产品开关:余额卡片代码保留,后续改为 true 即可恢复展示。
|
||||||
|
const SHOW_POINTS_BALANCE_CARD = false
|
||||||
|
|
||||||
// 当前登录会会用户的资料(头像 / 昵称)
|
// 当前登录会会用户的资料(头像 / 昵称)
|
||||||
const me = computed(() => userStore.user)
|
const me = computed(() => userStore.user)
|
||||||
|
|
||||||
// 状态(来自 store / 后端)
|
// 状态(来自 store / 后端)
|
||||||
const tokenBalance = computed(() => avatarStore.tokenBalance)
|
const tokenBalance = computed(() => avatarStore.tokenBalance)
|
||||||
|
const tokenConsumed = computed(() => avatarStore.tokenConsumed)
|
||||||
const avatars = computed(() => avatarStore.avatars)
|
const avatars = computed(() => avatarStore.avatars)
|
||||||
|
const avatarTokenUsage = (id: string) => avatarStore.tokenUsageByAvatar[id] || 0
|
||||||
|
|
||||||
// 删除确认弹窗状态
|
const shareToast = ref('')
|
||||||
const showDelete = ref(false)
|
|
||||||
const pendingDelete = ref<any>(null)
|
|
||||||
const deleting = ref(false)
|
|
||||||
|
|
||||||
const activities = ref<Array<{ id: string; type: string; text: string; createdAt: string }>>([
|
|
||||||
{ id: '1', type: 'create', text: '数字分身创建成功', createdAt: new Date(Date.now() - 86400000).toISOString() },
|
|
||||||
{ id: '2', type: 'edit', text: '更新了分身描述', createdAt: new Date(Date.now() - 43200000).toISOString() },
|
|
||||||
{ id: '3', type: 'authorize', text: '授权微信小程序访问', createdAt: new Date(Date.now() - 3600000).toISOString() }
|
|
||||||
])
|
|
||||||
|
|
||||||
// 状态文本
|
// 状态文本
|
||||||
const statusText = (status: string) => {
|
const statusText = (status: string) => {
|
||||||
@@ -194,55 +119,6 @@ const statusText = (status: string) => {
|
|||||||
return map[status] || status
|
return map[status] || status
|
||||||
}
|
}
|
||||||
|
|
||||||
// 活动图标
|
|
||||||
const activityIcon = (type: string) => {
|
|
||||||
const map: Record<string, string> = {
|
|
||||||
'create': '✨',
|
|
||||||
'edit': '✏️',
|
|
||||||
'authorize': '🔑',
|
|
||||||
'interact': '💬'
|
|
||||||
}
|
|
||||||
return map[type] || '📌'
|
|
||||||
}
|
|
||||||
|
|
||||||
// 格式化时间
|
|
||||||
const formatTime = (time: string) => {
|
|
||||||
const date = new Date(time)
|
|
||||||
const now = new Date()
|
|
||||||
const diff = now.getTime() - date.getTime()
|
|
||||||
const minutes = Math.floor(diff / 60000)
|
|
||||||
const hours = Math.floor(diff / 3600000)
|
|
||||||
const days = Math.floor(diff / 86400000)
|
|
||||||
|
|
||||||
if (minutes < 60) return `${minutes}分钟前`
|
|
||||||
if (hours < 24) return `${hours}小时前`
|
|
||||||
return `${days}天前`
|
|
||||||
}
|
|
||||||
|
|
||||||
// 删除流程
|
|
||||||
const askDelete = (a: any) => {
|
|
||||||
pendingDelete.value = a
|
|
||||||
showDelete.value = true
|
|
||||||
}
|
|
||||||
const cancelDelete = () => {
|
|
||||||
if (deleting.value) return
|
|
||||||
showDelete.value = false
|
|
||||||
pendingDelete.value = null
|
|
||||||
}
|
|
||||||
const confirmDelete = async () => {
|
|
||||||
if (!pendingDelete.value || deleting.value) return
|
|
||||||
deleting.value = true
|
|
||||||
try {
|
|
||||||
await avatarStore.removeAvatar(pendingDelete.value.id)
|
|
||||||
showDelete.value = false
|
|
||||||
pendingDelete.value = null
|
|
||||||
} catch (e: any) {
|
|
||||||
alert(e?.message || '删除失败,请稍后重试')
|
|
||||||
} finally {
|
|
||||||
deleting.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 导航
|
// 导航
|
||||||
const goBack = () => {
|
const goBack = () => {
|
||||||
router.back()
|
router.back()
|
||||||
@@ -256,8 +132,12 @@ const goCreate = () => {
|
|||||||
router.push('/avatar/create')
|
router.push('/avatar/create')
|
||||||
}
|
}
|
||||||
|
|
||||||
const goToKnowledge = () => {
|
const goToKnowledge = (id: string) => {
|
||||||
router.push('/knowledge')
|
router.push({ name: 'AvatarKnowledgeManage', params: { avatarId: id } })
|
||||||
|
}
|
||||||
|
|
||||||
|
const goToAuthorization = (id: string) => {
|
||||||
|
router.push({ name: 'AvatarAuthorizationManage', params: { avatarId: id } })
|
||||||
}
|
}
|
||||||
|
|
||||||
const goToEdit = (id: string) => {
|
const goToEdit = (id: string) => {
|
||||||
@@ -268,26 +148,43 @@ const goToChat = (id: string) => {
|
|||||||
router.push(`/avatar/chat/${id}`)
|
router.push(`/avatar/chat/${id}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const goToAvatarCard = () => {
|
const showShareToast = (message: string) => {
|
||||||
router.push('/avatar/card')
|
shareToast.value = message
|
||||||
|
window.setTimeout(() => { shareToast.value = '' }, 2400)
|
||||||
}
|
}
|
||||||
|
|
||||||
const goToAvatarContacts = () => {
|
const copyShareLink = async (link: string) => {
|
||||||
router.push('/avatar/contacts')
|
if (navigator.clipboard?.writeText) {
|
||||||
|
await navigator.clipboard.writeText(link)
|
||||||
|
showShareToast('公开对话链接已复制')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
window.prompt('复制公开对话链接', link)
|
||||||
}
|
}
|
||||||
|
|
||||||
const goToMyProjects = () => {
|
const shareAvatar = async (avatar: any) => {
|
||||||
router.push('/avatar/projects')
|
try {
|
||||||
}
|
const result: any = await createAvatarShareLink(avatar.id)
|
||||||
|
const token = result?.shareToken
|
||||||
const goToCreateOrg = () => {
|
if (!token) throw new Error('未能生成分享链接')
|
||||||
router.push('/avatar/org/create')
|
const link = `${window.location.origin}${window.location.pathname}#/share/${token}`
|
||||||
|
const title = `${avatar.displayName || avatar.name},和我聊聊`
|
||||||
|
if (navigator.share) {
|
||||||
|
await navigator.share({ title, text: avatar.description || '点击和我聊聊', url: link })
|
||||||
|
showShareToast('已唤起分享')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await copyShareLink(link)
|
||||||
|
} catch (error: any) {
|
||||||
|
if (error?.name !== 'AbortError') showShareToast(error?.message || '分享链接生成失败')
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
userStore.loadFromStorage()
|
userStore.loadFromStorage()
|
||||||
avatarStore.loadAvatars()
|
avatarStore.loadAvatars()
|
||||||
avatarStore.loadTokenBalance()
|
avatarStore.loadTokenBalance()
|
||||||
|
avatarStore.loadTokenUsage()
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -295,7 +192,7 @@ onMounted(() => {
|
|||||||
.avatar-manage-page {
|
.avatar-manage-page {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background: #F8F9FA;
|
background: #F8F9FA;
|
||||||
padding-bottom: 80px;
|
padding-bottom: calc(28px + env(safe-area-inset-bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 顶部导航 */
|
/* 顶部导航 */
|
||||||
@@ -398,7 +295,7 @@ onMounted(() => {
|
|||||||
background: rgba(255, 255, 255, 0.3);
|
background: rgba(255, 255, 255, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Token 余额条 */
|
/* 积分余额条 */
|
||||||
.token-section {
|
.token-section {
|
||||||
padding: 16px 20px;
|
padding: 16px 20px;
|
||||||
}
|
}
|
||||||
@@ -430,6 +327,12 @@ onMounted(() => {
|
|||||||
color: #F97316;
|
color: #F97316;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.token-used {
|
||||||
|
margin-top: 3px;
|
||||||
|
color: #A0A5B4;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
.recharge-btn {
|
.recharge-btn {
|
||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
background: #F97316;
|
background: #F97316;
|
||||||
@@ -454,10 +357,36 @@ onMounted(() => {
|
|||||||
.section-head {
|
.section-head {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 8px;
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
margin: 8px 0 12px;
|
margin: 8px 0 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.section-heading-copy {
|
||||||
|
min-width: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-create-btn {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 3px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border: 1px solid #FED7B5;
|
||||||
|
border-radius: 999px;
|
||||||
|
color: #E9650C;
|
||||||
|
background: #FFF7ED;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 650;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-create-btn span { font-size: 17px; line-height: 1; }
|
||||||
|
.section-create-btn:active { background: #FFEDD5; }
|
||||||
|
|
||||||
.section-title {
|
.section-title {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -481,22 +410,40 @@ onMounted(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.avatar-card {
|
.avatar-card {
|
||||||
display: flex;
|
position: relative;
|
||||||
align-items: center;
|
|
||||||
gap: 14px;
|
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
background: white;
|
background: white;
|
||||||
border-radius: 12px;
|
border: 1px solid #F4E5D9;
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
border-radius: 18px;
|
||||||
|
box-shadow: 0 8px 22px rgba(112, 62, 22, .07);
|
||||||
|
}
|
||||||
|
.avatar-card-main { display: flex; align-items: center; gap: 14px; padding: 4px 68px 2px 0; }
|
||||||
|
|
||||||
|
.card-edit {
|
||||||
|
position: absolute;
|
||||||
|
top: 12px;
|
||||||
|
right: 12px;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 7px 10px;
|
||||||
|
border: 1px solid #E9E2DC;
|
||||||
|
border-radius: 999px;
|
||||||
|
color: #6B625C;
|
||||||
|
background: #FAF8F6;
|
||||||
|
font-size: 12px;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.card-edit:active { background: #F2EDE8; }
|
||||||
|
|
||||||
.avatar-photo {
|
.avatar-photo {
|
||||||
width: 56px;
|
width: 66px;
|
||||||
height: 56px;
|
height: 66px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
background: #F3F4F6;
|
background: #FFF0E6;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -516,9 +463,12 @@ onMounted(() => {
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
.avatar-name-row { display: flex; align-items: center; gap: 8px; min-width: 0; }
|
||||||
|
|
||||||
.avatar-name {
|
.avatar-name {
|
||||||
font-size: 16px;
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
font-size: 18px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
margin: 0 0 4px;
|
margin: 0 0 4px;
|
||||||
color: #18191C;
|
color: #18191C;
|
||||||
@@ -527,16 +477,26 @@ onMounted(() => {
|
|||||||
.avatar-desc {
|
.avatar-desc {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
color: #9398AE;
|
color: #9398AE;
|
||||||
margin: 0 0 8px;
|
margin: 5px 0 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.avatar-token-usage {
|
||||||
|
display: inline-block;
|
||||||
|
margin-top: 5px;
|
||||||
|
color: #A0A5B4;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.avatar-status {
|
.avatar-status {
|
||||||
display: flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 6px;
|
flex: 0 0 auto;
|
||||||
|
gap: 4px;
|
||||||
|
color: #75809A;
|
||||||
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-dot {
|
.status-dot {
|
||||||
@@ -557,57 +517,40 @@ onMounted(() => {
|
|||||||
background: #F59E0B;
|
background: #F59E0B;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-text {
|
.avatar-actions {
|
||||||
font-size: 12px;
|
display: grid;
|
||||||
color: #9398AE;
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 8px;
|
||||||
|
margin-top: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.avatar-actions {
|
.avatar-actions button {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 8px;
|
align-items: center;
|
||||||
flex-shrink: 0;
|
justify-content: center;
|
||||||
|
gap: 4px;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 58px;
|
||||||
|
padding: 8px 3px;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.avatar-actions button span { font-size: 17px; line-height: 1; }
|
||||||
|
|
||||||
.chat-link {
|
.chat-link {
|
||||||
padding: 7px 14px;
|
background: linear-gradient(135deg, #F97316, #FB923C);
|
||||||
background: #FFF0E6;
|
color: #fff;
|
||||||
color: #F97316;
|
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 13px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
}
|
||||||
|
.knowledge-link { border: 1px solid #F5D7B8; color: #A85418; background: #FFF8F1; }
|
||||||
|
.authorization-link { border: 1px solid #DCE5F2; color: #47627D; background: #F6F9FC; }
|
||||||
|
.share-link { border: 1px solid #E5E1DD; color: #675E58; background: #FAF8F6; }
|
||||||
|
|
||||||
.edit-link {
|
.share-toast { position: fixed; left: 50%; bottom: 24px; z-index: 300; max-width: calc(100vw - 48px); transform: translateX(-50%); padding: 10px 14px; border-radius: 10px; color: white; background: rgba(39, 32, 28, .88); font-size: 13px; text-align: center; }
|
||||||
padding: 7px 14px;
|
|
||||||
background: #F3F4F6;
|
|
||||||
color: #6B7280;
|
|
||||||
border: none;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 13px;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.edit-link:hover {
|
|
||||||
background: #E5E7EB;
|
|
||||||
}
|
|
||||||
|
|
||||||
.del-link {
|
|
||||||
padding: 7px 14px;
|
|
||||||
background: #FEF2F2;
|
|
||||||
color: #EF4444;
|
|
||||||
border: none;
|
|
||||||
border-radius: 8px;
|
|
||||||
font-size: 13px;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.del-link:hover {
|
|
||||||
background: #FEE2E2;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 空状态 */
|
/* 空状态 */
|
||||||
.empty-state {
|
.empty-state {
|
||||||
@@ -644,197 +587,4 @@ onMounted(() => {
|
|||||||
box-shadow: 0 4px 12px rgba(249, 115, 22, 0.3);
|
box-shadow: 0 4px 12px rgba(249, 115, 22, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 分身工具入口 */
|
|
||||||
.tools-section {
|
|
||||||
padding: 8px 20px 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tools-grid {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-card {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
padding: 14px 16px;
|
|
||||||
background: white;
|
|
||||||
border-radius: 12px;
|
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
|
||||||
cursor: pointer;
|
|
||||||
transition: transform 0.2s, box-shadow 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-card:hover {
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-icon {
|
|
||||||
font-size: 24px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-info {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 2px;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-name {
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 600;
|
|
||||||
color: #18191C;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-desc {
|
|
||||||
font-size: 12px;
|
|
||||||
color: #9398AE;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tool-arrow {
|
|
||||||
font-size: 18px;
|
|
||||||
color: #C9CDD2;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 分身动态列表 */
|
|
||||||
.activities-section {
|
|
||||||
padding: 0 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-list {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-item {
|
|
||||||
display: flex;
|
|
||||||
align-items: flex-start;
|
|
||||||
gap: 12px;
|
|
||||||
padding: 14px 16px;
|
|
||||||
background: white;
|
|
||||||
border-radius: 12px;
|
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-icon {
|
|
||||||
font-size: 20px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
width: 36px;
|
|
||||||
height: 36px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border-radius: 10px;
|
|
||||||
background: #FFF0E6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-content {
|
|
||||||
flex: 1;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-text {
|
|
||||||
font-size: 14px;
|
|
||||||
color: #18191C;
|
|
||||||
margin: 0 0 4px;
|
|
||||||
line-height: 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.activity-time {
|
|
||||||
font-size: 12px;
|
|
||||||
color: #9398AE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 删除确认弹窗 */
|
|
||||||
.modal-mask {
|
|
||||||
position: fixed;
|
|
||||||
inset: 0;
|
|
||||||
background: rgba(0, 0, 0, 0.45);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 24px;
|
|
||||||
z-index: 50;
|
|
||||||
animation: fade 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fade { from { opacity: 0; } to { opacity: 1; } }
|
|
||||||
|
|
||||||
.modal {
|
|
||||||
width: 100%;
|
|
||||||
max-width: 320px;
|
|
||||||
background: white;
|
|
||||||
border-radius: 18px;
|
|
||||||
padding: 24px 22px 18px;
|
|
||||||
text-align: center;
|
|
||||||
box-shadow: 0 20px 50px rgba(0, 0, 0, 0.25);
|
|
||||||
animation: pop 0.25s cubic-bezier(0.16, 1, 0.3, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes pop { from { opacity: 0; transform: scale(0.94); } to { opacity: 1; transform: none; } }
|
|
||||||
|
|
||||||
.modal-icon {
|
|
||||||
font-size: 36px;
|
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-title {
|
|
||||||
font-size: 17px;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #18191C;
|
|
||||||
margin: 0 0 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-text {
|
|
||||||
font-size: 13px;
|
|
||||||
line-height: 1.6;
|
|
||||||
color: #6B7280;
|
|
||||||
margin: 0 0 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-cancel {
|
|
||||||
flex: 1;
|
|
||||||
padding: 12px;
|
|
||||||
background: #F3F4F6;
|
|
||||||
color: #6B7280;
|
|
||||||
border: none;
|
|
||||||
border-radius: 12px;
|
|
||||||
font-size: 15px;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-confirm {
|
|
||||||
flex: 1;
|
|
||||||
padding: 12px;
|
|
||||||
background: #EF4444;
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
border-radius: 12px;
|
|
||||||
font-size: 15px;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: opacity 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-confirm:hover {
|
|
||||||
opacity: 0.92;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-confirm:disabled {
|
|
||||||
opacity: 0.6;
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -78,9 +78,14 @@ const typeOptions = [
|
|||||||
{ value: 'team', label: '团队' },
|
{ value: 'team', label: '团队' },
|
||||||
{ value: 'company', label: '企业' },
|
{ value: 'company', label: '企业' },
|
||||||
{ value: 'community', label: '社群' }
|
{ value: 'community', label: '社群' }
|
||||||
]
|
] as const
|
||||||
|
|
||||||
const form = ref({ emoji: '🏢', name: '', desc: '', type: 'team' })
|
const form = ref({
|
||||||
|
emoji: '🏢',
|
||||||
|
name: '',
|
||||||
|
desc: '',
|
||||||
|
type: 'team' as 'team' | 'company' | 'community'
|
||||||
|
})
|
||||||
|
|
||||||
const canSubmit = computed(() => form.value.name.trim().length > 0)
|
const canSubmit = computed(() => form.value.name.trim().length > 0)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="knowledge-page">
|
<div class="knowledge-page" :class="{ embedded: isEmbedded }">
|
||||||
<!-- 顶部导航 -->
|
<!-- 顶部导航 -->
|
||||||
<header class="page-header">
|
<header v-if="!isEmbedded" class="page-header">
|
||||||
<div class="header-left">
|
<div class="header-left">
|
||||||
<button class="back-btn" @click="goBack">‹</button>
|
<button class="back-btn" @click="goBack">‹</button>
|
||||||
<h1 class="page-title">知识库管理</h1>
|
<h1 class="page-title">知识库管理</h1>
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
<div class="upload-section">
|
<div class="upload-section">
|
||||||
<div class="upload-zone" :class="{ 'drag-over': dragOver }" @click="triggerFile" @dragover.prevent="dragOver = true" @dragleave.prevent="dragOver = false" @drop.prevent="onDrop">
|
<div class="upload-zone" :class="{ 'drag-over': dragOver }" @click="triggerFile" @dragover.prevent="dragOver = true" @dragleave.prevent="dragOver = false" @drop.prevent="onDrop">
|
||||||
<div class="upload-icon">📥</div>
|
<div class="upload-icon">📥</div>
|
||||||
<p class="upload-title">拖拽文件到此处,或<span class="upload-link">点击上传</span></p>
|
<p class="upload-title"><span class="upload-link">点击上传</span></p>
|
||||||
<p class="upload-hint">支持 MD / TXT / PDF / DOC / DOCX / XLSX,上传后自动向量化</p>
|
<p class="upload-hint">支持 MD / TXT / PDF / DOC / DOCX / XLSX,上传后自动向量化</p>
|
||||||
<input ref="fileInput" type="file" accept=".md,.txt,.pdf,.doc,.docx,.xlsx" class="hidden-input" @change="onFileChange" />
|
<input ref="fileInput" type="file" accept=".md,.txt,.pdf,.doc,.docx,.xlsx" class="hidden-input" @change="onFileChange" />
|
||||||
</div>
|
</div>
|
||||||
@@ -31,22 +31,21 @@
|
|||||||
<p v-if="uploadError" class="error-text">{{ uploadError }}</p>
|
<p v-if="uploadError" class="error-text">{{ uploadError }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="table-scroll">
|
<div v-if="docs.length" class="mobile-card-list">
|
||||||
<table class="knowledge-table">
|
<article v-for="doc in docs" :key="doc.id" class="knowledge-card">
|
||||||
<thead><tr><th>文档</th><th>类型</th><th>大小</th><th>状态</th><th>上传时间</th><th>操作</th></tr></thead>
|
<div class="card-icon">{{ fileEmoji(doc.fileType) }}</div>
|
||||||
<tbody v-if="docs.length">
|
<div class="card-content">
|
||||||
<tr v-for="doc in docs" :key="doc.id">
|
<div class="card-title-row">
|
||||||
<td><div class="file-cell"><span class="doc-icon">{{ fileEmoji(doc.fileType) }}</span><strong>{{ doc.filename }}</strong></div></td>
|
<strong>{{ doc.filename }}</strong>
|
||||||
<td>{{ doc.fileType.toUpperCase() }}</td>
|
<span class="status-pill" :class="documentState(doc).tone">{{ documentState(doc).label }}</span>
|
||||||
<td>{{ formatSize(doc.fileSize) }}</td>
|
</div>
|
||||||
<td><span class="status-pill" :class="{ pending: !doc.vectorized }">{{ doc.vectorized ? `已向量化 · ${doc.chunkCount || 0} 段` : '处理中' }}</span></td>
|
<p class="card-meta">{{ doc.fileType.toUpperCase() }} · {{ formatSize(doc.fileSize) }} · {{ formatDate(doc.createdAt) }}</p>
|
||||||
<td>{{ formatDate(doc.createdAt) }}</td>
|
<p class="card-detail">{{ documentState(doc).detail }}</p>
|
||||||
<td><button class="table-delete" @click="removeDoc(doc.id)">删除</button></td>
|
</div>
|
||||||
</tr>
|
<button class="card-delete" @click="removeDoc(doc.id)">删除</button>
|
||||||
</tbody>
|
</article>
|
||||||
</table>
|
|
||||||
<div v-if="!docs.length" class="table-empty">📂 暂无文档,先上传一个知识文件</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div v-else class="card-empty">📂 暂无文档,先上传一个知识文件</div>
|
||||||
|
|
||||||
<section class="search-section">
|
<section class="search-section">
|
||||||
<h3 class="section-title">向量检索测试</h3>
|
<h3 class="section-title">向量检索测试</h3>
|
||||||
@@ -57,21 +56,22 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section v-else class="knowledge-panel">
|
<section v-else class="knowledge-panel">
|
||||||
<div class="panel-heading"><div><h3 class="section-title">标准问答对</h3><p>命中后优先使用标准答案,不调用 Qwen。</p></div><button class="add-qa-btn" @click="goAddQa">+ 添加</button></div>
|
<div class="panel-heading"><div><h3 class="section-title">标准问答对</h3><p>相似问法命中后优先使用标准答案。</p></div><button class="add-qa-btn" @click="goAddQa">+ 添加</button></div>
|
||||||
<div class="table-scroll">
|
<div v-if="qaPairs.length" class="mobile-card-list qa-card-list">
|
||||||
<table class="knowledge-table qa-table">
|
<article v-for="qa in qaPairs" :key="qa.id" class="knowledge-card qa-card" :class="{ 'qa-disabled': qa.enabled === false }">
|
||||||
<thead><tr><th>问题</th><th>标准答案</th><th>状态</th><th>更新时间</th><th>操作</th></tr></thead>
|
<div class="card-content">
|
||||||
<tbody v-if="qaPairs.length">
|
<div class="qa-card-head">
|
||||||
<tr v-for="qa in qaPairs" :key="qa.id" :class="{ 'qa-disabled': qa.enabled === false }">
|
<span class="qa-label">标准问题</span>
|
||||||
<td class="question-cell">{{ qa.question }}</td><td class="answer-cell">{{ qa.answer }}</td>
|
<label class="switch" :title="qa.enabled === false ? '已停用' : '已启用'"><input type="checkbox" :checked="qa.enabled !== false" @change="toggleQa(qa, $event)" /><span class="slider"></span></label>
|
||||||
<td><label class="switch" :title="qa.enabled === false ? '已停用' : '已启用'"><input type="checkbox" :checked="qa.enabled !== false" @change="toggleQa(qa, $event)" /><span class="slider"></span></label></td>
|
</div>
|
||||||
<td>{{ formatDate(qa.updatedAt || qa.createdAt) }}</td>
|
<strong class="qa-question">{{ qa.question }}</strong>
|
||||||
<td><div class="row-actions"><button class="qa-edit" @click="goEditQa(qa)">编辑</button><button class="qa-del" @click="removeQa(qa.id)">删除</button></div></td>
|
<p class="qa-answer">{{ qa.answer }}</p>
|
||||||
</tr>
|
<p class="card-meta">更新于 {{ formatDate(qa.updatedAt || qa.createdAt) }}</p>
|
||||||
</tbody>
|
<div class="qa-card-actions"><button class="qa-edit" @click="goEditQa(qa)">编辑</button><button class="qa-del" @click="removeQa(qa.id)">删除</button></div>
|
||||||
</table>
|
</div>
|
||||||
<div v-if="!qaPairs.length" class="table-empty">💡 暂无问答对,添加后分身会优先按此作答</div>
|
</article>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-else class="card-empty">💡 暂无问答对,添加后分身会优先按此作答</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
@@ -79,9 +79,10 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, computed } from 'vue'
|
import { ref, onMounted, computed } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
import { pickAvatarId, unwrapListData } from '@/utils/avatar-page-data.js'
|
import { pickScopedAvatarId, unwrapListData } from '@/utils/avatar-page-data.js'
|
||||||
|
import { isHuihuiEmbeddedMode } from '@/utils/embed-mode'
|
||||||
import {
|
import {
|
||||||
getKnowledgeDocs,
|
getKnowledgeDocs,
|
||||||
uploadKnowledgeDoc,
|
uploadKnowledgeDoc,
|
||||||
@@ -93,9 +94,11 @@ import {
|
|||||||
} from '@/api'
|
} from '@/api'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
const route = useRoute()
|
||||||
const store = useAvatarStore()
|
const store = useAvatarStore()
|
||||||
|
const isEmbedded = isHuihuiEmbeddedMode()
|
||||||
|
|
||||||
const avatarId = computed(() => pickAvatarId(store.currentAvatarId, store.avatars))
|
const avatarId = computed(() => pickScopedAvatarId(route.params.avatarId, store.currentAvatarId, store.avatars))
|
||||||
const activeTab = ref<'docs' | 'qa'>('docs')
|
const activeTab = ref<'docs' | 'qa'>('docs')
|
||||||
|
|
||||||
const docs = ref<any[]>([])
|
const docs = ref<any[]>([])
|
||||||
@@ -110,6 +113,19 @@ const searching = ref(false)
|
|||||||
const searched = ref(false)
|
const searched = ref(false)
|
||||||
const searchResults = ref<any[]>([])
|
const searchResults = ref<any[]>([])
|
||||||
|
|
||||||
|
const documentState = (doc: any) => {
|
||||||
|
if (doc.filePresent === false) {
|
||||||
|
return { tone: 'missing', label: '文件缺失', detail: '原文件不可用,请删除后重新上传' }
|
||||||
|
}
|
||||||
|
if (doc.vectorized) {
|
||||||
|
return { tone: 'ready', label: '已入库', detail: `已切分 ${doc.chunkCount || 0} 段,可用于对话` }
|
||||||
|
}
|
||||||
|
if (['uploaded', 'parsing'].includes(String(doc.status || '').toLowerCase())) {
|
||||||
|
return { tone: 'pending', label: '处理中', detail: '正在解析并建立知识索引' }
|
||||||
|
}
|
||||||
|
return { tone: 'failed', label: '处理失败', detail: '未能建立知识索引,请删除后重新上传' }
|
||||||
|
}
|
||||||
|
|
||||||
const loadDocs = async () => {
|
const loadDocs = async () => {
|
||||||
if (!avatarId.value) return
|
if (!avatarId.value) return
|
||||||
try {
|
try {
|
||||||
@@ -200,9 +216,21 @@ const toggleQa = async (qa: any, e: Event) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const goAddQa = () => router.push('/knowledge/qa/create')
|
const goAddQa = () => {
|
||||||
|
if (route.params.avatarId && avatarId.value) {
|
||||||
|
router.push({ name: 'AvatarQaPairCreate', params: { avatarId: avatarId.value } })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
router.push('/knowledge/qa/create')
|
||||||
|
}
|
||||||
|
|
||||||
const goEditQa = (qa: any) => router.push(`/knowledge/qa/${qa.id}/edit`)
|
const goEditQa = (qa: any) => {
|
||||||
|
if (route.params.avatarId && avatarId.value) {
|
||||||
|
router.push({ name: 'AvatarQaPairEdit', params: { avatarId: avatarId.value, qaId: qa.id } })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
router.push(`/knowledge/qa/${qa.id}/edit`)
|
||||||
|
}
|
||||||
|
|
||||||
const removeQa = async (id: string) => {
|
const removeQa = async (id: string) => {
|
||||||
if (!avatarId.value) return
|
if (!avatarId.value) return
|
||||||
@@ -226,6 +254,7 @@ onMounted(async () => {
|
|||||||
if (!store.avatars.length) {
|
if (!store.avatars.length) {
|
||||||
await store.loadAvatars()
|
await store.loadAvatars()
|
||||||
}
|
}
|
||||||
|
if (avatarId.value) store.currentAvatarId = avatarId.value
|
||||||
await Promise.all([loadDocs(), loadQA()])
|
await Promise.all([loadDocs(), loadQA()])
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
@@ -234,7 +263,7 @@ onMounted(async () => {
|
|||||||
.knowledge-page {
|
.knowledge-page {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background: #F8F9FA;
|
background: #F8F9FA;
|
||||||
padding-bottom: 80px;
|
padding-bottom: calc(28px + env(safe-area-inset-bottom));
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -258,20 +287,30 @@ onMounted(async () => {
|
|||||||
.tab-btn b { margin-left: 4px; font-size: 12px; color: #B0896C; }
|
.tab-btn b { margin-left: 4px; font-size: 12px; color: #B0896C; }
|
||||||
.tab-btn.active { background: white; border-color: #F97316; color: #F97316; font-weight: 700; }
|
.tab-btn.active { background: white; border-color: #F97316; color: #F97316; font-weight: 700; }
|
||||||
.tab-btn.active b { color: #F97316; }
|
.tab-btn.active b { color: #F97316; }
|
||||||
.knowledge-panel { padding: 0 20px; }
|
.knowledge-panel { min-width: 0; padding: 0 16px; }
|
||||||
.panel-heading { display: flex; align-items: center; justify-content: space-between; gap: 16px; padding: 18px 0 12px; }
|
.panel-heading { display: flex; align-items: center; justify-content: space-between; gap: 16px; padding: 18px 0 12px; }
|
||||||
.panel-heading p { margin: -5px 0 0; color: #9398AE; font-size: 12px; }
|
.panel-heading p { margin: -5px 0 0; color: #9398AE; font-size: 12px; }
|
||||||
.table-scroll { max-height: 420px; overflow: auto; border: 1px solid #F1E1D3; border-radius: 14px; background: white; }
|
.mobile-card-list { display: grid; grid-template-columns: minmax(0, 1fr); width: 100%; min-width: 0; gap: 10px; }
|
||||||
.knowledge-table { width: 100%; min-width: 720px; border-collapse: collapse; text-align: left; font-size: 13px; }
|
.knowledge-card { display: flex; align-items: center; width: 100%; min-width: 0; box-sizing: border-box; gap: 11px; padding: 14px; background: #fff; border: 1px solid #F1E1D3; border-radius: 16px; box-shadow: 0 5px 16px rgba(112, 62, 22, .04); }
|
||||||
.knowledge-table th { position: sticky; top: 0; z-index: 1; padding: 12px 14px; background: #FFF8F1; color: #8B6B58; font-weight: 600; white-space: nowrap; }
|
.card-icon { flex: 0 0 auto; width: 42px; height: 42px; display: grid; place-items: center; border-radius: 13px; background: #FFF3E6; font-size: 22px; }
|
||||||
.knowledge-table td { padding: 13px 14px; border-top: 1px solid #F5EEE7; color: #6B7280; vertical-align: middle; }
|
.card-content { min-width: 0; flex: 1; overflow: hidden; }
|
||||||
.knowledge-table tr.qa-disabled { opacity: .55; }
|
.card-title-row { display: flex; align-items: center; gap: 8px; min-width: 0; }
|
||||||
.file-cell { display: flex; align-items: center; gap: 9px; min-width: 190px; color: #27201C; }.file-cell strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
.card-title-row strong { min-width: 0; flex: 1; overflow: hidden; color: #27201C; font-size: 14px; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
.status-pill { display: inline-flex; padding: 4px 8px; border-radius: 999px; color: #15803D; background: #ECFDF3; font-size: 11px; white-space: nowrap; }.status-pill.pending { color: #B45309; background: #FFFBEB; }
|
.status-pill { flex: 0 0 auto; display: inline-flex; padding: 4px 7px; border-radius: 999px; color: #15803D; background: #ECFDF3; font-size: 10px; white-space: nowrap; }.status-pill.pending { color: #B45309; background: #FFFBEB; }
|
||||||
.table-delete { border: 0; color: #EF4444; background: #FEF2F2; border-radius: 7px; padding: 6px 10px; cursor: pointer; }
|
.status-pill.missing { color: #B91C1C; background: #FEF2F2; }
|
||||||
.table-empty { padding: 48px 20px; color: #9398AE; text-align: center; }
|
.status-pill.failed { color: #B91C1C; background: #FEF2F2; }
|
||||||
.question-cell { min-width: 190px; max-width: 280px; color: #27201C !important; font-weight: 600; }.answer-cell { min-width: 240px; max-width: 360px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
.card-meta, .card-detail { margin: 5px 0 0; color: #9398AE; font-size: 11px; line-height: 1.4; }.card-detail { color: #8B6B58; }
|
||||||
.row-actions { display: flex; gap: 6px; white-space: nowrap; }
|
.card-delete { flex: 0 0 auto; align-self: center; border: 0; color: #EF4444; background: #FEF2F2; border-radius: 8px; padding: 7px 9px; font-size: 12px; cursor: pointer; }
|
||||||
|
.card-empty { padding: 42px 16px; border: 1px dashed #F1D9C3; border-radius: 16px; color: #9398AE; background: #fff; font-size: 14px; text-align: center; }
|
||||||
|
.qa-card { align-items: stretch; text-align: left; }.qa-card.qa-disabled { opacity: .58; }
|
||||||
|
.qa-card .card-content,
|
||||||
|
.qa-card .qa-question,
|
||||||
|
.qa-card .qa-answer,
|
||||||
|
.qa-card .card-meta,
|
||||||
|
.qa-card .qa-card-actions { text-align: left; }
|
||||||
|
.qa-card-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 8px; }.qa-label { color: #C15F18; font-size: 11px; font-weight: 700; }
|
||||||
|
.qa-question { display: block; color: #27201C; font-size: 15px; line-height: 1.5; }.qa-answer { display: -webkit-box; margin: 7px 0 0; overflow: hidden; color: #6B7280; font-size: 13px; line-height: 1.55; -webkit-box-orient: vertical; -webkit-line-clamp: 3; }
|
||||||
|
.qa-card-actions { display: flex; gap: 8px; margin-top: 11px; }
|
||||||
|
|
||||||
.page-header {
|
.page-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -304,7 +343,7 @@ onMounted(async () => {
|
|||||||
|
|
||||||
/* 上传区 */
|
/* 上传区 */
|
||||||
.upload-section {
|
.upload-section {
|
||||||
padding: 16px 20px;
|
padding: 16px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.upload-zone {
|
.upload-zone {
|
||||||
@@ -369,7 +408,7 @@ onMounted(async () => {
|
|||||||
.docs-section,
|
.docs-section,
|
||||||
.qa-section,
|
.qa-section,
|
||||||
.search-section {
|
.search-section {
|
||||||
padding: 0 20px 16px;
|
padding: 16px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.section-title {
|
.section-title {
|
||||||
@@ -455,6 +494,7 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.search-input {
|
.search-input {
|
||||||
|
min-width: 0;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
border: 1px solid #E5E7EB;
|
border: 1px solid #E5E7EB;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
@@ -483,6 +523,19 @@ onMounted(async () => {
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 520px) {
|
||||||
|
.knowledge-panel { padding: 0 12px; }
|
||||||
|
.knowledge-card { display: grid; grid-template-columns: 42px minmax(0, 1fr); align-items: start; gap: 10px; padding: 13px; }
|
||||||
|
.card-content { grid-column: 2; }
|
||||||
|
.card-delete { grid-column: 2; justify-self: end; margin-top: -2px; }
|
||||||
|
.qa-card { display: block; }
|
||||||
|
.qa-card .card-content { width: 100%; grid-column: 1; }
|
||||||
|
.card-title-row { align-items: flex-start; flex-wrap: wrap; gap: 5px 7px; }
|
||||||
|
.status-pill { order: 2; }
|
||||||
|
.search-bar { gap: 8px; }
|
||||||
|
.search-btn { width: 68px; }
|
||||||
|
}
|
||||||
|
|
||||||
.search-btn:disabled {
|
.search-btn:disabled {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
|
|||||||
@@ -10,10 +10,12 @@
|
|||||||
<section class="form-section">
|
<section class="form-section">
|
||||||
<label class="field-label">问题</label>
|
<label class="field-label">问题</label>
|
||||||
<textarea
|
<textarea
|
||||||
|
ref="questionInput"
|
||||||
v-model="form.question"
|
v-model="form.question"
|
||||||
class="field-input"
|
class="field-input question-input"
|
||||||
rows="3"
|
rows="1"
|
||||||
placeholder="例如:你们的退款政策是什么?"
|
placeholder="例如:你们的退款政策是什么?"
|
||||||
|
@input="resizeQuestion"
|
||||||
></textarea>
|
></textarea>
|
||||||
|
|
||||||
<label class="field-label">标准答案</label>
|
<label class="field-label">标准答案</label>
|
||||||
@@ -46,23 +48,31 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, reactive, computed, onMounted } from 'vue'
|
import { ref, reactive, computed, nextTick, onMounted } from 'vue'
|
||||||
import { useRouter, useRoute } from 'vue-router'
|
import { useRouter, useRoute } from 'vue-router'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
import { pickAvatarId, unwrapListData } from '@/utils/avatar-page-data.js'
|
import { pickScopedAvatarId, unwrapListData } from '@/utils/avatar-page-data.js'
|
||||||
import { getQAPairs, createQAPair, updateQAPair } from '@/api'
|
import { getQAPairs, createQAPair, updateQAPair } from '@/api'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const store = useAvatarStore()
|
const store = useAvatarStore()
|
||||||
|
|
||||||
const avatarId = computed(() => pickAvatarId(store.currentAvatarId, store.avatars))
|
const avatarId = computed(() => pickScopedAvatarId(route.params.avatarId, store.currentAvatarId, store.avatars))
|
||||||
const qaId = computed(() => (route.params.qaId as string) || null)
|
const qaId = computed(() => (route.params.qaId as string) || null)
|
||||||
const isEdit = computed(() => !!qaId.value)
|
const isEdit = computed(() => !!qaId.value)
|
||||||
|
|
||||||
const form = reactive({ question: '', answer: '', enabled: true })
|
const form = reactive({ question: '', answer: '', enabled: true })
|
||||||
const saving = ref(false)
|
const saving = ref(false)
|
||||||
const error = ref('')
|
const error = ref('')
|
||||||
|
const questionInput = ref<HTMLTextAreaElement | null>(null)
|
||||||
|
|
||||||
|
const resizeQuestion = (event?: Event) => {
|
||||||
|
const element = (event?.target as HTMLTextAreaElement | null) || questionInput.value
|
||||||
|
if (!element) return
|
||||||
|
element.style.height = 'auto'
|
||||||
|
element.style.height = `${element.scrollHeight}px`
|
||||||
|
}
|
||||||
|
|
||||||
const goBack = () => router.back()
|
const goBack = () => router.back()
|
||||||
|
|
||||||
@@ -104,8 +114,11 @@ const save = async () => {
|
|||||||
} else {
|
} else {
|
||||||
await createQAPair(avatarId.value, payload)
|
await createQAPair(avatarId.value, payload)
|
||||||
}
|
}
|
||||||
// 保存成功返回知识库管理页
|
if (route.params.avatarId) {
|
||||||
router.replace('/knowledge')
|
router.replace({ name: 'AvatarKnowledgeManage', params: { avatarId: avatarId.value } })
|
||||||
|
} else {
|
||||||
|
router.replace('/knowledge')
|
||||||
|
}
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
error.value = e?.message || '保存失败'
|
error.value = e?.message || '保存失败'
|
||||||
} finally {
|
} finally {
|
||||||
@@ -117,9 +130,12 @@ onMounted(async () => {
|
|||||||
if (!store.avatars.length) {
|
if (!store.avatars.length) {
|
||||||
await store.loadAvatars()
|
await store.loadAvatars()
|
||||||
}
|
}
|
||||||
|
if (avatarId.value) store.currentAvatarId = avatarId.value
|
||||||
if (isEdit.value) {
|
if (isEdit.value) {
|
||||||
await loadForEdit()
|
await loadForEdit()
|
||||||
}
|
}
|
||||||
|
await nextTick()
|
||||||
|
resizeQuestion()
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -190,6 +206,13 @@ onMounted(async () => {
|
|||||||
border-color: #F97316;
|
border-color: #F97316;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.question-input {
|
||||||
|
min-height: 44px;
|
||||||
|
overflow: hidden;
|
||||||
|
resize: none;
|
||||||
|
line-height: 1.55;
|
||||||
|
}
|
||||||
|
|
||||||
.switch-row {
|
.switch-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { reactive, ref, computed, onUnmounted } from 'vue'
|
import { reactive, ref, computed, onMounted, onUnmounted } from 'vue'
|
||||||
import { useRouter, useRoute } from 'vue-router'
|
import { useRouter, useRoute } from 'vue-router'
|
||||||
import { useUserStore } from '@/store/user'
|
import { useUserStore } from '@/store/user'
|
||||||
import { useAvatarStore } from '@/store/avatar'
|
import { useAvatarStore } from '@/store/avatar'
|
||||||
@@ -161,6 +161,14 @@ const password = ref('')
|
|||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const errorMsg = ref('')
|
const errorMsg = ref('')
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
const ssoError = sessionStorage.getItem('hh_sso_error')
|
||||||
|
if (ssoError) {
|
||||||
|
errorMsg.value = ssoError
|
||||||
|
sessionStorage.removeItem('hh_sso_error')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
const counting = ref(false)
|
const counting = ref(false)
|
||||||
const countdown = ref(60)
|
const countdown = ref(60)
|
||||||
let timer: any = null
|
let timer: any = null
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<!-- 顶部导航 -->
|
<!-- 顶部导航 -->
|
||||||
<header class="page-header">
|
<header class="page-header">
|
||||||
<button class="back-btn" @click="goBack">‹</button>
|
<button class="back-btn" @click="goBack">‹</button>
|
||||||
<h1 class="page-title">Token 充值</h1>
|
<h1 class="page-title">积分充值</h1>
|
||||||
<div class="header-right"></div>
|
<div class="header-right"></div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@@ -12,7 +12,8 @@
|
|||||||
<div class="balance-card">
|
<div class="balance-card">
|
||||||
<span class="balance-label">当前余额</span>
|
<span class="balance-label">当前余额</span>
|
||||||
<span class="balance-amount">{{ currentBalance.toLocaleString() }}</span>
|
<span class="balance-amount">{{ currentBalance.toLocaleString() }}</span>
|
||||||
<span class="balance-unit">Token</span>
|
<span class="balance-unit">积分</span>
|
||||||
|
<span class="balance-used">累计使用 {{ totalConsumed.toLocaleString() }} 积分</span>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -28,10 +29,10 @@
|
|||||||
@click="selectedPlan = plan"
|
@click="selectedPlan = plan"
|
||||||
>
|
>
|
||||||
<div class="plan-badge" v-if="plan.badge">{{ plan.badge }}</div>
|
<div class="plan-badge" v-if="plan.badge">{{ plan.badge }}</div>
|
||||||
<div class="plan-amount">{{ plan.amount.toLocaleString() }}</div>
|
<div class="plan-amount">{{ formatTokenAmount(plan.amount) }}</div>
|
||||||
<div class="plan-unit">Token</div>
|
<div class="plan-unit">积分</div>
|
||||||
<div class="plan-price">¥{{ plan.price }}</div>
|
<div class="plan-price">¥{{ plan.price }}</div>
|
||||||
<div class="plan-desc" v-if="plan.desc">{{ plan.desc }}</div>
|
<div class="plan-desc" v-if="plan.desc">{{ formatPointsCopy(plan.desc) }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
@@ -45,7 +46,7 @@
|
|||||||
:class="{ selected: paymentMethod === 'wechat' }"
|
:class="{ selected: paymentMethod === 'wechat' }"
|
||||||
@click="paymentMethod = 'wechat'"
|
@click="paymentMethod = 'wechat'"
|
||||||
>
|
>
|
||||||
<span class="payment-icon">💚</span>
|
<span class="payment-icon wechat-icon"><img :src="wechatPayIcon" alt="" /></span>
|
||||||
<span class="payment-name">微信支付</span>
|
<span class="payment-name">微信支付</span>
|
||||||
<span class="payment-check" v-if="paymentMethod === 'wechat'">✓</span>
|
<span class="payment-check" v-if="paymentMethod === 'wechat'">✓</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -54,36 +55,47 @@
|
|||||||
:class="{ selected: paymentMethod === 'alipay' }"
|
:class="{ selected: paymentMethod === 'alipay' }"
|
||||||
@click="paymentMethod = 'alipay'"
|
@click="paymentMethod = 'alipay'"
|
||||||
>
|
>
|
||||||
<span class="payment-icon">💙</span>
|
<span class="payment-icon alipay-icon"><img :src="alipayIcon" alt="" /></span>
|
||||||
<span class="payment-name">支付宝</span>
|
<span class="payment-name">支付宝</span>
|
||||||
<span class="payment-check" v-if="paymentMethod === 'alipay'">✓</span>
|
<span class="payment-check" v-if="paymentMethod === 'alipay'">✓</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<p v-if="paymentNotice" class="payment-notice" :class="paymentNoticeTone">{{ paymentNotice }}</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- 充值按钮 -->
|
<!-- 充值按钮 -->
|
||||||
<section class="checkout-section">
|
<section class="checkout-section">
|
||||||
<button
|
<button
|
||||||
class="checkout-btn"
|
class="checkout-btn"
|
||||||
:class="{ disabled: !selectedPlan }"
|
:class="{ disabled: !selectedPlan || charging || Boolean(pendingOrderId) }"
|
||||||
:disabled="!selectedPlan"
|
:disabled="!selectedPlan || charging || Boolean(pendingOrderId)"
|
||||||
@click="doCharge"
|
@click="doCharge"
|
||||||
>
|
>
|
||||||
{{ selectedPlan ? `立即支付 ¥${selectedPlan.price}` : '请选择充值套餐' }}
|
{{ checkoutLabel }}
|
||||||
</button>
|
</button>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted } from 'vue'
|
import { computed, onMounted, onUnmounted, ref } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { getTokenBalance, getRechargePlans, chargeToken } from '@/api'
|
import {
|
||||||
|
chargeToken,
|
||||||
|
getRechargePlans,
|
||||||
|
getTokenBalance,
|
||||||
|
getTokenPaymentStatus,
|
||||||
|
type TokenPaymentOrder
|
||||||
|
} from '@/api'
|
||||||
|
import { isInUniWebView, onNativeMessage, UniEvents } from '@/utils/uniapp-bridge'
|
||||||
|
import wechatPayIcon from '@/assets/wechat-pay.svg'
|
||||||
|
import alipayIcon from '@/assets/alipay.svg'
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
// 当前余额
|
// 当前余额
|
||||||
const currentBalance = ref<number>(1250)
|
const currentBalance = ref<number>(0)
|
||||||
|
const totalConsumed = ref<number>(0)
|
||||||
|
|
||||||
// 充值套餐
|
// 充值套餐
|
||||||
const plans = ref<Array<{
|
const plans = ref<Array<{
|
||||||
@@ -99,12 +111,19 @@ const selectedPlan = ref<any>(null)
|
|||||||
|
|
||||||
// 支付方式
|
// 支付方式
|
||||||
const paymentMethod = ref<'wechat' | 'alipay'>('wechat')
|
const paymentMethod = ref<'wechat' | 'alipay'>('wechat')
|
||||||
|
const paymentNotice = ref('')
|
||||||
|
const paymentNoticeTone = ref<'pending' | 'success' | 'error'>('pending')
|
||||||
|
const pendingOrderId = ref(sessionStorage.getItem('hh_pending_payment_order') || '')
|
||||||
|
let pollTimer: number | undefined
|
||||||
|
let pollDeadline = 0
|
||||||
|
let removeNativeListener: (() => void) | undefined
|
||||||
|
|
||||||
// 从后端加载余额与套餐
|
// 从后端加载余额与套餐
|
||||||
const loadData = async () => {
|
const loadData = async () => {
|
||||||
try {
|
try {
|
||||||
const b: any = await getTokenBalance()
|
const b: any = await getTokenBalance()
|
||||||
currentBalance.value = b?.balance ?? 0
|
currentBalance.value = b?.balance ?? 0
|
||||||
|
totalConsumed.value = b?.totalConsumed ?? 0
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('加载余额失败', e)
|
console.error('加载余额失败', e)
|
||||||
}
|
}
|
||||||
@@ -116,18 +135,144 @@ const loadData = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 执行充值(写入后端)
|
// 会会支付订单创建与到账确认
|
||||||
const charging = ref(false)
|
const charging = ref(false)
|
||||||
|
const formatTokenAmount = (amount: number) => {
|
||||||
|
if (amount >= 1_000_000 && amount % 1_000_000 === 0) return `${amount / 1_000_000}M`
|
||||||
|
return amount.toLocaleString()
|
||||||
|
}
|
||||||
|
const formatPointsCopy = (value: string) => value.replace(/\bToken\b/gi, '积分')
|
||||||
|
|
||||||
|
const checkoutLabel = computed(() => {
|
||||||
|
if (!selectedPlan.value) return '请选择充值套餐'
|
||||||
|
if (charging.value) return '正在创建支付订单…'
|
||||||
|
if (pendingOrderId.value) return '等待支付结果…'
|
||||||
|
return `立即支付 ¥${selectedPlan.value.price}`
|
||||||
|
})
|
||||||
|
|
||||||
|
const payScene = () => {
|
||||||
|
if (paymentMethod.value === 'wechat' && /MicroMessenger/i.test(navigator.userAgent)) return 'JSAPI' as const
|
||||||
|
return 'APP' as const
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsePayMessage = (message: string) => {
|
||||||
|
const text = (message || '').trim()
|
||||||
|
if (!text) return null
|
||||||
|
try {
|
||||||
|
return JSON.parse(text)
|
||||||
|
} catch {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const findPaymentUrl = (value: any): string => {
|
||||||
|
if (typeof value === 'string' && /^https?:\/\//i.test(value)) return value
|
||||||
|
if (!value || typeof value !== 'object') return ''
|
||||||
|
for (const key of ['url', 'payUrl', 'mwebUrl', 'mweb_url', 'redirectUrl']) {
|
||||||
|
if (typeof value[key] === 'string' && /^https?:\/\//i.test(value[key])) return value[key]
|
||||||
|
}
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const invokeWechatJsapi = (params: Record<string, any>) => new Promise<void>((resolve, reject) => {
|
||||||
|
const invoke = () => {
|
||||||
|
const bridge = (window as any).WeixinJSBridge
|
||||||
|
if (!bridge?.invoke) {
|
||||||
|
reject(new Error('当前微信环境无法拉起支付'))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bridge.invoke('getBrandWCPayRequest', params, (result: any) => {
|
||||||
|
const message = String(result?.err_msg || result?.errMsg || '')
|
||||||
|
if (/\bok\b/i.test(message)) resolve()
|
||||||
|
else reject(new Error(/cancel/i.test(message) ? '支付已取消' : '微信支付未完成'))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if ((window as any).WeixinJSBridge) invoke()
|
||||||
|
else document.addEventListener('WeixinJSBridgeReady', invoke, { once: true })
|
||||||
|
})
|
||||||
|
|
||||||
|
const launchPayment = async (order: TokenPaymentOrder) => {
|
||||||
|
const parsed = parsePayMessage(order.payMessage)
|
||||||
|
if (order.payWay === 'JSAPI' && order.paymentMethod === 'wechat' && parsed && typeof parsed === 'object') {
|
||||||
|
await invokeWechatJsapi(parsed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (isInUniWebView() && UniEvents.payment({
|
||||||
|
orderId: order.id,
|
||||||
|
orderNo: order.orderNo,
|
||||||
|
paymentMethod: order.paymentMethod,
|
||||||
|
payType: order.payType,
|
||||||
|
payWay: order.payWay,
|
||||||
|
payMessage: order.payMessage,
|
||||||
|
paymentParams: parsed
|
||||||
|
})) return
|
||||||
|
|
||||||
|
const paymentUrl = findPaymentUrl(parsed)
|
||||||
|
if (paymentUrl) {
|
||||||
|
window.location.assign(paymentUrl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw new Error('请在会会 App 内完成支付')
|
||||||
|
}
|
||||||
|
|
||||||
|
const clearPendingOrder = () => {
|
||||||
|
pendingOrderId.value = ''
|
||||||
|
sessionStorage.removeItem('hh_pending_payment_order')
|
||||||
|
if (pollTimer) window.clearTimeout(pollTimer)
|
||||||
|
pollTimer = undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const pollPayment = async () => {
|
||||||
|
if (!pendingOrderId.value) return
|
||||||
|
try {
|
||||||
|
const order = await getTokenPaymentStatus(pendingOrderId.value)
|
||||||
|
if (order.status === 'paid') {
|
||||||
|
currentBalance.value = order.balance
|
||||||
|
paymentNoticeTone.value = 'success'
|
||||||
|
paymentNotice.value = `支付成功,${order.pointsAmount.toLocaleString()} 积分已到账`
|
||||||
|
clearPendingOrder()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (order.status === 'failed') {
|
||||||
|
paymentNoticeTone.value = 'error'
|
||||||
|
paymentNotice.value = order.failureReason || '支付未完成,请重新发起'
|
||||||
|
clearPendingOrder()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('查询支付结果失败', error)
|
||||||
|
}
|
||||||
|
if (Date.now() < pollDeadline) pollTimer = window.setTimeout(pollPayment, 2000)
|
||||||
|
else {
|
||||||
|
paymentNoticeTone.value = 'pending'
|
||||||
|
paymentNotice.value = '支付结果仍在确认中,可稍后刷新余额或重新发起'
|
||||||
|
clearPendingOrder()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const startPolling = (orderId: string) => {
|
||||||
|
pendingOrderId.value = orderId
|
||||||
|
sessionStorage.setItem('hh_pending_payment_order', orderId)
|
||||||
|
pollDeadline = Date.now() + 2 * 60 * 1000
|
||||||
|
if (pollTimer) window.clearTimeout(pollTimer)
|
||||||
|
void pollPayment()
|
||||||
|
}
|
||||||
|
|
||||||
const doCharge = async () => {
|
const doCharge = async () => {
|
||||||
if (!selectedPlan.value || charging.value) return
|
if (!selectedPlan.value || charging.value) return
|
||||||
charging.value = true
|
charging.value = true
|
||||||
|
paymentNotice.value = ''
|
||||||
try {
|
try {
|
||||||
const methodText = paymentMethod.value === 'wechat' ? '微信支付' : '支付宝'
|
const order = await chargeToken(selectedPlan.value.id, paymentMethod.value, payScene())
|
||||||
const res: any = await chargeToken(selectedPlan.value.id)
|
if (order.status === 'failed') throw new Error(order.failureReason || '支付订单创建失败')
|
||||||
currentBalance.value = res?.balance ?? currentBalance.value
|
paymentNoticeTone.value = 'pending'
|
||||||
alert(`已通过${methodText}成功充值,当前余额:${currentBalance.value} Token`)
|
paymentNotice.value = '支付订单已创建,正在等待付款结果'
|
||||||
} catch (e) {
|
startPolling(order.id)
|
||||||
alert('充值失败,请重试')
|
await launchPayment(order)
|
||||||
|
} catch (error: any) {
|
||||||
|
paymentNoticeTone.value = 'error'
|
||||||
|
paymentNotice.value = error?.message || '充值失败,请重试'
|
||||||
|
clearPendingOrder()
|
||||||
} finally {
|
} finally {
|
||||||
charging.value = false
|
charging.value = false
|
||||||
}
|
}
|
||||||
@@ -139,7 +284,33 @@ const goBack = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadData()
|
void loadData()
|
||||||
|
removeNativeListener = onNativeMessage((message) => {
|
||||||
|
if (message?.type !== 'paymentResult') return
|
||||||
|
if (message.orderId && message.orderId !== pendingOrderId.value) return
|
||||||
|
if (['cancelled', 'canceled'].includes(String(message.status).toLowerCase())) {
|
||||||
|
paymentNoticeTone.value = 'error'
|
||||||
|
paymentNotice.value = '支付已取消'
|
||||||
|
clearPendingOrder()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (String(message.status).toLowerCase() === 'failed') {
|
||||||
|
paymentNoticeTone.value = 'error'
|
||||||
|
paymentNotice.value = message.message || '支付未完成,请重新发起'
|
||||||
|
clearPendingOrder()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
void pollPayment()
|
||||||
|
})
|
||||||
|
if (pendingOrderId.value) {
|
||||||
|
paymentNotice.value = '正在确认上一笔支付结果'
|
||||||
|
startPolling(pendingOrderId.value)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (pollTimer) window.clearTimeout(pollTimer)
|
||||||
|
removeNativeListener?.()
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -187,6 +358,7 @@ onMounted(() => {
|
|||||||
|
|
||||||
.balance-card {
|
.balance-card {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
@@ -211,6 +383,12 @@ onMounted(() => {
|
|||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.balance-used {
|
||||||
|
flex-basis: 100%;
|
||||||
|
font-size: 12px;
|
||||||
|
opacity: 0.82;
|
||||||
|
}
|
||||||
|
|
||||||
/* 充值套餐 */
|
/* 充值套餐 */
|
||||||
.plans-section {
|
.plans-section {
|
||||||
padding: 0 20px 20px;
|
padding: 0 20px 20px;
|
||||||
@@ -319,7 +497,24 @@ onMounted(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.payment-icon {
|
.payment-icon {
|
||||||
font-size: 24px;
|
width: 38px;
|
||||||
|
height: 38px;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
border-radius: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-icon img {
|
||||||
|
width: 25px;
|
||||||
|
height: 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wechat-icon {
|
||||||
|
background: #EAF9F0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.alipay-icon {
|
||||||
|
background: #EAF3FF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.payment-name {
|
.payment-name {
|
||||||
@@ -342,6 +537,26 @@ onMounted(() => {
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.payment-notice {
|
||||||
|
margin: 12px 2px 0;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-radius: 10px;
|
||||||
|
color: #9A5B16;
|
||||||
|
background: #FFF5E8;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-notice.success {
|
||||||
|
color: #08783E;
|
||||||
|
background: #EAF9F0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.payment-notice.error {
|
||||||
|
color: #B42318;
|
||||||
|
background: #FFF0EE;
|
||||||
|
}
|
||||||
|
|
||||||
/* 充值按钮 */
|
/* 充值按钮 */
|
||||||
.checkout-section {
|
.checkout-section {
|
||||||
padding: 0 20px;
|
padding: 0 20px;
|
||||||
|
|||||||
Vendored
+1
@@ -0,0 +1 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
@@ -17,6 +17,7 @@ services:
|
|||||||
- REDIS_PORT=6379
|
- REDIS_PORT=6379
|
||||||
- SECRET_KEY=your-secret-key-change-in-production
|
- SECRET_KEY=your-secret-key-change-in-production
|
||||||
- AES_KEY=your-aes-key-32-chars-change-now!
|
- AES_KEY=your-aes-key-32-chars-change-now!
|
||||||
|
- AVATAR_MODEL_CONFIG_TOKEN=${AVATAR_MODEL_CONFIG_TOKEN:-}
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
- AVATAR_DB_PATH=/app/avatar.db
|
- AVATAR_DB_PATH=/app/avatar.db
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ CREATE TABLE IF NOT EXISTS `ai_model_configs` (
|
|||||||
`id` bigint NOT NULL AUTO_INCREMENT,
|
`id` bigint NOT NULL AUTO_INCREMENT,
|
||||||
`model_name` varchar(64) NOT NULL COMMENT '模型名称',
|
`model_name` varchar(64) NOT NULL COMMENT '模型名称',
|
||||||
`provider` varchar(32) NOT NULL COMMENT 'openai/zhipu/wenxin/qianwen/local',
|
`provider` varchar(32) NOT NULL COMMENT 'openai/zhipu/wenxin/qianwen/local',
|
||||||
|
`usage_scope` varchar(16) NOT NULL DEFAULT 'general' COMMENT '用途:general/digital_avatar',
|
||||||
`api_base_url` varchar(256) DEFAULT NULL COMMENT 'API地址',
|
`api_base_url` varchar(256) DEFAULT NULL COMMENT 'API地址',
|
||||||
`api_key_enc` varchar(512) DEFAULT NULL COMMENT '加密API Key',
|
`api_key_enc` varchar(512) DEFAULT NULL COMMENT '加密API Key',
|
||||||
`model_version` varchar(64) DEFAULT NULL COMMENT '模型版本',
|
`model_version` varchar(64) DEFAULT NULL COMMENT '模型版本',
|
||||||
|
|||||||
+2
-1
@@ -6,7 +6,8 @@ RUN npm install
|
|||||||
COPY . .
|
COPY . .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM nginx:alpine
|
# Nginx 1.31 uses syscalls that are blocked by the test server's legacy kernel.
|
||||||
|
FROM nginx:1.28.3-alpine
|
||||||
COPY --from=build /app/dist /usr/share/nginx/html
|
COPY --from=build /app/dist /usr/share/nginx/html
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|||||||
@@ -15,12 +15,17 @@
|
|||||||
<span class="model-title">{{ m.model_name }}</span>
|
<span class="model-title">{{ m.model_name }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex;gap:6px;align-items:center">
|
<div style="display:flex;gap:6px;align-items:center">
|
||||||
|
<el-tag :type="m.usage_scope === 'digital_avatar' ? 'warning' : 'info'" size="small">
|
||||||
|
{{ scopeLabels[m.usage_scope] || '通用业务' }}
|
||||||
|
</el-tag>
|
||||||
<el-tag v-if="m.is_default" type="success" size="small">默认</el-tag>
|
<el-tag v-if="m.is_default" type="success" size="small">默认</el-tag>
|
||||||
<el-tag v-if="!m.is_enabled" type="danger" size="small">禁用</el-tag>
|
<el-tag v-if="!m.is_enabled" type="danger" size="small">禁用</el-tag>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="model-meta">
|
<div class="model-meta">
|
||||||
<span>版本: {{ m.model_version || '--' }}</span>
|
<span>版本: {{ m.model_version || '--' }}</span>
|
||||||
|
<span v-if="m.usage_scope === 'digital_avatar'">视觉: {{ m.vision_model_version || 'qwen3.6-flash' }}</span>
|
||||||
|
<span v-if="m.usage_scope === 'digital_avatar'">病例OCR: {{ m.ocr_model_version || 'qwen-vl-ocr' }}</span>
|
||||||
<span>温度: {{ m.temperature }}</span>
|
<span>温度: {{ m.temperature }}</span>
|
||||||
<span>Max Tokens: {{ m.max_tokens }}</span>
|
<span>Max Tokens: {{ m.max_tokens }}</span>
|
||||||
<span>超时: {{ m.timeout_seconds }}s</span>
|
<span>超时: {{ m.timeout_seconds }}s</span>
|
||||||
@@ -49,6 +54,13 @@
|
|||||||
<el-option v-for="(l,v) in providerLabels" :key="v" :label="l" :value="v" />
|
<el-option v-for="(l,v) in providerLabels" :key="v" :label="l" :value="v" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="使用场景" prop="usage_scope">
|
||||||
|
<el-radio-group v-model="form.usage_scope">
|
||||||
|
<el-radio-button value="general">通用业务</el-radio-button>
|
||||||
|
<el-radio-button value="digital_avatar">数字分身专用</el-radio-button>
|
||||||
|
</el-radio-group>
|
||||||
|
<div class="scope-tip">数字分身专用模型仅用于分身对话和主动接管回复</div>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="API地址">
|
<el-form-item label="API地址">
|
||||||
<el-input v-model="form.api_base_url" placeholder="留空使用默认地址" />
|
<el-input v-model="form.api_base_url" placeholder="留空使用默认地址" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -58,6 +70,15 @@
|
|||||||
<el-form-item label="模型版本">
|
<el-form-item label="模型版本">
|
||||||
<el-input v-model="form.model_version" placeholder="如: gpt-4-turbo, glm-4" />
|
<el-input v-model="form.model_version" placeholder="如: gpt-4-turbo, glm-4" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<template v-if="form.usage_scope === 'digital_avatar'">
|
||||||
|
<el-form-item label="视觉模型">
|
||||||
|
<el-input v-model="form.vision_model_version" placeholder="如: qwen3.6-flash" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="病例OCR模型">
|
||||||
|
<el-input v-model="form.ocr_model_version" placeholder="如: qwen-vl-ocr" />
|
||||||
|
<div class="scope-tip">识别为病例、处方、检查单后自动调用,普通图片不会重复调用。</div>
|
||||||
|
</el-form-item>
|
||||||
|
</template>
|
||||||
<el-row :gutter="16">
|
<el-row :gutter="16">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="温度">
|
<el-form-item label="温度">
|
||||||
@@ -131,8 +152,9 @@ const testResult = ref(null)
|
|||||||
const testing = ref(false)
|
const testing = ref(false)
|
||||||
|
|
||||||
const providerLabels = { openai: 'OpenAI', zhipu: '智谱GLM', wenxin: '文心一言', qianwen: '通义千问', local: '本地模型' }
|
const providerLabels = { openai: 'OpenAI', zhipu: '智谱GLM', wenxin: '文心一言', qianwen: '通义千问', local: '本地模型' }
|
||||||
const form = reactive({ model_name: '', provider: 'openai', api_base_url: '', api_key: '', model_version: '', temperature: 0.7, max_tokens: 1000, timeout_seconds: 30, is_default: 0 })
|
const scopeLabels = { general: '通用业务', digital_avatar: '数字分身专用' }
|
||||||
const rules = { model_name: [{ required: true, message: '请输入模型名称' }], provider: [{ required: true }] }
|
const form = reactive({ model_name: '', provider: 'openai', usage_scope: 'general', api_base_url: '', api_key: '', model_version: '', vision_model_version: 'qwen3.6-flash', ocr_model_version: 'qwen-vl-ocr', temperature: 0.7, max_tokens: 1000, timeout_seconds: 30, is_default: 0 })
|
||||||
|
const rules = { model_name: [{ required: true, message: '请输入模型名称' }], provider: [{ required: true }], usage_scope: [{ required: true }] }
|
||||||
|
|
||||||
async function load() {
|
async function load() {
|
||||||
const res = await getAIModels()
|
const res = await getAIModels()
|
||||||
@@ -155,13 +177,13 @@ function onProviderChange(provider) {
|
|||||||
|
|
||||||
function openCreate() {
|
function openCreate() {
|
||||||
editModel.value = null
|
editModel.value = null
|
||||||
Object.assign(form, { model_name: '', provider: 'openai', api_base_url: PROVIDER_DEFAULTS.openai.api_base_url, api_key: '', model_version: PROVIDER_DEFAULTS.openai.model_version, temperature: 0.7, max_tokens: 1000, timeout_seconds: 30, is_default: 0 })
|
Object.assign(form, { model_name: '', provider: 'openai', usage_scope: 'general', api_base_url: PROVIDER_DEFAULTS.openai.api_base_url, api_key: '', model_version: PROVIDER_DEFAULTS.openai.model_version, vision_model_version: 'qwen3.6-flash', ocr_model_version: 'qwen-vl-ocr', temperature: 0.7, max_tokens: 1000, timeout_seconds: 30, is_default: 0 })
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
function openEdit(m) {
|
function openEdit(m) {
|
||||||
editModel.value = m
|
editModel.value = m
|
||||||
Object.assign(form, { model_name: m.model_name, provider: m.provider, api_base_url: m.api_base_url || '', api_key: '', model_version: m.model_version || '', temperature: m.temperature, max_tokens: m.max_tokens, timeout_seconds: m.timeout_seconds, is_default: m.is_default })
|
Object.assign(form, { model_name: m.model_name, provider: m.provider, usage_scope: m.usage_scope || 'general', api_base_url: m.api_base_url || '', api_key: '', model_version: m.model_version || '', vision_model_version: m.vision_model_version || 'qwen3.6-flash', ocr_model_version: m.ocr_model_version || 'qwen-vl-ocr', temperature: m.temperature, max_tokens: m.max_tokens, timeout_seconds: m.timeout_seconds, is_default: m.is_default })
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,4 +258,5 @@ onMounted(load)
|
|||||||
.result-meta { display: flex; align-items: center; gap: 10px; margin-bottom: 10px; }
|
.result-meta { display: flex; align-items: center; gap: 10px; margin-bottom: 10px; }
|
||||||
.result-content { background: var(--color-bg); border: 1px solid var(--color-border); border-radius: 8px; padding: 12px; font-size: 13px; line-height: 1.6; white-space: pre-wrap; max-height: 200px; overflow-y: auto; }
|
.result-content { background: var(--color-bg); border: 1px solid var(--color-border); border-radius: 8px; padding: 12px; font-size: 13px; line-height: 1.6; white-space: pre-wrap; max-height: 200px; overflow-y: auto; }
|
||||||
.empty-state { grid-column: 1/-1; padding: 40px; }
|
.empty-state { grid-column: 1/-1; padding: 40px; }
|
||||||
|
.scope-tip { margin-top: 6px; color: var(--color-text-muted); font-size: 12px; line-height: 1.5; }
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ H5 引入 uniapp web-view bridge 后调用:
|
|||||||
| `needLogin` | — | token 失效,请求壳重新登录 |
|
| `needLogin` | — | token 失效,请求壳重新登录 |
|
||||||
| `setTitle` | `title` | 设置原生导航栏标题 |
|
| `setTitle` | `title` | 设置原生导航栏标题 |
|
||||||
| `navigate` | `path` | 请求原生跳转(打开原生页/新 web-view) |
|
| `navigate` | `path` | 请求原生跳转(打开原生页/新 web-view) |
|
||||||
|
| `payment` | `payment` | 拉起会会原生支付;包含 `orderId/orderNo/payType/payWay/payMessage/paymentParams` |
|
||||||
| `back` | — | 请求原生返回 |
|
| `back` | — | 请求原生返回 |
|
||||||
|
|
||||||
### 2.3 原生 → H5(壳主动推送)
|
### 2.3 原生 → H5(壳主动推送)
|
||||||
@@ -63,9 +64,12 @@ H5 引入 uniapp web-view bridge 后调用:
|
|||||||
| `context` | `platform, version` | 注入运行环境信息 |
|
| `context` | `platform, version` | 注入运行环境信息 |
|
||||||
| `tokenRefresh` | `token` | 登录刷新后下发新 token |
|
| `tokenRefresh` | `token` | 登录刷新后下发新 token |
|
||||||
| `userUpdate` | `user` | 会会资料变更 |
|
| `userUpdate` | `user` | 会会资料变更 |
|
||||||
|
| `paymentResult` | `orderId,status` | 原生支付结束通知;`status` 为 `success/cancelled/failed` |
|
||||||
|
|
||||||
> H5 侧用 `onNativeMessage(cb)` 注册 `window.__uniBridgeHandle__`,见 `digital-avatar-app/src/utils/uniapp-bridge.ts`。
|
> H5 侧用 `onNativeMessage(cb)` 注册 `window.__uniBridgeHandle__`,见 `digital-avatar-app/src/utils/uniapp-bridge.ts`。
|
||||||
|
|
||||||
|
壳收到 `payment` 后应调用会会 App 已有的微信/支付宝支付能力(或 `uni.requestPayment`),把 `payMessage/paymentParams` 原样交给对应渠道。原生 SDK 返回后再发送 `paymentResult`;H5 不以原生返回作为到账依据,只会轮询本地订单,最终由会会服务端支付回调确认并增加积分。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 3. 项目结构(uni CLI / src 布局,已验证可编译)
|
## 3. 项目结构(uni CLI / src 布局,已验证可编译)
|
||||||
|
|||||||
Reference in New Issue
Block a user