fix: wrapped exceptions, making text more UI friendly (#320)

* fix: wrapped exceptions to be more human readbale

* fix message for sdk

* remove too generic test

Author: Nazar F

openhexa/cli/api.py

@@ -33,10 +33,14 @@
 def handle_ssl_error(e):
     """Handle SSL certificate verification errors with helpful message."""
     if "SSL certificate verification failed" in str(e) or "CERTIFICATE_VERIFY_FAILED" in str(e):
-        raise GraphQLError(
+        error_msg = (
             "SSL certificate verification failed. "
             "If you want to disable SSL verification, set the environment variable: HEXA_VERIFY_SSL=false"
         )
+        if settings.debug:
+            raise GraphQLError(error_msg) from e
+        else:
+            raise GraphQLError(error_msg)
 
 
 class InvalidDefinitionError(Exception):

openhexa/sdk/utils.py

@@ -6,10 +6,36 @@
 import os
 import typing
 
+import httpx
+import requests
+
 from openhexa.graphql import BaseOpenHexaClient
 from openhexa.utils import create_requests_session
 
 
+class SSLError(Exception):
+    """Raised when SSL certificate verification fails."""
+
+    pass
+
+
+def handle_ssl_error(e: Exception) -> None:
+    """Handle SSL certificate verification errors with helpful message.
+
+    Args:
+        e: The exception to handle.
+    """
+    if "SSL certificate verification failed" in str(e) or "CERTIFICATE_VERIFY_FAILED" in str(e):
+        error_msg = (
+            "SSL certificate verification failed. "
+            "If you want to disable SSL verification, set the environment variable: HEXA_VERIFY_SSL=false"
+        )
+        if Settings.debug():
+            raise SSLError(error_msg) from e
+        else:
+            raise SSLError(error_msg)
+
+
 class Settings:
     """Centralized settings for the OpenHexa SDK."""
 
@@ -45,21 +71,24 @@ def get_environment():
 
 def graphql(operation: str, variables: dict[str | typing.Any] | None = None) -> dict[str | typing.Any]:
     """Performa GraphQL query."""
-    auth_token = os.environ[
-        "HEXA_TOKEN"
-    ]  # Works for notebooks with the membership token and pipelines with the run token
+    auth_token = os.environ["HEXA_TOKEN"]
     headers = {"Authorization": f"Bearer {auth_token}"}
     session = create_requests_session(verify=Settings.verify_ssl())
 
-    req = session.post(
-        f"{os.environ['HEXA_SERVER_URL'].rstrip('/')}/graphql/",
-        headers=headers,
-        json={
-            "query": operation,
-            "variables": variables if variables is not None else {},
-        },
-    )
-    req.raise_for_status()
+    try:
+        req = session.post(
+            f"{os.environ['HEXA_SERVER_URL'].rstrip('/')}/graphql/",
+            headers=headers,
+            json={
+                "query": operation,
+                "variables": variables if variables is not None else {},
+            },
+        )
+        req.raise_for_status()
+    except (requests.exceptions.SSLError, httpx.ConnectError) as e:
+        handle_ssl_error(e)
+        raise
+
     body = req.json()
     if "errors" in body:
         raise Exception(body["errors"])
@@ -80,7 +109,11 @@ def __init__(self, token: str | None = None, server_url: str | None = None):
         url = server_url or f"{os.environ['HEXA_SERVER_URL'].rstrip('/')}/graphql/"
         token = token or os.getenv("HEXA_TOKEN")
 
-        super().__init__(url=url, token=token, verify=Settings.verify_ssl())
+        try:
+            super().__init__(url=url, token=token, verify=Settings.verify_ssl())
+        except (requests.exceptions.SSLError, httpx.ConnectError) as e:
+            handle_ssl_error(e)
+            raise
 
 
 class Iterator(metaclass=abc.ABCMeta):

tests/test_ssl_errors.py

@@ -1,8 +1,10 @@
 """SSL error handling test module."""
 
 
+import pytest
 import requests
 
+from openhexa.sdk.utils import SSLError, handle_ssl_error
 from openhexa.utils.session import create_requests_session
 
 
@@ -14,17 +16,16 @@ def test_create_requests_session_verify_default(self):
         session = create_requests_session()
         assert session.verify is True
 
-    def test_ssl_error_handling_logic(self):
-        """Test that SSL errors are properly converted to GraphQLError."""
+    def test_ssl_error_handling_raises_custom_exception(self):
         ssl_error = requests.exceptions.SSLError("CERTIFICATE_VERIFY_FAILED error")
 
-        if "CERTIFICATE_VERIFY_FAILED" in str(ssl_error):
-            expected_msg = (
-                "SSL certificate verification failed. "
-                "If you want to disable SSL verification, set the environment variable: HEXA_VERIFY_SSL=false"
-            )
-            assert "SSL certificate verification failed" in expected_msg
-            assert "HEXA_VERIFY_SSL=false" in expected_msg
+        with pytest.raises(SSLError) as exc_info:
+            handle_ssl_error(ssl_error)
 
-        other_ssl_error = requests.exceptions.SSLError("Some other SSL error")
-        assert "Some other SSL error" in str(other_ssl_error)
+        error_msg = str(exc_info.value)
+        assert "SSL certificate verification failed" in error_msg
+        assert "HEXA_VERIFY_SSL=false" in error_msg
+
+    def test_non_ssl_error_passes_through(self):
+        non_ssl_error = requests.exceptions.RequestException("Not an SSL error")
+        handle_ssl_error(non_ssl_error)