slipstream/discordbot
slipstream/discordbot
1
1
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

afwf

Browse Source
This commit is contained in:
Slipstream 2025-04-30 18:16:35 -06:00
parent 3d2c8f5bc8
commit 2a661dd671
Signed by: slipstream
GPG Key ID: 13E498CE010AC6FD
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gurt/api.py
View File

@ -772,7 +772,7 @@ async def get_ai_response(cog: 'GurtCog', message: discord.Message, model_name:
full_text = "\n".join(text_parts).strip()
if full_text: # Only add if there's some text content
# Use the new author_string here
author_string = msg.get("author_string", msg.get("author", {}).get("display_name", "Unknown User"))
author_string = msg.get("author_string", msg.get("author", {}).get("display_name", " "))
contents.append(types.Content(role=role, parts=[types.Part(text=f"{author_string}: {full_text}")]))

10
gurt/context.py
View File

@ -28,14 +28,14 @@ def gather_conversation_context(cog: 'GurtCog', channel_id: int, current_message
# Build the content string, including reply and attachment info
content_parts = []
# FIX: Use the pre-formatted author_string which includes '(BOT)' tag if applicable.
# Fall back to display_name or 'Unknown User' if author_string is missing for some reason.
author_name = msg_data.get('author_string', msg_data.get('author', {}).get('display_name', 'Unknown User'))
# Fall back to display_name or ' ' if author_string is missing for some reason.
author_name = msg_data.get('author_string', msg_data.get('author', {}).get('display_name', ' '))
message_id = msg_data['id'] # Get the message ID
# Add reply prefix if applicable
if msg_data.get("is_reply"):
reply_author = msg_data.get('replied_to_author_name', 'Unknown User')
reply_author = msg_data.get('replied_to_author_name', ' ')
reply_snippet = msg_data.get('replied_to_content_snippet') # Get value, could be None
# Keep snippet very short for context, handle None case
reply_snippet_short = '...' # Default if snippet is None or not a string
@ -217,7 +217,7 @@ async def get_memory_context(cog: 'GurtCog', message: discord.Message) -> Option
dist = result.get('distance', 1.0)
similarity_score = 1.0 - dist
timestamp_str = datetime.datetime.fromtimestamp(meta.get('timestamp', 0)).strftime('%Y-%m-%d %H:%M') if meta.get('timestamp') else 'Unknown time'
author_name = meta.get('display_name', meta.get('user_name', 'Unknown user'))
author_name = meta.get('display_name', meta.get('user_name', ' '))
semantic_memory_parts.append(f"- (Similarity: {similarity_score:.2f}) {author_name} (at {timestamp_str}): {doc[:100]}")
if len(semantic_memory_parts) > 1: memory_parts.append("\n".join(semantic_memory_parts))
except Exception as e: print(f"Error retrieving semantic memory context: {e}")
@ -230,7 +230,7 @@ async def get_memory_context(cog: 'GurtCog', message: discord.Message) -> Option
recent_attachments = messages_with_attachments[-5:] # Get last 5
attachment_memory_parts = ["Recently Shared Files/Images:"]
for msg in recent_attachments:
author_name = msg.get('author', {}).get('display_name', 'Unknown User')
author_name = msg.get('author', {}).get('display_name', ' ')
timestamp_str = 'Unknown time'
try:
# Safely parse timestamp

2
gurt/tools.py
View File

@ -79,7 +79,7 @@ async def search_user_messages(cog: commands.Cog, user_id: str, limit: int, chan
except ValueError: return {"error": f"Invalid user ID: {user_id}"}
messages = []
user_name = "Unknown User"
user_name = " "
async for message in channel.history(limit=500):
if message.author.id == user_id_int:
formatted_msg = format_message(cog, message) # Use formatter