supervertaler 1.9.145__py3-none-any.whl → 1.9.147__py3-none-any.whl

Supervertaler.py

@@ -34,7 +34,7 @@ License: MIT
 """
 
 # Version Information.
-__version__ = "1.9.145"
+__version__ = "1.9.147"
 __phase__ = "0.9"
 __release_date__ = "2026-01-20"
 __edition__ = "Qt"
@@ -65,18 +65,158 @@ def get_user_data_path() -> Path:
     """
     Get the path to user data directory.
     
-    In frozen builds (EXE): 'user_data' folder next to the EXE
-    In development: 'user_data' folder next to the script
+    This function returns a PERSISTENT location for user data that survives
+    pip upgrades and reinstalls. The location varies by context:
     
-    The build process copies user_data directly next to the EXE for easy access.
+    1. FROZEN BUILDS (Windows EXE): 'user_data' folder next to the EXE
+       - This allows the EXE to be portable (copy folder = copy everything)
+       - Path: C:/SomeFolder/Supervertaler/user_data/
+    
+    2. PIP INSTALLS: Platform-specific user data directory
+       - Windows: %LOCALAPPDATA%/Supervertaler/ (e.g., C:/Users/John/AppData/Local/Supervertaler/)
+       - macOS:   ~/Library/Application Support/Supervertaler/
+       - Linux:   ~/.local/share/Supervertaler/ (XDG_DATA_HOME)
+       - This location persists across pip upgrades!
+    
+    3. DEVELOPMENT MODE: 'user_data' or 'user_data_private' next to script
+       - Developers can use ENABLE_PRIVATE_FEATURES to use user_data_private/
+    
+    The key insight: pip installs wipe site-packages on upgrade, so we MUST
+    store user data outside the package directory for pip users.
     """
     if getattr(sys, 'frozen', False):
-        # Frozen build: user_data is next to the EXE (copied by build script)
+        # =====================================================================
+        # FROZEN BUILD (EXE): Keep data next to executable for portability
+        # =====================================================================
+        # Users can copy the entire folder to a USB drive and it works.
+        # The build script copies user_data/ next to Supervertaler.exe
         return Path(sys.executable).parent / "user_data"
+    
+    # Check if we're running from site-packages (pip install)
+    script_path = Path(__file__).resolve()
+    is_pip_install = "site-packages" in str(script_path)
+    
+    if is_pip_install:
+        # =================================================================
+        # PIP INSTALL: Use platform-specific persistent location
+        # =================================================================
+        # This survives pip upgrades because it's OUTSIDE site-packages!
+        try:
+            from platformdirs import user_data_dir
+            return Path(user_data_dir("Supervertaler", "MichaelBeijer"))
+        except ImportError:
+            # Fallback if platformdirs not available (shouldn't happen)
+            if sys.platform == 'win32':
+                base = Path(os.environ.get('LOCALAPPDATA', os.path.expanduser('~')))
+                return base / "Supervertaler"
+            elif sys.platform == 'darwin':
+                return Path.home() / "Library" / "Application Support" / "Supervertaler"
+            else:
+                # Linux/BSD - follow XDG spec
+                xdg_data = os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share'))
+                return Path(xdg_data) / "Supervertaler"
     else:
-        # Development: user_data next to script
+        # =================================================================
+        # DEVELOPMENT MODE: Use folder next to script
+        # =================================================================
         return Path(__file__).parent / "user_data"
 
+
+def migrate_user_data_if_needed(new_path: Path) -> bool:
+    """
+    Migrate user data from old location (inside site-packages) to new location.
+    
+    This handles the transition for existing pip users whose data was stored
+    inside the package directory (which gets wiped on upgrade).
+    
+    Returns True if migration was performed, False otherwise.
+    """
+    import shutil
+    
+    # Only migrate for pip installs (frozen builds keep data next to EXE)
+    if getattr(sys, 'frozen', False):
+        return False
+    
+    # Check if we're in a pip install
+    script_path = Path(__file__).resolve()
+    if "site-packages" not in str(script_path):
+        return False  # Development mode, no migration needed
+    
+    # Old location: user_data folder inside the package in site-packages
+    old_path = script_path.parent / "user_data"
+    
+    # If old location doesn't exist or is empty, no migration needed
+    if not old_path.exists():
+        return False
+    
+    # Check if old location has actual content (not just empty dirs)
+    old_has_content = False
+    for item in old_path.rglob('*'):
+        if item.is_file():
+            old_has_content = True
+            break
+    
+    if not old_has_content:
+        return False
+    
+    # If new location already has content, don't overwrite (user may have set up fresh)
+    new_has_content = False
+    if new_path.exists():
+        for item in new_path.rglob('*'):
+            if item.is_file():
+                new_has_content = True
+                break
+    
+    if new_has_content:
+        # Both have content - log but don't migrate (user may have set up manually)
+        print(f"[Migration] Both old and new data locations have content:")
+        print(f"  Old: {old_path}")
+        print(f"  New: {new_path}")
+        print(f"[Migration] Keeping new location. Old data preserved in site-packages.")
+        return False
+    
+    # Perform migration
+    print(f"[Migration] Migrating user data from old location...")
+    print(f"  From: {old_path}")
+    print(f"  To:   {new_path}")
+    
+    try:
+        # Ensure new path parent exists
+        new_path.parent.mkdir(parents=True, exist_ok=True)
+        
+        # Copy entire directory tree (use copy, not move, for safety)
+        if new_path.exists():
+            # Merge into existing empty directory
+            for item in old_path.iterdir():
+                dest = new_path / item.name
+                if item.is_dir():
+                    shutil.copytree(item, dest, dirs_exist_ok=True)
+                else:
+                    shutil.copy2(item, dest)
+        else:
+            shutil.copytree(old_path, new_path)
+        
+        print(f"[Migration] ✅ Successfully migrated user data!")
+        print(f"[Migration] Your API keys, TMs, glossaries, and prompts are now in:")
+        print(f"  {new_path}")
+        
+        # Leave a marker file in the old location so users know what happened
+        marker = old_path / "_MIGRATED_TO_NEW_LOCATION.txt"
+        marker.write_text(
+            f"Your Supervertaler data has been migrated to a persistent location:\n"
+            f"{new_path}\n\n"
+            f"This location survives pip upgrades.\n"
+            f"You can safely delete this old folder.\n"
+            f"Migration date: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n"
+        )
+        
+        return True
+        
+    except Exception as e:
+        print(f"[Migration] ⚠️ Error during migration: {e}")
+        print(f"[Migration] Your data is still in: {old_path}")
+        return False
+
 import threading
 import time  # For delays in Superlookup
 import re
@@ -5167,17 +5307,25 @@ class SupervertalerQt(QMainWindow):
         # ============================================================================
         # USER DATA PATH INITIALIZATION
         # ============================================================================
-        # Set up user data paths - handles both development and frozen (EXE) builds
-        # In frozen builds, user_data is copied directly next to the EXE by the build script.
+        # User data is stored in a PERSISTENT location that survives pip upgrades:
+        # - Windows: %LOCALAPPDATA%\Supervertaler\
+        # - macOS:   ~/Library/Application Support/Supervertaler/
+        # - Linux:   ~/.local/share/Supervertaler/
+        # - EXE:     user_data/ folder next to executable (portable mode)
+        # - Dev:     user_data_private/ or user_data/ next to script
         from modules.database_manager import DatabaseManager
         
         if ENABLE_PRIVATE_FEATURES:
             # Developer mode: use private folder (git-ignored)
             self.user_data_path = Path(__file__).parent / "user_data_private"
         else:
-            # Normal mode: use the helper function
+            # Normal mode: use the helper function (handles pip vs EXE vs dev)
             self.user_data_path = get_user_data_path()
         
+        # Migrate old data from site-packages to new persistent location (pip users)
+        # This is a one-time migration for users upgrading from older versions
+        migrate_user_data_if_needed(self.user_data_path)
+        
         # Ensure user_data directory exists (creates empty folder if missing)
         self.user_data_path.mkdir(parents=True, exist_ok=True)
         
@@ -29814,12 +29962,13 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
             from modules.llm_clients import LLMClient
             
             # Get appropriate API key for provider
+            # Note: api_keys is normalized so both 'gemini' and 'google' exist if either is set
             if provider == 'openai':
                 api_key = api_keys.get('openai', '')
-            elif provider == 'anthropic':
+            elif provider == 'claude':
                 api_key = api_keys.get('claude', '')
-            elif provider == 'google':
-                api_key = api_keys.get('google', '')
+            elif provider == 'gemini':
+                api_key = api_keys.get('gemini', '')
             elif provider == 'ollama':
                 api_key = ''  # Ollama doesn't need an API key
             else:
@@ -37596,7 +37745,9 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
                 return
             
             # Check if API key exists for selected provider
-            if provider not in api_keys:
+            # Note: 'gemini' and 'google' are aliases for the same API key
+            has_api_key = provider in api_keys or (provider == 'gemini' and 'google' in api_keys)
+            if not has_api_key:
                 reply = QMessageBox.question(
                     self, f"{provider.title()} API Key Missing",
                     f"{provider.title()} API key not found in api_keys.txt\n\n"
@@ -37675,8 +37826,10 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
             # Use modular LLM client with user's settings
             from modules.llm_clients import LLMClient
             
+            # Get API key (handle gemini/google alias)
+            api_key = api_keys.get(provider) or (api_keys.get('google') if provider == 'gemini' else None)
             client = LLMClient(
-                api_key=api_keys[provider],
+                api_key=api_key,
                 provider=provider,
                 model=model
             )
@@ -38668,7 +38821,8 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
                         "Please configure your API keys in Settings first."
                     )
                     return
-                elif llm_provider not in api_keys:
+                # Note: 'gemini' and 'google' are aliases for the same API key
+                elif llm_provider not in api_keys and not (llm_provider == 'gemini' and 'google' in api_keys):
                     QMessageBox.critical(
                         self, f"{llm_provider.title()} API Key Missing",
                         f"Please configure your {llm_provider.title()} API key in Settings."
@@ -38917,8 +39071,10 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
 
             if translation_provider_type == 'LLM':
                 from modules.llm_clients import LLMClient
+                # Handle gemini/google alias
+                api_key = api_keys.get(translation_provider_name) or (api_keys.get('google') if translation_provider_name == 'gemini' else None)
                 client = LLMClient(
-                    api_key=api_keys[translation_provider_name],
+                    api_key=api_key,
                     provider=translation_provider_name,
                     model=model
                 )
@@ -39444,7 +39600,9 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
             "gemini": "gemini"
         }
         api_key_name = provider_key_map.get(provider)
-        if not api_keys.get(api_key_name):
+        # Handle gemini/google alias
+        api_key_value = api_keys.get(api_key_name) or (api_keys.get('google') if provider == 'gemini' else None)
+        if not api_key_value:
             return  # No API key for selected provider
         
         # Get model based on provider
@@ -39466,7 +39624,7 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
                 from modules.translation_results_panel import TranslationMatch
                 
                 client = LLMClient(
-                    api_key=api_keys[api_key_name],
+                    api_key=api_key_value,
                     provider=provider,
                     model=model
                 )
@@ -39956,6 +40114,13 @@ OUTPUT ONLY THE SEGMENT MARKERS. DO NOT ADD EXPLANATIONS BEFORE OR AFTER."""
         except Exception as e:
             self.log(f"⚠ Error loading API keys: {str(e)}")
         
+        # Normalize gemini/google aliases - users can use either name
+        # This allows downstream code to just use api_keys.get('gemini') directly
+        if api_keys.get('google') and not api_keys.get('gemini'):
+            api_keys['gemini'] = api_keys['google']
+        elif api_keys.get('gemini') and not api_keys.get('google'):
+            api_keys['google'] = api_keys['gemini']
+        
         return api_keys
     
     def ensure_example_api_keys(self):

{supervertaler-1.9.145.dist-info → supervertaler-1.9.147.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervertaler
-Version: 1.9.145
+Version: 1.9.147
 Summary: Professional AI-powered 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
@@ -46,6 +46,7 @@ Requires-Dist: chardet>=5.0.0
 Requires-Dist: pyyaml>=6.0.0
 Requires-Dist: markdown>=3.4.0
 Requires-Dist: pyspellchecker>=0.7.0
+Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: sounddevice>=0.4.6
 Requires-Dist: numpy>=1.24.0
 Requires-Dist: PyMuPDF>=1.23.0
@@ -71,7 +72,7 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# 🚀 Supervertaler v1.9.145
+# 🚀 Supervertaler v1.9.147
 
 [![PyPI version](https://badge.fury.io/py/supervertaler.svg)](https://pypi.org/project/Supervertaler/)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
@@ -79,7 +80,24 @@ Dynamic: requires-python
 
 AI-enhanced CAT tool with multi-LLM support (GPT-4, Claude, Gemini, Ollama), innovative Superlookup concordance system offering access to multiple terminology sources (TMs, glossaries, web resources, etc.), and seamless CAT tool integration (memoQ, Trados, CafeTran, Phrase).
 
-**Current Version:** v1.9.145 (January 20, 2026)
+**Current Version:** v1.9.147 (January 21, 2026)
+
+### NEW in v1.9.147 - 📁 Persistent User Data Location
+
+**No More Data Loss on Upgrade!** User data (API keys, TMs, glossaries, prompts, settings) is now stored in a persistent location that survives `pip install --upgrade`:
+
+| Platform | User Data Location |
+|----------|-------------------|
+| **Windows** | `%LOCALAPPDATA%\MichaelBeijer\Supervertaler\` |
+| **macOS** | `~/Library/Application Support/Supervertaler/` |
+| **Linux** | `~/.local/share/Supervertaler/` |
+| **Windows EXE** | `user_data\` next to executable (portable) |
+
+Existing data is automatically migrated on first run after upgrade.
+
+### FIXED in v1.9.146 - 🔑 Gemini/Google API Key Alias
+
+**Bug Fix:** Fixed "Gemini API Key Missing" error when users had `google=...` instead of `gemini=...` in their api_keys.txt. Both names now work identically thanks to automatic normalization at load time.
 
 ### FIXED in v1.9.140 - 🐛 Glossary Add No Longer Triggers TM Search
 

{supervertaler-1.9.145.dist-info → supervertaler-1.9.147.dist-info}/RECORD

@@ -1,4 +1,4 @@
-Supervertaler.py,sha256=B2j743pISRdPk_qIPGeSw3Atfw3Ojs-STlmw5EkmD74,2152003
+Supervertaler.py,sha256=0Vkn41czCn0bkCEQ-Vpd1Ee3ifsLUjeJT5QY3wYPNkg,2159745
 modules/__init__.py,sha256=G58XleS-EJ2sX4Kehm-3N2m618_W2Es0Kg8CW_eBG7g,327
 modules/ai_actions.py,sha256=i5MJcM-7Y6CAvKUwxmxrVHeoZAVtAP7aRDdWM5KLkO0,33877
 modules/ai_attachment_manager.py,sha256=mA5ISI22qN9mH3DQFF4gOTciDyBt5xVR7sHTkgkTIlw,11361
@@ -77,9 +77,9 @@ modules/unified_prompt_manager_qt.py,sha256=kpR-Tk1xmVyJGHnZdHm6NbGQPTZ1jB8t4tI_
 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.145.dist-info/licenses/LICENSE,sha256=m28u-4qL5nXIWnJ6xlQVw__H30rWFtRK3pCOais2OuY,1092
-supervertaler-1.9.145.dist-info/METADATA,sha256=sJ3uoEIMo4xK3XreAPZVbdwq0a_1HKPBwV0gn24-DFU,43528
-supervertaler-1.9.145.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-supervertaler-1.9.145.dist-info/entry_points.txt,sha256=NP4hiCvx-_30YYKqgr-jfJYQvHr1qTYBMfoVmKIXSM8,53
-supervertaler-1.9.145.dist-info/top_level.txt,sha256=9tUHBYUSfaE4S2E4W3eavJsDyYymkwLfeWAHHAPT6Dk,22
-supervertaler-1.9.145.dist-info/RECORD,,
+supervertaler-1.9.147.dist-info/licenses/LICENSE,sha256=m28u-4qL5nXIWnJ6xlQVw__H30rWFtRK3pCOais2OuY,1092
+supervertaler-1.9.147.dist-info/METADATA,sha256=cqvLJ6GY6wgzZOqBQynIOMb7CiCaS46UQJbaI0qorSY,44450
+supervertaler-1.9.147.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+supervertaler-1.9.147.dist-info/entry_points.txt,sha256=NP4hiCvx-_30YYKqgr-jfJYQvHr1qTYBMfoVmKIXSM8,53
+supervertaler-1.9.147.dist-info/top_level.txt,sha256=9tUHBYUSfaE4S2E4W3eavJsDyYymkwLfeWAHHAPT6Dk,22
+supervertaler-1.9.147.dist-info/RECORD,,

{supervertaler-1.9.145.dist-info → supervertaler-1.9.147.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any