Compare commits
11
Commits
3823b83d9e
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1a011f206 | ||
|
|
bc18689f71 | ||
|
|
1d2412bafd | ||
|
|
839ba8cd0c | ||
|
|
03031ca7e3 | ||
|
|
fae39bbb01 | ||
|
|
c49635faba | ||
|
|
5e3643a237 | ||
|
|
8ce5aa8847 | ||
|
|
a7c4925106 | ||
|
|
7610960cb6 |
@@ -20,8 +20,6 @@ class MyPlugin(Star):
|
|||||||
# 注册指令的装饰器
|
# 注册指令的装饰器
|
||||||
@filter.on_llm_request()
|
@filter.on_llm_request()
|
||||||
async def content_inject(self, event: AstrMessageEvent,req : ProviderRequest):
|
async def content_inject(self, event: AstrMessageEvent,req : ProviderRequest):
|
||||||
"""这是一个 hello world 指令""" # 这是 handler 的描述,将会被解析方便用户了解插件内容。建议填写。
|
|
||||||
# logger.info("系统提示词:"+req.system_prompt)
|
|
||||||
req.extra_user_content_parts.append(TextPart(
|
req.extra_user_content_parts.append(TextPart(
|
||||||
text=(
|
text=(
|
||||||
"-----wt使用----"
|
"-----wt使用----"
|
||||||
@@ -45,7 +43,7 @@ class MyPlugin(Star):
|
|||||||
|
|
||||||
@filter.on_decorating_result()
|
@filter.on_decorating_result()
|
||||||
async def pattern_extract(self,event:AstrMessageEvent):
|
async def pattern_extract(self,event:AstrMessageEvent):
|
||||||
yield self.Timer.parse(event)
|
self.Timer.parse(event)
|
||||||
|
|
||||||
async def terminate(self):
|
async def terminate(self):
|
||||||
"""可选择实现异步的插件销毁方法,当插件被卸载/停用时会调用。"""
|
"""可选择实现异步的插件销毁方法,当插件被卸载/停用时会调用。"""
|
||||||
|
|||||||
+67
-11
@@ -5,39 +5,95 @@ from astrbot.core.message.message_event_result import MessageChain,Plain
|
|||||||
from ..tool.pattern import Pattern
|
from ..tool.pattern import Pattern
|
||||||
from astrbot.api.star import Star
|
from astrbot.api.star import Star
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import json
|
||||||
|
|
||||||
class TimerService:
|
class TimerService:
|
||||||
def __init__(self,star:Star) -> None:
|
def __init__(self,star:Star) -> None:
|
||||||
self.star = star
|
self.star = star
|
||||||
|
self.tasks:list[TimerTask] = []
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# 解析模板并进行定时
|
# 解析模板并进行定时
|
||||||
async def parse(self,event:AstrMessageEvent):
|
def parse(self,event:AstrMessageEvent):
|
||||||
res = event.get_result()
|
res = event.get_result()
|
||||||
if not res:
|
if not res:
|
||||||
logger.info("[wait_msg]:解析失败:没拿到消息链")
|
logger.warning("[wait_msg]:解析失败:没拿到消息链")
|
||||||
return
|
return
|
||||||
|
|
||||||
Second:int|None = None
|
Second:int|None = None
|
||||||
logger.info("[wait_msg]:开始解析模板")
|
logger.info("[wait_msg]:开始解析模板")
|
||||||
|
|
||||||
chain = res.chain
|
for index,i in enumerate(res.chain) :
|
||||||
for i in chain :
|
logger.info(f"获得消息链类型:{i.type}")
|
||||||
logger.info(f"获得消息链类型:{i.type}内容:{i}")
|
if not isinstance(i,Plain) or not i.type == "Plain":
|
||||||
if not isinstance(i,Plain) or i.type == "Plain":
|
|
||||||
continue
|
continue
|
||||||
dump = Pattern(i.text)
|
dump = Pattern(i.text)
|
||||||
i.text = dump.string
|
i.text = dump.string
|
||||||
Second = dump.count
|
Second = dump.count
|
||||||
|
# 改变信息
|
||||||
|
res.chain[index] = i
|
||||||
|
|
||||||
|
event.set_result(res)
|
||||||
if not Second is None:
|
if not Second is None:
|
||||||
self.timer(event,Second)
|
self.timer(event,Second)
|
||||||
|
return
|
||||||
|
|
||||||
yield
|
|
||||||
|
|
||||||
# 定时:
|
# 定时:
|
||||||
def timer(self,event:AstrMessageEvent,Sec:int):
|
def timer(self,event:AstrMessageEvent,Sec:int):
|
||||||
asyncio.create_task(self.timer_task())
|
logger.info(f"进行一个{Sec}秒的对{event.get_sender_id()}({event.get_sender_name()})的等")
|
||||||
|
task = asyncio.create_task(self.timer_task(event,Sec))
|
||||||
|
self.tasks.append(TimerTask(event=event,task=task))
|
||||||
|
|
||||||
|
# 等待,唤醒任务本体
|
||||||
|
async def timer_task(self,event:AstrMessageEvent,second:int):
|
||||||
|
await asyncio.sleep(second)
|
||||||
|
await self.response_time(event)
|
||||||
|
|
||||||
|
# 调用llm
|
||||||
|
async def response_time(self,event:AstrMessageEvent):
|
||||||
|
try:
|
||||||
|
umo = event.unified_msg_origin
|
||||||
|
conv_mnger = self.star.context.conversation_manager
|
||||||
|
provider =await self.star.context.get_current_chat_provider_id(umo)
|
||||||
|
conv_id = await conv_mnger.get_curr_conversation_id(umo)
|
||||||
|
if conv_id is None:
|
||||||
|
logger.error(f"conversation_id获取失败!!umo:{umo}")
|
||||||
|
return False
|
||||||
|
conversation = await conv_mnger.get_conversation(umo,conv_id)
|
||||||
|
if conversation is None :
|
||||||
|
conversation = []
|
||||||
|
try:
|
||||||
|
history_list = json.loads(conversation.history)
|
||||||
|
except:
|
||||||
|
logger.warning("上下文获取失败,使用空上下文喵")
|
||||||
|
history_list = []
|
||||||
|
|
||||||
|
except:
|
||||||
|
logger.error("消息管理失败!")
|
||||||
|
return False
|
||||||
|
# logger.debug(f"获取上下文:{conversation}")
|
||||||
|
try:
|
||||||
|
req = await self.star.context.llm_generate(
|
||||||
|
chat_provider_id=provider,
|
||||||
|
prompt="<你等待的时间内对方没有回复>",
|
||||||
|
contexts=history_list,
|
||||||
|
tools=None
|
||||||
|
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
logger.error("llm返回失败了喵...QAQ")
|
||||||
|
return
|
||||||
|
logger.debug(f"llm结果:{req.completion_text }")
|
||||||
|
|
||||||
|
# 保存至历史消息
|
||||||
|
|
||||||
|
#发送至平台
|
||||||
|
await event.send(MessageChain().message(req.completion_text))
|
||||||
|
|
||||||
|
class TimerTask:
|
||||||
|
def __init__(self,event:AstrMessageEvent,task:asyncio.Task) -> None:
|
||||||
|
self.event = event
|
||||||
|
self.task = task
|
||||||
|
pass
|
||||||
|
|
||||||
async def timer_task(self):
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
logger.warning("awa现在过去一秒了哦")
|
|
||||||
+3
-1
@@ -9,6 +9,7 @@ class Pattern:
|
|||||||
_MIN_SEC = 10
|
_MIN_SEC = 10
|
||||||
# 定义最大与最小的范围,固定输入的规范
|
# 定义最大与最小的范围,固定输入的规范
|
||||||
def __init__(self,o_str:str) -> None:
|
def __init__(self,o_str:str) -> None:
|
||||||
|
logger.debug(f"模板消息:{o_str}")
|
||||||
res = self.extract(o_str)
|
res = self.extract(o_str)
|
||||||
self.count:int|None = res['second']
|
self.count:int|None = res['second']
|
||||||
self.string:str = res["content"]
|
self.string:str = res["content"]
|
||||||
@@ -29,7 +30,7 @@ class Pattern:
|
|||||||
num = int(content)
|
num = int(content)
|
||||||
return self.sec_range(num)
|
return self.sec_range(num)
|
||||||
except:
|
except:
|
||||||
logger.debug ("模板内容错误:{}".format(content))
|
logger.warning ("模板内容错误:{}".format(content))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def extract(self,o_str:str):
|
def extract(self,o_str:str):
|
||||||
@@ -47,6 +48,7 @@ class Pattern:
|
|||||||
#消除不完整/非法模板
|
#消除不完整/非法模板
|
||||||
o_str= o_str.replace("<wt>","")
|
o_str= o_str.replace("<wt>","")
|
||||||
o_str=o_str.replace("</wt>","")
|
o_str=o_str.replace("</wt>","")
|
||||||
|
logger.debug(f"过滤后消息:{o_str}")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"content":o_str,
|
"content":o_str,
|
||||||
|
|||||||
Reference in New Issue
Block a user