Merge pull request #8 from hibobmaster/dev
Prevent blocking execution flow
This commit is contained in:
GitHub
commit
b620dd2a15
3 changed files with 23 additions and 48 deletions
45
bot.py
45
bot.py
|
|
@ -147,7 +147,6 @@ class Bot:
|
|||
if bard_token is not None:
|
||||
self.bardbot = Bardbot(self.bard_token)
|
||||
|
||||
|
||||
def __del__(self):
|
||||
try:
|
||||
loop = asyncio.get_event_loop()
|
||||
|
|
@ -156,7 +155,6 @@ class Bot:
|
|||
asyncio.set_event_loop(loop)
|
||||
loop.run_until_complete(self._close())
|
||||
|
||||
|
||||
async def _close(self):
|
||||
await self.session.close()
|
||||
|
||||
|
|
@ -196,13 +194,13 @@ class Bot:
|
|||
prompt = n.group(1)
|
||||
if self.api_key != '':
|
||||
try:
|
||||
await self.chat(room_id,
|
||||
asyncio.create_task(self.chat(room_id,
|
||||
reply_to_event_id,
|
||||
prompt,
|
||||
sender_id,
|
||||
raw_user_message
|
||||
)
|
||||
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
await send_room_message(self.client, room_id, reply_message=str(e))
|
||||
|
|
@ -214,12 +212,13 @@ class Bot:
|
|||
if m:
|
||||
prompt = m.group(1)
|
||||
try:
|
||||
await self.gpt(
|
||||
asyncio.create_task(self.gpt(
|
||||
room_id,
|
||||
reply_to_event_id,
|
||||
prompt, sender_id,
|
||||
raw_user_message
|
||||
)
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
await send_room_message(self.client, room_id, reply_message=str(e))
|
||||
|
|
@ -231,14 +230,14 @@ class Bot:
|
|||
prompt = b.group(1)
|
||||
# raw_content_body used for construct formatted_body
|
||||
try:
|
||||
await self.bing(
|
||||
asyncio.create_task(self.bing(
|
||||
room_id,
|
||||
reply_to_event_id,
|
||||
prompt,
|
||||
sender_id,
|
||||
raw_user_message
|
||||
)
|
||||
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
await send_room_message(self.client, room_id, reply_message=str(e))
|
||||
|
|
@ -249,7 +248,7 @@ class Bot:
|
|||
if i:
|
||||
prompt = i.group(1)
|
||||
try:
|
||||
await self.pic(room_id, prompt)
|
||||
asyncio.create_task(self.pic(room_id, prompt))
|
||||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
await send_room_message(self.client, room_id, reply_message=str(e))
|
||||
|
|
@ -260,23 +259,22 @@ class Bot:
|
|||
if b:
|
||||
prompt = b.group(1)
|
||||
try:
|
||||
await self.bard(
|
||||
asyncio.create_task(self.bard(
|
||||
room_id,
|
||||
reply_to_event_id,
|
||||
prompt,
|
||||
sender_id,
|
||||
raw_user_message
|
||||
)
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
await send_room_message(self.client, room_id, reply_message={e})
|
||||
|
||||
|
||||
|
||||
# help command
|
||||
h = self.help_prog.match(content_body)
|
||||
if h:
|
||||
await self.help(room_id)
|
||||
asyncio.create_task(self.help(room_id))
|
||||
|
||||
# message_callback decryption_failure event
|
||||
async def decryption_failure(self, room: MatrixRoom, event: MegolmEvent) -> None:
|
||||
|
|
@ -528,7 +526,6 @@ class Bot:
|
|||
except Exception as e:
|
||||
raise Exception(e)
|
||||
|
||||
|
||||
try:
|
||||
text = text.strip()
|
||||
await send_room_message(self.client, room_id, reply_message=text,
|
||||
|
|
@ -549,7 +546,6 @@ class Bot:
|
|||
except Exception as e:
|
||||
raise Exception(e)
|
||||
|
||||
|
||||
try:
|
||||
text = text.strip()
|
||||
await send_room_message(self.client, room_id, reply_message=text,
|
||||
|
|
@ -570,7 +566,6 @@ class Bot:
|
|||
except Exception as e:
|
||||
raise Exception(e)
|
||||
|
||||
|
||||
try:
|
||||
text = text.strip()
|
||||
await send_room_message(self.client, room_id, reply_message=text,
|
||||
|
|
@ -594,8 +589,8 @@ class Bot:
|
|||
except Exception as e:
|
||||
logger.error(e, exc_info=True)
|
||||
|
||||
|
||||
# !pic command
|
||||
|
||||
async def pic(self, room_id, prompt):
|
||||
try:
|
||||
await self.client.room_typing(room_id, timeout=180000)
|
||||
|
|
@ -653,21 +648,3 @@ class Bot:
|
|||
async def sync_forever(self, timeout=30000, full_state=True) -> None:
|
||||
|
||||
await self.client.sync_forever(timeout=timeout, full_state=full_state)
|
||||
|
||||
# Sync encryption keys with the server
|
||||
async def sync_encryption_key(self) -> None:
|
||||
if self.client.should_upload_keys:
|
||||
await self.client.keys_upload()
|
||||
|
||||
# Trust own devices
|
||||
async def trust_own_devices(self) -> None:
|
||||
await self.client.sync(timeout=30000, full_state=True)
|
||||
for device_id, olm_device in self.client.device_store[
|
||||
self.user_id].items():
|
||||
logger.debug("My other devices are: "
|
||||
f"device_id={device_id}, "
|
||||
f"olm_device={olm_device}.")
|
||||
logger.info("Setting up trust for my own "
|
||||
f"device {device_id} and session key "
|
||||
f"{olm_device.keys['ed25519']}.")
|
||||
self.client.verify_device(olm_device)
|
||||
|
|
|
|||
6
main.py
6
main.py
|
|
@ -1,7 +1,8 @@
|
|||
import asyncio
|
||||
import json
|
||||
import os
|
||||
|
||||
import signal
|
||||
from functools import partial
|
||||
from bot import Bot
|
||||
from log import getlogger
|
||||
|
||||
|
|
@ -46,9 +47,6 @@ async def main():
|
|||
)
|
||||
|
||||
await matrix_bot.login()
|
||||
await matrix_bot.sync_encryption_key()
|
||||
|
||||
# await matrix_bot.trust_own_devices()
|
||||
|
||||
await matrix_bot.sync_forever(timeout=30000, full_state=True)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ async def send_room_message(client: AsyncClient,
|
|||
NORMAL_BODY = content = {"msgtype": "m.text", "body": reply_message, }
|
||||
if reply_to_event_id == '':
|
||||
if markdown_formatted:
|
||||
# only format message contains multiline codes
|
||||
if re.search(r"```", reply_message) is not None:
|
||||
# only format message contains multiline codes, *, |
|
||||
if re.search(r"```|\*|\|", reply_message) is not None:
|
||||
content = {
|
||||
"msgtype": "m.text",
|
||||
"body": reply_message,
|
||||
|
|
|
|||
Loading…
Reference in a new issue