Compare commits

...
Author SHA1 Message Date
stefanfeng e3cce871b0 fix: add avatar photo upload endpoint to digital-avatar-app backend
- Add POST /api/avatar/{id}/photo endpoint
- Save uploaded photos to UPLOAD_DIR/{avatar_id}/
- Update avatar.photo_url in database
- Import UPLOAD_DIR from knowledge router
2026-08-07 15:10:59 +08:00
stefanfeng b7f8ac203b feat: add avatar photo upload via Huihui filecenter
- Add POST /avatars/{id}/upload-photo endpoint
- Use Huihui platform's filecenter API for image upload (same signing mechanism as news_service)
- Add upload button in avatar list table
- Frontend: handleUploadPhoto function with el-upload component
- Updates avatar photo_url in SQLite after successful upload
2026-08-07 14:28:22 +08:00
stefanfeng a5f7c86a4b fix: avatar list table full-width and image fallback
- Changed fixed width columns to min-width for elastic layout
- Add @error handler on el-avatar to hide broken images and show emoji
- Detail dialog avatar also handles image load errors
2026-08-07 14:04:45 +08:00
stefanfeng 6026b1279e fix: avatar list fixes — full-width table, absolute photo URLs, global token balance
- Table width set to 100%
- Photo URLs resolved to absolute paths using AVATAR_BACKEND_URL
- Token balance now reads from global token_account table
- Config: added AVATAR_BACKEND_URL setting
2026-08-07 13:53:02 +08:00
stefanfeng 57af1c7db1 fix: gracefully handle missing avatar SQLite database
- Return empty list instead of crashing when avatar.db doesn't exist
- Add is_available() check before each endpoint
- 503 status when trying to access unavailable database
2026-08-06 17:52:01 +08:00
6 changed files with 270 additions and 18 deletions
+138 -2
View File
@@ -1,8 +1,14 @@
"""数字分身管理 API 端点"""
from fastapi import APIRouter, Query, HTTPException
from typing import Optional
import mimetypes
import uuid
from fastapi import APIRouter, Query, HTTPException, UploadFile, File
from fastapi.responses import JSONResponse
from app.schemas import ApiResponse
from app.services.avatar_service import avatar_service, get_session
from app.services.avatar_service import avatar_service, get_session, is_available
from app.core.database import AsyncSessionLocal
from app.core.config import settings
router = APIRouter()
@@ -15,6 +21,8 @@ def list_avatars(
status: str = Query(default=None),
):
"""分页查询所有数字分身"""
if not is_available():
return ApiResponse(data={"total": 0, "page": page, "page_size": page_size, "items": []})
db = get_session()
try:
total, items = avatar_service.list_avatars(
@@ -35,6 +43,8 @@ def list_avatars(
@router.get("/{avatar_id}")
def get_avatar(avatar_id: str):
"""获取单个数字分身详情"""
if not is_available():
raise HTTPException(status_code=503, detail="数字分身数据库尚未初始化")
db = get_session()
try:
data = avatar_service.get_avatar(db, avatar_id)
@@ -54,6 +64,8 @@ def update_avatar_status(avatar_id: str, body: dict):
status_code=400,
detail="status 必须是 active、inactive 或 training",
)
if not is_available():
raise HTTPException(status_code=503, detail="数字分身数据库尚未初始化")
db = get_session()
try:
data = avatar_service.update_status(db, avatar_id, status)
@@ -63,3 +75,127 @@ def update_avatar_status(avatar_id: str, body: dict):
return ApiResponse(data=data, message=msg)
finally:
db.close()
async def _upload_to_filecenter(file_bytes: bytes, filename: str) -> str:
"""利用会会平台 filecenter 上传头像,返回 URL"""
import httpx
import hashlib
import random
from datetime import datetime
async with AsyncSessionLocal() as db:
# 读取平台配置
from sqlalchemy import select
from app.models import SystemConfig
result = await db.execute(select(SystemConfig))
configs = {row.config_key: row.config_value for row in result.scalars().all()}
cfg = {
"appId": configs.get("platform_app_id", ""),
"accessId": configs.get("platform_access_id", ""),
"accessSecret": configs.get("platform_access_secret", ""),
}
biz_url = configs.get("news_platform_base_url", "http://192.168.1.200:63120")
if not cfg["accessSecret"]:
raise RuntimeError("平台 accessSecret 未配置")
# 构建签名参数
nonce = str(random.random())[2:][: random.randint(8, 12)]
timestamp = datetime.now().strftime("%Y%m%d%I%M%S")
sign_params = {
"appId": cfg["appId"],
"accessId": cfg["accessId"],
"timestamp": timestamp,
"nonce": nonce,
"module": "userInfo",
"service": "kccloud",
}
# 计算签名
keys = sorted(sign_params.keys())
sign_parts = []
for k in keys:
v = sign_params.get(k)
if v and v != "" and v != []:
sign_parts.append(f"{k}={v}")
sign_str = "&".join(sign_parts) + f"&accessSecret={cfg['accessSecret']}"
signature = hashlib.md5(sign_str.encode("utf-8")).hexdigest().upper()
# 构建 filecenter URL
filecenter_url = biz_url.replace("/huihuibusiness", "/filecenter")
if "/api/" in filecenter_url:
filecenter_url = filecenter_url.split("/api/", 1)[0] + "/api/filecenter"
else:
filecenter_url = filecenter_url.rstrip("/") + "/filecenter"
# 确定 MIME 类型
mime = mimetypes.guess_type(filename)[0] or "image/jpeg"
files = {"file": (filename, file_bytes, mime)}
# 发送请求
async with httpx.AsyncClient(timeout=30) as client:
r = await client.post(
f"{filecenter_url}/fileUpload",
files=files,
data={**sign_params, "signature": signature},
)
d = r.json()
if d.get("code") in [0, 200]:
url = d.get("data") or d.get("url") or ""
if isinstance(url, dict):
url = url.get("url") or url.get("path") or ""
if not url:
raise RuntimeError(f"filecenter 返回空 URL: {d}")
return url
raise RuntimeError(f"filecenter 上传失败: {d.get('message', '未知错误')}")
@router.post("/{avatar_id}/upload-photo")
async def upload_avatar_photo(
avatar_id: str,
file: UploadFile = File(...),
):
"""上传数字分身头像(通过会会平台 filecenter)"""
if not is_available():
raise HTTPException(status_code=503, detail="数字分身数据库尚未初始化")
# 验证文件
if not file.content_type or not file.content_type.startswith("image/"):
raise HTTPException(status_code=400, detail="仅支持图片文件")
file_bytes = await file.read()
if len(file_bytes) > 5 * 1024 * 1024:
raise HTTPException(status_code=400, detail="头像文件不能超过5MB")
# 确保文件扩展名正确
filename = file.filename or "avatar.jpg"
ext = filename.split(".")[-1].lower() if "." in filename else "jpg"
if ext not in ("jpg", "jpeg", "png", "gif", "webp"):
filename = f"avatar.{ext}"
try:
photo_url = await _upload_to_filecenter(file_bytes, filename)
except Exception as e:
raise HTTPException(status_code=500, detail=f"头像上传失败: {str(e)}")
# 更新数据库
db = get_session()
try:
data = avatar_service.get_avatar(db, avatar_id)
if not data:
raise HTTPException(status_code=404, detail="数字分身不存在")
from sqlalchemy import text
db.execute(
text("UPDATE avatars SET photo_url = :url, updated_at = datetime('now') WHERE id = :id"),
{"url": photo_url, "id": avatar_id},
)
db.commit()
# 刷新数据
updated = avatar_service.get_avatar(db, avatar_id)
return ApiResponse(data=updated, message="头像上传成功")
finally:
db.close()
+3
View File
@@ -28,6 +28,9 @@ class Settings(BaseSettings):
# 数字分身 SQLite 数据库路径(直连数字分身应用的 SQLite)
AVATAR_DB_PATH: str = os.getenv("AVATAR_DB_PATH", "")
# 数字分身后端服务地址(用于拼接头像等文件 URL)
AVATAR_BACKEND_URL: str = os.getenv("AVATAR_BACKEND_URL", "")
# 日志目录
LOG_DIR: str = "/app/logs"
+37 -6
View File
@@ -23,7 +23,8 @@ def _get_engine_and_session():
if not os.path.isabs(db_path):
db_path = os.path.abspath(db_path)
if not os.path.exists(db_path):
raise FileNotFoundError(f"数字分身数据库不存在: {db_path}")
# 数据库不存在时返回 None,由调用方处理
return None, None
_engine = create_engine(
f"sqlite:///{db_path}",
connect_args={"check_same_thread": False},
@@ -32,11 +33,39 @@ def _get_engine_and_session():
return _engine, _SessionLocal()
def get_session() -> Session:
def get_session() -> Optional[Session]:
_, session = _get_engine_and_session()
return session
def is_available() -> bool:
"""检查数字分身数据库是否可用"""
engine, _ = _get_engine_and_session()
return engine is not None
def _resolve_photo_url(photo_url: str) -> str:
"""将相对路径的头像 URL 补全为绝对路径"""
if not photo_url:
return ""
if photo_url.startswith(("http://", "https://")):
return photo_url
base = settings.AVATAR_BACKEND_URL
if base:
base = base.rstrip("/")
return f"{base}{photo_url}"
return photo_url
def _get_global_token_balance(db: Session) -> int:
"""获取全局 token_account 余额(单行表)"""
try:
result = db.execute(text("SELECT balance FROM token_account LIMIT 1")).fetchone()
return result.balance if result and result.balance else 0
except Exception:
return 0
class AvatarService:
@staticmethod
@@ -90,6 +119,7 @@ class AvatarService:
rows = db.execute(query, params).fetchall()
items = []
global_token = _get_global_token_balance(db)
for row in rows:
config = {}
if row.config:
@@ -106,10 +136,10 @@ class AvatarService:
"name": row.name,
"display_name": row.display_name,
"description": row.description or "",
"photo_url": row.photo_url or "",
"photo_url": _resolve_photo_url(row.photo_url),
"emoji": row.emoji or "🤖",
"status": row.status or "active",
"token_balance": row.token_balance or 0,
"token_balance": global_token or (row.token_balance or 0),
"config": config,
"owner_nickname": row.owner_nickname or "",
"owner_phone": row.owner_phone or "",
@@ -148,15 +178,16 @@ class AvatarService:
elif isinstance(row.config, dict):
config = row.config
global_token = _get_global_token_balance(db)
return {
"id": row.id,
"name": row.name,
"display_name": row.display_name,
"description": row.description or "",
"photo_url": row.photo_url or "",
"photo_url": _resolve_photo_url(row.photo_url),
"emoji": row.emoji or "🤖",
"status": row.status or "active",
"token_balance": row.token_balance or 0,
"token_balance": global_token or (row.token_balance or 0),
"config": config,
"owner_nickname": row.owner_nickname or "",
"owner_phone": row.owner_phone or "",
+43 -1
View File
@@ -1,7 +1,11 @@
from fastapi import APIRouter, Depends, Body, Header
from fastapi import APIRouter, Depends, Body, Header, UploadFile, File
from sqlalchemy.orm import Session
import os
import uuid
import mimetypes
from database import get_db
from routers.knowledge import UPLOAD_DIR
from models import Avatar, KnowledgeDoc, KnowledgeChunk, QAPair, Authorization, User
from responses import ok, fail
@@ -93,3 +97,41 @@ def delete_avatar(avatar_id: str, db: Session = Depends(get_db)):
db.delete(a)
db.commit()
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())
+3
View File
@@ -90,6 +90,9 @@ export const tailLogFile = (filename, lines = 100) => request.get(`/logs/files/$
export const getAvatars = (params) => request.get('/avatars', { params })
export const getAvatarDetail = (id) => request.get(`/avatars/${id}`)
export const updateAvatarStatus = (id, status) => request.put(`/avatars/${id}/status`, { status })
export const uploadAvatarPhoto = (id, formData) => request.post(`/avatars/${id}/upload-photo`, formData, {
headers: { 'Content-Type': 'multipart/form-data' }
})
export default request
export const uploadAvatar = (userId, formData) => request.post(`/users/${userId}/upload-avatar`, formData, { headers: { "Content-Type": "multipart/form-data" } })
+45 -8
View File
@@ -23,10 +23,13 @@
<!-- Table -->
<el-table :data="avatars" v-loading="loading" :row-class-name="rowClassName" class="data-table">
<el-table-column label="分身" width="240">
<el-table-column label="分身" min-width="220">
<template #default="{ row }">
<div style="display:flex;align-items:center;gap:10px">
<el-avatar :size="40" :src="row.photo_url || ''" style="background:#30363d;flex-shrink:0">
<el-avatar v-if="row.photo_url" :size="40" :src="row.photo_url" style="background:#30363d;flex-shrink:0" @error="handleAvatarError">
{{ row.emoji || '🤖' }}
</el-avatar>
<el-avatar v-else :size="40" style="background:#30363d;flex-shrink:0">
{{ row.emoji || '🤖' }}
</el-avatar>
<div>
@@ -36,7 +39,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="归属用户" width="160">
<el-table-column label="归属用户" min-width="140">
<template #default="{ row }">
<span v-if="row.owner_nickname">{{ row.owner_nickname }}</span>
<span v-else style="color:var(--color-text-muted)">未绑定</span>
@@ -52,7 +55,7 @@
<span style="font-weight:600">{{ row.token_balance?.toLocaleString() ?? 0 }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" width="160">
<el-table-column label="创建时间" min-width="160">
<template #default="{ row }">
<span style="font-size:12px;color:var(--color-text-muted)">{{ row.created_at ? new Date(row.created_at).toLocaleString('zh-CN',{timeZone:'Asia/Shanghai',hour12:false}) : '--' }}</span>
</template>
@@ -73,9 +76,14 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<div style="display:flex;gap:4px">
<el-upload :show-file-list="false" accept="image/*" :before-upload="(file) => handleUploadPhoto(row, file)">
<el-button size="small" :loading="row._uploading"> 上传</el-button>
</el-upload>
<el-button size="small" @click="openDetail(row)">详情</el-button>
</div>
</template>
</el-table-column>
</el-table>
@@ -92,9 +100,12 @@
<div v-if="detailAvatar" class="detail-panel">
<!-- Header with avatar -->
<div class="detail-header">
<el-avatar :size="72" :src="detailAvatar.photo_url || ''" style="background:#30363d">
<el-avatar v-if="detailAvatar.photo_url" :size="72" :src="detailAvatar.photo_url" style="background:#30363d" @error="handleAvatarError">
<span style="font-size:32px">{{ detailAvatar.emoji || '🤖' }}</span>
</el-avatar>
<el-avatar v-else :size="72" style="background:#30363d">
<span style="font-size:32px">{{ detailAvatar.emoji || '' }}</span>
</el-avatar>
<div style="margin-left:16px">
<div class="detail-name">{{ detailAvatar.name }}</div>
<div v-if="detailAvatar.display_name" class="detail-display-name">{{ detailAvatar.display_name }}</div>
@@ -189,7 +200,7 @@
<script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue'
import { ElMessage } from 'element-plus'
import { getAvatars, updateAvatarStatus } from '@/api'
import { getAvatars, updateAvatarStatus, uploadAvatarPhoto } from '@/api'
const avatars = ref([])
const total = ref(0)
@@ -249,6 +260,32 @@ function openDetail(row) {
detailVisible.value = true
}
async function handleUploadPhoto(row, file) {
const formData = new FormData()
formData.append('file', file)
row._uploading = true
try {
const res = await uploadAvatarPhoto(row.id, formData)
if (res.code === 200) {
row.photo_url = res.data?.photo_url || row.photo_url
ElMessage.success('头像上传成功')
loadAvatars()
} else {
ElMessage.error(res.message || '上传失败')
}
} catch (e) {
ElMessage.error('上传失败:' + (e.message || '未知错误'))
} finally {
row._uploading = false
}
return false // prevent el-upload default behavior
}
function handleAvatarError(e) {
// 图片加载失败时隐藏 img,只保留 emoji fallback
e.target.style.display = 'none'
}
function rowClassName({ rowIndex }) {
return rowIndex % 2 === 0 ? 'row-dark' : 'row-darker'
}
@@ -259,7 +296,7 @@ onUnmounted(() => window.removeEventListener('page-refresh', loadAvatars))
<style scoped>
.filter-bar { display: flex; gap: 10px; margin-bottom: 12px; flex-wrap: wrap; }
.data-table { border-radius: 8px; overflow: hidden; }
.data-table { border-radius: 8px; overflow: hidden; width: 100%; }
/* Detail panel */
.detail-header { display: flex; align-items: center; }