vnpy_okx 2025.11.4__tar.gz → 2025.12.4__tar.gz

{vnpy_okx-2025.11.4 → vnpy_okx-2025.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vnpy_okx
-Version: 2025.11.4
+Version: 2025.12.4
 Summary: OKX trading gateway for VeighNa.
 Project-URL: Homepage, https://www.github.com/veighna-global
 Project-URL: Source, https://www.github.com/veighna-global
@@ -33,7 +33,7 @@ Description-Content-Type: text/markdown
 </p>
 
 <p align="center">
-    <img src ="https://img.shields.io/badge/version-2025.11.04-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/version-2025.12.04-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/platform-windows|linux|macos-yellow.svg"/>
     <img src ="https://img.shields.io/badge/python-3.10|3.11|3.12|3.13-blue.svg" />
     <img src ="https://img.shields.io/github/license/veighna-global/vnpy_okx.svg?color=orange"/>

{vnpy_okx-2025.11.4 → vnpy_okx-2025.12.4}/README.md

@@ -5,7 +5,7 @@
 </p>
 
 <p align="center">
-    <img src ="https://img.shields.io/badge/version-2025.11.04-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/version-2025.12.04-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/platform-windows|linux|macos-yellow.svg"/>
     <img src ="https://img.shields.io/badge/python-3.10|3.11|3.12|3.13-blue.svg" />
     <img src ="https://img.shields.io/github/license/veighna-global/vnpy_okx.svg?color=orange"/>

{vnpy_okx-2025.11.4 → vnpy_okx-2025.12.4}/vnpy_okx/__init__.py

@@ -23,7 +23,7 @@
 from .okx_gateway import OkxGateway
 
 
-__version__ = "2025.11.04"
+__version__ = "2025.12.04"
 
 
 __all__ = ["OkxGateway"]

{vnpy_okx-2025.11.4 → vnpy_okx-2025.12.4}/vnpy_okx/okx_gateway.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from urllib.parse import urlencode
 from types import TracebackType
 from collections.abc import Callable
+from time import sleep
 
 from vnpy.event import EventEngine, Event, EVENT_TIMER
 from vnpy.trader.constant import (
@@ -47,12 +48,6 @@ REAL_PUBLIC_HOST: str = "wss://ws.okx.com:8443/ws/v5/public"
 REAL_PRIVATE_HOST: str = "wss://ws.okx.com:8443/ws/v5/private"
 REAL_BUSINESS_HOST: str = "wss://ws.okx.com:8443/ws/v5/business"
 
-# AWS server hosts
-AWS_REST_HOST: str = "https://aws.okx.com"
-AWS_PUBLIC_HOST: str = "wss://wsaws.okx.com:8443/ws/v5/public"
-AWS_PRIVATE_HOST: str = "wss://wsaws.okx.com:8443/ws/v5/private"
-AWS_BUSINESS_HOST: str = "wss://wsaws.okx.com:8443/ws/v5/business"
-
 # Demo server hosts
 DEMO_REST_HOST: str = "https://www.okx.com"
 DEMO_PUBLIC_HOST: str = "wss://wspap.okx.com:8443/ws/v5/public"
@@ -113,10 +108,11 @@ class OkxGateway(BaseGateway):
         "API Key": "",
         "Secret Key": "",
         "Passphrase": "",
-        "Server": ["REAL", "AWS", "DEMO"],
+        "Server": ["REAL", "DEMO"],
         "Proxy Host": "",
         "Proxy Port": 0,
         "Spread Trading": ["False", "True"],
+        "Margin Currency": ""
     }
 
     exchanges: Exchange = [Exchange.GLOBAL]
@@ -137,6 +133,7 @@ class OkxGateway(BaseGateway):
         self.proxy_host: str = ""
         self.proxy_port: int = 0
         self.spread_trading: bool = False
+        self.margin_currency: str = ""
 
         self.orders: dict[str, OrderData] = {}
         self.local_orderids: set[str] = set()
@@ -172,6 +169,7 @@ class OkxGateway(BaseGateway):
         self.proxy_host = setting["Proxy Host"]
         self.proxy_port = setting["Proxy Port"]
         self.spread_trading = setting["Spread Trading"] == "True"
+        self.margin_currency = setting["Margin Currency"]
 
         self.rest_api.connect(
             self.key,
@@ -199,6 +197,7 @@ class OkxGateway(BaseGateway):
             self.server,
             self.proxy_host,
             self.proxy_port,
+            self.margin_currency,
         )
 
         if self.spread_trading:
@@ -566,7 +565,7 @@ class RestApi(RestClient):
             key: API Key for authentication
             secret: API Secret for request signing
             passphrase: API Passphrase for authentication
-            server: Server type ("REAL", "AWS", or "DEMO")
+            server: Server type ("REAL" or "DEMO")
             proxy_host: Proxy server hostname or IP
             proxy_port: Proxy server port
             spread_trading: Whether to enable spread trading
@@ -582,7 +581,6 @@ class RestApi(RestClient):
 
         server_hosts: dict[str, str] = {
             "REAL": REAL_REST_HOST,
-            "AWS": AWS_REST_HOST,
             "DEMO": DEMO_REST_HOST,
         }
 
@@ -889,6 +887,9 @@ class RestApi(RestClient):
 
         # Loop until no more data or request fails
         while True:
+            # Add small delay to avoid rate limit
+            sleep(0.1)
+
             # Create query params
             params: dict = {
                 id_key: contract.name,
@@ -1098,7 +1099,10 @@ class WebsocketApi(WebsocketClient):
     def send_ping(self) -> None:
         """Send heartbeat ping to server"""
         if self.connected:
-            self.wsapp.send("ping")
+            try:
+                self.wsapp.send("ping")
+            except Exception:
+                pass
 
 
 class PublicApi(WebsocketApi):
@@ -1124,7 +1128,6 @@ class PublicApi(WebsocketApi):
 
         self.server_hosts: dict[str, str] = {
             "REAL": REAL_PUBLIC_HOST,
-            "AWS": AWS_PUBLIC_HOST,
             "DEMO": DEMO_PUBLIC_HOST,
         }
 
@@ -1267,6 +1270,7 @@ class PrivateApi(WebsocketApi):
         self.key: str = ""
         self.secret: bytes = b""
         self.passphrase: str = ""
+        self.margin_currency: str = ""
 
         self.reqid: int = 0
         self.order_count: int = 0
@@ -1284,7 +1288,6 @@ class PrivateApi(WebsocketApi):
 
         self.server_hosts: dict[str, str] = {
             "REAL": REAL_PRIVATE_HOST,
-            "AWS": AWS_PRIVATE_HOST,
             "DEMO": DEMO_PRIVATE_HOST,
         }
 
@@ -1298,6 +1301,7 @@ class PrivateApi(WebsocketApi):
         server: str,
         proxy_host: str,
         proxy_port: int,
+        margin_currency: str,
     ) -> None:
         """
         Start server connection.
@@ -1308,13 +1312,15 @@ class PrivateApi(WebsocketApi):
             key: API Key for authentication
             secret: API Secret for request signing
             passphrase: API Passphrase for authentication
-            server: Server type ("REAL", "AWS", or "DEMO")
+            server: Server type ("REAL" or "DEMO")
             proxy_host: Proxy server hostname or IP
             proxy_port: Proxy server port
+            margin_currency: Margin currency
         """
         self.key = key
         self.secret = secret.encode()
         self.passphrase = passphrase
+        self.margin_currency = margin_currency
 
         self.connect_time = int(datetime.now().strftime("%y%m%d%H%M%S"))
 
@@ -1617,6 +1623,9 @@ class PrivateApi(WebsocketApi):
             "tdMode": "cross"       # Only support cross margin mode
         }
 
+        if self.margin_currency:
+            arg["ccy"] = self.margin_currency
+
         # Create websocket request with unique request ID
         self.reqid += 1
         packet: dict = {
@@ -1710,7 +1719,6 @@ class BusinessApi(WebsocketApi):
 
         self.server_hosts: dict[str, str] = {
             "REAL": REAL_BUSINESS_HOST,
-            "AWS": AWS_BUSINESS_HOST,
             "DEMO": DEMO_BUSINESS_HOST,
         }
 
@@ -1734,7 +1742,7 @@ class BusinessApi(WebsocketApi):
             key: API Key for authentication
             secret: API Secret for request signing
             passphrase: API Passphrase for authentication
-            server: Server type ("REAL", "AWS", or "DEMO")
+            server: Server type ("REAL" or "DEMO")
             proxy_host: Proxy server hostname or IP
             proxy_port: Proxy server port
         """