XF/fisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: XF:a41a1e76a59f1a630f65a4d32f08679833df3533
Branches Tags
XF:master
...
compare: XF:29125d5087580858c51bb51e206678982e4fc9b0
Branches Tags
XF:master

2 Commits
a41a1e76a5 ... 29125d5087

Author SHA1 Message Date
Mark Veidemanis
29125d5087
Reshuffle the menu to minimise confusion 2022-12-13 07:20:49 +00:00
Mark Veidemanis
3a7b5c3ffd
Bring Alpaca and OANDA implementation functions into alignment 2022-12-13 07:20:49 +00:00
2 changed files with 23 additions and 32 deletions
Show Stats Expand all files Collapse all files

19
core/exchanges/alpaca.py
View File

@ -22,9 +22,16 @@ class AlpacaExchange(BaseExchange):
def get_account(self): def get_account(self):
return self.call("get_account") return self.call("get_account")
def get_supported_assets(self): def get_instruments(self):
request = GetAssetsRequest(status="active", asset_class="crypto") request = GetAssetsRequest(status="active", asset_class="crypto")
assets = self.call("get_all_assets", filter=request) assets = self.call("get_all_assets", filter=request)
return assets
def get_currencies(self, currencies):
pass # TODO
def get_supported_assets(self):
assets = self.get_instruments()
assets = assets["itemlist"] assets = assets["itemlist"]
asset_list = [x["symbol"] for x in assets if "symbol" in x] asset_list = [x["symbol"] for x in assets if "symbol" in x]
@ -67,7 +74,7 @@ class AlpacaExchange(BaseExchange):
cast = { cast = {
"symbol": trade.symbol, "symbol": trade.symbol,
"side": direction, "side": direction,
"time_in_force": TimeInForce.IOC, "time_in_force": TimeInForce.IOC, # TODO
} }
if trade.amount is not None: if trade.amount is not None:
cast["qty"] = trade.amount cast["qty"] = trade.amount
@ -115,7 +122,7 @@ class AlpacaExchange(BaseExchange):
return order return order
def get_trade(self, trade_id): def get_trade(self, trade_id):
pass pass # TODO
def update_trade(self, trade): def update_trade(self, trade):
pass pass
@ -125,7 +132,7 @@ class AlpacaExchange(BaseExchange):
def get_position_info(self, symbol): def get_position_info(self, symbol):
position = self.call("get_open_position", symbol) position = self.call("get_open_position", symbol)
return position return position # TODO: check
def get_all_positions(self): def get_all_positions(self):
items = [] items = []
@ -139,7 +146,7 @@ class AlpacaExchange(BaseExchange):
return items return items
def close_position(self, side, symbol): def close_position(self, side, symbol):
pass pass # TODO
def close_all_positions(self): def close_all_positions(self):
pass pass # TODO

36
core/templates/base.html
View File

@ -219,25 +219,20 @@
<div class="navbar-item has-dropdown is-hoverable"> <div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link"> <a class="navbar-link">
View Exchange
</a> </a>
<div class="navbar-dropdown"> <div class="navbar-dropdown">
<a class="navbar-item" href="{% url 'profit' type='page' %}"> <a class="navbar-item" href="{% url 'profit' type='page' %}">
Profit by account Profit
</a> </a>
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
Manage
</a>
<div class="navbar-dropdown">
<a class="navbar-item" href="{% url 'positions' type='page' %}"> <a class="navbar-item" href="{% url 'positions' type='page' %}">
Positions Positions
</a> </a>
<a class="navbar-item" href="{% url 'trades' type='page' %}"> <a class="navbar-item" href="{% url 'trades' type='page' %}">
Bot Trades Trades
</a>
<a class="navbar-item" href="{% url 'accounts' type='page' %}">
Accounts
</a> </a>
</div> </div>
</div> </div>
@ -245,28 +240,17 @@
<a class="navbar-link"> <a class="navbar-link">
Setup Setup
</a> </a>
<div class="navbar-dropdown"> <div class="navbar-dropdown">
<a class="navbar-item" href="{% url 'hooks' type='page' %}"> <a class="navbar-item" href="{% url 'strategies' type='page' %}">
Hooks Strategies
</a> </a>
<a class="navbar-item" href="{% url 'signals' type='page' %}"> <a class="navbar-item" href="{% url 'signals' type='page' %}">
Signals Signals
</a> </a>
<a class="navbar-item" href="{% url 'accounts' type='page' %}"> <a class="navbar-item" href="{% url 'hooks' type='page' %}">
Accounts Hooks
</a>
<a class="navbar-item" href="{% url 'strategies' type='page' %}">
Strategies
</a>
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link">
Limits
</a> </a>
<div class="navbar-dropdown">
<a class="navbar-item" href="{% url 'tradingtimes' type='page' %}"> <a class="navbar-item" href="{% url 'tradingtimes' type='page' %}">
Trading Times Trading Times
</a> </a>