Raise hard import errors if trying to use adapters with missing dependencies, with helpful error messages. Remove runtime requirement on pandas

Signed-off-by: Tim Paine <[email protected]>

Author: timkpaine

csp/adapters/db.py

@@ -28,8 +28,7 @@
 
     _HAS_SQLALCHEMY = True
 except (PackageNotFoundError, ValueError, TypeError, ImportError):
-    _HAS_SQLALCHEMY = False
-    db = None
+    raise ModuleNotFoundError("csp's db adapter requires `sqlalchemy`")
 
 
 class TimeAccessor(ABC):

csp/adapters/kafka.py

@@ -20,8 +20,7 @@
     _HAS_KAFKA_ADAPTER = True
     from csp.lib import _kafkaadapterimpl
 except ImportError:
-    _HAS_KAFKA_ADAPTER = False
-    _kafkaadapterimpl = None
+    raise ImportError("csp's kafka adapter requires the C++ csp extension to be built, but it could not be imported")
 
 _ = BytesMessageProtoMapper, DateTimeType, JSONTextMessageMapper, RawBytesMessageMapper, RawTextMessageMapper
 T = typing.TypeVar("T")

csp/adapters/parquet.py

@@ -20,8 +20,7 @@
     _HAS_PARQUET_ADAPTER = True
     from csp.lib import _parquetadapterimpl
 except ImportError:
-    _HAS_PARQUET_ADAPTER = False
-    _parquetadapterimpl = None
+    raise ImportError("csp's parquet adapter requires the C++ csp extension to be built, but it could not be imported")
 
 
 __all__ = [

csp/adapters/perspective.py

@@ -11,17 +11,17 @@
     import tornado.web
     import tornado.websocket
 except ImportError:
-    raise ImportError("perspective adapter requires tornado package")
+    raise ModuleNotFoundError("csp's perspective adapter requires `tornado`")
 
 
 try:
     from perspective import PerspectiveManager, Table as Table_, View as View_, __version__, set_threadpool_size
 
     MAJOR, MINOR, PATCH = map(int, __version__.split("."))
     if (MAJOR, MINOR, PATCH) < (0, 6, 2):
-        raise ImportError("perspective adapter requires 0.6.2 or greater of the perspective-python package")
+        raise ModuleNotFoundError("csp's perspective adapter requires `perspective-python>=0.6.2`")
 except ImportError:
-    raise ImportError("perspective adapter requires 0.6.2 or greater of the perspective-python package")
+    raise ModuleNotFoundError("csp's perspective adapter requires `perspective-python>=0.6.2`")
 
 
 # Run perspective update in a separate tornado loop

csp/adapters/slack.py

@@ -23,7 +23,7 @@
 
     _HAVE_SLACK_SDK = True
 except ImportError:
-    _HAVE_SLACK_SDK = False
+    raise ModuleNotFoundError("csp's slack adapter requires `slack-sdk`")
 
 T = TypeVar("T")
 log = getLogger(__file__)

csp/adapters/symphony.py

@@ -1,6 +1,5 @@
 import http.client
 import json
-import requests
 import ssl
 import threading
 from logging import getLogger
@@ -14,6 +13,11 @@
 from csp.impl.pushadapter import PushInputAdapter
 from csp.impl.wiring import py_push_adapter_def
 
+try:
+    import requests
+except ImportError:
+    raise ModuleNotFoundError("csp's symphony adapter requires `requests`")
+
 __all__ = ["SymphonyAdapter", "SymphonyMessage"]
 
 log = getLogger(__file__)

csp/adapters/websocket.py

@@ -25,8 +25,9 @@
     _HAS_WS_ADAPTER = True
     from csp.lib import _websocketadapterimpl
 except ImportError:
-    _HAS_WS_ADAPTER = False
-    _websocketadapterimpl = None
+    raise ImportError(
+        "csp's websocket adapter requires the C++ csp extension to be built, but it could not be imported"
+    )
 
 from .websocket_types import WebsocketHeaderUpdate
 
@@ -45,14 +46,14 @@
     import tornado.web
     import tornado.websocket
 except ImportError:
-    raise ImportError("websocket adapter requires tornado package")
+    raise ModuleNotFoundError("csp's websocket adapter requires `tornado`")
 
 try:
     import rapidjson
 
     datetime_mode = rapidjson.DM_UNIX_TIME | rapidjson.DM_NAIVE_IS_UTC
 except ImportError:
-    raise ImportError("websocket adapter requires rapidjson package")
+    raise ModuleNotFoundError("csp's websocket adapter requires `rapidjson`")
 
 
 def diff_dict(old, new):

pyproject.toml

@@ -21,12 +21,10 @@ dependencies = [
     "backports.zoneinfo; python_version<'3.9'",
     "numpy",
     "packaging",
-    "pandas",
     "psutil",
     "pyarrow>=7.0.0",
     "pytz",
     "ruamel.yaml",
-    "sqlalchemy",
 ]
 
 classifiers = [
@@ -75,6 +73,7 @@ develop = [
     "pillow",
     # adapters
     "httpx>=0.20,<1",  # kafka
+    "pandas",  # pandas extension
     "polars",  # parquet
     "psutil",  # test_engine/test_history
     "slack-sdk>=3",  # slack