supervertaler 1.9.175__py3-none-any.whl → 1.9.177b0__py3-none-any.whl

Supervertaler.py

@@ -34,7 +34,7 @@ License: MIT
 """
 
 # Version Information.
-__version__ = "1.9.175"
+__version__ = "1.9.176-beta"
 __phase__ = "0.9"
 __release_date__ = "2026-01-28"
 __edition__ = "Qt"
@@ -6435,13 +6435,10 @@ class SupervertalerQt(QMainWindow):
             from PyQt6.QtCore import QTimer
             QTimer.singleShot(2000, lambda: self._check_for_new_models(force=False))  # 2 second delay
         
-        # First-run check - show data location dialog, then Features tab
-        if self._needs_data_location_dialog:
+        # First-run check - show unified setup wizard
+        if self._needs_data_location_dialog or not general_settings.get('first_run_completed', False):
             from PyQt6.QtCore import QTimer
-            QTimer.singleShot(300, self._show_data_location_dialog)
-        elif not general_settings.get('first_run_completed', False):
-            from PyQt6.QtCore import QTimer
-            QTimer.singleShot(500, self._show_first_run_welcome)
+            QTimer.singleShot(300, lambda: self._show_setup_wizard(is_first_run=True))
     
     def _show_data_location_dialog(self):
         """Show dialog to let user choose their data folder location on first run."""
@@ -6672,7 +6669,273 @@ class SupervertalerQt(QMainWindow):
                 self.log("✅ First-run welcome shown (will show again next time)")
         except Exception as e:
             self.log(f"⚠️ First-run welcome error: {e}")
-    
+
+    def _show_setup_wizard(self, is_first_run: bool = False):
+        """
+        Show unified setup wizard that combines data folder selection and features intro.
+
+        Args:
+            is_first_run: If True, this is an automatic first-run trigger. If False, user
+                          manually invoked from menu (skip data folder if already configured).
+        """
+        try:
+            from PyQt6.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QLabel,
+                                         QPushButton, QLineEdit, QFileDialog, QStackedWidget,
+                                         QWidget, QFrame, QCheckBox)
+            from PyQt6.QtCore import Qt
+
+            dialog = QDialog(self)
+            dialog.setWindowTitle("Supervertaler Setup Wizard")
+            dialog.setMinimumWidth(600)
+            dialog.setMinimumHeight(450)
+            dialog.setModal(True)
+
+            main_layout = QVBoxLayout(dialog)
+            main_layout.setSpacing(15)
+            main_layout.setContentsMargins(20, 20, 20, 20)
+
+            # Stacked widget for wizard pages
+            stacked = QStackedWidget()
+
+            # Determine if we need to show data folder page
+            show_data_folder_page = is_first_run and self._needs_data_location_dialog
+
+            # ==================== PAGE 1: Data Folder Selection ====================
+            page1 = QWidget()
+            page1_layout = QVBoxLayout(page1)
+            page1_layout.setSpacing(15)
+
+            # Step indicator
+            step1_indicator = QLabel("<span style='color: #888;'>Step 1 of 2</span>")
+            page1_layout.addWidget(step1_indicator)
+
+            # Title
+            page1_title = QLabel("<h2>📁 Choose Your Data Folder</h2>")
+            page1_layout.addWidget(page1_title)
+
+            # Explanation
+            page1_msg = QLabel(
+                "Supervertaler stores your data in a folder of your choice:<br><br>"
+                "• <b>API keys</b> – Your LLM provider credentials<br>"
+                "• <b>Translation memories</b> – Reusable translation pairs<br>"
+                "• <b>Glossaries</b> – Terminology databases<br>"
+                "• <b>Prompts</b> – Custom AI prompts<br>"
+                "• <b>Settings</b> – Application configuration<br><br>"
+                "Choose a location that's easy to find and backup."
+            )
+            page1_msg.setWordWrap(True)
+            page1_layout.addWidget(page1_msg)
+
+            # Path input with browse button
+            path_layout = QHBoxLayout()
+            path_edit = QLineEdit()
+            default_path = get_default_user_data_path()
+            path_edit.setText(str(default_path))
+            path_edit.setMinimumWidth(350)
+            path_layout.addWidget(path_edit)
+
+            browse_btn = QPushButton("Browse...")
+            def browse_folder():
+                folder = QFileDialog.getExistingDirectory(
+                    dialog,
+                    "Choose Data Folder",
+                    str(Path.home())
+                )
+                if folder:
+                    folder_path = Path(folder)
+                    if folder_path.name != "Supervertaler":
+                        folder_path = folder_path / "Supervertaler"
+                    path_edit.setText(str(folder_path))
+
+            browse_btn.clicked.connect(browse_folder)
+            path_layout.addWidget(browse_btn)
+            page1_layout.addLayout(path_layout)
+
+            # Tip
+            page1_tip = QLabel(
+                "💡 <b>Tip:</b> The default location is in your home folder, "
+                "making it easy to find and backup."
+            )
+            page1_tip.setWordWrap(True)
+            page1_tip.setStyleSheet("color: #666;")
+            page1_layout.addWidget(page1_tip)
+
+            page1_layout.addStretch()
+            stacked.addWidget(page1)
+
+            # ==================== PAGE 2: Features Introduction ====================
+            page2 = QWidget()
+            page2_layout = QVBoxLayout(page2)
+            page2_layout.setSpacing(15)
+
+            # Step indicator
+            step2_label = "Step 2 of 2" if show_data_folder_page else "Setup"
+            step2_indicator = QLabel(f"<span style='color: #888;'>{step2_label}</span>")
+            page2_layout.addWidget(step2_indicator)
+
+            # Data folder info (shown when skipping page 1)
+            if not show_data_folder_page:
+                from PyQt6.QtGui import QDesktopServices
+                from PyQt6.QtCore import QUrl
+
+                data_folder_path = str(self.user_data_path)
+                data_folder_info = QLabel(
+                    f"<b>📁 Data Folder:</b> <a href='file:///{data_folder_path}' "
+                    f"style='color: #3b82f6;'>{data_folder_path}</a><br>"
+                    "<span style='color: #666; font-size: 0.9em;'>"
+                    "Your settings, TMs, glossaries and prompts are stored here. "
+                    "Change in Settings → General.</span>"
+                )
+                data_folder_info.setWordWrap(True)
+                data_folder_info.setTextFormat(Qt.TextFormat.RichText)
+                data_folder_info.setOpenExternalLinks(False)  # Handle clicks ourselves
+                data_folder_info.linkActivated.connect(
+                    lambda url: QDesktopServices.openUrl(QUrl.fromLocalFile(data_folder_path))
+                )
+                data_folder_info.setStyleSheet(
+                    "background: #f0f4ff; padding: 12px; border-radius: 6px; "
+                    "border-left: 4px solid #3b82f6; margin-bottom: 10px;"
+                )
+                page2_layout.addWidget(data_folder_info)
+
+            # Title
+            page2_title = QLabel("<h2>✨ Modular Features</h2>")
+            page2_layout.addWidget(page2_title)
+
+            # Message
+            page2_msg = QLabel(
+                "Supervertaler uses a <b>modular architecture</b> – you can install "
+                "only the features you need.<br><br>"
+                "<b>Core features</b> (always available):<br>"
+                "• AI translation with OpenAI, Claude, Gemini, Ollama<br>"
+                "• Translation Memory and Glossaries<br>"
+                "• XLIFF, SDLXLIFF, memoQ support<br>"
+                "• Basic spellchecking<br><br>"
+                "<b>Optional features</b> (install via pip):<br>"
+                "• <code>openai-whisper</code> – Local voice dictation (no API needed)<br><br>"
+                "You can view and manage features in <b>Settings → Features</b>."
+            )
+            page2_msg.setWordWrap(True)
+            page2_msg.setTextFormat(Qt.TextFormat.RichText)
+            page2_layout.addWidget(page2_msg)
+
+            # Checkbox
+            dont_show_checkbox = CheckmarkCheckBox("Don't show this wizard on startup")
+            dont_show_checkbox.setChecked(True)
+            page2_layout.addWidget(dont_show_checkbox)
+
+            # Open Features tab checkbox
+            open_features_checkbox = CheckmarkCheckBox("Open Features tab after closing")
+            open_features_checkbox.setChecked(True)
+            page2_layout.addWidget(open_features_checkbox)
+
+            page2_layout.addStretch()
+            stacked.addWidget(page2)
+
+            main_layout.addWidget(stacked)
+
+            # ==================== Navigation Buttons ====================
+            nav_layout = QHBoxLayout()
+
+            back_btn = QPushButton("← Back")
+            back_btn.setVisible(False)  # Hidden on first page
+
+            next_btn = QPushButton("Next →")
+            finish_btn = QPushButton("Finish")
+            finish_btn.setVisible(False)
+            finish_btn.setDefault(True)
+
+            # Use Default button (only on page 1)
+            default_btn = QPushButton("Use Default")
+            default_btn.clicked.connect(lambda: path_edit.setText(str(default_path)))
+
+            nav_layout.addWidget(default_btn)
+            nav_layout.addStretch()
+            nav_layout.addWidget(back_btn)
+            nav_layout.addWidget(next_btn)
+            nav_layout.addWidget(finish_btn)
+
+            main_layout.addLayout(nav_layout)
+
+            # Track chosen path for later
+            chosen_path_holder = [None]
+
+            def go_to_page(page_index):
+                stacked.setCurrentIndex(page_index)
+                if page_index == 0:
+                    back_btn.setVisible(False)
+                    next_btn.setVisible(True)
+                    finish_btn.setVisible(False)
+                    default_btn.setVisible(True)
+                else:
+                    back_btn.setVisible(show_data_folder_page)
+                    next_btn.setVisible(False)
+                    finish_btn.setVisible(True)
+                    default_btn.setVisible(False)
+
+            def on_next():
+                # Save the data folder choice
+                chosen_path = Path(path_edit.text())
+                chosen_path_holder[0] = chosen_path
+
+                # Create the folder and save config
+                chosen_path.mkdir(parents=True, exist_ok=True)
+                save_user_data_path(chosen_path)
+
+                # Update our path if different
+                if chosen_path != self.user_data_path:
+                    self.user_data_path = chosen_path
+                    self._reinitialize_with_new_data_path()
+                else:
+                    if hasattr(self, 'db_manager') and self.db_manager and not self.db_manager.connection:
+                        self.db_manager.connect()
+
+                self.log(f"📁 Data folder set to: {chosen_path}")
+                go_to_page(1)
+
+            def on_back():
+                go_to_page(0)
+
+            def on_finish():
+                # Save first_run preference
+                if dont_show_checkbox.isChecked():
+                    settings = self.load_general_settings()
+                    settings['first_run_completed'] = True
+                    self.save_general_settings(settings)
+                    self.log("✅ Setup wizard completed (won't show again on startup)")
+                else:
+                    self.log("✅ Setup wizard shown (will show again next time)")
+
+                dialog.accept()
+
+                # Navigate to Features tab if checkbox is checked
+                if open_features_checkbox.isChecked():
+                    self.main_tabs.setCurrentIndex(4)  # Settings tab
+                    if hasattr(self, 'settings_tabs'):
+                        for i in range(self.settings_tabs.count()):
+                            if "Features" in self.settings_tabs.tabText(i):
+                                self.settings_tabs.setCurrentIndex(i)
+                                break
+
+            back_btn.clicked.connect(on_back)
+            next_btn.clicked.connect(on_next)
+            finish_btn.clicked.connect(on_finish)
+
+            # Start on appropriate page
+            if show_data_folder_page:
+                go_to_page(0)
+            else:
+                # Skip to features page if data folder already configured
+                go_to_page(1)
+                step2_indicator.setText("<span style='color: #888;'>Supervertaler Setup</span>")
+
+            dialog.exec()
+
+        except Exception as e:
+            self.log(f"⚠️ Setup wizard error: {e}")
+            import traceback
+            traceback.print_exc()
+
     def _check_for_new_models(self, force: bool = False):
         """
         Check for new LLM models from providers
@@ -7936,6 +8199,11 @@ class SupervertalerQt(QMainWindow):
         superdocs_action.triggered.connect(lambda: self._open_url("https://supervertaler.gitbook.io/superdocs/"))
         help_menu.addAction(superdocs_action)
 
+        setup_wizard_action = QAction("🚀 Setup Wizard...", self)
+        setup_wizard_action.setToolTip("Run the initial setup wizard (data folder location, features overview)")
+        setup_wizard_action.triggered.connect(lambda: self._show_setup_wizard(is_first_run=False))
+        help_menu.addAction(setup_wizard_action)
+
         help_menu.addSeparator()
 
         shortcuts_action = QAction("⌨️ Keyboard Shortcuts", self)
@@ -22051,20 +22319,24 @@ class SupervertalerQt(QMainWindow):
         """
         Search termbases using a provided cursor (thread-safe for background threads).
         This method allows background workers to query the database without SQLite threading errors.
-        
+
+        Implements BIDIRECTIONAL matching: searches both source_term and target_term columns.
+        When a match is found on target_term, source and target are swapped in the result.
+        This matches memoQ/Trados behavior where a NL→EN termbase also works for EN→NL projects.
+
         Args:
             source_text: The source text to search for
             cursor: A database cursor from a thread-local connection
             source_lang: Source language code
             target_lang: Target language code
             project_id: Current project ID (required to filter by activated termbases)
-        
+
         Returns:
             Dictionary of {term: translation} matches
         """
         if not source_text or not cursor:
             return {}
-        
+
         try:
             # Convert language names to codes (match interactive search logic)
             source_lang_code = self._convert_language_to_code(source_lang) if source_lang else None
@@ -22084,20 +22356,26 @@ class SupervertalerQt(QMainWindow):
                 try:
                     # JOIN termbases AND termbase_activation to filter by activated termbases
                     # This matches the logic in database_manager.py search_termbases()
+                    # BIDIRECTIONAL: Search both source_term (forward) and target_term (reverse)
+                    # Using UNION to combine both directions
                     query = """
-                        SELECT 
-                            t.id, t.source_term, t.target_term, t.termbase_id, t.priority,
-                            t.domain, t.notes, t.project, t.client, t.forbidden,
-                            tb.is_project_termbase, tb.name as termbase_name, 
-                            COALESCE(ta.priority, tb.ranking) as ranking
-                        FROM termbase_terms t
-                        LEFT JOIN termbases tb ON CAST(t.termbase_id AS INTEGER) = tb.id
-                        LEFT JOIN termbase_activation ta ON ta.termbase_id = tb.id AND ta.project_id = ? AND ta.is_active = 1
-                        WHERE LOWER(t.source_term) LIKE ?
-                        AND (ta.is_active = 1 OR tb.is_project_termbase = 1)
+                        SELECT * FROM (
+                            -- Forward match: search source_term
+                            SELECT
+                                t.id, t.source_term, t.target_term, t.termbase_id, t.priority,
+                                t.domain, t.notes, t.project, t.client, t.forbidden,
+                                tb.is_project_termbase, tb.name as termbase_name,
+                                COALESCE(ta.priority, tb.ranking) as ranking,
+                                'source' as match_direction
+                            FROM termbase_terms t
+                            LEFT JOIN termbases tb ON CAST(t.termbase_id AS INTEGER) = tb.id
+                            LEFT JOIN termbase_activation ta ON ta.termbase_id = tb.id AND ta.project_id = ? AND ta.is_active = 1
+                            WHERE LOWER(t.source_term) LIKE ?
+                            AND (ta.is_active = 1 OR tb.is_project_termbase = 1)
                     """
                     params = [project_id if project_id else 0, f"%{clean_word.lower()}%"]
 
+                    # Language filters for forward query
                     if source_lang_code:
                         query += " AND (t.source_lang = ? OR (t.source_lang IS NULL AND tb.source_lang = ?) OR (t.source_lang IS NULL AND tb.source_lang IS NULL))"
                         params.extend([source_lang_code, source_lang_code])
@@ -22105,15 +22383,45 @@ class SupervertalerQt(QMainWindow):
                         query += " AND (t.target_lang = ? OR (t.target_lang IS NULL AND tb.target_lang = ?) OR (t.target_lang IS NULL AND tb.target_lang IS NULL))"
                         params.extend([target_lang_code, target_lang_code])
 
-                    # Limit raw hits per word to keep batch worker light
-                    query += " LIMIT 15"
+                    # Reverse match: search target_term, swap source/target in output
+                    query += """
+                            UNION ALL
+                            -- Reverse match: search target_term, swap columns
+                            SELECT
+                                t.id, t.target_term as source_term, t.source_term as target_term,
+                                t.termbase_id, t.priority,
+                                t.domain, t.notes, t.project, t.client, t.forbidden,
+                                tb.is_project_termbase, tb.name as termbase_name,
+                                COALESCE(ta.priority, tb.ranking) as ranking,
+                                'target' as match_direction
+                            FROM termbase_terms t
+                            LEFT JOIN termbases tb ON CAST(t.termbase_id AS INTEGER) = tb.id
+                            LEFT JOIN termbase_activation ta ON ta.termbase_id = tb.id AND ta.project_id = ? AND ta.is_active = 1
+                            WHERE LOWER(t.target_term) LIKE ?
+                            AND (ta.is_active = 1 OR tb.is_project_termbase = 1)
+                    """
+                    params.extend([project_id if project_id else 0, f"%{clean_word.lower()}%"])
+
+                    # Language filters for reverse query (swapped)
+                    if source_lang_code:
+                        # For reverse: source_lang filters target_lang column
+                        query += " AND (t.target_lang = ? OR (t.target_lang IS NULL AND tb.target_lang = ?) OR (t.target_lang IS NULL AND tb.target_lang IS NULL))"
+                        params.extend([source_lang_code, source_lang_code])
+                    if target_lang_code:
+                        # For reverse: target_lang filters source_lang column
+                        query += " AND (t.source_lang = ? OR (t.source_lang IS NULL AND tb.source_lang = ?) OR (t.source_lang IS NULL AND tb.source_lang IS NULL))"
+                        params.extend([target_lang_code, target_lang_code])
+
+                    # Close UNION and limit
+                    query += ") combined LIMIT 30"
                     cursor.execute(query, params)
                     results = cursor.fetchall()
 
                     for row in results:
-                        # Uniform access
+                        # Uniform access (columns are already swapped for reverse matches)
                         source_term = row[1] if isinstance(row, tuple) else row['source_term']
                         target_term = row[2] if isinstance(row, tuple) else row['target_term']
+                        match_direction = row[13] if isinstance(row, tuple) else row.get('match_direction', 'source')
                         if not source_term or not target_term:
                             continue
 
@@ -22137,8 +22445,10 @@ class SupervertalerQt(QMainWindow):
                         existing = matches.get(source_term.strip())
                         # Deduplicate: keep numerically lowest ranking (highest priority)
                         # For project termbases, ranking is None so they always win
+                        # Also prefer 'source' matches over 'target' matches when equal
                         if existing:
                             existing_ranking = existing.get('ranking', None)
+                            existing_direction = existing.get('match_direction', 'source')
                             if is_project_tb:
                                 # Project termbase always wins
                                 pass
@@ -22147,8 +22457,12 @@ class SupervertalerQt(QMainWindow):
                                 continue
                             elif existing_ranking is not None and ranking is not None:
                                 # Both have rankings, keep lower (higher priority)
-                                if existing_ranking <= ranking:
+                                if existing_ranking < ranking:
                                     continue
+                                elif existing_ranking == ranking:
+                                    # Same ranking: prefer source match over target match
+                                    if existing_direction == 'source' and match_direction == 'target':
+                                        continue
 
                         matches[source_term.strip()] = {
                             'translation': target_term.strip(),
@@ -22163,15 +22477,18 @@ class SupervertalerQt(QMainWindow):
                             'forbidden': forbidden or False,
                             'is_project_termbase': bool(is_project_tb),
                             'termbase_name': termbase_name or '',
-                            'target_synonyms': []  # Will be populated below
+                            'target_synonyms': [],  # Will be populated below
+                            'match_direction': match_direction  # Track if this was a reverse match
                         }
-                        
+
                         # Fetch synonyms for this term
+                        # For reverse matches, fetch 'source' synonyms since they become targets
                         try:
+                            synonym_lang = 'source' if match_direction == 'target' else 'target'
                             cursor.execute("""
-                                SELECT synonym_text FROM termbase_synonyms 
-                                WHERE term_id = ? AND language = 'target' AND forbidden = 0
-                            """, (term_id,))
+                                SELECT synonym_text FROM termbase_synonyms
+                                WHERE term_id = ? AND language = ? AND forbidden = 0
+                            """, (term_id, synonym_lang))
                             synonym_rows = cursor.fetchall()
                             for syn_row in synonym_rows:
                                 synonym = syn_row[0] if isinstance(syn_row, tuple) else syn_row['synonym_text']

modules/database_manager.py

@@ -1477,120 +1477,225 @@ class DatabaseManager:
         # TODO: Implement in Phase 3
         pass
     
-    def search_termbases(self, search_term: str, source_lang: str = None, 
+    def search_termbases(self, search_term: str, source_lang: str = None,
                         target_lang: str = None, project_id: str = None,
-                        min_length: int = 0) -> List[Dict]:
+                        min_length: int = 0, bidirectional: bool = True) -> List[Dict]:
         """
-        Search termbases for matching source terms
-        
+        Search termbases for matching terms (bidirectional by default)
+
         Args:
-            search_term: Source term to search for
+            search_term: Term to search for
             source_lang: Filter by source language (optional)
             target_lang: Filter by target language (optional)
             project_id: Filter by project (optional)
             min_length: Minimum term length to return
-            
+            bidirectional: If True, also search target_term and swap results (default True)
+
         Returns:
             List of termbase hits, sorted by priority (lower = higher priority)
+            Each result includes 'match_direction' ('source' or 'target') indicating
+            which column matched. For 'target' matches, source_term and target_term
+            are swapped so results are always oriented correctly for the current project.
         """
         # Build query with filters - include termbase name and ranking via JOIN
         # Note: termbase_id is stored as TEXT in termbase_terms but INTEGER in termbases
         # Use CAST to ensure proper comparison
         # IMPORTANT: Join with termbase_activation to get the ACTUAL priority for this project
         # CRITICAL FIX: Also match when search_term starts with the glossary term
-        # This handles cases like searching for "ca." when glossary has "ca." 
+        # This handles cases like searching for "ca." when glossary has "ca."
         # AND searching for "ca" when glossary has "ca."
         # We also strip trailing punctuation from glossary terms for comparison
-        query = """
-            SELECT 
-                t.id, t.source_term, t.target_term, t.termbase_id, t.priority, 
+
+        # Build matching conditions for a given column
+        def build_match_conditions(column: str) -> str:
+            return f"""(
+                LOWER(t.{column}) = LOWER(?) OR
+                LOWER(t.{column}) LIKE LOWER(?) OR
+                LOWER(t.{column}) LIKE LOWER(?) OR
+                LOWER(t.{column}) LIKE LOWER(?) OR
+                LOWER(RTRIM(t.{column}, '.!?,;:')) = LOWER(?) OR
+                LOWER(?) LIKE LOWER(t.{column}) || '%' OR
+                LOWER(?) = LOWER(RTRIM(t.{column}, '.!?,;:'))
+            )"""
+
+        # Build match params for one direction
+        def build_match_params() -> list:
+            return [
+                search_term,
+                f"{search_term} %",
+                f"% {search_term}",
+                f"% {search_term} %",
+                search_term,  # For RTRIM comparison
+                search_term,  # For reverse LIKE
+                search_term   # For reverse RTRIM comparison
+            ]
+
+        # Matching patterns:
+        # 1. Exact match: column = search_term
+        # 2. Glossary term starts with search: column LIKE "search_term %"
+        # 3. Glossary term ends with search: column LIKE "% search_term"
+        # 4. Glossary term contains search: column LIKE "% search_term %"
+        # 5. Glossary term (stripped) = search_term: RTRIM(column) = search_term (handles "ca." = "ca")
+        # 6. Search starts with glossary term: search_term LIKE column || '%'
+        # 7. Search = glossary term stripped: search_term = RTRIM(column)
+
+        # Base SELECT for forward matches (source_term matches)
+        base_select_forward = """
+            SELECT
+                t.id, t.source_term, t.target_term, t.termbase_id, t.priority,
                 t.forbidden, t.source_lang, t.target_lang, t.definition, t.domain,
                 t.notes, t.project, t.client,
                 tb.name as termbase_name,
                 tb.source_lang as termbase_source_lang,
                 tb.target_lang as termbase_target_lang,
                 tb.is_project_termbase,
-                COALESCE(ta.priority, tb.ranking) as ranking
+                COALESCE(ta.priority, tb.ranking) as ranking,
+                'source' as match_direction
             FROM termbase_terms t
             LEFT JOIN termbases tb ON CAST(t.termbase_id AS INTEGER) = tb.id
             LEFT JOIN termbase_activation ta ON ta.termbase_id = tb.id AND ta.project_id = ? AND ta.is_active = 1
-            WHERE (
-                LOWER(t.source_term) = LOWER(?) OR 
-                LOWER(t.source_term) LIKE LOWER(?) OR 
-                LOWER(t.source_term) LIKE LOWER(?) OR 
-                LOWER(t.source_term) LIKE LOWER(?) OR
-                LOWER(RTRIM(t.source_term, '.!?,;:')) = LOWER(?) OR
-                LOWER(?) LIKE LOWER(t.source_term) || '%' OR
-                LOWER(?) = LOWER(RTRIM(t.source_term, '.!?,;:'))
-            )
+            WHERE {match_conditions}
             AND (ta.is_active = 1 OR tb.is_project_termbase = 1)
-        """
-        # Matching patterns:
-        # 1. Exact match: source_term = search_term
-        # 2. Glossary term starts with search: source_term LIKE "search_term %"
-        # 3. Glossary term ends with search: source_term LIKE "% search_term"
-        # 4. Glossary term contains search: source_term LIKE "% search_term %"
-        # 5. Glossary term (stripped) = search_term: RTRIM(source_term) = search_term (handles "ca." = "ca")
-        # 6. Search starts with glossary term: search_term LIKE source_term || '%' 
-        # 7. Search = glossary term stripped: search_term = RTRIM(source_term)
-        params = [
-            project_id if project_id else 0,  # Use 0 if no project (won't match any activation records)
-            search_term,
-            f"{search_term} %",
-            f"% {search_term}",
-            f"% {search_term} %",
-            search_term,  # For RTRIM comparison
-            search_term,  # For reverse LIKE
-            search_term   # For reverse RTRIM comparison
-        ]
-        
-        # Language filters - if term has no language, use termbase language for filtering
+        """.format(match_conditions=build_match_conditions('source_term'))
+
+        # Base SELECT for reverse matches (target_term matches) - swap source/target in output
+        base_select_reverse = """
+            SELECT
+                t.id, t.target_term as source_term, t.source_term as target_term,
+                t.termbase_id, t.priority,
+                t.forbidden, t.target_lang as source_lang, t.source_lang as target_lang,
+                t.definition, t.domain,
+                t.notes, t.project, t.client,
+                tb.name as termbase_name,
+                tb.target_lang as termbase_source_lang,
+                tb.source_lang as termbase_target_lang,
+                tb.is_project_termbase,
+                COALESCE(ta.priority, tb.ranking) as ranking,
+                'target' as match_direction
+            FROM termbase_terms t
+            LEFT JOIN termbases tb ON CAST(t.termbase_id AS INTEGER) = tb.id
+            LEFT JOIN termbase_activation ta ON ta.termbase_id = tb.id AND ta.project_id = ? AND ta.is_active = 1
+            WHERE {match_conditions}
+            AND (ta.is_active = 1 OR tb.is_project_termbase = 1)
+        """.format(match_conditions=build_match_conditions('target_term'))
+
+        # Build params
+        project_param = project_id if project_id else 0
+        forward_params = [project_param] + build_match_params()
+        reverse_params = [project_param] + build_match_params()
+
+        # Build language filter conditions
+        lang_conditions_forward = ""
+        lang_conditions_reverse = ""
+        lang_params_forward = []
+        lang_params_reverse = []
+
         if source_lang:
-            query += """ AND (
-                t.source_lang = ? OR 
+            # For forward: filter on source_lang
+            lang_conditions_forward += """ AND (
+                t.source_lang = ? OR
                 (t.source_lang IS NULL AND tb.source_lang = ?) OR
                 (t.source_lang IS NULL AND tb.source_lang IS NULL)
             )"""
-            params.extend([source_lang, source_lang])
-        
+            lang_params_forward.extend([source_lang, source_lang])
+            # For reverse: source_lang becomes target_lang (swapped)
+            lang_conditions_reverse += """ AND (
+                t.target_lang = ? OR
+                (t.target_lang IS NULL AND tb.target_lang = ?) OR
+                (t.target_lang IS NULL AND tb.target_lang IS NULL)
+            )"""
+            lang_params_reverse.extend([source_lang, source_lang])
+
         if target_lang:
-            query += """ AND (
-                t.target_lang = ? OR 
+            # For forward: filter on target_lang
+            lang_conditions_forward += """ AND (
+                t.target_lang = ? OR
                 (t.target_lang IS NULL AND tb.target_lang = ?) OR
                 (t.target_lang IS NULL AND tb.target_lang IS NULL)
             )"""
-            params.extend([target_lang, target_lang])
-        
-        # Project filter: match project-specific terms OR global terms (project_id IS NULL)
+            lang_params_forward.extend([target_lang, target_lang])
+            # For reverse: target_lang becomes source_lang (swapped)
+            lang_conditions_reverse += """ AND (
+                t.source_lang = ? OR
+                (t.source_lang IS NULL AND tb.source_lang = ?) OR
+                (t.source_lang IS NULL AND tb.source_lang IS NULL)
+            )"""
+            lang_params_reverse.extend([target_lang, target_lang])
+
+        # Project filter conditions
+        project_conditions = ""
+        project_params = []
         if project_id:
-            query += " AND (t.project_id = ? OR t.project_id IS NULL)"
-            params.append(project_id)
-        
+            project_conditions = " AND (t.project_id = ? OR t.project_id IS NULL)"
+            project_params = [project_id]
+
+        # Min length conditions
+        min_len_forward = ""
+        min_len_reverse = ""
         if min_length > 0:
-            query += f" AND LENGTH(t.source_term) >= {min_length}"
-        
-        # Sort by ranking (lower number = higher priority)
-        # Project termbases (ranking IS NULL) appear first, then by ranking, then alphabetically
-        # Use COALESCE to treat NULL as -1 (highest priority)
-        query += " ORDER BY COALESCE(tb.ranking, -1) ASC, t.source_term ASC"
-        
+            min_len_forward = f" AND LENGTH(t.source_term) >= {min_length}"
+            min_len_reverse = f" AND LENGTH(t.target_term) >= {min_length}"
+
+        # Build forward query
+        forward_query = base_select_forward + lang_conditions_forward + project_conditions + min_len_forward
+        forward_params.extend(lang_params_forward)
+        forward_params.extend(project_params)
+
+        if bidirectional:
+            # Build reverse query
+            reverse_query = base_select_reverse + lang_conditions_reverse + project_conditions + min_len_reverse
+            reverse_params.extend(lang_params_reverse)
+            reverse_params.extend(project_params)
+
+            # Combine with UNION and sort
+            query = f"""
+                SELECT * FROM (
+                    {forward_query}
+                    UNION ALL
+                    {reverse_query}
+                ) combined
+                ORDER BY COALESCE(ranking, -1) ASC, source_term ASC
+            """
+            params = forward_params + reverse_params
+        else:
+            # Original forward-only behavior
+            query = forward_query + " ORDER BY COALESCE(ranking, -1) ASC, source_term ASC"
+            params = forward_params
+
         self.cursor.execute(query, params)
         results = []
+        seen_combinations = set()  # Track (source_term, target_term, termbase_id) to avoid duplicates
+
         for row in self.cursor.fetchall():
             result_dict = dict(row)
+
+            # Deduplicate: same term pair from same termbase should only appear once
+            # Prefer 'source' match over 'target' match
+            combo_key = (
+                result_dict.get('source_term', '').lower(),
+                result_dict.get('target_term', '').lower(),
+                result_dict.get('termbase_id')
+            )
+            if combo_key in seen_combinations:
+                continue
+            seen_combinations.add(combo_key)
+
             # SQLite stores booleans as 0/1, explicitly convert to Python bool
             if 'is_project_termbase' in result_dict:
                 result_dict['is_project_termbase'] = bool(result_dict['is_project_termbase'])
-            
+
             # Fetch target synonyms for this term and include them in the result
             term_id = result_dict.get('id')
+            match_direction = result_dict.get('match_direction', 'source')
             if term_id:
                 try:
+                    # For reverse matches, fetch 'source' synonyms since they become targets
+                    synonym_lang = 'source' if match_direction == 'target' else 'target'
                     self.cursor.execute("""
                         SELECT synonym_text, forbidden FROM termbase_synonyms
-                        WHERE term_id = ? AND language = 'target'
+                        WHERE term_id = ? AND language = ?
                         ORDER BY display_order ASC
-                    """, (term_id,))
+                    """, (term_id, synonym_lang))
                     synonyms = []
                     for syn_row in self.cursor.fetchall():
                         syn_text = syn_row[0]
@@ -1600,7 +1705,7 @@ class DatabaseManager:
                     result_dict['target_synonyms'] = synonyms
                 except Exception:
                     result_dict['target_synonyms'] = []
-            
+
             results.append(result_dict)
         return results
     

{supervertaler-1.9.175.dist-info → supervertaler-1.9.177b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervertaler
-Version: 1.9.175
+Version: 1.9.177b0
 Summary: Professional AI-enhanced translation workbench with multi-LLM support, glossary system, TM, spellcheck, voice commands, and PyQt6 interface. Batteries included (core).
 Home-page: https://supervertaler.com
 Author: Michael Beijer

{supervertaler-1.9.175.dist-info → supervertaler-1.9.177b0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-Supervertaler.py,sha256=GSTR2FDPPN0JfSQKl8GbY1vjNeq9U5hnudZOE4WnXRs,2307421
+Supervertaler.py,sha256=4cGlqNtBnj95ts-qLw6W-aNSJqjqkeFDTCbBAWkx5cI,2322643
 modules/__init__.py,sha256=G58XleS-EJ2sX4Kehm-3N2m618_W2Es0Kg8CW_eBG7g,327
 modules/ai_actions.py,sha256=i5MJcM-7Y6CAvKUwxmxrVHeoZAVtAP7aRDdWM5KLkO0,33877
 modules/ai_attachment_manager.py,sha256=juZlrW3UPkIkcnj0SREgOQkQROLf0fcu3ShZcKXMxsI,11361
@@ -6,7 +6,7 @@ modules/ai_file_viewer_dialog.py,sha256=lKKqUUlOEVgHmmu6aRxqH7P6ds-7dRLk4ltDyjCw
 modules/autofingers_engine.py,sha256=eJ7tBi7YJvTToe5hYTfnyGXB-qme_cHrOPZibaoR2Xw,17061
 modules/cafetran_docx_handler.py,sha256=_F7Jh0WPVaDnMhdxEsVSXuD1fN9r-S_V6i0gr86Pdfc,14076
 modules/config_manager.py,sha256=MkPY3xVFgFDkcwewLREg4BfyKueO0OJkT1cTLxehcjM,17894
-modules/database_manager.py,sha256=FecvNLJa_mw0PZld8-LozUSSgtAq6wDZ8Mhq_u2aiA0,82563
+modules/database_manager.py,sha256=yNtaJNAKtICBBSc5iyhIufzDn25k7OqkOuFeojmWuM4,87319
 modules/database_migrations.py,sha256=tndJ4wV_2JBfPggMgO1tQRwdfRFZ9zwvADllCZE9CCk,15663
 modules/dejavurtf_handler.py,sha256=8NZPPYtHga40SZCypHjPoJPmZTvm9rD-eEUUab7mjtg,28156
 modules/document_analyzer.py,sha256=t1rVvqLaTcpQTEja228C7zZnh8dXshK4wA9t1E9aGVk,19524
@@ -77,9 +77,9 @@ modules/unified_prompt_manager_qt.py,sha256=U89UFGG-M7BLetoaLAlma0x-n8SIyx682DhS
 modules/voice_commands.py,sha256=iBb-gjWxRMLhFH7-InSRjYJz1EIDBNA2Pog8V7TtJaY,38516
 modules/voice_dictation.py,sha256=QmitXfkG-vRt5hIQATjphHdhXfqmwhzcQcbXB6aRzIg,16386
 modules/voice_dictation_lite.py,sha256=jorY0BmWE-8VczbtGrWwt1zbnOctMoSlWOsQrcufBcc,9423
-supervertaler-1.9.175.dist-info/licenses/LICENSE,sha256=m28u-4qL5nXIWnJ6xlQVw__H30rWFtRK3pCOais2OuY,1092
-supervertaler-1.9.175.dist-info/METADATA,sha256=iABI3TeYmFFqP1Ho2qd3cj0_UOjaC-7mbzrqLqHIfUw,5725
-supervertaler-1.9.175.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-supervertaler-1.9.175.dist-info/entry_points.txt,sha256=NP4hiCvx-_30YYKqgr-jfJYQvHr1qTYBMfoVmKIXSM8,53
-supervertaler-1.9.175.dist-info/top_level.txt,sha256=9tUHBYUSfaE4S2E4W3eavJsDyYymkwLfeWAHHAPT6Dk,22
-supervertaler-1.9.175.dist-info/RECORD,,
+supervertaler-1.9.177b0.dist-info/licenses/LICENSE,sha256=m28u-4qL5nXIWnJ6xlQVw__H30rWFtRK3pCOais2OuY,1092
+supervertaler-1.9.177b0.dist-info/METADATA,sha256=KeUutsoVb7QmekOgaHFTiDxTdrgrJLs0yLcThPa0lAQ,5727
+supervertaler-1.9.177b0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+supervertaler-1.9.177b0.dist-info/entry_points.txt,sha256=NP4hiCvx-_30YYKqgr-jfJYQvHr1qTYBMfoVmKIXSM8,53
+supervertaler-1.9.177b0.dist-info/top_level.txt,sha256=9tUHBYUSfaE4S2E4W3eavJsDyYymkwLfeWAHHAPT6Dk,22
+supervertaler-1.9.177b0.dist-info/RECORD,,