python-binance 1.0.28__tar.gz → 1.0.30__tar.gz

{python_binance-1.0.28/python_binance.egg-info → python-binance-1.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-binance
-Version: 1.0.28
+Version: 1.0.30
 Summary: Binance REST API python implementation
 Home-page: https://github.com/sammchardy/python-binance
 Author: Sam McHardy
@@ -31,7 +31,7 @@ Requires-Dist: websockets
 Requires-Dist: pycryptodome
 
 =================================
-Welcome to python-binance v1.0.28
+Welcome to python-binance v1.0.30
 =================================
 
 .. image:: https://img.shields.io/pypi/v/python-binance.svg
@@ -95,7 +95,8 @@ Features
 
 - Implementation of all General, Market Data and Account endpoints.
 - Asyncio implementation
-- Testnet support for Spot, Futures and Vanilla Options
+- Demo trading support (by providing demo=True)
+- Testnet support for Spot, Futures and Vanilla Options (deprecated)
 - Simple handling of authentication include RSA and EDDSA keys
 - No need to generate timestamps yourself, the wrapper does it for you
 - RecvWindow sent by default

{python_binance-1.0.28 → python-binance-1.0.30}/README.rst

@@ -1,5 +1,5 @@
 =================================
-Welcome to python-binance v1.0.28
+Welcome to python-binance v1.0.30
 =================================
 
 .. image:: https://img.shields.io/pypi/v/python-binance.svg
@@ -63,7 +63,8 @@ Features
 
 - Implementation of all General, Market Data and Account endpoints.
 - Asyncio implementation
-- Testnet support for Spot, Futures and Vanilla Options
+- Demo trading support (by providing demo=True)
+- Testnet support for Spot, Futures and Vanilla Options (deprecated)
 - Simple handling of authentication include RSA and EDDSA keys
 - No need to generate timestamps yourself, the wrapper does it for you
 - RecvWindow sent by default

{python_binance-1.0.28 → python-binance-1.0.30}/binance/__init__.py

@@ -4,7 +4,7 @@
 
 """
 
-__version__ = "1.0.28"
+__version__ = "1.0.30"
 
 from binance.async_client import AsyncClient  # noqa
 from binance.client import Client  # noqa

{python_binance-1.0.28 → python-binance-1.0.30}/binance/async_client.py

@@ -31,6 +31,7 @@ class AsyncClient(BaseClient):
         tld: str = "com",
         base_endpoint: str = BaseClient.BASE_ENDPOINT_DEFAULT,
         testnet: bool = False,
+        demo: bool = False,
         loop=None,
         session_params: Optional[Dict[str, Any]] = None,
         private_key: Optional[Union[str, Path]] = None,
@@ -41,6 +42,15 @@ class AsyncClient(BaseClient):
         self.https_proxy = https_proxy
         self.loop = loop or get_loop()
         self._session_params: Dict[str, Any] = session_params or {}
+        
+        # Convert https_proxy to requests_params format for BaseClient
+        if https_proxy and requests_params is None:
+            requests_params = {'proxies': {'http': https_proxy, 'https': https_proxy}}
+        elif https_proxy and requests_params is not None:
+            if 'proxies' not in requests_params:
+                requests_params['proxies'] = {}
+            requests_params['proxies'].update({'http': https_proxy, 'https': https_proxy})
+        
         super().__init__(
             api_key,
             api_secret,
@@ -48,6 +58,7 @@ class AsyncClient(BaseClient):
             tld,
             base_endpoint,
             testnet,
+            demo,
             private_key,
             private_key_pass,
             time_unit=time_unit,
@@ -62,9 +73,13 @@ class AsyncClient(BaseClient):
         tld: str = "com",
         base_endpoint: str = BaseClient.BASE_ENDPOINT_DEFAULT,
         testnet: bool = False,
+        demo: bool = False,
         loop=None,
         session_params: Optional[Dict[str, Any]] = None,
+        private_key: Optional[Union[str, Path]] = None,
+        private_key_pass: Optional[str] = None,
         https_proxy: Optional[str] = None,
+        time_unit: Optional[str] = None,
     ):
         self = cls(
             api_key,
@@ -73,8 +88,13 @@ class AsyncClient(BaseClient):
             tld,
             base_endpoint,
             testnet,
+            demo,
             loop,
             session_params,
+            private_key,
+            private_key_pass,
+            https_proxy,
+            time_unit
         )
         self.https_proxy = https_proxy  # move this to the constructor
 
@@ -144,6 +164,9 @@ class AsyncClient(BaseClient):
             url_encoded_data = urlencode(dict_data)
             data = f"{url_encoded_data}&signature={signature}"
 
+        # Remove proxies from kwargs since aiohttp uses 'proxy' parameter instead
+        kwargs.pop('proxies', None)
+        
         async with getattr(self.session, method)(
             yarl.URL(uri, encoded=True),
             proxy=self.https_proxy,
@@ -162,7 +185,8 @@ class AsyncClient(BaseClient):
         if not str(response.status).startswith("2"):
             raise BinanceAPIException(response, response.status, await response.text())
         
-        if response.text == "":
+        text = await response.text()
+        if text == "":
             return {}
 
         try:
@@ -275,7 +299,7 @@ class AsyncClient(BaseClient):
     get_products.__doc__ = Client.get_products.__doc__
 
     async def get_exchange_info(self) -> Dict:
-        return await self._get("exchangeInfo", version=self.PRIVATE_API_VERSION)
+        return await self._get("exchangeInfo")
 
     get_exchange_info.__doc__ = Client.get_exchange_info.__doc__
 
@@ -293,12 +317,12 @@ class AsyncClient(BaseClient):
     # General Endpoints
 
     async def ping(self) -> Dict:
-        return await self._get("ping", version=self.PRIVATE_API_VERSION)
+        return await self._get("ping")
 
     ping.__doc__ = Client.ping.__doc__
 
     async def get_server_time(self) -> Dict:
-        return await self._get("time", version=self.PRIVATE_API_VERSION)
+        return await self._get("time")
 
     get_server_time.__doc__ = Client.get_server_time.__doc__
 
@@ -311,7 +335,7 @@ class AsyncClient(BaseClient):
         if symbol:
             params["symbol"] = symbol
         response = await self._get(
-            "ticker/price", version=self.PRIVATE_API_VERSION, data=params
+            "ticker/price", data=params
         )
         if isinstance(response, list) and all(isinstance(item, dict) for item in response):
             return response
@@ -326,13 +350,13 @@ class AsyncClient(BaseClient):
         elif "symbols" in params:
             data["symbols"] = params["symbols"]
         return await self._get(
-            "ticker/bookTicker", data=data, version=self.PRIVATE_API_VERSION
+            "ticker/bookTicker", data=data
         )
 
     get_orderbook_tickers.__doc__ = Client.get_orderbook_tickers.__doc__
 
     async def get_order_book(self, **params) -> Dict:
-        return await self._get("depth", data=params, version=self.PRIVATE_API_VERSION)
+        return await self._get("depth", data=params)
 
     get_order_book.__doc__ = Client.get_order_book.__doc__
 
@@ -343,14 +367,14 @@ class AsyncClient(BaseClient):
 
     async def get_historical_trades(self, **params) -> Dict:
         return await self._get(
-            "historicalTrades", data=params, version=self.PRIVATE_API_VERSION
+            "historicalTrades", data=params
         )
 
     get_historical_trades.__doc__ = Client.get_historical_trades.__doc__
 
     async def get_aggregate_trades(self, **params) -> Dict:
         return await self._get(
-            "aggTrades", data=params, version=self.PRIVATE_API_VERSION
+            "aggTrades", data=params
         )
 
     get_aggregate_trades.__doc__ = Client.get_aggregate_trades.__doc__
@@ -411,12 +435,12 @@ class AsyncClient(BaseClient):
     aggregate_trade_iter.__doc__ = Client.aggregate_trade_iter.__doc__
 
     async def get_ui_klines(self, **params) -> Dict:
-        return await self._get("uiKlines", data=params, version=self.PRIVATE_API_VERSION)
+        return await self._get("uiKlines", data=params)
 
     get_ui_klines.__doc__ = Client.get_ui_klines.__doc__
 
     async def get_klines(self, **params) -> Dict:
-        return await self._get("klines", data=params, version=self.PRIVATE_API_VERSION)
+        return await self._get("klines", data=params)
 
     get_klines.__doc__ = Client.get_klines.__doc__
 
@@ -647,33 +671,33 @@ class AsyncClient(BaseClient):
 
     async def get_avg_price(self, **params):
         return await self._get(
-            "avgPrice", data=params, version=self.PRIVATE_API_VERSION
+            "avgPrice", data=params
         )
 
     get_avg_price.__doc__ = Client.get_avg_price.__doc__
 
     async def get_ticker(self, **params):
         return await self._get(
-            "ticker/24hr", data=params, version=self.PRIVATE_API_VERSION
+            "ticker/24hr", data=params
         )
 
     get_ticker.__doc__ = Client.get_ticker.__doc__
 
     async def get_symbol_ticker(self, **params):
         return await self._get(
-            "ticker/price", data=params, version=self.PRIVATE_API_VERSION
+            "ticker/price", data=params
         )
 
     get_symbol_ticker.__doc__ = Client.get_symbol_ticker.__doc__
 
     async def get_symbol_ticker_window(self, **params):
-        return await self._get("ticker", data=params, version=self.PRIVATE_API_VERSION)
+        return await self._get("ticker", data=params)
 
     get_symbol_ticker_window.__doc__ = Client.get_symbol_ticker_window.__doc__
 
     async def get_orderbook_ticker(self, **params):
         return await self._get(
-            "ticker/bookTicker", data=params, version=self.PRIVATE_API_VERSION
+            "ticker/bookTicker", data=params
         )
 
     get_orderbook_ticker.__doc__ = Client.get_orderbook_ticker.__doc__
@@ -1719,11 +1743,11 @@ class AsyncClient(BaseClient):
 
     futures_premium_index_klines.__doc__ = Client.futures_index_price_klines.__doc__
 
-    async def futures_continous_klines(self, **params):
+    async def futures_continuous_klines(self, **params):
         return await self._request_futures_api("get", "continuousKlines", data=params)
 
     async def futures_historical_klines(
-        self, symbol, interval, start_str, end_str=None, limit=500
+        self, symbol: str, interval: str, start_str, end_str=None, limit=None
     ):
         return await self._historical_klines(
             symbol,
@@ -1868,6 +1892,77 @@ class AsyncClient(BaseClient):
             params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
         return await self._request_futures_api("post", "order", True, data=params)
 
+    async def futures_limit_order(self, **params):
+        """Send in a new futures limit order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["type"] = "LIMIT"
+        return await self._request_futures_api("post", "order", True, data=params)
+
+    async def futures_market_order(self, **params):
+        """Send in a new futures market order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["type"] = "MARKET"
+        return await self._request_futures_api("post", "order", True, data=params)
+
+
+    async def futures_limit_buy_order(self, **params):
+        """Send in a new futures limit buy order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["side"] = "BUY"
+        params["type"] = "LIMIT"
+        return await self._request_futures_api("post", "order", True, data=params)
+
+    async def futures_limit_sell_order(self, **params):
+        """Send in a new futures limit sell order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["side"] = "SELL"
+        params["type"] = "LIMIT"
+        return await self._request_futures_api("post", "order", True, data=params)
+
+    async def futures_market_buy_order(self, **params):
+        """Send in a new futures market buy order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["side"] = "BUY"
+        params["type"] = "MARKET"
+        return await self._request_futures_api("post", "order", True, data=params)
+
+    async def futures_market_sell_order(self, **params):
+        """Send in a new futures market sell order.
+
+        https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api
+
+        """
+        if "newClientOrderId" not in params:
+            params["newClientOrderId"] = self.CONTRACT_ORDER_PREFIX + self.uuid22()
+        params["side"] = "SELL"
+        params["type"] = "MARKET"
+        return await self._request_futures_api("post", "order", True, data=params)
+
     async def futures_modify_order(self, **params):
         """Modify an existing order. Currently only LIMIT order modification is supported.
 
@@ -5355,4 +5450,4 @@ class AsyncClient(BaseClient):
         return await self._request_futures_api("get", "convert/orderStatus", signed=True, data=params, version=1)
         
     futures_v1_get_convert_order_status.__doc__ = Client.futures_v1_get_convert_order_status.__doc__
-            
+            

{python_binance-1.0.28 → python-binance-1.0.30}/binance/base_client.py

@@ -22,24 +22,29 @@ from .helpers import get_loop
 class BaseClient:
     API_URL = "https://api{}.binance.{}/api"
     API_TESTNET_URL = "https://testnet.binance.vision/api"
+    API_DEMO_URL = "https://demo-api.binance.com/api"
     MARGIN_API_URL = "https://api{}.binance.{}/sapi"
     WEBSITE_URL = "https://www.binance.{}"
     FUTURES_URL = "https://fapi.binance.{}/fapi"
     FUTURES_TESTNET_URL = "https://testnet.binancefuture.com/fapi"
+    FUTURES_DEMO_URL = "https://demo-fapi.binance.com/fapi"
     FUTURES_DATA_URL = "https://fapi.binance.{}/futures/data"
     FUTURES_DATA_TESTNET_URL = "https://testnet.binancefuture.com/futures/data"
     FUTURES_COIN_URL = "https://dapi.binance.{}/dapi"
     FUTURES_COIN_TESTNET_URL = "https://testnet.binancefuture.com/dapi"
+    FUTURES_COIN_DEMO_URL = "https://demo-dapi.binance.com/dapi"
     FUTURES_COIN_DATA_URL = "https://dapi.binance.{}/futures/data"
     FUTURES_COIN_DATA_TESTNET_URL = "https://testnet.binancefuture.com/futures/data"
     OPTIONS_URL = "https://eapi.binance.{}/eapi"
     OPTIONS_TESTNET_URL = "https://testnet.binanceops.{}/eapi"
     PAPI_URL = "https://papi.binance.{}/papi"
     WS_API_URL = "wss://ws-api.binance.{}/ws-api/v3"
-    WS_API_TESTNET_URL = "wss://testnet.binance.vision/ws-api/v3"
+    WS_API_TESTNET_URL = "wss://ws-api.testnet.binance.vision/ws-api/v3"
+    WS_API_DEMO_URL = "wss://demo-ws-api.binance.com/ws-api/v3"
     WS_FUTURES_URL = "wss://ws-fapi.binance.{}/ws-fapi/v1"
     WS_FUTURES_TESTNET_URL = "wss://testnet.binancefuture.com/ws-fapi/v1"
-    PUBLIC_API_VERSION = "v1"
+    WS_FUTURES_DEMO_URL = "wss://testnet.binancefuture.com/ws-fapi/v1"
+    PUBLIC_API_VERSION = "v3"
     PRIVATE_API_VERSION = "v3"
     MARGIN_API_VERSION = "v1"
     MARGIN_API_VERSION2 = "v2"
@@ -157,6 +162,7 @@ class BaseClient:
         tld: str = "com",
         base_endpoint: str = BASE_ENDPOINT_DEFAULT,
         testnet: bool = False,
+        demo: bool = False,
         private_key: Optional[Union[str, Path]] = None,
         private_key_pass: Optional[str] = None,
         loop: Optional[asyncio.AbstractEventLoop] = None,
@@ -201,15 +207,27 @@ class BaseClient:
         self._requests_params = requests_params
         self.response = None
         self.testnet = testnet
+        self.demo = demo
         self.timestamp_offset = 0
-        ws_api_url = self.WS_API_TESTNET_URL if testnet else self.WS_API_URL.format(tld)
+        ws_api_url = self.WS_API_URL.format(tld)
+        if testnet:
+            ws_api_url = self.WS_API_TESTNET_URL
+        elif demo:
+            ws_api_url = self.WS_API_DEMO_URL
         if self.TIME_UNIT:
             ws_api_url += f"?timeUnit={self.TIME_UNIT}"
-        self.ws_api = WebsocketAPI(url=ws_api_url, tld=tld)
-        ws_future_url = (
-            self.WS_FUTURES_TESTNET_URL if testnet else self.WS_FUTURES_URL.format(tld)
-        )
-        self.ws_future = WebsocketAPI(url=ws_future_url, tld=tld)
+        # Extract proxy from requests_params for WebSocket connections
+        https_proxy = None
+        if requests_params and 'proxies' in requests_params:
+            https_proxy = requests_params['proxies'].get('https') or requests_params['proxies'].get('http')
+        
+        self.ws_api = WebsocketAPI(url=ws_api_url, tld=tld, https_proxy=https_proxy)
+        ws_future_url = self.WS_FUTURES_URL.format(tld)
+        if testnet:
+            ws_future_url = self.WS_FUTURES_TESTNET_URL
+        elif demo:
+            ws_future_url = self.WS_FUTURES_DEMO_URL
+        self.ws_future = WebsocketAPI(url=ws_future_url, tld=tld, https_proxy=https_proxy)
         self.loop = loop or get_loop()
 
     def _get_headers(self) -> Dict:
@@ -250,6 +268,8 @@ class BaseClient:
         url = self.API_URL
         if self.testnet:
             url = self.API_TESTNET_URL
+        elif self.demo:
+            url = self.API_DEMO_URL
         v = self.PRIVATE_API_VERSION if signed else version
         return url + "/" + v + "/" + path
 
@@ -273,6 +293,8 @@ class BaseClient:
         url = self.FUTURES_URL
         if self.testnet:
             url = self.FUTURES_TESTNET_URL
+        elif self.demo:
+            url = self.FUTURES_DEMO_URL
         options = {
             1: self.FUTURES_API_VERSION,
             2: self.FUTURES_API_VERSION2,
@@ -290,6 +312,8 @@ class BaseClient:
         url = self.FUTURES_COIN_URL
         if self.testnet:
             url = self.FUTURES_COIN_TESTNET_URL
+        elif self.demo:
+            url = self.FUTURES_COIN_DEMO_URL
         options = {
             1: self.FUTURES_API_VERSION,
             2: self.FUTURES_API_VERSION2,