Merge pull request vnpy#3 from noranhe/main

[Add] 类型声明

Author: vnpy

vnpy_postgresql/postgresql_database.py

@@ -25,7 +25,7 @@
 from vnpy.trader.setting import SETTINGS
 
 
-db = PeeweePostgresqlDatabase(
+db: PeeweePostgresqlDatabase = PeeweePostgresqlDatabase(
     database=SETTINGS["database.database"],
     user=SETTINGS["database.user"],
     password=SETTINGS["database.password"],
@@ -38,7 +38,7 @@
 class DbBarData(Model):
     """K线数据表映射对象"""
 
-    id = AutoField()
+    id: AutoField = AutoField()
 
     symbol: str = CharField()
     exchange: str = CharField()
@@ -54,14 +54,14 @@ class DbBarData(Model):
     close_price: float = FloatField()
 
     class Meta:
-        database = db
-        indexes = ((("symbol", "exchange", "interval", "datetime"), True),)
+        database: PeeweePostgresqlDatabase = db
+        indexes: tuple = ((("symbol", "exchange", "interval", "datetime"), True),)
 
 
 class DbTickData(Model):
     """TICK数据表映射对象"""
 
-    id = AutoField()
+    id: AutoField = AutoField()
 
     symbol: str = CharField()
     exchange: str = CharField()
@@ -108,14 +108,14 @@ class DbTickData(Model):
     localtime: datetime = DateTimeField(null=True)
 
     class Meta:
-        database = db
-        indexes = ((("symbol", "exchange", "datetime"), True),)
+        database: PeeweePostgresqlDatabase = db
+        indexes: tuple = ((("symbol", "exchange", "datetime"), True),)
 
 
 class DbBarOverview(Model):
     """K线汇总数据表映射对象"""
 
-    id = AutoField()
+    id: AutoField = AutoField()
 
     symbol: str = CharField()
     exchange: str = CharField()
@@ -125,8 +125,8 @@ class DbBarOverview(Model):
     end: datetime = DateTimeField()
 
     class Meta:
-        database = db
-        indexes = ((("symbol", "exchange", "interval"), True),)
+        database: PeeweePostgresqlDatabase = db
+        indexes: tuple = ((("symbol", "exchange", "interval"), True),)
 
 
 class DbTickOverview(Model):
@@ -150,25 +150,25 @@ class PostgresqlDatabase(BaseDatabase):
 
     def __init__(self) -> None:
         """"""
-        self.db = db
+        self.db: PeeweePostgresqlDatabase = db
         self.db.connect()
         self.db.create_tables([DbBarData, DbTickData, DbBarOverview, DbTickOverview])
 
     def save_bar_data(self, bars: List[BarData], stream: bool = False) -> bool:
         """保存K线数据"""
         # 读取主键参数
-        bar = bars[0]
-        symbol = bar.symbol
-        exchange = bar.exchange
-        interval = bar.interval
+        bar: BarData = bars[0]
+        symbol: str = bar.symbol
+        exchange: Exchange = bar.exchange
+        interval: Interval = bar.interval
 
         # 将BarData数据转换为字典，并调整时区
-        data = []
+        data: list = []
 
         for bar in bars:
             bar.datetime = convert_tz(bar.datetime)
 
-            d = bar.__dict__
+            d: dict = bar.__dict__
             d["exchange"] = d["exchange"].value
             d["interval"] = d["interval"].value
             d.pop("gateway_name")
@@ -229,12 +229,12 @@ def save_tick_data(self, ticks: List[TickData], stream: bool = False) -> bool:
         exchange: Exchange = tick.exchange
 
         # 将TickData数据转换为字典，并调整时区
-        data = []
+        data: list = []
 
         for tick in ticks:
             tick.datetime = convert_tz(tick.datetime)
 
-            d = tick.__dict__
+            d: dict = tick.__dict__
             d["exchange"] = d["exchange"].value
             d.pop("gateway_name")
             d.pop("vt_symbol")
@@ -303,7 +303,7 @@ def load_bar_data(
 
         bars: List[BarData] = []
         for db_bar in s:
-            bar = BarData(
+            bar: BarData = BarData(
                 symbol=db_bar.symbol,
                 exchange=Exchange(db_bar.exchange),
                 datetime=datetime.fromtimestamp(db_bar.datetime.timestamp(), DB_TZ),
@@ -340,7 +340,7 @@ def load_tick_data(
 
         ticks: List[TickData] = []
         for db_tick in s:
-            tick = TickData(
+            tick: TickData = TickData(
                 symbol=db_tick.symbol,
                 exchange=Exchange(db_tick.exchange),
                 datetime=datetime.fromtimestamp(db_tick.datetime.timestamp(), DB_TZ),
@@ -395,7 +395,7 @@ def delete_bar_data(
             & (DbBarData.exchange == exchange.value)
             & (DbBarData.interval == interval.value)
         )
-        count = d.execute()
+        count: int = d.execute()
 
         # 删除K线汇总数据
         d2: ModelDelete = DbBarOverview.delete().where(
@@ -416,7 +416,7 @@ def delete_tick_data(
             (DbTickData.symbol == symbol)
             & (DbTickData.exchange == exchange.value)
         )
-        count = d.execute()
+        count: int = d.execute()
 
         # 删除Tick汇总数据
         d2: ModelDelete = DbTickOverview.delete().where(
@@ -430,13 +430,13 @@ def delete_tick_data(
     def get_bar_overview(self) -> List[BarOverview]:
         """查询数据库中的K线汇总信息"""
         # 如果已有K线，但缺失汇总信息，则执行初始化
-        data_count = DbBarData.select().count()
-        overview_count = DbBarOverview.select().count()
+        data_count: int = DbBarData.select().count()
+        overview_count: int = DbBarOverview.select().count()
         if data_count and not overview_count:
             self.init_bar_overview()
 
         s: ModelSelect = DbBarOverview.select()
-        overviews = []
+        overviews: List[BarOverview] = []
         for overview in s:
             overview.exchange = Exchange(overview.exchange)
             overview.interval = Interval(overview.interval)
@@ -468,7 +468,7 @@ def init_bar_overview(self) -> None:
         )
 
         for data in s:
-            overview = DbBarOverview()
+            overview: DbBarOverview = DbBarOverview()
             overview.symbol = data.symbol
             overview.exchange = data.exchange
             overview.interval = data.interval