mirror of
https://github.com/wassname/catalyst.git
synced 2026-08-07 11:20:19 +08:00
ENH: Make reader.get_value raise NoDataOnDate if the date is not in the calendar.
DataPortal now catches the NoDataOnDate exception and returns nan for OHLC and 0 for V. Price is still forward filled, unchanged.
This commit is contained in:
@@ -35,6 +35,7 @@ from pandas import (
|
||||
date_range,
|
||||
)
|
||||
|
||||
from zipline.data.bar_reader import NoDataOnDate
|
||||
from zipline.data.minute_bars import (
|
||||
BcolzMinuteBarMetadata,
|
||||
BcolzMinuteBarWriter,
|
||||
@@ -854,18 +855,19 @@ class BcolzMinuteBarTestCase(WithTradingCalendars,
|
||||
'open'),
|
||||
780)
|
||||
|
||||
self.assertEqual(
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(
|
||||
sid,
|
||||
Timestamp('2015-06-02', tz='UTC'),
|
||||
'open'),
|
||||
390)
|
||||
self.assertEqual(
|
||||
'open'
|
||||
)
|
||||
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(
|
||||
sid,
|
||||
Timestamp('2015-06-02 20:01:00', tz='UTC'),
|
||||
'open'),
|
||||
780)
|
||||
'open'
|
||||
)
|
||||
|
||||
def test_adjust_non_trading_minutes_half_days(self):
|
||||
# half day
|
||||
@@ -908,18 +910,20 @@ class BcolzMinuteBarTestCase(WithTradingCalendars,
|
||||
Timestamp('2015-11-27 18:01:00', tz='UTC'),
|
||||
'open'),
|
||||
210)
|
||||
self.assertEqual(
|
||||
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(
|
||||
sid,
|
||||
Timestamp('2015-11-30', tz='UTC'),
|
||||
'open'),
|
||||
210)
|
||||
self.assertEqual(
|
||||
'open'
|
||||
)
|
||||
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(
|
||||
sid,
|
||||
Timestamp('2015-11-30 21:01:00', tz='UTC'),
|
||||
'open'),
|
||||
600)
|
||||
'open'
|
||||
)
|
||||
|
||||
def test_set_sid_attrs(self):
|
||||
"""Confirm that we can set the attributes of a sid's file correctly.
|
||||
|
||||
@@ -21,6 +21,7 @@ import pandas as pd
|
||||
from pandas import DataFrame
|
||||
from six import iteritems
|
||||
|
||||
from zipline.data.bar_reader import NoDataOnDate
|
||||
from zipline.data.resample import (
|
||||
minute_to_session,
|
||||
DailyHistoryAggregator,
|
||||
@@ -803,12 +804,12 @@ class TestReindexSessionBars(WithBcolzEquityDailyBarReader,
|
||||
err_msg="The open of the fixture data on the "
|
||||
"first session should be 10.")
|
||||
tday = pd.Timestamp('2015-11-26', tz='UTC')
|
||||
assert_almost_equal(self.reader.get_value(1, tday, 'close'), nan,
|
||||
err_msg="Thanksgiving is a NYSE holiday, but "
|
||||
"futures trading is open. Result should be nan.")
|
||||
assert_almost_equal(self.reader.get_value(1, tday, 'volume'), 0,
|
||||
err_msg="Thanksgiving is a NYSE holiday, but "
|
||||
"futures trading is open. Result should be 0.")
|
||||
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(1, tday, 'close')
|
||||
|
||||
with self.assertRaises(NoDataOnDate):
|
||||
self.reader.get_value(1, tday, 'volume')
|
||||
|
||||
def test_last_availabe_dt(self):
|
||||
self.assertEqual(self.reader.last_available_dt, self.END_DATE)
|
||||
|
||||
@@ -22,6 +22,8 @@ from numpy.testing import assert_almost_equal
|
||||
import pandas as pd
|
||||
|
||||
from zipline._protocol import handle_non_market_minutes
|
||||
|
||||
from zipline.data.data_portal import DataPortal
|
||||
from zipline.protocol import BarData
|
||||
from zipline.testing import (
|
||||
MockDailyBarReader,
|
||||
@@ -477,6 +479,34 @@ class TestMinuteBarData(WithBarDataChecks,
|
||||
bd.current(self.HILARIOUSLY_ILLIQUID_ASSET, "volume")
|
||||
)
|
||||
|
||||
def test_get_value_during_non_market_hours(self):
|
||||
# make sure that if we try to get the OHLCV values of ASSET1 during
|
||||
# non-market hours, we don't get the previous market minute's values
|
||||
futures_cal = get_calendar("us_futures")
|
||||
|
||||
data_portal = DataPortal(
|
||||
self.env.asset_finder,
|
||||
futures_cal,
|
||||
first_trading_day=self.DATA_PORTAL_FIRST_TRADING_DAY,
|
||||
equity_minute_reader=self.bcolz_equity_minute_bar_reader,
|
||||
)
|
||||
|
||||
bar_data = BarData(
|
||||
data_portal,
|
||||
lambda: pd.Timestamp("2016-01-06 3:15", tz="US/Eastern"),
|
||||
"minute",
|
||||
futures_cal
|
||||
)
|
||||
|
||||
self.assertTrue(np.isnan(bar_data.current(self.ASSET1, "open")))
|
||||
self.assertTrue(np.isnan(bar_data.current(self.ASSET1, "high")))
|
||||
self.assertTrue(np.isnan(bar_data.current(self.ASSET1, "low")))
|
||||
self.assertTrue(np.isnan(bar_data.current(self.ASSET1, "close")))
|
||||
self.assertEqual(0, bar_data.current(self.ASSET1, "volume"))
|
||||
|
||||
# price should still forward fill
|
||||
self.assertEqual(390, bar_data.current(self.ASSET1, "price"))
|
||||
|
||||
def test_can_trade_equity_same_cal_outside_lifetime(self):
|
||||
cal = get_calendar(self.ASSET1.exchange)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user