Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 67 additions & 50 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pytrade/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pytrade.instruments import Candlestick, Granularity, Instrument
from pytrade.interfaces.data import IDataContext, IInstrumentData

COLUMNS = ["Timestamp", "Instrument", "Open", "High", "Low", "Close"]
COLUMNS = ["datetime", "instrument", "open", "high", "low", "close"]

INDEX = COLUMNS[0]

Expand Down
12 changes: 6 additions & 6 deletions pytrade/instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ def __init__(

def to_dict(self):
return {
"Timestamp": self.timestamp,
"Instrument": self.instrument,
"Open": self.open,
"High": self.open,
"Low": self.open,
"Close": self.open,
"datetime": self.timestamp,
"instrument": self.instrument,
"open": self.open,
"high": self.open,
"low": self.open,
"close": self.open,
}


Expand Down
8 changes: 4 additions & 4 deletions pytrade/interfaces/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ def timestamp(self) -> Timestamp:

@property
def Open(self):
return self.df.Open
return self.df.open

@property
def High(self):
return self.df.High
return self.df.high

@property
def Low(self):
return self.df.Low
return self.df.low

@property
def Close(self):
return self.df.Close
return self.df.close

@property
def last_price(self):
Expand Down