PrivateCoffee/matrix-gptbot
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: improve code readability and efficiency

Browse source 
Enhanced code readability by formatting multiline log statements and adding missing line breaks in conditional blocks. Adopted a more robust error handling approach by catching general exceptions in encoding determination. Eliminated redundant variable assignments for async tasks to streamline event handling and response callbacks, directly invoking `asyncio.create_task()` for better clarity and efficiency. Simplify message and file sending routines by removing unnecessary status assignments, implying a focus on action over response verification. Lastly, optimized message truncation logic by discarding the unused result, focusing on in-place operation for token limit adherence. These changes collectively contribute to a cleaner, more maintainable, and efficient codebase, addressing potential bugs and performance bottlenecks.
This commit is contained in:
Kumi 2024-05-18 21:33:32 +02:00
parent 7f8ff1502a
commit e2e31060ce
Signed by: kumi
GPG key ID: ECBCC9082395383F
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gptbot/classes/bot.py
View file

@ -245,6 +245,7 @@ class GPTBot:
# Set up WolframAlpha # Set up WolframAlpha
if "WolframAlpha" in config: if "WolframAlpha" in config:
from .wolframalpha import WolframAlpha from .wolframalpha import WolframAlpha
bot.calculation_api = WolframAlpha( bot.calculation_api = WolframAlpha(
config["WolframAlpha"]["APIKey"], bot.logger config["WolframAlpha"]["APIKey"], bot.logger
) )
@ -252,6 +253,7 @@ class GPTBot:
# Set up TrackingMore # Set up TrackingMore
if "TrackingMore" in config: if "TrackingMore" in config:
from .trackingmore import TrackingMore from .trackingmore import TrackingMore
bot.parcel_api = TrackingMore(config["TrackingMore"]["APIKey"], bot.logger) bot.parcel_api = TrackingMore(config["TrackingMore"]["APIKey"], bot.logger)
# Set up the Matrix client # Set up the Matrix client
@ -334,8 +336,11 @@ class GPTBot:
try: try:
event_type = event.source["content"]["msgtype"] event_type = event.source["content"]["msgtype"]
except KeyError: except KeyError:
if event.__class__.__name__ in ("RoomMemberEvent", ): if event.__class__.__name__ in ("RoomMemberEvent",):
self.logger.log(f"Ignoring event of type {event.__class__.__name__}", "debug") self.logger.log(
f"Ignoring event of type {event.__class__.__name__}",
"debug",
)
continue continue
self.logger.log(f"Could not process event: {event}", "warning") self.logger.log(f"Could not process event: {event}", "warning")
continue # This is most likely not a message event continue # This is most likely not a message event
@ -381,7 +386,7 @@ class GPTBot:
try: try:
encoding = tiktoken.encoding_for_model(model) encoding = tiktoken.encoding_for_model(model)
except: except Exception:
# TODO: Handle this more gracefully # TODO: Handle this more gracefully
encoding = tiktoken.encoding_for_model("gpt-3.5-turbo") encoding = tiktoken.encoding_for_model("gpt-3.5-turbo")
@ -601,7 +606,7 @@ class GPTBot:
) )
return return
task = asyncio.create_task(self._event_callback(room, event)) asyncio.create_task(self._event_callback(room, event))
def room_uses_timing(self, room: MatrixRoom): def room_uses_timing(self, room: MatrixRoom):
"""Check if a room uses timing. """Check if a room uses timing.
@ -629,7 +634,7 @@ class GPTBot:
await callback(response, self) await callback(response, self)
async def response_callback(self, response: Response): async def response_callback(self, response: Response):
task = asyncio.create_task(self._response_callback(response)) asyncio.create_task(self._response_callback(response))
async def accept_pending_invites(self): async def accept_pending_invites(self):
"""Accept all pending invites.""" """Accept all pending invites."""
@ -736,7 +741,7 @@ class GPTBot:
"url": content_uri, "url": content_uri,
} }
status = await self.matrix_client.room_send(room, "m.room.message", content) await self.matrix_client.room_send(room, "m.room.message", content)
self.logger.log("Sent image", "debug") self.logger.log("Sent image", "debug")
@ -770,7 +775,7 @@ class GPTBot:
"url": content_uri, "url": content_uri,
} }
status = await self.matrix_client.room_send(room, "m.room.message", content) await self.matrix_client.room_send(room, "m.room.message", content)
self.logger.log("Sent file", "debug") self.logger.log("Sent file", "debug")
@ -1306,7 +1311,7 @@ class GPTBot:
chat_messages.append({"role": "system", "content": message_body}) chat_messages.append({"role": "system", "content": message_body})
# Truncate messages to fit within the token limit # Truncate messages to fit within the token limit
truncated_messages = self._truncate( self._truncate(
chat_messages[1:], self.max_tokens - 1, system_message=system_message chat_messages[1:], self.max_tokens - 1, system_message=system_message
) )