Kanium-PUBLIC/KaniumCogs
5
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge pull request '9month-revision-update2' (#22) from 9month-revision-update2 into master

Browse Source 
Reviewed-on: #22
This commit is contained in:
AllfatherHatt 2026-03-16 13:22:06 +01:00
commit d1b6085ee8
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
reginaldCog/reginald.py
View File

@ -25,7 +25,6 @@ CALLABLE_FUNCTIONS = {
DEFAULT_MODEL = "gpt-5-mini-2025-08-07" DEFAULT_MODEL = "gpt-5-mini-2025-08-07"
DEFAULT_MAX_COMPLETION_TOKENS = 2000 DEFAULT_MAX_COMPLETION_TOKENS = 2000
TYPING_HEARTBEAT_INTERVAL_SECONDS = 8
STATUS_UPDATE_MIN_INTERVAL_SECONDS = 1.5 STATUS_UPDATE_MIN_INTERVAL_SECONDS = 1.5
@ -100,12 +99,6 @@ class ReginaldCog(PermissionsMixin, BlacklistMixin, MemoryMixin, commands.Cog):
} }
return tool_statuses.get(tool_name, "Reginald is consulting an external source...") return tool_statuses.get(tool_name, "Reginald is consulting an external source...")
async def typing_heartbeat(self, channel: discord.TextChannel):
while True:
with suppress(discord.HTTPException):
await channel.trigger_typing()
await asyncio.sleep(TYPING_HEARTBEAT_INTERVAL_SECONDS)
def make_status_updater( def make_status_updater(
self, status_message: discord.Message self, status_message: discord.Message
) -> Callable[[str, bool], Awaitable[None]]: ) -> Callable[[str, bool], Awaitable[None]]:
@ -215,18 +208,37 @@ class ReginaldCog(PermissionsMixin, BlacklistMixin, MemoryMixin, commands.Cog):
status_message = await message.channel.send(self.get_thinking_status_message()) status_message = await message.channel.send(self.get_thinking_status_message())
status_update = self.make_status_updater(status_message) status_update = self.make_status_updater(status_message)
typing_task = asyncio.create_task(self.typing_heartbeat(message.channel)) response_text = None
if hasattr(message.channel, "typing"):
try: try:
async with message.channel.typing():
response_text = await self.generate_response(
api_key,
formatted_messages,
status_update=status_update,
)
except (discord.HTTPException, AttributeError):
# Fall back to normal processing if typing indicator isn't available.
response_text = await self.generate_response(
api_key,
formatted_messages,
status_update=status_update,
)
else:
response_text = await self.generate_response( response_text = await self.generate_response(
api_key, api_key,
formatted_messages, formatted_messages,
status_update=status_update, status_update=status_update,
) )
finally:
typing_task.cancel()
with suppress(asyncio.CancelledError):
await typing_task
try:
await self.send_split_message(message.channel, response_text)
finally:
if status_message is not None:
with suppress(discord.HTTPException):
await status_message.delete()
try:
memory.append({"user": user_name, "content": prompt}) memory.append({"user": user_name, "content": prompt})
memory.append({"user": "Reginald", "content": response_text}) memory.append({"user": "Reginald", "content": response_text})
@ -250,11 +262,8 @@ class ReginaldCog(PermissionsMixin, BlacklistMixin, MemoryMixin, commands.Cog):
).mid_term_memory() as mid_memory: ).mid_term_memory() as mid_memory:
short_memory[channel_id] = memory short_memory[channel_id] = memory
mid_memory[channel_id] = mid_term_summaries[-self.summary_retention_limit :] mid_memory[channel_id] = mid_term_summaries[-self.summary_retention_limit :]
except Exception as error:
await self.send_split_message(message.channel, response_text) print(f"DEBUG: Memory persistence failed after response delivery: {error}")
if status_message is not None:
with suppress(discord.HTTPException):
await status_message.delete()
def should_reginald_interject(self, message_content: str) -> bool: def should_reginald_interject(self, message_content: str) -> bool:
direct_invocation = {"reginald,"} direct_invocation = {"reginald,"}