From 49281fe890e8b1a888fd5a87fc6b44796f4f9751 Mon Sep 17 00:00:00 2001 From: mraniki <8766259+mraniki@users.noreply.github.com> Date: Wed, 26 Apr 2023 21:57:23 +0200 Subject: [PATCH] fix: identify order function --- findmyorder/main.py | 34 +++++++++++++++++----------------- tests/examples/example.py | 10 +++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/findmyorder/main.py b/findmyorder/main.py index 941449d9..6d068134 100644 --- a/findmyorder/main.py +++ b/findmyorder/main.py @@ -65,24 +65,24 @@ def get_order(self,mystring: str = None,): parsed_order = identify_order(mystring) self.logger.info(msg=f"parsed_order: {parsed_order}") - order_raw = mystring.split() - self.logger.info(msg=f"Order identified: {order_raw}") - - order = {} - order['market'] = 'Any' - order['exchange'] = 'Any' - order['timestamp'] = datetime.utcnow() - order['leverage'] = 1 - order['ordertype'] = 'spot' - order['direction'] = 'BUY' - order['symbol'] = 'EURUSD' - order['quantity'] = 10 - order['amount'] = 100 - order['stoploss'] = 1000 - order['takeprofit'] = {'tp1':1, 'tp2':10, 'tp3':100, 'tp4':1000, 'tp5':1000} - order['comments'] = 'findmyorder' + # order_raw = mystring.split() + # self.logger.info(msg=f"Order identified: {order_raw}") + + # order = {} + # order['market'] = 'Any' + # order['exchange'] = 'Any' + # order['timestamp'] = datetime.utcnow() + # order['leverage'] = 1 + # order['ordertype'] = 'spot' + # order['direction'] = 'BUY' + # order['symbol'] = 'EURUSD' + # order['quantity'] = 10 + # order['amount'] = 100 + # order['stoploss'] = 1000 + # order['takeprofit'] = {'tp1':1, 'tp2':10, 'tp3':100, 'tp4':1000, 'tp5':1000} + # order['comments'] = 'findmyorder' - return order + return parsed_order except Exception as e: self.logger.debug(f"error {e}") diff --git a/tests/examples/example.py b/tests/examples/example.py index eeab0ad0..f43e511a 100644 --- a/tests/examples/example.py +++ b/tests/examples/example.py @@ -20,24 +20,24 @@ async def main(): order = fmo.search(msg_order) logger.debug(f"search 1: {order}") order = fmo.get_order(msg_order) - logger.debug(f"get_order 1: {order}") + logger.info(f"get_order 1: {order}") msg_order = "buy btc" order = fmo.get_order(msg_order) - logger.debug(msg=f"get_order 2: {order}") + logger.info(msg=f"get_order 2: {order}") msg_order = "SELL BTC 1%" order = fmo.get_order(msg_order) - logger.debug(f"get_order 3 : {order}") + logger.info(f"get_order 3 : {order}") msg_order = "SELL BTCUSDT 1%" order = fmo.get_order(msg_order) - logger.debug(f"get_order 4 : {order}") + logger.info(f"get_order 4 : {order}") msg_order = "buy EURUSD sl=1000 tp=1000 q=1 comment=FOMC" order = fmo.get_order(msg_order) - logger.debug(f"get_order 5 : {order}") + logger.info(f"get_order 5 : {order}") await asyncio.sleep(10000)