fix timezone

Author: 51bitquant

crawl_data.py

@@ -15,8 +15,8 @@
 
 BINANCE_SPOT_LIMIT = 1000
 BINANCE_FUTURE_LIMIT = 1500
-
-CHINA_TZ = pytz.timezone("Asia/Shanghai")
+from tzlocal import get_localzone_name
+LOCAL_TZ = pytz.timezone(get_localzone_name())
 from threading import Thread
 database: BaseDatabase = get_database()
 
@@ -26,7 +26,7 @@ def generate_datetime(timestamp: float) -> datetime:
     :return:
     """
     dt = datetime.fromtimestamp(timestamp / 1000)
-    dt = CHINA_TZ.localize(dt)
+    dt = LOCAL_TZ.localize(dt)
     return dt
 
 

examples/download_data_demo2.py

@@ -16,7 +16,9 @@
 BINANCE_SPOT_LIMIT = 1000
 BINANCE_FUTURE_LIMIT = 1500
 
-CHINA_TZ = pytz.timezone("Asia/Shanghai")
+from tzlocal import get_localzone_name
+LOCAL_TZ = pytz.timezone(get_localzone_name())
+
 from threading import Thread
 database: BaseDatabase = get_database()
 
@@ -26,7 +28,7 @@ def generate_datetime(timestamp: float) -> datetime:
     :return:
     """
     dt = datetime.fromtimestamp(timestamp / 1000)
-    dt = CHINA_TZ.localize(dt)
+    dt = LOCAL_TZ.localize(dt)
     return dt
 
 

howtrader/gateway/binance/binance_inverse_gateway.py

@@ -46,9 +46,9 @@
 
 from howtrader.api.rest import Request, RestClient, Response
 from howtrader.api.websocket import WebsocketClient
+from tzlocal import get_localzone_name
 
-# Asia/Shanghai timezone
-CHINA_TZ = pytz.timezone("Asia/Shanghai")
+LOCAL_TZ = pytz.timezone(get_localzone_name())  # # CHINA_TZ = pytz.timezone("Asia/Shanghai")
 
 # rest api host for inverse future
 D_REST_HOST: str = "https://dapi.binance.com"
@@ -1052,7 +1052,7 @@ def subscribe(self, req: SubscribeRequest) -> None:
             symbol=req.symbol,
             name=symbol_contract_map[req.symbol].name,
             exchange=Exchange.BINANCE,
-            datetime=datetime.now(CHINA_TZ),
+            datetime=datetime.now(LOCAL_TZ),
             gateway_name=self.gateway_name,
         )
         self.ticks[req.symbol.lower()] = tick
@@ -1110,5 +1110,5 @@ def on_packet(self, packet: dict) -> None:
 def generate_datetime(timestamp: float) -> datetime:
     """generate time"""
     dt: datetime = datetime.fromtimestamp(timestamp / 1000)
-    dt: datetime = CHINA_TZ.localize(dt)
+    dt: datetime = LOCAL_TZ.localize(dt)
     return dt

howtrader/gateway/binance/binance_spot_gateway.py

@@ -40,9 +40,9 @@
 from howtrader.event import Event, EventEngine
 from howtrader.api.rest import RestClient, Request, Response
 from howtrader.api.websocket import WebsocketClient
+from tzlocal import get_localzone_name
 
-# Asia/Shanghai timezone
-CHINA_TZ = pytz.timezone("Asia/Shanghai")
+LOCAL_TZ = pytz.timezone(get_localzone_name()) #pytz.timezone("Asia/Shanghai")
 
 # REST API HOST
 REST_HOST: str = "https://api.binance.com"
@@ -321,7 +321,7 @@ def connect(
         self.proxy_host = proxy_host
 
         self.connect_time = (
-                int(datetime.now(CHINA_TZ).strftime("%y%m%d%H%M%S")) * self.order_count
+                int(datetime.now(LOCAL_TZ).strftime("%y%m%d%H%M%S")) * self.order_count
         )
 
         self.init(REST_HOST, proxy_host, proxy_port)
@@ -964,7 +964,7 @@ def subscribe(self, req: SubscribeRequest) -> None:
             symbol=req.symbol,
             name=symbol_contract_map[req.symbol].name,
             exchange=Exchange.BINANCE,
-            datetime=datetime.now(CHINA_TZ),
+            datetime=datetime.now(LOCAL_TZ),
             gateway_name=self.gateway_name,
         )
         self.ticks[req.symbol] = tick
@@ -1022,5 +1022,5 @@ def on_packet(self, packet: dict) -> None:
 def generate_datetime(timestamp: float) -> datetime:
     """generate datetime"""
     dt: datetime = datetime.fromtimestamp(timestamp / 1000)
-    dt: datetime = CHINA_TZ.localize(dt)
+    dt: datetime = LOCAL_TZ.localize(dt)
     return dt

howtrader/gateway/binance/binance_usdt_gateway.py

@@ -47,9 +47,9 @@
 
 from howtrader.api.rest import Request, RestClient, Response
 from howtrader.api.websocket import WebsocketClient
+from tzlocal import get_localzone_name
 
-# Asia/Shanghai timezone
-CHINA_TZ = pytz.timezone("Asia/Shanghai")
+LOCAL_TZ = pytz.timezone(get_localzone_name()) #pytz.timezone("Asia/Shanghai") # Asia/Shanghai timezone
 
 # rest api host
 F_REST_HOST: str = "https://fapi.binance.com"
@@ -1053,7 +1053,7 @@ def subscribe(self, req: SubscribeRequest) -> None:
             symbol=req.symbol,
             name=symbol_contract_map[req.symbol].name,
             exchange=Exchange.BINANCE,
-            datetime=datetime.now(CHINA_TZ),
+            datetime=datetime.now(LOCAL_TZ),
             gateway_name=self.gateway_name,
         )
         self.ticks[req.symbol.lower()] = tick
@@ -1111,5 +1111,5 @@ def on_packet(self, packet: dict) -> None:
 def generate_datetime(timestamp: float) -> datetime:
     """generate time"""
     dt: datetime = datetime.fromtimestamp(timestamp / 1000)
-    dt: datetime = CHINA_TZ.localize(dt)
+    dt: datetime = LOCAL_TZ.localize(dt)
     return dt

requirements.txt

@@ -13,7 +13,6 @@ numpy==1.23.0
 pandas
 matplotlib
 seaborn
-ta-lib
 deap
 plotly
 importlib-metadata

setup.py

@@ -39,7 +39,6 @@ def get_install_requires():
         "matplotlib",
         "seaborn",
         "deap",
-        "ta-lib",
         "tzlocal",
         "plotly",
         "importlib-metadata"