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

Adjusting

Browse Source
This commit is contained in:
AllfatherHatt 2025-02-20 19:23:15 +01:00
parent e9749a680b
commit 72e9a0135f
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
reginaldCog/reginald.py
View File

@ -3,15 +3,15 @@ import openai
import random import random
import asyncio import asyncio
from redbot.core import Config, commands from redbot.core import Config, commands
from openai import OpenAIError from openai.error import OpenAIError
class ReginaldCog(commands.Cog): class ReginaldCog(commands.Cog):
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
self.config = Config.get_conf(self, identifier=71717171171717) self.config = Config.get_conf(self, identifier=71717171171717)
self.memory_locks = {} # ✅ Prevents race conditions per user self.memory_locks = {}
# ✅ Register Config Keys Correctly # ✅ Properly Registered Configuration Keys
default_global = {"openai_model": "gpt-4o-mini"} default_global = {"openai_model": "gpt-4o-mini"}
default_guild = { default_guild = {
"openai_api_key": None, "openai_api_key": None,
@ -47,7 +47,6 @@ class ReginaldCog(commands.Cog):
await ctx.send(random.choice(["Yes?", "How may I assist?", "You rang?"])) await ctx.send(random.choice(["Yes?", "How may I assist?", "You rang?"]))
return return
# ✅ Fetch API Key Correctly
api_key = await self.config.guild(ctx.guild).openai_api_key() api_key = await self.config.guild(ctx.guild).openai_api_key()
if not api_key: if not api_key:
await ctx.send("OpenAI API key not set. Use `!setreginaldcogapi`.") await ctx.send("OpenAI API key not set. Use `!setreginaldcogapi`.")
@ -79,7 +78,7 @@ class ReginaldCog(commands.Cog):
# ✅ Store conversation history correctly (while lock is held) # ✅ Store conversation history correctly (while lock is held)
memory.append({"role": "user", "content": prompt}) memory.append({"role": "user", "content": prompt})
memory.append({"role": "assistant", "content": response_text}) memory.append({"role": "assistant", "content": response_text})
memory = memory[-25:] # Keep only last 25 messages memory = memory[-25:]
guild_memory[user_id] = memory # ✅ Atomic update inside async context guild_memory[user_id] = memory # ✅ Atomic update inside async context
@ -91,8 +90,8 @@ class ReginaldCog(commands.Cog):
"""✅ Generates a response using OpenAI's async API client (corrected version).""" """✅ Generates a response using OpenAI's async API client (corrected version)."""
model = await self.config.openai_model() model = await self.config.openai_model()
try: try:
async with openai.AsyncClient(api_key=api_key) as client: # ✅ Correct API key handling openai.api_key = api_key # ✅ Correct API key handling
response = await client.chat.completions.create( response = await openai.ChatCompletion.acreate(
model=model, model=model,
messages=messages, messages=messages,
max_tokens=1024, max_tokens=1024,
@ -104,7 +103,7 @@ class ReginaldCog(commands.Cog):
if not response.choices: if not response.choices:
return "I fear I have no words to offer at this time." return "I fear I have no words to offer at this time."
return response.choices[0].message.content.strip() return response.choices[0].message["content"].strip()
except OpenAIError: except OpenAIError:
fallback_responses = [ fallback_responses = [
"It appears I am currently indisposed. Might I suggest a cup of tea while we wait?", "It appears I am currently indisposed. Might I suggest a cup of tea while we wait?",