From e3fa532aeddf238ae8a05aeec81ea86665fc386c Mon Sep 17 00:00:00 2001 From: "shiyao.zhu" Date: Thu, 23 Mar 2023 14:54:44 +0800 Subject: [PATCH] update version --- okx/__init__.py | 2 +- okx/client.py | 30 +++++++++++++----------------- okx/consts.py | 2 +- setup.py | 1 + 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/okx/__init__.py b/okx/__init__.py index c514a84..d98db50 100644 --- a/okx/__init__.py +++ b/okx/__init__.py @@ -2,4 +2,4 @@ Python SDK for the OKX API v5 """ -__version__="0.1.5" \ No newline at end of file +__version__="0.1.6" \ No newline at end of file diff --git a/okx/client.py b/okx/client.py index f050f9f..0f5e652 100644 --- a/okx/client.py +++ b/okx/client.py @@ -1,18 +1,17 @@ import json - -import httpx - -from . import consts as c, utils, exceptions - import time - import traceback +import httpx from httpx import _client +from . import consts as c, utils + + class Client(object): - def __init__(self, api_key = '-1', api_secret_key = '-1', passphrase = '-1', use_server_time=False, flag='1', base_api = 'https://www.okx.com',debug = False): + def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1', + base_api=c.DOMAIN, debug=False): self.API_KEY = api_key self.API_SECRET_KEY = api_secret_key @@ -32,25 +31,24 @@ class Client(object): timestamp = self._get_timestamp() body = json.dumps(params) if method == c.POST else "" if self.API_KEY != '-1': - sign = utils.sign(utils.pre_hash(timestamp, method, request_path, str(body), self.debug), self.API_SECRET_KEY) + sign = utils.sign(utils.pre_hash(timestamp, method, request_path, str(body), self.debug), + self.API_SECRET_KEY) header = utils.get_header(self.API_KEY, sign, timestamp, self.PASSPHRASE, self.flag, self.debug) else: header = utils.get_header_no_sign(self.flag, self.debug) response = None - if self.debug == True: - print('domain:',self.domain) - print('url:',request_path) + if self.debug: + print('domain:', self.domain) + print('url:', request_path) if method == c.GET: response = self.client.get(request_path, headers=header) elif method == c.POST: response = self.client.post(request_path, data=body, headers=header) self.request_times += 1 - # print('request times:', self.request_times) - if (self.request_times > 512): + if self.request_times > 512: self.client.close() self.client._state = _client.ClientState.UNOPENED self.request_times = 0 - # print('close the current tcp connection while request times larger than 512.') return response def _request_until_success(self, method, request_path, params): @@ -67,13 +65,11 @@ class Client(object): continue break except Exception as e: - msg = traceback.format_exc() + traceback.format_exc() print(e) retry_times += 1 print('http request retry in 1 seconds, retry times:', retry_times) time.sleep(1) - # if not str(response.status_code).startswith('2'): - # raise exceptions.OkxAPIException(response) return response.json() def _request_without_params(self, method, request_path): diff --git a/okx/consts.py b/okx/consts.py index 833e44f..ebb96c2 100644 --- a/okx/consts.py +++ b/okx/consts.py @@ -1,5 +1,5 @@ # http header -#API_URL = 'https://www.okx.com' +DOMAIN = 'https://www.okx.com' CONTENT_TYPE = 'Content-Type' OK_ACCESS_KEY = 'OK-ACCESS-KEY' diff --git a/setup.py b/setup.py index 8f92bbe..15923ca 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ setuptools.setup( ], install_requires=[ "importlib-metadata", + "httpx", "keyring", "requests", "Twisted",