Trying to fix indentation
This commit is contained in:
parent
7f6372a09b
commit
a2646eac14
@ -51,12 +51,10 @@ class ReginaldCog(commands.Cog):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@commands.Cog.listener()
|
@commands.Cog.listener()
|
||||||
async def on_message(self, message, ctx):
|
async def on_message(self, message):
|
||||||
if message.author.bot or not message.guild:
|
if message.author.bot or not message.guild:
|
||||||
return # Ignore bots and DMs
|
return # Ignore bots and DMs
|
||||||
|
|
||||||
ctx.send("<heard message>")
|
|
||||||
|
|
||||||
guild = message.guild
|
guild = message.guild
|
||||||
channel_id = str(message.channel.id)
|
channel_id = str(message.channel.id)
|
||||||
user_id = str(message.author.id)
|
user_id = str(message.author.id)
|
||||||
@ -66,7 +64,6 @@ class ReginaldCog(commands.Cog):
|
|||||||
# ✅ Fetch the stored listening channel or fall back to default
|
# ✅ Fetch the stored listening channel or fall back to default
|
||||||
allowed_channel_id = await self.config.guild(guild).listening_channel()
|
allowed_channel_id = await self.config.guild(guild).listening_channel()
|
||||||
if not allowed_channel_id:
|
if not allowed_channel_id:
|
||||||
ctx.send("<deciding channel is not cool>")
|
|
||||||
allowed_channel_id = self.default_listening_channel
|
allowed_channel_id = self.default_listening_channel
|
||||||
await self.config.guild(guild).listening_channel.set(allowed_channel_id)
|
await self.config.guild(guild).listening_channel.set(allowed_channel_id)
|
||||||
|
|
||||||
@ -92,14 +89,13 @@ class ReginaldCog(commands.Cog):
|
|||||||
await message.channel.send(random.choice(["Yes?", "How may I assist?", "You rang?"]))
|
await message.channel.send(random.choice(["Yes?", "How may I assist?", "You rang?"]))
|
||||||
return
|
return
|
||||||
explicit_invocation = True
|
explicit_invocation = True
|
||||||
|
|
||||||
# ✅ Passive Listening: Check if the message contains relevant keywords
|
# ✅ Passive Listening: Check if the message contains relevant keywords
|
||||||
elif self.should_reginald_interject(message_content):
|
elif self.should_reginald_interject(message_content):
|
||||||
prompt = message_content
|
prompt = message_content
|
||||||
explicit_invocation = False
|
explicit_invocation = False
|
||||||
|
|
||||||
else:
|
else:
|
||||||
ctx.send("<decided not to interject>")
|
|
||||||
return # Ignore irrelevant messages
|
return # Ignore irrelevant messages
|
||||||
|
|
||||||
# ✅ Context Handling: Maintain conversation flow
|
# ✅ Context Handling: Maintain conversation flow
|
||||||
@ -123,30 +119,30 @@ class ReginaldCog(commands.Cog):
|
|||||||
"content": f"[{summary['timestamp']}] Topics: {', '.join(summary['topics'])}\n{summary['summary']}"
|
"content": f"[{summary['timestamp']}] Topics: {', '.join(summary['topics'])}\n{summary['summary']}"
|
||||||
})
|
})
|
||||||
|
|
||||||
formatted_messages += [{"role": "user", "content": f"{entry['user']}: {entry['content']}"} for entry in memory]
|
formatted_messages += [{"role": "user", "content": f"{entry['user']}: {entry['content']}"} for entry in memory]
|
||||||
formatted_messages.append({"role": "user", "content": f"{user_name}: {prompt}"})
|
formatted_messages.append({"role": "user", "content": f"{user_name}: {prompt}"})
|
||||||
|
|
||||||
# ✅ Generate AI Response
|
# ✅ Generate AI Response
|
||||||
response_text = await self.generate_response(api_key, formatted_messages)
|
response_text = await self.generate_response(api_key, formatted_messages)
|
||||||
|
|
||||||
# ✅ Store Memory
|
# ✅ Store Memory
|
||||||
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})
|
||||||
|
|
||||||
if len(memory) > self.short_term_memory_limit:
|
if len(memory) > self.short_term_memory_limit:
|
||||||
summary = await self.summarize_memory(message, memory[:int(self.short_term_memory_limit * self.summary_retention_ratio)])
|
summary = await self.summarize_memory(message, memory[:int(self.short_term_memory_limit * self.summary_retention_ratio)])
|
||||||
mid_memory.setdefault(channel_id, []).append({
|
mid_memory.setdefault(channel_id, []).append({
|
||||||
"timestamp": datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
|
"timestamp": datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
|
||||||
"topics": self.extract_topics_from_summary(summary),
|
"topics": self.extract_topics_from_summary(summary),
|
||||||
"summary": summary
|
"summary": summary
|
||||||
})
|
})
|
||||||
if len(mid_memory[channel_id]) > self.summary_retention_limit:
|
if len(mid_memory[channel_id]) > self.summary_retention_limit:
|
||||||
mid_memory[channel_id].pop(0)
|
mid_memory[channel_id].pop(0)
|
||||||
memory = memory[-(self.short_term_memory_limit - int(self.short_term_memory_limit * self.summary_retention_ratio)):]
|
memory = memory[-(self.short_term_memory_limit - int(self.short_term_memory_limit * self.summary_retention_ratio)):]
|
||||||
|
|
||||||
short_memory[channel_id] = memory
|
short_memory[channel_id] = memory
|
||||||
|
|
||||||
await self.send_split_message(message.channel, response_text)
|
await self.send_split_message(message.channel, response_text)
|
||||||
|
|
||||||
|
|
||||||
def should_reginald_interject(self, message_content: str) -> bool:
|
def should_reginald_interject(self, message_content: str) -> bool:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user