Merge branch 'main_merge_260613_001' into 'main'

feat: Add support for Webull ZA、EU，Update proeprty trailing_limit_price

See merge request webull/webull-openapi-python-sdk!33

Author: 方佳

README.md

@@ -1,6 +1,6 @@
 # Webull OpenAPI Python SDK
 
-Note: This is the new version of the Webull SDK, currently applicable only to Webull Hong Kong, Webull US, Webull JP, Webull SG, Webull TH, Webull AU, Webull MY, Webull UK, Webull BR, or Webull MX customers.
+Note: This is the new version of the Webull SDK, currently applicable only to Webull Hong Kong, Webull US, Webull JP, Webull SG, Webull TH, Webull AU, Webull MY, Webull UK, Webull BR, Webull MX, Webull ZA, or Webull EU customers.
 
 Webull OpenAPI aims to provide quantitative trading investors with convenient, fast and secure services. Webull aims to help every quant traders achieve flexible and changeable trading or market strategies.
 
@@ -30,7 +30,9 @@ Subscription to real-time information: Subscribe to order status changes, market
 | Webull UK | https://www.webull-uk.com/open-api-management   |
 | Webull BR | https://www.webull.com.br/open-api-management   |
 | Webull MX | https://www.webull.com.mx/open-api-management   |
-- Requires Python 3.7 through 3.11.
+| Webull ZA | https://www.webull.co.za/open-api-management    |
+| Webull EU | https://www.webull.eu/open-api-management       |
+- Requires Python 3.7 through 3.13.
 
 ## Interface Protocol
 
@@ -54,5 +56,7 @@ The bottom layer of Webull OpenAPI provides three protocols, HTTP / GRPC / MQTT,
 | Webull AU | https://developer.webull.com.au/apis/docs |
 | Webull MY | https://developer.webull.com.my/apis/docs |
 | Webull UK | https://developer.webull-uk.com/apis/docs |
-| Webull BR | https://developer.webull.com.br/apis/docs/ |
-| Webull MX | https://developer.webull.com.mx/apis/docs/ |
+| Webull BR | https://developer.webull.com.br/apis/docs |
+| Webull MX | https://developer.webull.com.mx/apis/docs |
+| Webull ZA | https://developer.webull.co.za/apis/docs |
+| Webull EU | https://developer.webull.eu/apis/docs |

samples/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.10'
+__version__ = '2.0.11'

samples/trade/trade_client_v3.py

@@ -815,7 +815,8 @@
             "order_type": "TRAILING_STOP_LOSS_LIMIT",
             "quantity": "200",
             "trailing_stop_step": "0.1",
-            "trailing_limit_price": "580",
+            # also supports the legacy field name "trailing_limit_price"
+            "trailing_limit_price_offset": "580",
             "trailing_type": "PERCENTAGE",
             "support_trading_session": "CORE",
             "side": "BUY",
@@ -836,7 +837,8 @@
             "stop_price": "560.77",
             "quantity": "200",
             "trailing_stop_step": "0.15",
-            "trailing_limit_price": "581",
+            # also supports the legacy field name "trailing_limit_price"
+            "trailing_limit_price_offset": "581",
             "trailing_type": "PERCENTAGE",
             "trigger_price_type": "PRICE"
         }

tests/core/endpoint/test_endpoint.py

@@ -94,6 +94,16 @@ def test_quotes_endpoint(self):
         endpoint_request = ResolveEndpointRequest(_region_id, api_type.QUOTES)
         endpoint = resolver.resolve(endpoint_request)
         self.assertEqual(endpoint, 'data-api.webull.com')
+
+        _region_id = 'za'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.QUOTES)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'data-api.webull.com.au')
+
+        _region_id = 'eu'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.QUOTES)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'data-api.webull.eu')
     def test_api_endpoint(self):
         """
             Set by Request, and it only takes effect for the current Request. The sample code is as follows.
@@ -148,6 +158,16 @@ def test_api_endpoint(self):
         endpoint_request = ResolveEndpointRequest(_region_id)
         endpoint = resolver.resolve(endpoint_request)
         self.assertEqual(endpoint, 'api.webull.com')
+
+        _region_id = 'za'
+        endpoint_request = ResolveEndpointRequest(_region_id)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'api.webull.com.au')
+
+        _region_id = 'eu'
+        endpoint_request = ResolveEndpointRequest(_region_id)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'api.webull.eu')
     def test_event_endpoint(self):
         resolver = DefaultEndpointResolver(self)
         _region_id = 'us'
@@ -198,4 +218,14 @@ def test_event_endpoint(self):
         _region_id = 'mx'
         endpoint_request = ResolveEndpointRequest(_region_id, api_type.EVENTS)
         endpoint = resolver.resolve(endpoint_request)
-        self.assertEqual(endpoint, 'events-api.webull.com')
+        self.assertEqual(endpoint, 'events-api.webull.com')
+
+        _region_id = 'za'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.EVENTS)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'events-api.webull.com.au')
+
+        _region_id = 'eu'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.EVENTS)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'events-api.webull.eu')

webull/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.10'
+__version__ = '2.0.11'

webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.0.10'
+__version__ = '2.0.11'
 
 import logging
 

webull/core/common/region.py

@@ -12,3 +12,5 @@ class Region(Enum):
     UK = 'uk'
     BR = 'br'
     MX = 'mx'
+    ZA = 'za'
+    EU = 'eu'

webull/core/data/endpoints.json

@@ -1,6 +1,6 @@
 {
     "default_region": "us",
-    "regions": ["us", "hk", "jp", "sg", "th", "au", "my", "uk", "br", "mx"],
+    "regions": ["us", "hk", "jp", "sg", "th", "au", "my", "uk", "br", "mx", "za", "eu"],
     "region_mapping": {
         "us": {
             "api": "api.webull.com",
@@ -51,6 +51,16 @@
             "api": "api.webull.com",
             "quotes-api": "data-api.webull.com",
             "events-api": "events-api.webull.com"
+        },
+        "za": {
+            "api": "api.webull.com.au",
+            "quotes-api": "data-api.webull.com.au",
+            "events-api": "events-api.webull.com.au"
+        },
+        "eu": {
+            "api": "api.webull.eu",
+            "quotes-api": "data-api.webull.eu",
+            "events-api": "events-api.webull.eu"
         }
     }
 }

webull/core/http/initializer/client_initializer.py

@@ -54,38 +54,12 @@ def initializer(api_client):
     @staticmethod
     def init_token(api_client):
         """Initialize token"""
-        disable_config_region_ids = ["hk"]
-        if api_client.get_region_id() in disable_config_region_ids:
-            if not ClientInitializer._check_region_token_enable(api_client):
-                return
-        else:
-            if not ClientInitializer._check_token_enable(api_client):
-                return
+        if not ClientInitializer._check_token_enable(api_client):
+            return
 
         token_manager = TokenManager(api_client.get_token_dir())
         token_manager.init_token(api_client)
 
-    @staticmethod
-    def _check_region_token_enable(api_client):
-        """
-        Check whether token checking is enabled in the specified region
-        """
-        if api_client is None:
-            logger.warning("_check_region_token_enable api_client is null, return False")
-            return False
-
-        if not api_client.get_region_id():
-            logger.warning("_check_region_token_enable region_id is null, return False")
-            return False
-
-        enable_region_ids = ["hk"]
-        result = api_client.get_region_id() in enable_region_ids
-        logger.info(
-            "_check_region_token_enable result is %s, enable regionIds is %s.",
-            result, enable_region_ids
-        )
-        return result
-
     @staticmethod
     def _check_token_enable(api_client):
         """

webull/data/__init__.py

@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = '2.0.10'
+__version__ = '2.0.11'