moved the proxy check to when the print to elog button is first clicked

Author: YektaY

trace/main.py

@@ -35,7 +35,14 @@
 from config import logger, datetime_pv
 from file_io import PathAction, TraceFileHandler
 from widgets import ControlPanel, ElogPostModal, DataInsightTool, PlotSettingsModal
-from services import Theme, IconColors, ThemeManager, get_user, post_entry
+from services import (
+    Theme,
+    IconColors,
+    ThemeManager,
+    get_user,
+    post_entry,
+    test_proxy_connection,
+)
 
 DISABLE_AUTO_SCROLL = -2  # Using -2 as invalid since QButtonGroups use -1 as invalid
 
@@ -552,6 +559,17 @@ def elog_button_clicked(self) -> bool:
         bool
             True if the post was successful, False otherwise.
         """
+        # Test proxy connection first if proxy is configured
+        proxy_success, proxy_error = test_proxy_connection()
+        if not proxy_success:
+            error_dialog = QMessageBox()
+            error_dialog.setIcon(QMessageBox.Warning)
+            error_dialog.setWindowTitle("Proxy Connection Failed")
+            error_dialog.setText(proxy_error)
+            error_dialog.setStandardButtons(QMessageBox.Ok)
+            error_dialog.exec_()
+            return False
+
         # Test if API is reachable
         status_code, _ = get_user()
         if status_code != 200:

trace/services/__init__.py

@@ -1,2 +1,2 @@
-from .elog_client import get_user, post_entry, get_logbooks
+from .elog_client import get_user, post_entry, get_logbooks, test_proxy_connection
 from .theme_manager import ThemeManager, Theme, IconColors

trace/services/elog_client.py

@@ -6,6 +6,7 @@
 
 import os
 import json
+from typing import Optional
 from pathlib import Path
 
 import requests
@@ -22,24 +23,47 @@
 if ELOG_PROXY_URL:
     os.environ["HTTP_PROXY"] = ELOG_PROXY_URL
     os.environ["HTTPS_PROXY"] = ELOG_PROXY_URL
+    logger.info(f"ELOG client configured to use proxy: {ELOG_PROXY_URL}")
+
+
+def test_proxy_connection() -> tuple[bool, Optional[str]]:
+    """
+    Tests proxy connectivity if a proxy is configured.
+
+    :return: A tuple of (success, error_message). If successful, error_message is None.
+             If failed, error_message contains a detailed description of the failure.
+    """
+    if not ELOG_PROXY_URL:
+        # No proxy configured, consider this a success
+        return True, None
+
+    if not ELOG_API_URL:
+        return False, "ELOG API URL is not configured. Cannot test proxy connection."
+
+    error_msg = (
+        f"Failed to connect through proxy {ELOG_PROXY_URL}. "
+        f"Please check your network connection and proxy configuration."
+    )
 
-    # Test proxy connectivity
     try:
-        test_response = requests.head(ELOG_API_URL, timeout=5)
-        logger.info(f"ELOG client using proxy: {ELOG_PROXY_URL} - Connection test successful")
+        requests.head(ELOG_API_URL, timeout=2)
+        logger.info(f"Proxy connection test successful: {ELOG_PROXY_URL}")
+        return True, None
     except requests.exceptions.ProxyError as e:
-        logger.error(f"Proxy connection failed: {ELOG_PROXY_URL} is not accessible - {e}")
+        logger.error(f"Proxy connection test failed: {e}")
+        return False, error_msg
     except requests.exceptions.ConnectionError as e:
-        logger.error(
-            f"""Connection failed through proxy {ELOG_PROXY_URL}.
-            Check network connectivity and proxy configuration - {e}"""
-        )
+        logger.error(f"Proxy connection test failed: {e}")
+        return False, error_msg
     except requests.exceptions.Timeout as e:
-        logger.error(
-            f"Connection timeout through proxy {ELOG_PROXY_URL}.The proxy or server may be slow or unresponsive - {e}"
+        error_msg = (
+            f"Connection timeout through proxy {ELOG_PROXY_URL}. " f"The proxy or server may be slow or unresponsive."
         )
+        logger.error(f"Proxy connection test failed: {e}")
+        return False, error_msg
     except requests.exceptions.RequestException as e:
-        logger.error(f"Proxy connection test failed for {ELOG_PROXY_URL}: {e}")
+        logger.error(f"Proxy connection test failed: {e}")
+        return False, error_msg
 
 
 def get_user() -> tuple[int, dict | Exception]: