mirror of
https://github.com/LiteyukiStudio/nonebot-plugin-marshoai.git
synced 2025-06-09 17:55:25 +00:00
修复夸赞名单报错
This commit is contained in:
parent
21b695f2d4
commit
9878114376
@ -103,7 +103,7 @@ class MarshoHandler:
|
|||||||
处理单条聊天
|
处理单条聊天
|
||||||
"""
|
"""
|
||||||
|
|
||||||
context_msg = get_prompt(model_name) + (
|
context_msg = await get_prompt(model_name) + (
|
||||||
self.context.build(self.target.id, self.target.private)
|
self.context.build(self.target.id, self.target.private)
|
||||||
)
|
)
|
||||||
response = await make_chat_openai(
|
response = await make_chat_openai(
|
||||||
|
@ -288,7 +288,7 @@ with contextlib.suppress(ImportError): # 优化先不做()
|
|||||||
response = await make_chat_openai(
|
response = await make_chat_openai(
|
||||||
client=client,
|
client=client,
|
||||||
model_name=model_name,
|
model_name=model_name,
|
||||||
msg=get_prompt(model_name)
|
msg=await get_prompt(model_name)
|
||||||
+ [
|
+ [
|
||||||
UserMessage(
|
UserMessage(
|
||||||
content=f"*{user_nickname}{config.marshoai_poke_suffix}"
|
content=f"*{user_nickname}{config.marshoai_poke_suffix}"
|
||||||
|
@ -136,15 +136,15 @@ async def make_chat_openai(
|
|||||||
|
|
||||||
|
|
||||||
@from_cache("praises")
|
@from_cache("praises")
|
||||||
def get_praises():
|
async def get_praises():
|
||||||
praises_file = store.get_plugin_data_file(
|
praises_file = store.get_plugin_data_file(
|
||||||
"praises.json"
|
"praises.json"
|
||||||
) # 夸赞名单文件使用localstore存储
|
) # 夸赞名单文件使用localstore存储
|
||||||
if not praises_file.exists():
|
if not praises_file.exists():
|
||||||
with open(praises_file, "w", encoding="utf-8") as f:
|
async with aiofiles.open(praises_file, "w", encoding="utf-8") as f:
|
||||||
json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)
|
json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)
|
||||||
with open(praises_file, "r", encoding="utf-8") as f:
|
async with aiofiles.open(praises_file, "r", encoding="utf-8") as f:
|
||||||
data = json.load(f)
|
data = json.loads(await f.read())
|
||||||
praises_json = data
|
praises_json = data
|
||||||
return praises_json
|
return praises_json
|
||||||
|
|
||||||
@ -160,8 +160,8 @@ async def refresh_praises_json():
|
|||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
def build_praises() -> str:
|
async def build_praises() -> str:
|
||||||
praises = get_praises()
|
praises = await get_praises()
|
||||||
result = ["你喜欢以下几个人物,他们有各自的优点:"]
|
result = ["你喜欢以下几个人物,他们有各自的优点:"]
|
||||||
for item in praises["like"]:
|
for item in praises["like"]:
|
||||||
result.append(f"名字:{item['name']},优点:{item['advantages']}")
|
result.append(f"名字:{item['name']},优点:{item['advantages']}")
|
||||||
@ -237,11 +237,11 @@ async def refresh_nickname_json():
|
|||||||
logger.error("刷新 nickname_json 表错误:无法载入 nickname.json 文件")
|
logger.error("刷新 nickname_json 表错误:无法载入 nickname.json 文件")
|
||||||
|
|
||||||
|
|
||||||
def get_prompt(model: str) -> List[Dict[str, Any]]:
|
async def get_prompt(model: str) -> List[Dict[str, Any]]:
|
||||||
"""获取系统提示词"""
|
"""获取系统提示词"""
|
||||||
prompts = config.marshoai_additional_prompt
|
prompts = config.marshoai_additional_prompt
|
||||||
if config.marshoai_enable_praises:
|
if config.marshoai_enable_praises:
|
||||||
praises_prompt = build_praises()
|
praises_prompt = await build_praises()
|
||||||
prompts += praises_prompt
|
prompts += praises_prompt
|
||||||
|
|
||||||
if config.marshoai_enable_time_prompt:
|
if config.marshoai_enable_time_prompt:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user