Merge branch 'main_merge_2605111' into 'main'

feat:add sg region and fix data api

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

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, or Webull JP customers.
+Note: This is the new version of the Webull SDK, currently applicable only to Webull Hong Kong, Webull US, or Webull JP, or Webull SG 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.
 
@@ -23,6 +23,7 @@ Subscription to real-time information: Subscribe to order status changes, market
 | Webull HK | https://www.webull.hk/open-api                  |
 | Webull US | https://www.webull.com/center#openApiManagement |
 | Webull JP | https://www.webull.co.jp/center/openapi/manage |
+| Webull SG | https://www.webull.com.sg/open-api-management|
 
 - Requires Python 3.7 through 3.11.
 
@@ -43,3 +44,4 @@ The bottom layer of Webull OpenAPI provides three protocols, HTTP / GRPC / MQTT,
 | Webull HK | https://developer.webull.hk/apis/docs    |
 | Webull US | https://developer.webull.com/apis/docs   |
 | Webull JP | https://developer.webull.co.jp/apis/docs |
+| Webull SG | https://developer.webull.com.sg/apis/docs |

samples/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.6'
+__version__ = '2.0.7'

tests/core/endpoint/test_endpoint.py

@@ -58,7 +58,12 @@ def test_quotes_endpoint(self):
         _region_id = 'jp'
         endpoint_request = ResolveEndpointRequest(_region_id, api_type.QUOTES)
         endpoint = resolver.resolve(endpoint_request)
-        self.assertEqual(endpoint, '')
+        self.assertEqual(endpoint, 'data-api.webull.co.jp')
+
+        _region_id = 'sg'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.QUOTES)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'data-api.webull.com.sg')
 
     def test_api_endpoint(self):
         """
@@ -80,6 +85,10 @@ def test_api_endpoint(self):
         endpoint = resolver.resolve(endpoint_request)
         self.assertEqual(endpoint, 'api.webull.co.jp')
 
+        _region_id = 'sg'
+        endpoint_request = ResolveEndpointRequest(_region_id)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'api.webull.com.sg')
     def test_event_endpoint(self):
         resolver = DefaultEndpointResolver(self)
         _region_id = 'us'
@@ -96,3 +105,8 @@ def test_event_endpoint(self):
         endpoint_request = ResolveEndpointRequest(_region_id, api_type.EVENTS)
         endpoint = resolver.resolve(endpoint_request)
         self.assertEqual(endpoint, 'events-api.webull.co.jp')
+
+        _region_id = 'sg'
+        endpoint_request = ResolveEndpointRequest(_region_id, api_type.EVENTS)
+        endpoint = resolver.resolve(endpoint_request)
+        self.assertEqual(endpoint, 'events-api.webull.com.sg')

webull/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.6'
+__version__ = '2.0.7'

webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.0.6'
+__version__ = '2.0.7'
 
 import logging
 

webull/core/common/region.py

@@ -5,3 +5,4 @@ class Region(Enum):
     US = 'us'
     HK = 'hk'
     JP = 'jp'
+    SG = 'sg'

webull/core/data/endpoints.json

@@ -1,6 +1,6 @@
 {
     "default_region": "us",
-    "regions": ["us", "hk", "jp"],
+    "regions": ["us", "hk", "jp","sg"],
     "region_mapping": {
         "us": {
             "api": "api.webull.com",
@@ -14,8 +14,13 @@
         },
         "jp": {
             "api": "api.webull.co.jp",
-            "quotes-api": "",
+            "quotes-api": "data-api.webull.co.jp",
             "events-api": "events-api.webull.co.jp"
+        },
+        "sg": {
+            "api": "api.webull.com.sg",
+            "quotes-api": "data-api.webull.com.sg",
+            "events-api": "events-api.webull.com.sg"
         }
     }
 }

webull/data/__init__.py

@@ -1,3 +1,3 @@
 # coding=utf-8
 
-__version__ = '2.0.6'
+__version__ = '2.0.7'

webull/data/request/subscribe_request.py

@@ -19,7 +19,8 @@
 
 class SubscribeRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/streaming/subscribe", version='v2', method="POST", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/streaming/subscribe", version='v2', method="POST",
+                            query_params={})
         self.set_body_params({})
 
     def set_session_id(self, session_id):

webull/data/request/unsubscribe_request.py

@@ -19,7 +19,8 @@
 
 class UnsubcribeRequest(ApiRequest):
     def __init__(self):
-        ApiRequest.__init__(self, "/market-data/streaming/unsubscribe", version='v2', method="POST", query_params={})
+        ApiRequest.__init__(self, "/openapi/market-data/streaming/unsubscribe", version='v2', method="POST",
+                            query_params={})
         self.set_body_params({})
 
     def set_session_id(self, session_id):