fix exception types

metadata-ingestion/setup.py

@@ -449,7 +449,7 @@
     },
     # FIXME: I don't think tableau uses sqllineage anymore so we should be able
     # to remove that dependency.
-    "tableau": {"tableauserverclient>=0.30.0"} | sqllineage_lib | sqlglot_lib,
+    "tableau": {"tableauserverclient>=0.24.0"} | sqllineage_lib | sqlglot_lib,
     "teradata": sql_common
     | usage_common
     | sqlglot_lib

metadata-ingestion/src/datahub/ingestion/source/tableau.py

@@ -14,6 +14,7 @@
     Optional,
     Set,
     Tuple,
+    Type,
     Union,
     cast,
 )
@@ -31,10 +32,7 @@
     SiteItem,
     TableauAuth,
 )
-from tableauserverclient.server.endpoint.exceptions import (
-    NonXMLResponseError,
-    NotSignedInError,
-)
+from tableauserverclient.server.endpoint.exceptions import NonXMLResponseError
 from urllib3 import Retry
 
 import datahub.emitter.mce_builder as builder
@@ -162,6 +160,19 @@
 from datahub.utilities import config_clean
 from datahub.utilities.urns.dataset_urn import DatasetUrn
 
+try:
+    # On earlier versions of the tableauserverclient, the NonXMLResponseError
+    # was thrown when reauthentication was needed. We'll keep both exceptions
+    # around for now, but can remove this in the future.
+    from tableauserverclient.server.endpoint.exceptions import NotSignedInError
+
+    REAUTHENTICATE_ERRORS: Tuple[Type[Exception], ...] = (
+        NotSignedInError,
+        NonXMLResponseError,
+    )
+except ImportError:
+    REAUTHENTICATE_ERRORS = (NonXMLResponseError,)
+
 logger: logging.Logger = logging.getLogger(__name__)
 
 # Replace / with |
@@ -969,13 +980,7 @@ def get_connection_object_page(
             query_data = query_metadata(
                 self.server, query, connection_type, count, offset, query_filter
             )
-        except (
-            # On earlier versions of the tableauserverclient, the NonXMLResponseError
-            # was thrown when reauthentication was needed. We'll keep both exceptions
-            # around for now, but can remove this in the future.
-            NonXMLResponseError,
-            NotSignedInError,
-        ):
+        except REAUTHENTICATE_ERRORS:
             if not retry_on_auth_error:
                 raise