Upload 4 files

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+or-logo1.png filter=lfs diff=lfs merge=lfs -text

app.py

@@ -175,19 +175,19 @@ class SimpleBrowser:
     def get_citation_index(self, cursor: int) -> int:
         if cursor not in self.used_citations:
             self.used_citations.append(cursor)
-        return self.used_citations.index(cursor) + 1  # Start from 1 instead of 0
+        return self.used_citations.index(cursor)
 
     def get_page_info(self, cursor: int) -> Optional[Dict[str, str]]:
         # Prioritize link_map as it stores search result metadata
         if cursor in self.link_map:
             return self.link_map[cursor]
-
+            
         # Fallback to page_stack for opened pages
         if 0 <= cursor < len(self.page_stack):
             url = self.page_stack[cursor]
             page = self.pages.get(url)
             if page:
-                return {'url': url, 'title': page.get('title', ''), 'snippet': ''}
+                return {'url': url, 'title': page.get('title', '')}
         return None
 
     def _format_line_numbers(self, text: str, offset: int = 0) -> str:
@@ -213,9 +213,8 @@ class SimpleBrowser:
             except:
                 domain = ''
 
-            # Store snippet information as well
-            self.link_map[i] = {'url': url, 'title': title, 'snippet': snippet}
-            link_map[i] = {'url': url, 'title': title, 'snippet': snippet}
+            self.link_map[i] = {'url': url, 'title': title}
+            link_map[i] = {'url': url, 'title': title}
             link_text = f"【{i}†{title}†{domain}】" if domain else f"【{i}†{title}】"
             lines.append(f"{link_text}")
             lines.append(f"  {snippet}")
@@ -486,59 +485,24 @@ def is_final_answer(text: str) -> bool:
 # HTML Rendering Helpers (From app_local.py)
 # ============================================================
 def render_citations(text: str, browser: SimpleBrowser) -> str:
-    """Convert citation markers to clickable HTML links with tooltips."""
-    # Store citation HTML to protect from markdown conversion
-    citation_store = {}
-    citation_counter = [0]
-
+    """Convert citation markers to clickable HTML links."""
     def replace_citation(m):
         cursor_str = m.group(1)
-        full_match = m.group(0)  # Get the full match to extract line info
-
-        # Extract line information from the citation marker
-        # Format: 【{cursor}†L{line_start}(-L{line_end})?】
-        line_info = ""
-        line_match = re.search(r'†(L\d+(?:-L\d+)?)', full_match)
-        if line_match:
-            line_info = line_match.group(1)
+        # l1 = m.group(2)
+        # l2 = m.group(3)
 
         try:
             cursor = int(cursor_str)
             index = browser.get_citation_index(cursor)
-
+            
             # Check if we have URL info
             info = browser.get_page_info(cursor)
             if info and info.get('url'):
-                url = info.get('url', '')
-                title = info.get('title', 'No Title')
-                snippet = info.get('snippet', '')
-
-                # Unescape HTML entities and remove newlines to prevent rendering issues
-                title_display = html.unescape(title).replace('\n', ' ').replace('\r', '').strip()
-                snippet_display = html.unescape(snippet).replace('\n', ' ').replace('\r', '').strip() if snippet else 'No description available'
-
-                # Extract domain from URL
-                try:
-                    domain = url.split('/')[2] if len(url.split('/')) > 2 else url
-                except:
-                    domain = url
-
-                # Add line info if available
-                line_html = ""
-                if line_info:
-                    line_html = f'<div class="citation-tooltip-line">📍 {line_info}</div>'
-
-                # Create citation with tooltip (single line to avoid markdown conversion issues)
-                tooltip_html = f'<span class="citation-tooltip"><div class="citation-tooltip-title">{title_display}</div>{line_html}<div class="citation-tooltip-snippet">{snippet_display}</div><div class="citation-tooltip-url">🔗 {html.escape(domain)}</div></span>'
-
-                citation_html = f'<span class="citation-wrapper"><a href="{html.escape(url)}" target="_blank" class="citation-link">[{index}]</a>{tooltip_html}</span>'
-
-                # Store citation HTML and return placeholder
-                placeholder = f'___CITATION_{citation_counter[0]}___'
-                citation_store[placeholder] = citation_html
-                citation_counter[0] += 1
-                return placeholder
-
+                 # Return clickable index link pointing to reference section
+                 # Aligned with generate_html_example.py style (green via CSS class)
+                url = info.get('url')
+                return f'<a href="{html.escape(url)}" target="_blank" class="citation-link">[{index}]</a>'
+            
             # Fallback if no URL
             return f'<span class="citation-link">[{index}]</span>'
         except Exception as e:
@@ -546,14 +510,19 @@ def render_citations(text: str, browser: SimpleBrowser) -> str:
             pass
         return m.group(0)
 
-    # First pass: replace citations with placeholders
+    # First pass: replace citations with linked citations
     result = re.sub(r'[【\[](\d+)†.*?[】\]]', replace_citation, text)
+    
+    # Second pass: Deduplicate adjacent identical citations
+    # Matches: <a ...>[N]</a> followed by optional whitespace and same link
+    # We repeat this until no more changes to handle multiple duplicates
+    while True:
+        new_result = re.sub(r'(<a [^>]+>\[\d+\]</a>)(\s*)\1', r'\1', result)
+        if new_result == result:
+            break
+        result = new_result
 
-    # Second pass: Remove standalone URLs that appear after text (common pattern)
-    # This removes URLs that directly follow sentences without proper citation
-    result = re.sub(r'(?<=[.!?])\s+(https?://[^\s]+)', '', result)
-
-    # Third pass: Convert basic markdown to HTML
+    # Convert basic markdown to HTML
     result = re.sub(r'\*\*(.+?)\*\*', r'<strong>\1</strong>', result)
     result = re.sub(r'\*(.+?)\*', r'<em>\1</em>', result)
     result = re.sub(r'`(.+?)`', r'<code>\1</code>', result)
@@ -561,17 +530,6 @@ def render_citations(text: str, browser: SimpleBrowser) -> str:
     if not result.startswith('<p>'):
         result = f'<p>{result}</p>'
 
-    # Fourth pass: Restore citation HTML from placeholders
-    for placeholder, citation_html in citation_store.items():
-        result = result.replace(placeholder, citation_html)
-
-    # Fifth pass: Deduplicate adjacent identical citations
-    while True:
-        new_result = re.sub(r'(<span class="citation-wrapper">.*?</span>)(\s*)\1', r'\1', result)
-        if new_result == result:
-            break
-        result = new_result
-
     return result
 
 def render_thinking_streaming(text: str) -> str:
@@ -698,12 +656,8 @@ def render_tool_result(result: str, fn_name: str) -> str:
                             <div style="color: #6b7280; font-size: 0.85rem; line-height: 1.5; margin-top: 0.75rem;">
                                 {html.escape(summary)}
                             </div>
-                            <div style="display: flex; align-items: center; gap: 0.25rem; color: #9ca3af; font-size: 0.7rem; margin-top: 0.5rem;">
-                                <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                                    <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path>
-                                    <path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path>
-                                </svg>
-                                <span style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;">{html.escape(url.split('/')[2] if len(url.split('/')) > 2 else url)}</span>
+                            <div style="color: #9ca3af; font-size: 0.75rem; margin-top: 0.5rem; font-family: monospace; word-break: break-all;">
+                                {html.escape(url)}
                             </div>
                         </div>
                     </div>
@@ -1525,125 +1479,7 @@ def create_interface():
     .answer-section a:hover {
         text-decoration: underline;
     }
-
-    /* Citation Tooltip - 小便签弹窗 */
-    .citation-wrapper {
-        position: relative;
-        display: inline-block;
-    }
-
-    .citation-link {
-        color: #10a37f;
-        text-decoration: none;
-        font-weight: 600;
-        padding: 2px 4px;
-        border-radius: 4px;
-        background: #e6f7f1;
-        transition: all 0.2s ease;
-        cursor: pointer;
-        border: 1px solid #10a37f30;
-    }
-
-    .citation-link:hover {
-        background: #10a37f;
-        color: white;
-        text-decoration: none;
-    }
-
-    .citation-tooltip {
-        visibility: hidden;
-        opacity: 0;
-        position: absolute;
-        bottom: 125%;
-        left: 50%;
-        transform: translateX(-50%);
-        z-index: 999999;
-        width: 280px;
-        background: linear-gradient(135deg, #ffffff 0%, #f9fafb 100%);
-        border: 2px solid #10a37f;
-        border-radius: 12px;
-        padding: 12px 14px;
-        box-shadow: 0 8px 24px rgba(16, 163, 127, 0.25), 0 4px 8px rgba(0, 0, 0, 0.1);
-        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-        pointer-events: auto;
-    }
-
-    .citation-tooltip::after {
-        content: "";
-        position: absolute;
-        top: 100%;
-        left: 50%;
-        transform: translateX(-50%);
-        border: 8px solid transparent;
-        border-top-color: #10a37f;
-    }
-
-    /* Create an invisible bridge between link and tooltip */
-    .citation-tooltip::before {
-        content: "";
-        position: absolute;
-        top: 100%;
-        left: 0;
-        right: 0;
-        height: 20px;
-        background: transparent;
-    }
-
-    .citation-wrapper:hover .citation-tooltip,
-    .citation-tooltip:hover {
-        visibility: visible;
-        opacity: 1;
-        bottom: 130%;
-    }
-
-    .citation-tooltip-title {
-        font-weight: 600;
-        color: #1e293b;
-        font-size: 0.9rem;
-        margin-bottom: 8px;
-        line-height: 1.4;
-        border-bottom: 1px solid #e5e7eb;
-        padding-bottom: 6px;
-    }
-
-    .citation-tooltip-line {
-        color: #059669;
-        font-size: 0.75rem;
-        font-weight: 600;
-        margin-bottom: 6px;
-        padding: 3px 8px;
-        background: #ecfdf5;
-        border-radius: 4px;
-        display: inline-block;
-        border: 1px solid #10a37f30;
-    }
-
-    .citation-tooltip-snippet {
-        color: #475569;
-        font-size: 0.8rem;
-        line-height: 1.5;
-        margin-bottom: 8px;
-        max-height: 80px;
-        overflow-y: auto;
-    }
-
-    .citation-tooltip-url {
-        color: #6b7280;
-        font-size: 0.7rem;
-        font-family: 'SF Mono', Monaco, monospace;
-        word-break: break-all;
-        padding: 2px 0;
-        border-top: 1px solid #e5e7eb;
-        padding-top: 6px;
-        text-decoration: none;
-        opacity: 0.8;
-    }
-
-    .citation-tooltip-url:hover {
-        color: #10a37f;
-        opacity: 1;
-    }
-
+    
     /* User Message Bubble - 淡蓝色背景，右对齐 */
     .user-message-bubble {
         background: linear-gradient(135deg, #e0f2fe 0%, #bae6fd 100%);
@@ -2230,50 +2066,6 @@ def create_interface():
             color: #f0f9ff !important;
         }
 
-        /* Citation Tooltip 深色模式 */
-        .citation-link {
-            background: #064e3b !important;
-            border-color: #10a37f80 !important;
-            color: #6ee7b7 !important;
-        }
-
-        .citation-link:hover {
-            background: #10a37f !important;
-            color: #ffffff !important;
-        }
-
-        .citation-tooltip {
-            background: linear-gradient(135deg, #1f2937 0%, #111827 100%) !important;
-            border-color: #10a37f !important;
-            box-shadow: 0 8px 24px rgba(16, 163, 127, 0.4), 0 4px 8px rgba(0, 0, 0, 0.3) !important;
-        }
-
-        .citation-tooltip-title {
-            color: #e5e7eb !important;
-            border-bottom-color: #374151 !important;
-        }
-
-        .citation-tooltip-line {
-            color: #6ee7b7 !important;
-            background: #064e3b !important;
-            border-color: #10a37f50 !important;
-        }
-
-        .citation-tooltip-snippet {
-            color: #d1d5db !important;
-        }
-
-        .citation-tooltip-url {
-            color: #9ca3af !important;
-            border-top-color: #374151 !important;
-            opacity: 0.8 !important;
-        }
-
-        .citation-tooltip-url:hover {
-            color: #10a37f !important;
-            opacity: 1 !important;
-        }
-
         /* 用户问题气泡深色模式 */
         .user-message-bubble {
             background: linear-gradient(135deg, #1e3a5f 0%, #1e40af 100%) !important;
@@ -2406,50 +2198,6 @@ def create_interface():
         color: #e0f2fe !important;
     }
 
-    /* Citation Tooltip Gradio dark 模式 */
-    .dark .citation-link {
-        background: #064e3b !important;
-        border-color: #10a37f80 !important;
-        color: #6ee7b7 !important;
-    }
-
-    .dark .citation-link:hover {
-        background: #10a37f !important;
-        color: #ffffff !important;
-    }
-
-    .dark .citation-tooltip {
-        background: linear-gradient(135deg, #1f2937 0%, #111827 100%) !important;
-        border-color: #10a37f !important;
-        box-shadow: 0 8px 24px rgba(16, 163, 127, 0.4), 0 4px 8px rgba(0, 0, 0, 0.3) !important;
-    }
-
-    .dark .citation-tooltip-title {
-        color: #e5e7eb !important;
-        border-bottom-color: #374151 !important;
-    }
-
-    .dark .citation-tooltip-line {
-        color: #6ee7b7 !important;
-        background: #064e3b !important;
-        border-color: #10a37f50 !important;
-    }
-
-    .dark .citation-tooltip-snippet {
-        color: #d1d5db !important;
-    }
-
-    .dark .citation-tooltip-url {
-        color: #9ca3af !important;
-        border-top-color: #374151 !important;
-        opacity: 0.8 !important;
-    }
-
-    .dark .citation-tooltip-url:hover {
-        color: #10a37f !important;
-        opacity: 1 !important;
-    }
-
     .dark .search-result-card {
         background: #1f2937 !important;
         border-color: #374151 !important;