fix: 移除不必要的类属性

jkit/article.py

@@ -57,15 +57,15 @@ class ArticlePaidStatusEnum(Enum):
     PAID = "付费"
 
 
-class PaidInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class PaidInfoField(DataObject, frozen=True):
     notebook_paid_status: Optional[NotebookPaidStatusEnum]
     article_paid_status: ArticlePaidStatusEnum
     price: Optional[PositiveFloat]
     paid_cotent_percent: Optional[Percentage]
     paid_readers_count: Optional[NonNegativeInt]
 
 
-class AuthorInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class AuthorInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -82,7 +82,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class ArticleInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleInfo(DataObject, frozen=True):
     id: PositiveInt
     notebook_id: PositiveInt
     title: NonEmptyStr
@@ -107,7 +107,7 @@ def text_content(self) -> str:
         return BLANK_LINES_REGEX.sub("\n", result)
 
 
-class ArticleAudioInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleAudioInfo(DataObject, frozen=True):
     id: PositiveInt
     name: NonEmptyStr
     producer: NonEmptyStr
@@ -126,7 +126,7 @@ def is_file_expired(self) -> bool:
         return self.file_url_expire_time >= datetime.now()
 
 
-class ArticleIncludedCollectionInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleIncludedCollectionInfo(DataObject, frozen=True):
     id: PositiveInt
     slug: CollectionSlug
     name: NonEmptyStr
@@ -146,7 +146,7 @@ async def full_name(self) -> str:
         return (await self.to_collection_obj().info).name
 
 
-class ArticleBelongToNotebookInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleBelongToNotebookInfo(DataObject, frozen=True):
     id: PositiveInt
     name: NonEmptyStr
 
@@ -156,7 +156,7 @@ def to_notebook_obj(self) -> "Notebook":
         return Notebook.from_id(self.id)
 
 
-class CommentPublisherInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class CommentPublisherInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -170,15 +170,15 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class ArticleSubcommentInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleSubcommentInfo(DataObject, frozen=True):
     id: PositiveInt
     content: str
     images: tuple[UserUploadedUrl, ...]
     published_at: NormalizedDatetime
     publisher_info: CommentPublisherInfoField
 
 
-class ArticleCommentInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleCommentInfo(DataObject, frozen=True):
     id: PositiveInt
     floor: PositiveInt
     content: str

jkit/collection.py

@@ -38,7 +38,7 @@
     from jkit.user import User
 
 
-class OwnerInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class OwnerInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -49,7 +49,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class CollectionInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class CollectionInfo(DataObject, frozen=True):
     id: PositiveInt
     slug: CollectionSlug
     name: NonEmptyStr
@@ -63,7 +63,7 @@ class CollectionInfo(DataObject, frozen=True, eq=True, kw_only=True):
     subscribers_count: NonNegativeInt
 
 
-class ArticleAuthorInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleAuthorInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -75,7 +75,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class CollectionArticleInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class CollectionArticleInfo(DataObject, frozen=True):
     id: PositiveInt
     slug: ArticleSlug
     title: NonEmptyStr

jkit/config.py

@@ -14,7 +14,7 @@ def _validate(self: T) -> T:
         return convert(to_builtins(self), type=self.__class__)
 
 
-class _NetworkConfig(ConfigObject, eq=False, kw_only=True, gc=False):
+class _NetworkConfig(ConfigObject):
     """网络配置"""
 
     # 使用的传输协议，HTTP/2 有助于提升性能
@@ -41,14 +41,14 @@ def __setattr__(self, __name: str, __value: object) -> None:
         jkit._network_request.HTTP_CLIENT = self._get_http_client()
 
 
-class _EndpointsConfig(ConfigObject, eq=False, kw_only=True, gc=False):
+class _EndpointsConfig(ConfigObject):
     """API 端点配置"""
 
     jianshu: NonEmptyStr = "https://www.jianshu.com"
     jpep: NonEmptyStr = "https://20221023.jianshubei.com/api"
 
 
-class _ResourceCheckConfig(ConfigObject, eq=False, kw_only=True, gc=False):
+class _ResourceCheckConfig(ConfigObject):
     """资源检查配置"""
 
     # 从资源对象获取数据时自动进行资源检查
@@ -63,15 +63,15 @@ class _ResourceCheckConfig(ConfigObject, eq=False, kw_only=True, gc=False):
     force_check_safe_data: bool = False
 
 
-class _DataValidationConfig(ConfigObject, eq=False, kw_only=True, gc=False):
+class _DataValidationConfig(ConfigObject):
     """数据校验配置"""
 
     # 是否启用数据校验
     # 遇特殊情况时可关闭以避免造成 ValidationError，此时不保证采集到的数据正确
     enabled: bool = True
 
 
-class _Config(ConfigObject, eq=False, kw_only=True, gc=False):
+class _Config(ConfigObject):
     network: _NetworkConfig = field(default_factory=_NetworkConfig)
     endpoints: _EndpointsConfig = field(default_factory=_EndpointsConfig)
     resource_check: _ResourceCheckConfig = field(default_factory=_ResourceCheckConfig)

jkit/jpep/ftn_macket.py

@@ -21,15 +21,15 @@ class PaymentChannels(Enum):
     ANT_CREDIT_PAY = "蚂蚁花呗"
 
 
-class PublisherInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class PublisherInfoField(DataObject, frozen=True):
     id: PositiveInt
     name: NonEmptyStr
     hashed_name: NonEmptyStr
     avatar_url: Optional[NonEmptyStr]
     credit: NonNegativeInt
 
 
-class FTNMacketOrderRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class FTNMacketOrderRecord(DataObject, frozen=True):
     id: PositiveInt
     price: PositiveFloat
 

jkit/jpep/platform_settings.py

@@ -4,7 +4,7 @@
 from jkit.msgspec_constraints import NonNegativeFloat
 
 
-class PlatformSettingsData(DataObject, frozen=True, eq=True, kw_only=True):
+class PlatformSettingsData(DataObject, frozen=True):
     opening: bool
 
     ftn_trade_fee: NonNegativeFloat

jkit/lottery.py

@@ -18,7 +18,7 @@
     from jkit.user import User
 
 
-class UserInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class UserInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -30,7 +30,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class LotteryWinRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class LotteryWinRecord(DataObject, frozen=True):
     id: PositiveInt
     time: NormalizedDatetime
     award_name: NonEmptyStr

jkit/notebook.py

@@ -35,7 +35,7 @@
 T = TypeVar("T", bound="Notebook")
 
 
-class AuthorInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class AuthorInfoField(DataObject, frozen=True):
     slug: UserSlug
     name: UserName
     avatar_url: UserUploadedUrl
@@ -46,7 +46,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class NotebookInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class NotebookInfo(DataObject, frozen=True):
     id: NotebookId
     name: NonEmptyStr
     description_updated_at: NormalizedDatetime
@@ -57,7 +57,7 @@ class NotebookInfo(DataObject, frozen=True, eq=True, kw_only=True):
     total_wordage: NonNegativeInt
 
 
-class ArticleAuthorInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleAuthorInfoField(DataObject, frozen=True):
     id: PositiveInt
     slug: UserSlug
     name: UserName
@@ -69,7 +69,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class NotebookArticleInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class NotebookArticleInfo(DataObject, frozen=True):
     id: PositiveInt
     slug: ArticleSlug
     title: NonEmptyStr

jkit/private/assets.py

@@ -27,7 +27,7 @@
 )
 
 
-class AssetsTransactionRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class AssetsTransactionRecord(DataObject, frozen=True):
     id: PositiveInt
     time: NormalizedDatetime
     type_id: PositiveInt
@@ -36,20 +36,20 @@ class AssetsTransactionRecord(DataObject, frozen=True, eq=True, kw_only=True):
     amount_precise: Decimal
 
 
-class FPRewardsRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class FPRewardsRecord(DataObject, frozen=True):
     time: NormalizedDatetime
     own_amount: Decimal
     level1_referral_amount: Decimal
     level2_referral_amount: Decimal
     total_amount: Decimal
 
 
-class BenefitCardsInfo(DataObject, frozen=True, eq=True, kw_only=True):
+class BenefitCardsInfo(DataObject, frozen=True):
     total_amount: NonNegativeFloat
     estimated_benefits_percent: Percentage
 
 
-class UnusedBenfitCardRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class UnusedBenfitCardRecord(DataObject, frozen=True):
     amount: NonNegativeFloat
     start_time: NormalizedDatetime
     end_time: NormalizedDatetime
@@ -59,7 +59,7 @@ def is_valid(self) -> bool:
         return self.start_time <= datetime.now() <= self.end_time
 
 
-class ActiveBenfitCardRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class ActiveBenfitCardRecord(DataObject, frozen=True):
     amount: NonNegativeFloat
     start_time: NormalizedDatetime
     end_time: NormalizedDatetime
@@ -70,7 +70,7 @@ def is_valid(self) -> bool:
         return self.start_time <= datetime.now() <= self.end_time
 
 
-class ExpiredBenfitCardRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class ExpiredBenfitCardRecord(DataObject, frozen=True):
     amount: NonNegativeFloat
     start_time: NormalizedDatetime
     end_time: NormalizedDatetime

jkit/ranking/article_earning.py

@@ -20,12 +20,12 @@
     from jkit.article import Article
 
 
-class AuthorInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class AuthorInfoField(DataObject, frozen=True):
     name: Optional[UserName]
     avatar_url: Optional[UserUploadedUrl]
 
 
-class RecordField(DataObject, frozen=True, eq=True, kw_only=True):
+class RecordField(DataObject, frozen=True):
     ranking: PositiveInt
     title: Optional[NonEmptyStr]
     slug: Optional[ArticleSlug]
@@ -47,7 +47,7 @@ def to_article_obj(self) -> "Article":
         return Article.from_slug(self.slug)._as_checked()
 
 
-class ArticleEarningRankingData(DataObject, frozen=True, eq=True, kw_only=True):
+class ArticleEarningRankingData(DataObject, frozen=True):
     total_fp_amount_sum: PositiveFloat
     fp_to_author_amount_sum: PositiveFloat
     fp_to_voter_amount_sum: PositiveFloat

jkit/ranking/assets.py

@@ -18,7 +18,7 @@
     from jkit.user import User
 
 
-class UserInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class UserInfoField(DataObject, frozen=True):
     id: Optional[PositiveInt]
     slug: Optional[UserSlug]
     name: Optional[UserName]
@@ -33,7 +33,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class AssetsRankingRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class AssetsRankingRecord(DataObject, frozen=True):
     ranking: PositiveInt
     assets_amount: NonNegativeFloat
     user_info: UserInfoField

jkit/ranking/daily_update.py

@@ -10,7 +10,7 @@
     from jkit.user import User
 
 
-class UserInfoField(DataObject, frozen=True, eq=True, kw_only=True):
+class UserInfoField(DataObject, frozen=True):
     slug: UserSlug
     name: UserName
     avatar_url: UserUploadedUrl
@@ -21,7 +21,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class DailyUpdateRankingRecord(DataObject, frozen=True, eq=True, kw_only=True):
+class DailyUpdateRankingRecord(DataObject, frozen=True):
     ranking: PositiveInt
     days: PositiveInt
     user_info: UserInfoField

jkit/ranking/user_earning.py

@@ -20,7 +20,7 @@
     from jkit.user import User
 
 
-class RecordField(DataObject, frozen=True, eq=True, kw_only=True):
+class RecordField(DataObject, frozen=True):
     ranking: PositiveInt
     name: UserName
     slug: UserSlug
@@ -35,7 +35,7 @@ def to_user_obj(self) -> "User":
         return User.from_slug(self.slug)._as_checked()
 
 
-class UserEarningRankingData(DataObject, frozen=True, eq=True, kw_only=True):
+class UserEarningRankingData(DataObject, frozen=True):
     total_fp_amount_sum: PositiveFloat
     fp_by_creating_amount_sum: PositiveFloat
     fp_by_voting_amount_sum: PositiveFloat