Skip to content

Commit e9407ae

Browse files
committed
Remove superfluous checks
Signed-off-by: Tim Paine <[email protected]>
1 parent a25d3e1 commit e9407ae

File tree

5 files changed

+39
-68
lines changed

5 files changed

+39
-68
lines changed

csp/adapters/db.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
_SQLALCHEMY_2 = False
2626

2727
import sqlalchemy as db
28-
29-
_HAS_SQLALCHEMY = True
3028
except (PackageNotFoundError, ValueError, TypeError, ImportError):
3129
raise ModuleNotFoundError("csp's db adapter requires `sqlalchemy`")
3230

@@ -198,8 +196,6 @@ def __init__(
198196
:param log_query: set to True to see what query was generated to access the data
199197
:param use_raw_user_query: Don't do any alteration to user query, assume it contains all the needed columns and sorting
200198
"""
201-
if not _HAS_SQLALCHEMY:
202-
raise RuntimeError("Could not find SQLAlchemy installation")
203199
self._connection = connection
204200
self._table_name = table_name
205201
self._schema_name = schema_name

csp/adapters/kafka.py

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from csp.impl.wiring import input_adapter_def, output_adapter_def, status_adapter_def
1818

1919
try:
20-
_HAS_KAFKA_ADAPTER = True
2120
from csp.lib import _kafkaadapterimpl
2221
except ImportError:
2322
raise ImportError("csp's kafka adapter requires the C++ csp extension to be built, but it could not be imported")
@@ -70,9 +69,6 @@ def __init__(
7069
:param group_id_prefix - ( optional ) when not passing an explicit group_id, a prefix can be supplied that will be use to
7170
prefix the UUID generated for the group_id
7271
"""
73-
if not _HAS_KAFKA_ADAPTER:
74-
raise ModuleNotFoundError("`csp` build does not include kafka C++ adapter")
75-
7672
if group_id is not None and start_offset is not None:
7773
raise ValueError("start_offset is not supported when consuming with group_id")
7874

@@ -192,23 +188,19 @@ def _create(self, engine, memo):
192188
return _kafkaadapterimpl._kafka_adapter_manager(engine, self._properties)
193189

194190

195-
if _HAS_KAFKA_ADAPTER:
196-
_kafka_input_adapter_def = input_adapter_def(
197-
"kafka_input_adapter",
198-
_kafkaadapterimpl._kafka_input_adapter,
199-
ts["T"],
200-
KafkaAdapterManager,
201-
typ="T",
202-
properties=dict,
203-
)
204-
_kafka_output_adapter_def = output_adapter_def(
205-
"kafka_output_adapter",
206-
_kafkaadapterimpl._kafka_output_adapter,
207-
KafkaAdapterManager,
208-
input=ts["T"],
209-
typ="T",
210-
properties=dict,
211-
)
212-
else:
213-
_kafka_input_adapter_def = None
214-
_kafka_output_adapter_def = None
191+
_kafka_input_adapter_def = input_adapter_def(
192+
"kafka_input_adapter",
193+
_kafkaadapterimpl._kafka_input_adapter,
194+
ts["T"],
195+
KafkaAdapterManager,
196+
typ="T",
197+
properties=dict,
198+
)
199+
_kafka_output_adapter_def = output_adapter_def(
200+
"kafka_output_adapter",
201+
_kafkaadapterimpl._kafka_output_adapter,
202+
KafkaAdapterManager,
203+
input=ts["T"],
204+
typ="T",
205+
properties=dict,
206+
)

csp/adapters/parquet.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from csp.impl.wiring.node import node
1818

1919
try:
20-
_HAS_PARQUET_ADAPTER = True
2120
from csp.lib import _parquetadapterimpl
2221
except ImportError:
2322
raise ImportError("csp's parquet adapter requires the C++ csp extension to be built, but it could not be imported")
@@ -293,9 +292,6 @@ def _create(self, engine, memo):
293292
return _parquetadapterimpl._parquet_input_adapter_manager(engine, self._properties, self._filenames_gen)
294293

295294

296-
if _HAS_PARQUET_ADAPTER:
297-
_parquet_input_adapter_def = input_adapter_def(
298-
"parquet_adapter", _parquetadapterimpl._parquet_input_adapter, ts["T"], ParquetReader, typ="T", properties=dict
299-
)
300-
else:
301-
_parquet_input_adapter_def = None
295+
_parquet_input_adapter_def = input_adapter_def(
296+
"parquet_adapter", _parquetadapterimpl._parquet_input_adapter, ts["T"], ParquetReader, typ="T", properties=dict
297+
)

csp/adapters/slack.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
from slack_sdk.socket_mode.request import SocketModeRequest
2121
from slack_sdk.socket_mode.response import SocketModeResponse
2222
from slack_sdk.web import WebClient
23-
24-
_HAVE_SLACK_SDK = True
2523
except ImportError:
2624
raise ModuleNotFoundError("csp's slack adapter requires `slack-sdk`")
2725

@@ -55,8 +53,6 @@ def mention_user(userid: str) -> str:
5553

5654
class SlackAdapterManager(AdapterManagerImpl):
5755
def __init__(self, app_token: str, bot_token: str, ssl: Optional[SSLContext] = None):
58-
if not _HAVE_SLACK_SDK:
59-
raise RuntimeError("Could not find slack-sdk installation")
6056
if not app_token.startswith("xapp-") or not bot_token.startswith("xoxb-"):
6157
raise RuntimeError("Slack app token or bot token looks malformed")
6258

csp/adapters/websocket.py

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from csp.impl.wiring.delayed_node import DelayedNodeWrapperDef
2323

2424
try:
25-
_HAS_WS_ADAPTER = True
2625
from csp.lib import _websocketadapterimpl
2726
except ImportError:
2827
raise ImportError(
@@ -406,9 +405,6 @@ def __init__(
406405
headers: Dict[str, str] = None
407406
headers to apply to the request during the handshake
408407
"""
409-
if not _HAS_WS_ADAPTER:
410-
raise ModuleNotFoundError("`csp` build does not include websocket C++ adapter")
411-
412408
assert reconnect_interval >= timedelta(seconds=1)
413409
self._properties = dict(
414410
uri=uri,
@@ -455,30 +451,25 @@ def _create(self, engine, memo):
455451
return _websocketadapterimpl._websocket_adapter_manager(engine, self._properties)
456452

457453

458-
if _HAS_WS_ADAPTER:
459-
_websocket_input_adapter_def = input_adapter_def(
460-
"websocket_input_adapter",
461-
_websocketadapterimpl._websocket_input_adapter,
462-
ts["T"],
463-
WebsocketAdapterManager,
464-
typ="T",
465-
properties=dict,
466-
)
454+
_websocket_input_adapter_def = input_adapter_def(
455+
"websocket_input_adapter",
456+
_websocketadapterimpl._websocket_input_adapter,
457+
ts["T"],
458+
WebsocketAdapterManager,
459+
typ="T",
460+
properties=dict,
461+
)
467462

468-
_websocket_output_adapter_def = output_adapter_def(
469-
"websocket_output_adapter",
470-
_websocketadapterimpl._websocket_output_adapter,
471-
WebsocketAdapterManager,
472-
input=ts["T"],
473-
)
463+
_websocket_output_adapter_def = output_adapter_def(
464+
"websocket_output_adapter",
465+
_websocketadapterimpl._websocket_output_adapter,
466+
WebsocketAdapterManager,
467+
input=ts["T"],
468+
)
474469

475-
_websocket_header_update_adapter_def = output_adapter_def(
476-
"websocket_header_update_adapter",
477-
_websocketadapterimpl._websocket_header_update_adapter,
478-
WebsocketAdapterManager,
479-
input=ts[List[WebsocketHeaderUpdate]],
480-
)
481-
else:
482-
_websocket_input_adapter_def = None
483-
_websocket_output_adapter_def = None
484-
_websocket_header_update_adapter_def = None
470+
_websocket_header_update_adapter_def = output_adapter_def(
471+
"websocket_header_update_adapter",
472+
_websocketadapterimpl._websocket_header_update_adapter,
473+
WebsocketAdapterManager,
474+
input=ts[List[WebsocketHeaderUpdate]],
475+
)

0 commit comments

Comments
 (0)