improve debug mode exception catching

Author: Codegass

n0mail/cli/chat_commands.py

@@ -5,6 +5,7 @@
 from typing import Optional, List, Dict, Union, Iterator
 import os # Import os for path handling
 import json # For parsing tool arguments
+import traceback # Import traceback module
 import re # Import re for email validation
 from email.utils import parseaddr # Need this for parsing addresses
 from datetime import timezone # Ensure timezone is imported
@@ -46,30 +47,27 @@
 MAX_HISTORY_TURNS = 10 # Max user/assistant turns to keep in context (20 messages total)
 MAX_CONSECUTIVE_TOOL_CALLS = 5 # Limit for consecutive tool calls
 
-# --- Tool Definitions for OpenAI Function Calling ---
 
-# Removed tools definition list - moved to tools/definitions.py
-
-# --- System Prompt (Adjusted for Tool Use) ---
+# --- System Prompt (Adjusted for Tool Use and Keyword Search) ---
 CHAT_SYSTEM_PROMPT = (
     "You are an AI assistant for the N0Mail application. Your primary goal is to help users find information within their emails.\n"
     "You have access to several tools:\n"
-    "1. `retrieve_rag_context`: Use this for general questions about email content (e.g., 'What was discussed about project X?', 'Summarize recent important emails'). It performs a semantic search.\n"
-    "2. `search_email_by_sender`: Use this *only* when you have a specific, complete email address to search for (e.g., '[email protected]').\n"
-    "3. `find_email_address_based_on_name`: Use this *first* if the user asks about emails involving a person but only provides their name. This tool tries to find potential email addresses associated with that name.\n\n"
+    "1. `retrieve_rag_context`: Performs a semantic search based on the *meaning* of the query. Use this for general questions, topic exploration, or finding conceptually related emails even if exact keywords don't match (e.g., 'What was discussed about project X?').\n"
+    "2. `search_email_by_sender`: Searches for emails sent *from* a specific, complete email address. Use this ONLY when the user provides a full email address (e.g., '[email protected]') and asks for emails FROM that specific sender.\n"
+    "3. `search_email_by_keyword`: Searches for emails containing *exact* keywords or phrases within the subject or body. Use this for finding specific terms, IDs, error codes, or quoted text. This tool does NOT understand semantics, only exact matches.\n"
+    "4. `find_email_address_based_on_name`: Looks up potential email addresses associated with a person's name. Use this *before* calling `search_email_by_sender` if the user only provides a name.\n\n"
     "Tool Usage Workflow:\n"
-    "- Analyze the user's request and decide if a tool is needed.\n"
-    "- **CRITICAL: If the user asks about emails from/to a person by name ONLY (e.g., 'find emails from John Doe'), you MUST first call `find_email_address_based_on_name` with the provided name.**\n"
-    "- **Consecutive Tool Calls:** You can now make multiple tool calls in sequence within a single turn to fulfill the user's request efficiently. For example:\n"
-    "    - After calling `find_email_address_based_on_name`:\n"
-    "        - If it returns a *single* email address, immediately proceed to call `search_email_by_sender` with that address in the *same turn*.\n"
-    "        - If it returns *multiple* potential addresses, STOP the tool sequence, present these options to the user, and ask them to confirm the correct one before potentially calling `search_email_by_sender` in the *next* turn.\n"
-    "        - If it returns 'No matching addresses found', STOP the tool sequence and inform the user.\n"
-    "- Only call `search_email_by_sender` if you have a confirmed, complete email address.\n"
-    "- **Limit:** You can make a maximum of 5 consecutive tool calls per user turn. Plan your tool usage accordingly.\n"
-    "- **Goal:** Your aim after any sequence of tool calls is to provide a comprehensive final answer to the user based on the collected information. Only stop the sequence mid-way if user input is genuinely required (like choosing between multiple emails) or if you hit the call limit.\n"
-    "- **Errors:** If a tool returns an error message (e.g., starts with 'Error:'), relay the error to the user politely and stop the current tool sequence.\n"
-    "- **Handling No/Insufficient Results:** If `retrieve_rag_context` returns no relevant emails or the found emails don't contain the specific information requested, inform the user clearly (e.g., 'I searched your recent emails but couldn't find specific details about X. Right now I can only find the information that xxxxxx. Could you provide more context or rephrase your question?'). Don't invent information.\n"
+    "- Analyze the user's request carefully to determine the most appropriate tool.\n"
+    "- **Choosing the Right Search Tool:**\n"
+    "    - For general questions about topics, summaries, or concepts where exact wording isn't known or important, use `retrieve_rag_context`.\n"
+    "    - If the user provides specific keywords or phrases they want to find *exactly* within the email subject or body, use `search_email_by_keyword`.\n"
+    "    - If the user asks for emails specifically *from* a person AND provides their *full email address*, use `search_email_by_sender`.\n"
+    "- **Handling Names vs. Emails:**\n"
+    "    - **CRITICAL:** If the user asks about emails involving a person but only provides their name (e.g., 'find emails from John Doe'), you MUST first call `find_email_address_based_on_name` to get potential email addresses.\n"
+    "- **Consecutive Tool Calls:** You can make multiple tool calls in sequence (up to 5 max). For example, after `find_email_address_based_on_name` returns a single address, immediately call `search_email_by_sender` in the same turn. If multiple addresses are found, present them to the user first.\n"
+    "- **Goal:** Aim to provide a comprehensive final answer after tool calls. Only stop a sequence mid-way if user input is required or the call limit is reached.\n"
+    "- **Errors:** If a tool returns an error, inform the user politely and stop the sequence.\n"
+    "- **Handling No/Insufficient Results:** If search tools return no relevant emails or insufficient information, clearly state that (e.g., 'I searched your emails but couldn't find specific details about X...'). Do not invent information.\n"
     "- If no tool seems necessary, answer directly based on the conversation history.\n"
     "- Keep your responses concise and helpful. Format using Markdown.\n"
     "- The initial message in the history is an email briefing for context."
@@ -115,37 +113,6 @@ def _prepare_initial_brief_data(brief_days: int, max_emails_brief: int) -> Optio
         console.print(f"[bold red]Error preparing initial brief data:[/bold red] {e}")
         return None
 
-def _find_full_emails_by_ids(email_ids: List[str]) -> List[Dict]:
-    """Fetches full email details from SQLite database based on a list of IDs."""
-    if not email_ids:
-        return []
-    
-    unique_ids = list(set(email_ids)) # Ensure IDs are unique
-    console.print(f"[grey]Fetching full content for {len(unique_ids)} unique email IDs from database...[/grey]")
-    
-    full_emails = []
-    try:
-        with database.get_db_connection() as conn:
-            query = (
-                select(
-                    models.emails_table.c.id, models.emails_table.c.subject,
-                    models.emails_table.c.sender, models.emails_table.c.date,
-                    models.emails_table.c.body_md # Get the full body
-                ).where(models.emails_table.c.id.in_(unique_ids))
-            )
-            results = conn.execute(query).mappings().fetchall()
-            full_emails = [dict(row) for row in results]
-            
-            if len(full_emails) < len(unique_ids):
-                found_ids = {e['id'] for e in full_emails}
-                missing_ids = [eid for eid in unique_ids if eid not in found_ids]
-                console.print(f"[yellow]Warning: Could not find full details for {len(missing_ids)} email IDs in SQLite: {missing_ids}[/yellow]")
-                
-    except Exception as e:
-        console.print(f"[bold red]Error fetching full emails from SQLite:[/bold red] {e}")
-        
-    return full_emails
-
 def _format_emails_for_llm(email_list: List[Dict]) -> str:
     """Formats a list of email dictionaries into a string for LLM context."""
     if not email_list:
@@ -640,6 +607,9 @@ def run_chat(
                          break
                 except Exception as api_e:
                     console.print(f"\n[bold red]Error calling LLM API (iteration {consecutive_tool_calls + 1}):[/bold red] {api_e}")
+                    console.print("[bold red]--- Traceback Start ---[/bold red]")
+                    traceback.print_exc() # Explicitly print the full traceback
+                    console.print("[bold red]--- Traceback End ---[/bold red]")
                     break 
 
                 if response_message is None: