bobmaster/matrix_chatgpt_bot
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases 10 Packages Wiki Activity

Merge pull request #10 from hibobmaster/dev

Browse source 
fix type check
This commit is contained in:
BobMaster 2023-04-16 10:42:32 +08:00 committed by GitHub
commit 8661d1fa10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BingImageGen.py
View file

@ -52,7 +52,7 @@ class ImageGenAsync:
def __del__(self): def __del__(self):
try: try:
loop = asyncio.get_event_loop() loop = asyncio.get_running_loop()
except RuntimeError as e: except RuntimeError as e:
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)

18
bot.py
View file

@ -3,7 +3,7 @@ import os
import re import re
import sys import sys
import traceback import traceback
from typing import Optional, Union from typing import Union
import aiohttp import aiohttp
from nio import (AsyncClient, AsyncClientConfig, InviteMemberEvent, JoinError, from nio import (AsyncClient, AsyncClientConfig, InviteMemberEvent, JoinError,
@ -33,7 +33,7 @@ class Bot:
device_id: str, device_id: str,
chatgpt_api_endpoint: str = os.environ.get( chatgpt_api_endpoint: str = os.environ.get(
"CHATGPT_API_ENDPOINT") or "https://api.openai.com/v1/chat/completions", "CHATGPT_API_ENDPOINT") or "https://api.openai.com/v1/chat/completions",
api_key: Optional[str] = os.environ.get("OPENAI_API_KEY") or "", api_key: Union[str, None] = None,
room_id: Union[str, None] = None, room_id: Union[str, None] = None,
bing_api_endpoint: Union[str, None] = None, bing_api_endpoint: Union[str, None] = None,
password: Union[str, None] = None, password: Union[str, None] = None,
@ -116,7 +116,7 @@ class Bot:
self.help_prog = re.compile(r"^\s*!help\s*.*$") self.help_prog = re.compile(r"^\s*!help\s*.*$")
# initialize chatbot and chatgpt_api_endpoint # initialize chatbot and chatgpt_api_endpoint
if self.api_key != '': if self.api_key is not None:
self.chatbot = Chatbot(api_key=self.api_key, timeout=120) self.chatbot = Chatbot(api_key=self.api_key, timeout=120)
self.chatgpt_api_endpoint = self.chatgpt_api_endpoint self.chatgpt_api_endpoint = self.chatgpt_api_endpoint
@ -125,11 +125,6 @@ class Bot:
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": f"Bearer {self.api_key}", "Authorization": f"Bearer {self.api_key}",
} }
else:
self.chatgpt_api_endpoint = self.chatgpt_api_endpoint
self.headers = {
"Content-Type": "application/json",
}
# initialize askGPT class # initialize askGPT class
self.askgpt = askGPT(self.session) self.askgpt = askGPT(self.session)
@ -149,7 +144,7 @@ class Bot:
def __del__(self): def __del__(self):
try: try:
loop = asyncio.get_event_loop() loop = asyncio.get_running_loop()
except RuntimeError as e: except RuntimeError as e:
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
@ -192,7 +187,7 @@ class Bot:
n = self.chat_prog.match(content_body) n = self.chat_prog.match(content_body)
if n: if n:
prompt = n.group(1) prompt = n.group(1)
if self.api_key != '': if self.api_key is not None:
try: try:
asyncio.create_task(self.chat(room_id, asyncio.create_task(self.chat(room_id,
reply_to_event_id, reply_to_event_id,
@ -289,9 +284,8 @@ class Bot:
# invite_callback event # invite_callback event
async def invite_callback(self, room: MatrixRoom, event: InviteMemberEvent) -> None: async def invite_callback(self, room: MatrixRoom, event: InviteMemberEvent) -> None:
"""Handle an incoming invite event. """Handle an incoming invite event.
https://github.com/8go/matrix-eno-bot/blob/ad037e02bd2960941109e9526c1033dd157bb212/callbacks.py#L104
If an invite is received, then join the room specified in the invite. If an invite is received, then join the room specified in the invite.
code copied from: code copied from: https://github.com/8go/matrix-eno-bot/blob/ad037e02bd2960941109e9526c1033dd157bb212/callbacks.py#L104
""" """
logger.debug(f"Got invite to {room.room_id} from {event.sender}.") logger.debug(f"Got invite to {room.room_id} from {event.sender}.")
# Attempt to join 3 times before giving up # Attempt to join 3 times before giving up