Fix: Hebrew Elantra N detection, final answer display, stronger prompts; UI redesign; Hebrew comparison test

agent.py

@@ -141,6 +141,7 @@ def run_stream(engine: RAGEngine, graph, query: str, api_key: str):
     """
     Run the agent graph and yield progress (steps + draft) for each step.
     Updates engine cache and history with the final answer. Yields strings for Gradio.
+    Ensures the user always sees a final verbal answer (or a clear error message).
     """
     initial: AgentState = {"query": query, "api_key": api_key}
     last_state: AgentState = initial
@@ -155,12 +156,21 @@ def run_stream(engine: RAGEngine, graph, query: str, api_key: str):
             text = f"{text}\n\n{body}"
         yield text
 
-    # Final state: update cache and history
-    final_answer = last_state.get("refusal") or last_state.get("draft_answer") or ""
-    steps_log = last_state.get("steps_log") or []
+    # Final state: ensure we have a visible answer
+    final_answer = (last_state.get("refusal") or last_state.get("draft_answer") or "").strip()
+    steps_log = list(last_state.get("steps_log") or [])
+    steps_log.append("✅ Done")
+
+    # If no answer at all, show a clear fallback (user expects a verbal, detailed response)
+    if not final_answer:
+        final_answer = (
+            "לא התקבלה תשובה מהמודל. ייתכן שנחסמה או שהבקשה ארכה מדי. "
+            "נסה לקצר את השאלה או לשאול שוב."
+        )
+
     if not any(final_answer.startswith(p) for p in ("⚠️", "❌", "⏱️")):
         cache_key = engine._get_cache_key(query)
         engine.response_cache[cache_key] = final_answer
     engine._maintain_conversation_history(query, final_answer)
-    steps_log.append("✅ Done")
+
     yield f"{chr(10).join(steps_log)}\n\n{final_answer}"

app.py

@@ -102,129 +102,155 @@ def create_comparison_start():
     """Generate a comparison question template"""
     return "Compare between the cars: "
 
-# Clean, professional UI with excellent readability
+# Premium, inviting UI – automotive vibe with warmth
 custom_css = """
+@import url('https://fonts.googleapis.com/css2?family=Outfit:wght@400;500;600;700;800&family=Heebo:wght@400;500;600;700&display=swap');
+
 :root {
-    --primary: #1e3a8a;
-    --text-primary: #1f2937;
-    --text-secondary: #6b7280;
-    --bg-white: #ffffff;
-    --bg-light: #f9fafb;
-    --border: #e5e7eb;
+    --primary: #c2410c;
+    --primary-hover: #9a3412;
+    --primary-soft: rgba(194, 65, 12, 0.12);
+    --accent: #0d9488;
+    --text-primary: #1c1917;
+    --text-secondary: #57534e;
+    --text-muted: #78716c;
+    --bg-app: linear-gradient(160deg, #fef7ed 0%, #faf5f0 50%, #f5f5f4 100%);
+    --bg-surface: #ffffff;
+    --bg-chat: #fafaf9;
+    --border: #e7e5e4;
+    --shadow-sm: 0 1px 2px rgba(0,0,0,0.04);
+    --shadow-md: 0 4px 12px rgba(0,0,0,0.06);
+    --shadow-lg: 0 12px 40px rgba(0,0,0,0.08);
+    --radius: 16px;
+    --radius-sm: 10px;
+    --font-head: 'Outfit', -apple-system, sans-serif;
+    --font-body: 'Heebo', -apple-system, sans-serif;
 }
 
-/* Dark mode (Gradio adds dark theme on body / html in some builds).
-   We override our own variables to keep contrast strong. */
 body.dark, [data-theme="dark"], .dark {
-    --primary: #93c5fd;
-    --text-primary: #e5e7eb;
-    --text-secondary: #9ca3af;
-    --bg-white: #0b1220;
-    --bg-light: #0b1220;
-    --border: #243244;
+    --primary: #ea580c;
+    --primary-hover: #f97316;
+    --primary-soft: rgba(234, 88, 12, 0.2);
+    --text-primary: #fafaf9;
+    --text-secondary: #d6d3d1;
+    --text-muted: #a8a29e;
+    --bg-app: linear-gradient(160deg, #1c1917 0%, #292524 100%);
+    --bg-surface: #292524;
+    --bg-chat: #1c1917;
+    --border: #44403c;
 }
 
 * {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif;
+    font-family: var(--font-body);
 }
 
 body {
-    background: var(--bg-light) !important;
+    background: var(--bg-app) !important;
+    min-height: 100vh !important;
 }
 
 .gradio-container {
-    max-width: 980px !important;
-    margin: 20px auto !important;
+    max-width: 900px !important;
+    margin: 0 auto !important;
+    padding: 24px 16px 40px !important;
 }
 
-/* Header */
+/* Header – hero style */
 .header-section {
-    background: var(--bg-white) !important;
-    border-bottom: 3px solid var(--primary) !important;
-    padding: 32px 20px !important;
-    margin-bottom: 20px !important;
+    background: var(--bg-surface) !important;
+    border-radius: var(--radius) !important;
+    padding: 36px 28px !important;
+    margin-bottom: 24px !important;
     text-align: center !important;
+    box-shadow: var(--shadow-md) !important;
+    border: 1px solid var(--border) !important;
 }
 
 .header-section h1 {
-    color: var(--primary) !important;
-    font-size: 2.5rem !important;
+    font-family: var(--font-head) !important;
+    font-size: 2.75rem !important;
     font-weight: 800 !important;
-    margin: 0 0 8px 0 !important;
+    margin: 0 0 6px 0 !important;
+    letter-spacing: -0.02em !important;
+    background: linear-gradient(135deg, var(--primary) 0%, var(--accent) 100%) !important;
+    -webkit-background-clip: text !important;
+    -webkit-text-fill-color: transparent !important;
+    background-clip: text !important;
 }
 
-.header-section p {
+.header-tagline {
+    font-size: 1.05rem !important;
     color: var(--text-secondary) !important;
-    font-size: 1rem !important;
-    margin: 0 !important;
+    margin: 0 0 14px 0 !important;
+    font-weight: 500 !important;
 }
 
-/* Under-header info text */
 .header-note {
-    margin-top: 10px !important;
-    color: var(--text-secondary) !important;
-    font-size: 0.95rem !important;
+    font-size: 0.9rem !important;
+    color: var(--text-muted) !important;
     line-height: 1.6 !important;
+    max-width: 560px !important;
+    margin: 0 auto !important;
+}
+
+.header-models {
+    margin-top: 12px !important;
+    font-size: 0.8rem !important;
+    color: var(--text-muted) !important;
 }
 
-/* Chat container - Clean minimal design */
+/* Chat container – card with shadow */
 .chat-container {
-    background: var(--bg-white) !important;
+    background: var(--bg-surface) !important;
     border: 1px solid var(--border) !important;
-    border-radius: 10px !important;
+    border-radius: var(--radius) !important;
     overflow: hidden !important;
+    box-shadow: var(--shadow-lg) !important;
 }
 
 .gradio-chatbot {
-    background: var(--bg-white) !important;
+    background: var(--bg-chat) !important;
+    padding: 24px !important;
+    height: 520px !important;
     border-radius: 0 !important;
-    border: none !important;
-    padding: 20px !important;
-    height: 500px !important;
 }
 
-/* Chat wrapper */
 [data-testid="chatbot"] {
-    background: var(--bg-white) !important;
-    border-radius: 0 !important;
+    background: var(--bg-chat) !important;
 }
 
-.gr-box.gr-input-box {
-    background: var(--bg-white) !important;
-    border: none !important;
-    border-top: 1px solid var(--border) !important;
-}
-
-/* Messages - Minimal, readable design */
+/* Message bubbles */
 .message {
-    padding: 20px 0 !important;
+    padding: 14px 0 !important;
     margin: 0 !important;
-    border-radius: 0 !important;
     line-height: 1.7 !important;
     color: var(--text-primary) !important;
-    background: transparent !important;
-    border: none !important;
     font-size: 15px !important;
+    border: none !important;
+    background: transparent !important;
+    border-radius: 0 !important;
 }
 
 .message.user {
-    background: transparent !important;
-    border: none !important;
-    margin: 20px 0 !important;
-    color: var(--text-primary) !important;
+    margin: 12px 0 !important;
+    padding: 14px 18px !important;
     text-align: right !important;
-    padding: 12px 16px !important;
-    background: rgba(147, 197, 253, 0.20) !important;
-    border-radius: 8px !important;
+    background: linear-gradient(135deg, var(--primary-soft) 0%, rgba(13, 148, 136, 0.08) 100%) !important;
+    border-radius: var(--radius-sm)  var(--radius-sm) 4px var(--radius-sm) !important;
+    border: 1px solid rgba(194, 65, 12, 0.15) !important;
+    max-width: 85% !important;
+    margin-left: auto !important;
 }
 
 .message.assistant {
-    background: transparent !important;
-    border: none !important;
-    margin: 20px 0 !important;
-    color: var(--text-primary) !important;
-    padding: 12px 16px !important;
+    margin: 12px 0 !important;
+    padding: 16px 18px !important;
     text-align: left !important;
+    background: var(--bg-surface) !important;
+    border-radius: 4px var(--radius-sm) var(--radius-sm) var(--radius-sm) !important;
+    border: 1px solid var(--border) !important;
+    box-shadow: var(--shadow-sm) !important;
+    max-width: 92% !important;
 }
 
 .message .prose, .message .prose * {
@@ -236,170 +262,187 @@ body {
 
 .message a {
     color: var(--primary) !important;
-    text-decoration: underline !important;
+    text-decoration: none !important;
+    border-bottom: 1px solid var(--primary) !important;
+}
+
+.message a:hover {
+    opacity: 0.9 !important;
 }
 
 .message h1, .message h2, .message h3 {
     color: var(--text-primary) !important;
-    font-weight: 600 !important;
-    margin: 12px 0 !important;
+    font-weight: 700 !important;
+    margin: 14px 0 8px 0 !important;
+    font-family: var(--font-head) !important;
+}
+
+/* Input area – pill style */
+.gr-box.gr-input-box {
+    background: var(--bg-surface) !important;
+    border: 1px solid var(--border) !important;
+    border-radius: 999px !important;
+    margin: 12px 16px 16px !important;
+    padding: 8px 8px 8px 20px !important;
+    box-shadow: var(--shadow-sm) !important;
 }
 
-/* Input - Clean minimal */
 .gr-textbox textarea {
     color: var(--text-primary) !important;
-    background: var(--bg-white) !important;
+    background: transparent !important;
     border: none !important;
-    border-top: 1px solid var(--border) !important;
-    border-radius: 0 !important;
-    padding: 16px !important;
+    padding: 12px 8px !important;
     font-size: 15px !important;
-    min-height: 50px !important;
+    min-height: 48px !important;
+    border-radius: 0 !important;
 }
 
 .gr-textbox textarea:focus {
-    border-top: 1px solid var(--border) !important;
-    box-shadow: none !important;
     outline: none !important;
+    box-shadow: none !important;
 }
 
 .gr-textbox textarea::placeholder {
-    color: #9ca3af !important;
+    color: var(--text-muted) !important;
 }
 
-/* Buttons - Minimal style */
-.gr-button {
-    background: var(--primary) !important;
+/* Primary button – Send */
+.gr-button.primary {
+    background: linear-gradient(135deg, var(--primary) 0%, var(--primary-hover) 100%) !important;
     color: white !important;
     border: none !important;
     font-weight: 600 !important;
-    border-radius: 6px !important;
-    padding: 10px 20px !important;
+    border-radius: 999px !important;
+    padding: 12px 24px !important;
+    transition: transform 0.15s ease, box-shadow 0.15s ease !important;
+    box-shadow: 0 2px 8px rgba(194, 65, 12, 0.35) !important;
 }
 
-.gr-button:hover {
-    background: #162e4d !important;
+.gr-button.primary:hover {
+    transform: translateY(-1px) !important;
+    box-shadow: 0 4px 14px rgba(194, 65, 12, 0.4) !important;
 }
 
-.gr-button.gr-button-secondary {
-    background: transparent !important;
-    color: var(--text-secondary) !important;
+/* Example chips */
+.gr-examples .gr-sample-button,
+.gr-sample-button {
+    background: var(--bg-surface) !important;
     border: 1px solid var(--border) !important;
+    color: var(--text-primary) !important;
+    border-radius: 999px !important;
+    padding: 10px 18px !important;
+    font-size: 0.9rem !important;
+    transition: all 0.2s ease !important;
+}
+
+.gr-examples .gr-sample-button:hover,
+.gr-sample-button:hover {
+    border-color: var(--primary) !important;
+    color: var(--primary) !important;
+    background: var(--primary-soft) !important;
 }
 
-.gr-button-sm {
-    padding: 6px 12px !important;
-    font-size: 0.85rem !important;
+/* Stop button */
+.gr-button-secondary,
+.gr-button:not(.primary) {
+    border-radius: var(--radius-sm) !important;
     font-weight: 500 !important;
 }
 
-/* Tables */
+/* Tables in answers */
 table {
     border-collapse: collapse !important;
     width: 100% !important;
-    margin: 12px 0 !important;
+    margin: 14px 0 !important;
+    border-radius: var(--radius-sm) !important;
+    overflow: hidden !important;
 }
 
 table th {
     background: var(--primary) !important;
     color: white !important;
-    padding: 10px !important;
+    padding: 12px 14px !important;
     text-align: left !important;
     font-weight: 600 !important;
 }
 
 table td {
-    padding: 10px !important;
+    padding: 12px 14px !important;
     border-bottom: 1px solid var(--border) !important;
     color: var(--text-primary) !important;
 }
 
 /* Code */
 code {
-    background: rgba(148, 163, 184, 0.15) !important;
-    color: var(--text-primary) !important;
-    padding: 3px 6px !important;
-    border-radius: 4px !important;
-    font-family: monospace !important;
+    background: var(--primary-soft) !important;
+    color: var(--primary) !important;
+    padding: 3px 8px !important;
+    border-radius: 6px !important;
+    font-family: ui-monospace, monospace !important;
     font-size: 0.9rem !important;
 }
 
 pre {
-    background: rgba(148, 163, 184, 0.12) !important;
-    color: var(--text-primary) !important;
-    padding: 12px !important;
-    border-radius: 6px !important;
+    background: var(--bg-surface) !important;
+    border: 1px solid var(--border) !important;
+    padding: 14px !important;
+    border-radius: var(--radius-sm) !important;
     overflow-x: auto !important;
 }
 
 pre code {
     background: transparent !important;
     color: var(--text-primary) !important;
-    padding: 0 !important;
-}
-
-/* Typography */
-.prose {
-    color: var(--text-primary) !important;
 }
 
 .prose h1, .prose h2, .prose h3, .prose h4 {
     color: var(--primary) !important;
-    font-weight: 700 !important;
-}
-
-.prose a {
-    color: var(--primary) !important;
+    font-family: var(--font-head) !important;
 }
 
-/* Hide footer */
 footer {
     display: none !important;
 }
 
 @media (max-width: 768px) {
-    .message.user {
-        margin-left: 0 !important;
-    }
-    .message.assistant {
-        margin-right: 0 !important;
-    }
+    .header-section h1 { font-size: 2rem !important; }
+    .message.user { max-width: 95% !important; }
+    .message.assistant { max-width: 98% !important; }
 }
 """
 
-# Simple, clean theme
 theme = gr.themes.Base().set(
-    button_primary_background_fill="#1e3a8a",
+    button_primary_background_fill="#c2410c",
     button_primary_text_color="#ffffff",
 )
 
-with gr.Blocks(theme=theme, css=custom_css, title="CarsRUS") as demo:
+with gr.Blocks(theme=theme, css=custom_css, title="CarsRUS – השוואת רכבים חכמה") as demo:
     
-    # Header
     with gr.Column(elem_classes="header-section"):
         gr.HTML("""
         <div>
-            <h1>CarsRUS</h1>
+            <h1>🚗 CarsRUS</h1>
+            <p class="header-tagline">השוואת רכבים והמלצות מבוססות כתבות מ־auto.co.il</p>
             <p class="header-note">
-                מערכת RAG שממליצה ומשווה רק על בסיס כתבות מ־auto.co.il שנמצאות בבסיס הידע המקומי. דגמים נתמכים: Citroen C3, Audi RS3, Kia EV9, MG S6, Hyundai Elantra N, Aion HT, Genesis GV80, Link &amp; Co 01.
+                שאל על דגם בודד או בקש השוואה בין שני דגמים. התשובות מבוססות רק על כתבות מבסיס הידע המקומי.
             </p>
+            <p class="header-models">דגמים: Citroen C3 · Audi RS3 · Kia EV9 · MG S6 · Hyundai Elantra N · Aion HT · Genesis GV80 · Link & Co 01</p>
         </div>
         """)
 
-    # Chat (single column layout)
     with gr.Column(elem_classes="chat-container"):
         chat_interface = gr.ChatInterface(
             fn=chat_function,
             examples=[
+                "ספר לי על אודי RS3",
+                "השוואה בין RS3 לאלנטרה N",
+                "מה מיוחד בקיה EV9?",
                 "Tell me about the Audi RS3",
                 "Compare Audi RS3 vs Hyundai Elantra N",
-                "What's special about Kia EV9?",
-                "מה היתרונות של קיה EV9?",
-                "השוואה בין RS3 לאלנטרה N",
             ],
             cache_examples=False,
-            submit_btn="Send",
-            stop_btn="Stop",
+            submit_btn="שלח",
+            stop_btn="עצור",
         )
 
 if __name__ == "__main__":

rag_engine.py

@@ -184,8 +184,8 @@ class RAGEngine:
         return None
 
     def _build_regex_patterns(self):
-        """בנה תבניות רגקס חכמות לזיהוי שמות רכבים"""
-        # Patterns are lowercased and use word boundaries where appropriate
+        """בנה תבניות רגקס חכמות לזיהוי שמות רכבים (כולל עברית – בלי \\b על עברית)"""
+        # Patterns: English use \\b; Hebrew has no word boundary (אלנטרה can appear as "לאלנטרה")
         self.regex_patterns = {
             r'\baudi[\s\-]*rs\s*3\b': 'audi_rs3',
             r'\bcitroen[\s\-]*c\s*3\b': 'citroen_c3',
@@ -194,13 +194,13 @@ class RAGEngine:
             r'\bev\s*9\b': 'kia_ev9',
             r'\bhyundai[\s\-]*elantra\s*n\b': 'hyundai_elantra_n',
             r'\belantra\s*n\b': 'hyundai_elantra_n',
+            r'אלנטרה\s*[nN]?': 'hyundai_elantra_n',  # Hebrew: "אלנטרה" or "אלנטרה N" (no \\b – "לאלנטרה" ok)
             r'\baion\s*ht\b': 'aion_ht',
             r'\bgenesis[\s\-]*gv\s*80\b': 'genesis_gv80',
             r'\bgv\s*80\b': 'genesis_gv80',
             r'\blink\s*&?\s*co\s*01\b': 'link_co_01',
             r'\brs\s*3\b': 'audi_rs3',
             r'\bcorolla\b': 'toyota_corolla',
-            # Add other common patterns as needed
         }
 
     def _extract_keywords(self, text: str) -> List[str]:
@@ -884,7 +884,7 @@ Content: {r['text'][:self.max_context_chars_per_chunk]}...
 """
         conversation_context = self._get_context_from_history()
         system_prompt = """You are an expert automotive assistant. Your answer MUST be based only on the "Context from car reviews" provided in the user message.
-Your task: aggregate and summarize the information from that context and directly answer the user's question. Do not use general knowledge beyond the context.
+Your task: aggregate and summarize the information from that context and give a detailed, verbal answer as a car expert would to a friend. Always output a full paragraph (or more) that directly answers the user's question—never leave the answer empty or vague.
 Respond in the same language as the user (Hebrew or English). For comparison questions, provide a structured analysis with clear advantages for each vehicle.
 If the context is empty or irrelevant, say you have no information from your knowledge base for this question."""
         user_prompt = f"""Context from car reviews:
@@ -1009,7 +1009,7 @@ Content: {r['text'][:self.max_context_chars_per_chunk]}...
         
         # עצה 9: פרומפט מותאם
         system_prompt = """You are an expert automotive assistant. Your answer MUST be based only on the "Context from car reviews" provided in the user message.
-Your task: aggregate and summarize the information from that context and directly answer the user's question. Do not use general knowledge beyond the context.
+Your task: aggregate and summarize the information from that context and give a detailed, verbal answer as a car expert would to a friend. Always output a full paragraph (or more) that directly answers the user's question—never leave the answer empty or vague.
 Respond in the same language as the user (Hebrew or English). For comparison questions, provide a structured analysis with clear advantages for each vehicle.
 If the context is empty or irrelevant, say you have no information from your knowledge base for this question."""
         
@@ -1178,7 +1178,7 @@ Content: {r['text'][:self.max_context_chars_per_chunk]}...
 """
         conversation_context = self._get_context_from_history()
         system_prompt = """You are an expert automotive assistant. Your answer MUST be based only on the "Context from car reviews" provided in the user message.
-Your task: aggregate and summarize the information from that context and directly answer the user's question. Do not use general knowledge beyond the context.
+Your task: aggregate and summarize the information from that context and give a detailed, verbal answer as a car expert would to a friend. Always output a full paragraph (or more) that directly answers the user's question—never leave the answer empty or vague.
 Respond in the same language as the user (Hebrew or English). For comparison questions, provide a structured analysis with clear advantages for each vehicle.
 If the context is empty or irrelevant, say you have no information from your knowledge base for this question."""
         prompt = f"""Context from car reviews:

tests/test_business_logic.py

@@ -86,6 +86,20 @@ def test_comparison_two_supported_no_refusal():
     print("✅ test_comparison_two_supported_no_refusal passed")
 
 
+def test_comparison_hebrew_two_cars_identified():
+    """Hebrew comparison 'השוואה בין RS3 לאלנטרה N' must identify both cars (audi_rs3, hyundai_elantra_n)."""
+    engine = _get_engine()
+    query = "השוואה בין RS3 לאלנטרה N"
+    ordered = engine._get_ordered_supported_canonicals_in_text(query)
+    assert len(ordered) >= 2, f"Expected at least 2 cars in Hebrew comparison, got {ordered}"
+    assert "audi_rs3" in ordered, f"Expected audi_rs3 in {ordered}"
+    assert "hyundai_elantra_n" in ordered, f"Expected hyundai_elantra_n in {ordered}"
+    refusal, _, user_prompt, _ = engine.prepare_generation(query)
+    assert refusal is None, "Hebrew comparison with two cars must not refuse"
+    assert "Elantra" in user_prompt or "אלנטרה" in user_prompt or "RS3" in user_prompt
+    print("✅ test_comparison_hebrew_two_cars_identified passed")
+
+
 def test_comparison_one_supported_refusal():
     """Comparison with only one supported car: no refusal; we answer with disclaimer + info on the one we know."""
     engine = _get_engine()
@@ -158,6 +172,7 @@ def run_all():
         test_unsupported_car_returns_refusal,
         test_supported_car_single_no_refusal,
         test_comparison_two_supported_no_refusal,
+        test_comparison_hebrew_two_cars_identified,
         test_comparison_one_supported_refusal,
         test_hybrid_search_returns_relevant_results,
         test_chat_function_requires_gemini_key,