ready -> test

Author: oliver-zehentleitner

binance_websocket_api_futures.py

@@ -16,47 +16,66 @@ async def handle_socket_message(stream_id=None):
             data = await ubwa.get_stream_data_from_asyncio_queue(stream_id=stream_id)
             print(f"received data:\r\n{data}\r\n")
 
-    print(f"Starting the stream:")
+    print(f"Starting the stream ...\r\n")
     api_stream = ubwa.create_stream(api=True,
                                     api_key=os.getenv('BINANCE_API_KEY'),
                                     api_secret=os.getenv('BINANCE_API_SECRET'),
                                     stream_label="Bobs Future Websocket API",
                                     process_asyncio_queue=handle_socket_message)
 
-    print(f"Executing API requests on Binance Futures:")
+    print(f"Executing API requests on Binance Futures:\r\n")
+
     account_status = ubwa.api.futures.get_account_status(stream_id=api_stream, return_response=True)
     print(f"Status of account_status request: {account_status['status']}\r\n")
+
     ubwa.api.futures.get_listen_key(stream_id=api_stream)
+
     ubwa.api.futures.get_server_time(stream_id=api_stream)
+
     print(f"Account balance: "
-          f"{str(ubwa.api.futures.get_account_balance(stream_id=api_stream, return_response=True))[:100]} ...")
+          f"{str(ubwa.api.futures.get_account_balance(stream_id=api_stream, return_response=True))[:100]} ...\r\n")
+
     print(f"Account position: "
-          f"{str(ubwa.api.futures.get_account_position(stream_id=api_stream, return_response=True))[:100]} ...")
+          f"{str(ubwa.api.futures.get_account_position(stream_id=api_stream, return_response=True))[:100]} ...\r\n")
+
     print(f"Account status: "
-          f"{str(ubwa.api.futures.get_account_status(stream_id=api_stream, return_response=True))[:100]} ...")
+          f"{str(ubwa.api.futures.get_account_status(stream_id=api_stream, return_response=True))[:100]} ...\r\n")
+
     print(f"Ticker order book: "
-          f"{str(ubwa.api.futures.get_ticker_order_book(stream_id=api_stream, return_response=True))[:100]} ...")
+          f"{str(ubwa.api.futures.get_ticker_order_book(stream_id=api_stream, 
+                                                        symbol=market, 
+                                                        return_response=True))[:100]} ...\r\n")
+
     print(f"Ticker price: "
-          f"{str(ubwa.api.futures.get_ticker_price(stream_id=api_stream, return_response=True))[:100]} ...")
+          f"{str(ubwa.api.futures.get_ticker_price(stream_id=api_stream, 
+                                                   symbol=market,
+                                                   return_response=True))[:100]} ...\r\n")
+
     orig_client_order_id = ubwa.api.futures.create_order(stream_id=api_stream, price=1.0, order_type="LIMIT",
                                                          quantity=15.0, side="SELL", symbol=market, time_in_force="GTC")
+
     order_book = ubwa.api.futures.get_order_book(stream_id=api_stream, symbol=market, limit=10, return_response=True)
-    print(f"Orderbook, lastUpdateId={order_book['result']['lastUpdateId']}: \r\nASKS {order_book['result']['asks']}\r\n"
-          f"BIDS {order_book['result']['bids']}\r\n")
-    #ubwa.api.futures.get_order(stream_id=api_stream, symbol=market, orig_client_order_id=orig_client_order_id)
-    #new_orig_client_order_id = ubwa.api.futures.modify_order(stream_id=api_stream, symbol=market,
-    #                                                         orig_client_order_id=orig_client_order_id)
-    #ubwa.api.futures.cancel_order(stream_id=api_stream, symbol=market, orig_client_order_id=new_orig_client_order_id)
-    #ubwa.api.futures.get_order(stream_id=api_stream, symbol=market, orig_client_order_id=new_orig_client_order_id)
-    print(f"PING: {ubwa.api.futures.ping(stream_id=api_stream, return_response=True)}")
-    await asyncio.sleep(2)
-    print(f"Stopping!")
+    print(f"Orderbook, lastUpdateId={order_book['result']['lastUpdateId']}: \r\n{order_book['result']}\r\n")
+
+    ubwa.api.futures.get_order(stream_id=api_stream, symbol=market, orig_client_order_id=orig_client_order_id)
+
+    new_orig_client_order_id = ubwa.api.futures.modify_order(stream_id=api_stream, symbol=market,
+                                                             quantity=15.0, side="SELL",
+                                                             orig_client_order_id=orig_client_order_id)
+
+    ubwa.api.futures.cancel_order(stream_id=api_stream, symbol=market, orig_client_order_id=new_orig_client_order_id)
+
+    ubwa.api.futures.get_order(stream_id=api_stream, symbol=market, orig_client_order_id=new_orig_client_order_id)
+
+    print(f"PING: {ubwa.api.futures.ping(stream_id=api_stream, return_response=True)}\r\n")
+
+    print(f"Stopping!\r\n")
 
 def process_stream_signal(signal_type=None, stream_id=None, data_record=None, error_msg=None):
     # More info about `stream_signals`:
     # https://github.com/LUCIT-Systems-and-Development/unicorn-binance-websocket-api/wiki/%60stream_signals%60
     print(f"Received stream_signal for stream '{ubwa_manager.get_stream_label(stream_id=stream_id)}': "
-          f"{signal_type} - {stream_id} - {data_record} - {error_msg}")
+          f"{signal_type} - {stream_id} - {data_record} - {error_msg}\r\n")
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG,

binance_websocket_api_spot.py

@@ -24,6 +24,7 @@ async def handle_socket_message(stream_id=None):
                                     process_asyncio_queue=handle_socket_message)
 
     print(f"Executing API requests on Binance Spot:")
+
     current_average_price = ubwa.api.spot.get_current_average_price(stream_id=api_stream, symbol=market, return_response=True)
     print(f"current_average_price: {current_average_price}\r\n")
 
@@ -81,13 +82,13 @@ async def handle_socket_message(stream_id=None):
 
     recent_trades = ubwa.api.spot.get_recent_trades(stream_id=api_stream, symbol=market, return_response=True)
     print(f"recent_trades: {recent_trades['result'][:5]}\r\n")
-    print(f"Stopping!")
+    print(f"Stopping!\r\n")
 
 def process_stream_signal(signal_type=None, stream_id=None, data_record=None, error_msg=None):
     # More info about `stream_signals`:
     # https://github.com/LUCIT-Systems-and-Development/unicorn-binance-websocket-api/wiki/%60stream_signals%60
     print(f"Received stream_signal for stream '{ubwa_manager.get_stream_label(stream_id=stream_id)}': "
-          f"{signal_type} - {stream_id} - {data_record} - {error_msg}")
+          f"{signal_type} - {stream_id} - {data_record} - {error_msg}\r\n")
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG,

unicorn_binance_websocket_api/api/futures.py

@@ -165,6 +165,9 @@ def cancel_order(self, order_id: int = None, orig_client_order_id: str = None,
               ]
             }
         """
+        if symbol is None or (order_id is None and orig_client_order_id is None):
+            raise ValueError(f"Missing mandatory parameter: symbol, order_id/orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -180,9 +183,9 @@ def cancel_order(self, order_id: int = None, orig_client_order_id: str = None,
                   "timestamp": self._manager.get_timestamp()}
 
         if order_id is not None:
-            params['orderId'] = order_id
+            params['orderId'] = int(order_id)
         if orig_client_order_id is not None:
-            params['origClientOrderId'] = orig_client_order_id
+            params['origClientOrderId'] = str(orig_client_order_id)
         if recv_window is not None:
             params['recvWindow'] = str(recv_window)
 
@@ -444,6 +447,9 @@ def create_order(self,
                 ]
             }
         """
+        if side is None or symbol is None or order_type is None:
+            raise ValueError(f"Missing mandatory parameter: order_type, side, symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1353,6 +1359,9 @@ def get_order(self, order_id: int = None, orig_client_order_id: str = None, proc
                 ]
             }
         """
+        if symbol is None or (order_id is None and orig_client_order_id is None):
+            raise ValueError(f"Missing mandatory parameter: symbol, order_id/orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1497,6 +1506,9 @@ def get_order_book(self, process_response=None, limit: int = None, recv_window:
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1738,6 +1750,9 @@ def get_ticker_order_book(self, process_response=None, request_id: str = None, r
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1874,6 +1889,9 @@ def get_ticker_price(self, process_response=None, request_id: str = None, return
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2064,6 +2082,14 @@ def modify_order(self,
                 ]
             }
         """
+        if (price is None or
+                quantity is None or
+                side is None or
+                symbol is None or
+                (order_id is None and orig_client_order_id is None)):
+            raise ValueError(f"Missing mandatory parameter: price, quantity, side, symbol, "
+                             f"order_id/orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2082,9 +2108,9 @@ def modify_order(self,
                   "timestamp": self._manager.get_timestamp()}
 
         if order_id is not None:
-            params['orderId'] = order_id
+            params['orderId'] = int(order_id)
         if orig_client_order_id is not None:
-            params['origClientOrderId'] = orig_client_order_id
+            params['origClientOrderId'] = str(orig_client_order_id)
         if price_match is not None:
             params['priceMatch'] = price_match
         if recv_window is not None:

unicorn_binance_websocket_api/api/spot.py

@@ -343,6 +343,15 @@ def cancel_and_replace_order(self,
               ]
             }
         """
+        if (cancel_replace_mode is None or
+                quantity is None or
+                side is None or
+                symbol is None or
+                order_type is None or
+                (cancel_order_id is None and cancel_orig_client_order_id is None)):
+            raise ValueError(f"Missing mandatory parameter: cancel_replace_mode, quantity, side, symbol, order_type,"
+                             f"cancel_order_id/cancel_orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -362,11 +371,11 @@ def cancel_and_replace_order(self,
                   "type": order_type}
 
         if cancel_order_id is not None:
-            params['cancelOrderId'] = cancel_order_id
+            params['cancelOrderId'] = int(cancel_order_id)
         if cancel_orig_client_order_id is not None:
-            params['cancelOrigClientOrderId'] = cancel_orig_client_order_id
+            params['cancelOrigClientOrderId'] = str(cancel_orig_client_order_id)
         if cancel_new_client_order_id is not None:
-            params['cancelNewClientOrderId'] = cancel_new_client_order_id
+            params['cancelNewClientOrderId'] = str(cancel_new_client_order_id)
         if cancel_restrictions is not None:
             params['cancelRestrictions'] = cancel_restrictions
         if iceberg_qty is not None:
@@ -588,6 +597,9 @@ def cancel_open_orders(self, process_response=None, return_response: bool = Fals
                 ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -755,6 +767,9 @@ def cancel_order(self, cancel_restrictions: Optional[Literal['ONLY_NEW', 'ONLY_P
                 ]
             }
         """
+        if symbol is None or (order_id is None and orig_client_order_id is None):
+            raise ValueError(f"Missing mandatory parameter: symbol, order_id/orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -774,9 +789,9 @@ def cancel_order(self, cancel_restrictions: Optional[Literal['ONLY_NEW', 'ONLY_P
         if new_client_order_id is not None:
             params['newClientOrderId'] = new_client_order_id
         if order_id is not None:
-            params['orderId'] = order_id
+            params['orderId'] = int(order_id)
         if orig_client_order_id is not None:
-            params['origClientOrderId'] = orig_client_order_id
+            params['origClientOrderId'] = str(orig_client_order_id)
         if recv_window is not None:
             params['recvWindow'] = str(recv_window)
 
@@ -1001,6 +1016,9 @@ def create_order(self,
                 ]
             }
         """
+        if side is None or symbol is None or order_type is None:
+            raise ValueError(f"Missing mandatory parameter: order_type, side, symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1528,6 +1546,9 @@ def get_aggregate_trades(self, process_response=None, end_time: int = None, from
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -1965,6 +1986,9 @@ def get_historical_trades(self, process_response=None, from_id: int = None, limi
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2125,6 +2149,9 @@ def get_klines(self, process_response=None,
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2533,6 +2560,9 @@ def get_order(self, order_id: int = None, orig_client_order_id: str = None, proc
                 ]
             }
         """
+        if symbol is None or (order_id is None and orig_client_order_id is None):
+            raise ValueError(f"Missing mandatory parameter: symbol, order_id/orig_client_order_id")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2708,6 +2738,9 @@ def get_order_book(self, process_response=None, limit: int = None, recv_window:
                 ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -2832,6 +2865,9 @@ def get_recent_trades(self, process_response=None, limit: int = None,
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)
@@ -3167,6 +3203,9 @@ def get_ui_klines(self,
               ]
             }
         """
+        if symbol is None:
+            raise ValueError(f"Missing mandatory parameter: symbol")
+
         if stream_id is None:
             if stream_label is not None:
                 stream_id = self._manager.get_stream_id_by_label(stream_label=stream_label)