diff --git a/iqfeed/iqfeed.py b/iqfeed/iqfeed.py index fc762d0..0e08140 100644 --- a/iqfeed/iqfeed.py +++ b/iqfeed/iqfeed.py @@ -1,7 +1,7 @@ import pandas as pd import socket -from datetime import datetime +from datetime import datetime, time from dotenv import load_dotenv from os import getenv from io import StringIO @@ -63,11 +63,15 @@ def minutes(value): def hours(value): return value * 3600 -def get_historical_data(symbol: str, interval: int, - start_date: datetime, end_date: datetime = None, +def get_historical_data(symbol: str, interval: int, date: datetime = None, + start_date: datetime = None, end_date: datetime = None, start_filter_time: datetime = datetime.strptime('093000', '%H%M%S').time(), end_filter_time: datetime = datetime.strptime('160000', '%H%M%S').time()) -> pd.DataFrame: - + + if date: + start_date = date + end_date = datetime.combine(date, time.max) + message = 'HIT,{symbol},{interval},{begin},{end},,{begin_filter},{end_filter},1\n'.format( symbol = symbol, interval = interval, @@ -94,8 +98,7 @@ def get_historical_data(symbol: str, interval: int, if __name__ == '__main__': symbols = ['SPY'] - start_date = datetime(2023, 1, 1, 7, 50) - end_date = datetime(2023, 1, 31, 16, 0) + date = datetime(2024, 3, 28) for symbol in symbols: - data = get_historical_data(symbol, minutes(5), start_date, end_date) + data = get_historical_data(symbol, minutes(5), date) print(data)