Skip to content

Commit 4e1246e

Browse files
committed
Standardize Databento response handling
- Consistently use originally requested `start` and `end` - Consistently use and keyword arguments
1 parent aadc7c8 commit 4e1246e

File tree

1 file changed

+23
-26
lines changed
  • nautilus_trader/adapters/databento

1 file changed

+23
-26
lines changed

nautilus_trader/adapters/databento/data.py

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class DatabentoDataClient(LiveMarketDataClient):
9696
The cache for the client.
9797
clock : LiveClock
9898
The clock for the client.
99-
instrument_provder : DatabentoInstrumentProvider
99+
instrument_provider : DatabentoInstrumentProvider
100100
The instrument provider for the client.
101101
loader : DatabentoDataLoader, optional
102102
The loader for the client.
@@ -419,7 +419,7 @@ async def _get_dataset_range(
419419

420420
def subscribe_order_book_deltas(self, command: SubscribeOrderBook) -> None:
421421
if command.book_type != BookType.L3_MBO:
422-
raise NotImplementedError("Use Booktype.L3_MBO for Databento")
422+
raise NotImplementedError("Use BookType.L3_MBO for Databento")
423423

424424
self.create_task(
425425
self._subscribe_order_book_deltas(command),
@@ -565,9 +565,6 @@ async def _subscribe_order_book_deltas_batch(
565565
)
566566
return
567567

568-
if not instrument_ids:
569-
return # No subscribing instrument IDs were loaded in the cache
570-
571568
dataset: Dataset = self._loader.get_dataset_for_venue(instrument_ids[0].venue)
572569
live_client = self._get_live_client_mbo(dataset)
573570

@@ -962,10 +959,10 @@ async def _request_instrument(self, request: RequestInstrument) -> None:
962959

963960
self._handle_instrument(
964961
instruments[0],
965-
request.id,
966-
start,
967-
end,
968-
request.params,
962+
correlation_id=request.id,
963+
start=request.start,
964+
end=request.end,
965+
params=request.params,
969966
)
970967

971968
async def _request_instruments(self, request: RequestInstruments) -> None:
@@ -995,10 +992,10 @@ async def _request_instruments(self, request: RequestInstruments) -> None:
995992
self._handle_instruments(
996993
request.venue,
997994
instruments,
998-
request.id,
999-
start,
1000-
end,
1001-
request.params,
995+
correlation_id=request.id,
996+
start=request.start,
997+
end=request.end,
998+
params=request.params,
1002999
)
10031000

10041001
async def _request_quote_ticks(self, request: RequestQuoteTicks) -> None:
@@ -1007,7 +1004,7 @@ async def _request_quote_ticks(self, request: RequestQuoteTicks) -> None:
10071004

10081005
if request.limit > 0:
10091006
self._log.warning(
1010-
f"Ignoring limit {request.limit} because its applied from the start (instead of the end)",
1007+
f"Ignoring limit {request.limit} because it's applied from the start (instead of the end)",
10111008
)
10121009

10131010
self._log.info(
@@ -1042,10 +1039,10 @@ async def _request_quote_ticks(self, request: RequestQuoteTicks) -> None:
10421039
self._handle_quote_ticks(
10431040
request.instrument_id,
10441041
quotes,
1045-
request.id,
1046-
start,
1047-
end,
1048-
request.params,
1042+
correlation_id=request.id,
1043+
start=request.start,
1044+
end=request.end,
1045+
params=request.params,
10491046
)
10501047

10511048
async def _request_trade_ticks(self, request: RequestTradeTicks) -> None:
@@ -1054,7 +1051,7 @@ async def _request_trade_ticks(self, request: RequestTradeTicks) -> None:
10541051

10551052
if request.limit > 0:
10561053
self._log.warning(
1057-
f"Ignoring limit {request.limit} because its applied from the start (instead of the end)",
1054+
f"Ignoring limit {request.limit} because it's applied from the start (instead of the end)",
10581055
)
10591056

10601057
self._log.info(
@@ -1073,10 +1070,10 @@ async def _request_trade_ticks(self, request: RequestTradeTicks) -> None:
10731070
self._handle_trade_ticks(
10741071
request.instrument_id,
10751072
trades,
1076-
request.id,
1077-
start,
1078-
end,
1079-
request.params,
1073+
correlation_id=request.id,
1074+
start=request.start,
1075+
end=request.end,
1076+
params=request.params,
10801077
)
10811078

10821079
async def _request_bars(self, request: RequestBars) -> None:
@@ -1085,7 +1082,7 @@ async def _request_bars(self, request: RequestBars) -> None:
10851082

10861083
if request.limit > 0:
10871084
self._log.warning(
1088-
f"Ignoring limit {request.limit} because its applied from the start (instead of the end)",
1085+
f"Ignoring limit {request.limit} because it's applied from the start (instead of the end)",
10891086
)
10901087

10911088
self._log.info(
@@ -1111,8 +1108,8 @@ async def _request_bars(self, request: RequestBars) -> None:
11111108
bars=bars,
11121109
partial=None, # No partials
11131110
correlation_id=request.id,
1114-
start=start,
1115-
end=end,
1111+
start=request.start,
1112+
end=request.end,
11161113
params=request.params,
11171114
)
11181115

0 commit comments

Comments
 (0)