Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f90de0541 | ||
|
|
6aa3559033 |
@@ -32,6 +32,22 @@ async def preset():
|
||||
return STEP_PRESET
|
||||
|
||||
|
||||
@router.post("/preset/apply")
|
||||
async def apply_preset(user: User = Depends(current_user), db=Depends(get_db)):
|
||||
"""一键把 Step Plan 预设落成渠道(已有同名渠道则跳过)。"""
|
||||
from ...core.config import settings
|
||||
rows = await repos.ChannelRepo.visible_to(db, user)
|
||||
for r in rows:
|
||||
if r.name == STEP_PRESET["name"]:
|
||||
return {"applied": False, "reason": "已存在同名渠道"}
|
||||
c = Channel(name=STEP_PRESET["name"], base_url=STEP_PRESET["base_url"],
|
||||
api_key_enc=settings.step_api_key or "", models=STEP_PRESET["models"],
|
||||
owner_id=user.id if not user.is_admin else None, visibility="admin")
|
||||
db.add(c)
|
||||
await db.commit()
|
||||
return {"applied": True, "channel": _view(c)}
|
||||
|
||||
|
||||
@router.get("")
|
||||
async def list_channels(user: User = Depends(current_user), db=Depends(get_db)):
|
||||
rows = await repos.ChannelRepo.visible_to(db, user)
|
||||
|
||||
@@ -15,7 +15,7 @@ class CharacterIn(BaseModel):
|
||||
name: str
|
||||
persona: str = ""
|
||||
greeting: str = ""
|
||||
voice: str = "tongtong"
|
||||
voice: str = "elegantgentle-female"
|
||||
avatar_url: str = ""
|
||||
|
||||
|
||||
|
||||
@@ -271,11 +271,11 @@ async def tts(sid: int, mid: int, user: User = Depends(current_user),
|
||||
raise HTTPException(404, "消息不存在")
|
||||
client, models = await _channel_for(db, user, s)
|
||||
model = models.get("tts") or "stepaudio-2.5-tts"
|
||||
voice = "tongtong"
|
||||
voice = "elegantgentle-female"
|
||||
if s.character_id:
|
||||
ch = await db.get(Character, s.character_id)
|
||||
if ch:
|
||||
voice = ch.voice
|
||||
if ch and ch.voice:
|
||||
voice = ch.voice # 非法音色由 client.fix_voice 兜底
|
||||
try:
|
||||
audio = await client.tts(model, _dec(user, m.content_enc), voice)
|
||||
except Exception as e:
|
||||
|
||||
@@ -8,6 +8,8 @@ class Settings(BaseSettings):
|
||||
jwt_expire_minutes: int = 60 * 24 * 7
|
||||
first_admin_user: str = "admin"
|
||||
first_admin_pass: str = "maopaoya-admin"
|
||||
# 默认 Step Plan 渠道的 key(为空则种渠道但不填 key,到后台补)
|
||||
step_api_key: str = ""
|
||||
|
||||
class Config:
|
||||
env_file = ".env"
|
||||
|
||||
@@ -38,6 +38,15 @@ async def startup():
|
||||
password_hash=security.hash_password(settings.first_admin_pass),
|
||||
kdf_salt=salt.hex(), is_admin=True))
|
||||
await db.commit()
|
||||
# 默认渠道:空库时种 Step Plan 预设(key 走 OMO_STEP_API_KEY)
|
||||
from .models.entities import Channel
|
||||
from .core.config import STEP_PRESET
|
||||
chans = (await db.execute(__import__('sqlalchemy').select(Channel))).scalars().all()
|
||||
if not chans:
|
||||
db.add(Channel(name=STEP_PRESET["name"], base_url=STEP_PRESET["base_url"],
|
||||
api_key_enc=settings.step_api_key, models=STEP_PRESET["models"],
|
||||
owner_id=None, visibility="admin"))
|
||||
await db.commit()
|
||||
|
||||
|
||||
@app.exception_handler(Exception)
|
||||
|
||||
+21
-13
@@ -44,20 +44,28 @@ class LLMClient:
|
||||
d = r.json()["data"][0]
|
||||
return d.get("url") or ("data:image/png;base64," + d.get("b64_json", ""))
|
||||
|
||||
# 阶跃 stepaudio 系合法音色(system_voices 实测 + 官方文档)
|
||||
TTS_VOICES = {"elegantgentle-female", "livelybreezy-female", "lively-girl",
|
||||
"cixingnansheng", "wenrounansheng", "shenchennanyin",
|
||||
"zhengpaiqingnian", "shuangkuainansheng", "ganliannvsheng",
|
||||
"qinhenvsheng", "huolinvsheng"}
|
||||
|
||||
@staticmethod
|
||||
def fix_voice(voice: str) -> str:
|
||||
return voice if voice in LLMClient.TTS_VOICES else "elegantgentle-female"
|
||||
|
||||
async def tts(self, model: str, text: str, voice: str) -> bytes:
|
||||
"""优先 OpenAI 兼容 /audio/speech;失败回落阶跃 stepaudio TTS 格式。"""
|
||||
headers = {"Authorization": f"Bearer {self.api_key}"}
|
||||
try:
|
||||
r = await get_http().post(f"{self.base_url}/audio/speech", headers=headers,
|
||||
json={"model": model, "input": text, "voice": voice})
|
||||
r.raise_for_status()
|
||||
return r.content
|
||||
except httpx.HTTPError:
|
||||
r = await get_http().post(f"{self.base_url}/audio/speech", headers=headers,
|
||||
json={"model": model, "text": text, "voice": voice,
|
||||
"response_format": "wav"})
|
||||
r.raise_for_status()
|
||||
return r.content
|
||||
"""OpenAI 兼容 /audio/speech;input 上限 1000 字符(stepaudio-2.5-tts)。"""
|
||||
voice = self.fix_voice(voice)
|
||||
r = await get_http().post(
|
||||
f"{self.base_url}/audio/speech",
|
||||
headers={"Authorization": f"Bearer {self.api_key}"},
|
||||
json={"model": model, "input": text[:1000], "voice": voice,
|
||||
"response_format": "wav"})
|
||||
if r.status_code >= 400:
|
||||
detail = r.text[:150]
|
||||
raise RuntimeError(f"{r.status_code}: {detail}")
|
||||
return r.content
|
||||
|
||||
async def ping(self, model: str) -> tuple[bool, str]:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user