chore: 升级依赖库

FHU-yezi · Mar 14, 2024 · d342607 · d342607
1 parent 4b7920a
commit d342607
Show file tree

Hide file tree

Showing 15 changed files with 195 additions and 178 deletions.
diff --git a/jobs/jianshu/lottery.py b/jobs/jianshu/lottery.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from jkit.jianshu_lottery import JianshuLottery, JianshuLotteryWinRecord
+from jkit.lottery import Lottery, LotteryWinRecord
 from prefect import flow, get_run_logger
 from prefect.states import Completed, State
 
@@ -14,7 +14,7 @@
 )
 
 
-async def process_item(item: JianshuLotteryWinRecord, /) -> LotteryWinRecordDocument:
+async def process_item(item: LotteryWinRecord, /) -> LotteryWinRecordDocument:
     await JianshuUserDocument.insert_or_update_one(
         slug=item.user_info.slug,
         updated_at=item.time,
@@ -48,7 +48,7 @@ async def flow_func() -> State:
         logger.warning("数据库中没有记录")
 
     data: List[LotteryWinRecordDocument] = []
-    async for item in JianshuLottery().iter_win_records():
+    async for item in Lottery().iter_win_records():
         if item.id == stop_id:
             break
 

diff --git a/jobs/jpep/ftn_trade.py b/jobs/jpep/ftn_trade.py
@@ -43,9 +43,9 @@ async def process_item(
         await UserDocument.insert_or_update_one(
             updated_at=fetch_time,
             id=item.publisher_info.id,
-            name=item.publisher_info.name,  # type: ignore
-            hashed_name=item.publisher_info.hashed_name,  # type: ignore
-            avatar_url=item.publisher_info.avatar_url,  # type: ignore
+            name=item.publisher_info.name,
+            hashed_name=item.publisher_info.hashed_name,
+            avatar_url=item.publisher_info.avatar_url,
         )
 
         latest_credit_value = await CreditHistoryDocument.get_latest_value(
@@ -56,7 +56,7 @@ async def process_item(
                 CreditHistoryDocument(
                     time=fetch_time,
                     user_id=item.publisher_info.id,
-                    value=item.publisher_info.credit, # type: ignore
+                    value=item.publisher_info.credit,
                 )
             )
 
@@ -73,7 +73,7 @@ async def process_item(
             tradable=item.tradable_amount,
             minimum_trade=item.minimum_trade_amount,
         ),
-        publisher_id=item.publisher_info.id,  # type: ignore
+        publisher_id=item.publisher_info.id,
     ).validate()
 
 

diff --git a/models/jianshu/article_earning_ranking_record.py b/models/jianshu/article_earning_ranking_record.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List, Optional
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     ArticleSlug,
     NonEmptyStr,
     PositiveFloat,

diff --git a/models/jianshu/assets_ranking_record.py b/models/jianshu/assets_ranking_record.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List, Optional
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     NonNegativeFloat,
     PositiveFloat,
     PositiveInt,

diff --git a/models/jianshu/daily_update_ranking_record.py b/models/jianshu/daily_update_ranking_record.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     PositiveInt,
     UserSlug,
 )

diff --git a/models/jianshu/lottery_win_record.py b/models/jianshu/lottery_win_record.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     NonEmptyStr,
     PositiveInt,
     UserSlug,

diff --git a/models/jianshu/lp_recommend_article_record.py b/models/jianshu/lp_recommend_article_record.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     ArticleSlug,
     NonEmptyStr,
     NonNegativeFloat,

diff --git a/models/jianshu/user.py b/models/jianshu/user.py
@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import Any, ClassVar, Dict, List, Optional
 
-from jkit._constraints import PositiveInt, UserName, UserSlug, UserUploadedUrl
+from jkit.msgspec_constraints import PositiveInt, UserName, UserSlug, UserUploadedUrl
 from pymongo import IndexModel
 
 from utils.db import JIANSHU_DB

diff --git a/models/jpep/credit_history.py b/models/jpep/credit_history.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List, Optional
 
-from jkit._constraints import NonNegativeInt, PositiveInt
+from jkit.msgspec_constraints import NonNegativeInt, PositiveInt
 from pymongo import IndexModel
 
 from utils.db import JPEP_DB

diff --git a/models/jpep/ftn_trade_order.py b/models/jpep/ftn_trade_order.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import ClassVar, List, Literal
 
-from jkit._constraints import (
+from jkit.msgspec_constraints import (
     NonNegativeInt,
     PositiveFloat,
     PositiveInt,

diff --git a/models/jpep/user.py b/models/jpep/user.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Any, ClassVar, Dict, List, Optional
 
-from jkit._constraints import NonNegativeInt, PositiveInt
+from jkit.msgspec_constraints import NonNegativeInt, PositiveInt
 from pymongo import IndexModel
 
 from utils.db import JPEP_DB