hyper-bot 2.0.0__tar.gz → 2.0.1__tar.gz

{hyper_bot-2.0.0/src/hyper_bot.egg-info → hyper_bot-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyper-bot
-Version: 2.0.0
+Version: 2.0.1
 Summary: 稳定高效、易于开发的QQ Bot框架
 Author-email: Harcic <harcic@outlook.com>
 Project-URL: repository, https://github.com/HarcicYang/HyperBotCore

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyper-bot"
-version = "2.0.0"
+version = "2.0.1"
 description = "稳定高效、易于开发的QQ Bot框架"
 readme = "readme.md"
 authors = [

{hyper_bot-2.0.0 → hyper_bot-2.0.1/src/hyper_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyper-bot
-Version: 2.0.0
+Version: 2.0.1
 Summary: 稳定高效、易于开发的QQ Bot框架
 Author-email: Harcic <harcic@outlook.com>
 Project-URL: repository, https://github.com/HarcicYang/HyperBotCore

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyper_bot.egg-info/SOURCES.txt

@@ -60,7 +60,6 @@ src/hyperot/v2/client/runtime.py
 src/hyperot/v2/common/__init__.py
 src/hyperot/v2/common/enums.py
 src/hyperot/v2/common/errors.py
-src/hyperot/v2/common/ids.py
 src/hyperot/v2/common/models.py
 src/hyperot/v2/config/__init__.py
 src/hyperot/v2/config/loader.py
@@ -71,6 +70,7 @@ src/hyperot/v2/events/dispatcher.py
 src/hyperot/v2/events/formatting.py
 src/hyperot/v2/events/models.py
 src/hyperot/v2/messages/__init__.py
+src/hyperot/v2/messages/registry.py
 src/hyperot/v2/messages/segments.py
 tests/test_configurator.py
 tests/test_events.py

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/__init__.py

@@ -1,14 +1,8 @@
 from .api import ClientAPI
 from .client import Client
 from .common import (
-    FileId,
-    GroupId,
     MemberRole,
-    MessageId,
-    RequestId,
-    SceneId,
     SceneType,
-    UserId,
 )
 from .events import (
     BotOfflineEvent,
@@ -32,12 +26,15 @@ from .messages import (
     Message,
     Quote,
     Segment,
+    SegmentDecoder,
+    SegmentEncoder,
+    SegmentRegistry,
     Text,
     UnknownSegment,
     Video,
 )
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 __all__ = [
     "Audio",
@@ -50,26 +47,23 @@ __all__ = [
     "Event",
     "Face",
     "File",
-    "FileId",
     "Forward",
     "ForwardNode",
-    "GroupId",
     "Image",
     "Markdown",
     "MemberRole",
     "Mention",
     "MentionAll",
     "Message",
-    "MessageId",
     "MessageReceivedEvent",
     "Quote",
-    "RequestId",
     "SceneEvent",
-    "SceneId",
     "SceneType",
     "Segment",
+    "SegmentDecoder",
+    "SegmentEncoder",
+    "SegmentRegistry",
     "Text",
     "UnknownSegment",
-    "UserId",
     "Video",
 ]

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/actions/models.py

@@ -3,7 +3,7 @@ from typing import ClassVar
 from pydantic import Field, JsonValue
 from typing_extensions import override
 
-from ..common import FileId, GroupId, MemberRole, MessageId, RequestId, SceneId, SceneType, UserId
+from ..common import MemberRole, SceneType
 from ..messages import Message
 from .base import Action
 from .formatting import format_actor, format_message, format_preview, format_scene, format_text, format_value
@@ -38,7 +38,7 @@ class RawAction(Action[RawResult]):
 
 class SendMessageAction(Action[SendResult]):
     scene_type: SceneType
-    scene_id: SceneId
+    scene_id: str
     message: Message
 
     @override
@@ -47,7 +47,7 @@ class SendMessageAction(Action[SendResult]):
 
 
 class RecallMessageAction(Action[None]):
-    message_id: MessageId
+    message_id: str
 
     @override
     def log_summary(self) -> str:
@@ -56,7 +56,7 @@ class RecallMessageAction(Action[None]):
 
 class FetchMessageAction(Action[Message]):
     log_level: ClassVar[str] = "TRACE"
-    message_id: MessageId
+    message_id: str
 
     @override
     def log_summary(self) -> str:
@@ -89,7 +89,7 @@ class GetVersionAction(Action[VersionInfo]):
 
 class GetUserProfileAction(Action[UserProfile]):
     log_level: ClassVar[str] = "TRACE"
-    user_id: UserId
+    user_id: str
 
     @override
     def log_summary(self) -> str:
@@ -106,7 +106,7 @@ class GetFriendListAction(Action[list[FriendInfo]]):
 
 class GetGroupProfileAction(Action[GroupProfile]):
     log_level: ClassVar[str] = "TRACE"
-    group_id: GroupId
+    group_id: str
 
     @override
     def log_summary(self) -> str:
@@ -123,8 +123,8 @@ class GetGroupListAction(Action[list[GroupProfile]]):
 
 class GetGroupMemberAction(Action[GroupMemberProfile]):
     log_level: ClassVar[str] = "TRACE"
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
 
     @override
     def log_summary(self) -> str:
@@ -133,7 +133,7 @@ class GetGroupMemberAction(Action[GroupMemberProfile]):
 
 class GetGroupMemberListAction(Action[list[GroupMemberProfile]]):
     log_level: ClassVar[str] = "TRACE"
-    group_id: GroupId
+    group_id: str
 
     @override
     def log_summary(self) -> str:
@@ -141,8 +141,8 @@ class GetGroupMemberListAction(Action[list[GroupMemberProfile]]):
 
 
 class KickMemberAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
 
     @override
     def log_summary(self) -> str:
@@ -150,8 +150,8 @@ class KickMemberAction(Action[None]):
 
 
 class MuteMemberAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
     duration: int
 
     @override
@@ -160,8 +160,8 @@ class MuteMemberAction(Action[None]):
 
 
 class UnmuteMemberAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
 
     @override
     def log_summary(self) -> str:
@@ -169,8 +169,8 @@ class UnmuteMemberAction(Action[None]):
 
 
 class SetMemberRoleAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
     role: MemberRole
 
     @override
@@ -181,8 +181,8 @@ class SetMemberRoleAction(Action[None]):
 
 
 class SetMemberTitleAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
     title: str
 
     @override
@@ -194,8 +194,8 @@ class SetMemberTitleAction(Action[None]):
 
 
 class SetMemberCardAction(Action[None]):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
     card: str
 
     @override
@@ -206,7 +206,7 @@ class SetMemberCardAction(Action[None]):
 
 
 class SetGroupNameAction(Action[None]):
-    group_id: GroupId
+    group_id: str
     name: str
 
     @override
@@ -215,7 +215,7 @@ class SetGroupNameAction(Action[None]):
 
 
 class SetGroupMuteAction(Action[None]):
-    group_id: GroupId
+    group_id: str
     muted: bool
 
     @override
@@ -225,7 +225,7 @@ class SetGroupMuteAction(Action[None]):
 
 
 class LeaveGroupAction(Action[None]):
-    group_id: GroupId
+    group_id: str
 
     @override
     def log_summary(self) -> str:
@@ -233,7 +233,7 @@ class LeaveGroupAction(Action[None]):
 
 
 class ReactMessageAction(Action[None]):
-    message_id: MessageId
+    message_id: str
     reaction: str
     enabled: bool = True
 
@@ -244,7 +244,7 @@ class ReactMessageAction(Action[None]):
 
 
 class SetEssenceAction(Action[None]):
-    message_id: MessageId
+    message_id: str
     enabled: bool = True
 
     @override
@@ -255,8 +255,8 @@ class SetEssenceAction(Action[None]):
 
 class PokeAction(Action[None]):
     scene_type: SceneType
-    scene_id: SceneId
-    user_id: UserId
+    scene_id: str
+    user_id: str
 
     @override
     def log_summary(self) -> str:
@@ -264,7 +264,7 @@ class PokeAction(Action[None]):
 
 
 class ApproveFriendRequestAction(Action[None]):
-    request_id: RequestId
+    request_id: str
 
     @override
     def log_summary(self) -> str:
@@ -272,7 +272,7 @@ class ApproveFriendRequestAction(Action[None]):
 
 
 class RejectFriendRequestAction(Action[None]):
-    request_id: RequestId
+    request_id: str
     reason: str | None = None
 
     @override
@@ -282,7 +282,7 @@ class RejectFriendRequestAction(Action[None]):
 
 
 class ApproveGroupRequestAction(Action[None]):
-    request_id: RequestId
+    request_id: str
 
     @override
     def log_summary(self) -> str:
@@ -290,7 +290,7 @@ class ApproveGroupRequestAction(Action[None]):
 
 
 class RejectGroupRequestAction(Action[None]):
-    request_id: RequestId
+    request_id: str
     reason: str | None = None
 
     @override
@@ -301,7 +301,7 @@ class RejectGroupRequestAction(Action[None]):
 
 class GetFileInfoAction(Action[FileReference]):
     log_level: ClassVar[str] = "TRACE"
-    file_id: FileId
+    file_id: str
 
     @override
     def log_summary(self) -> str:
@@ -310,7 +310,7 @@ class GetFileInfoAction(Action[FileReference]):
 
 class DownloadFileAction(Action[FileUrl]):
     log_level: ClassVar[str] = "TRACE"
-    file_id: FileId
+    file_id: str
 
     @override
     def log_summary(self) -> str:
@@ -318,7 +318,7 @@ class DownloadFileAction(Action[FileUrl]):
 
 
 class SendLikeAction(Action[None]):
-    user_id: UserId
+    user_id: str
     times: int = 1
 
     @override

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/actions/result.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel, ConfigDict, JsonValue
 from typing_extensions import override
 
-from ..common import FileId, GroupId, MemberRole, MessageId, UserId
+from ..common import MemberRole
 from ..messages import Message
 from .formatting import format_actor, format_message, format_text, format_url, format_value
 
@@ -14,7 +14,7 @@ class ResultModel(BaseModel):
 
 
 class SendResult(ResultModel):
-    message_id: MessageId
+    message_id: str
 
     @override
     def log_summary(self) -> str:
@@ -22,7 +22,7 @@ class SendResult(ResultModel):
 
 
 class UserProfile(ResultModel):
-    user_id: UserId
+    user_id: str
     display_name: str | None = None
     sex: str | None = None
     age: int | None = None
@@ -39,7 +39,7 @@ class UserProfile(ResultModel):
 
 
 class FriendInfo(ResultModel):
-    user_id: UserId
+    user_id: str
     display_name: str | None = None
 
     @override
@@ -48,7 +48,7 @@ class FriendInfo(ResultModel):
 
 
 class GroupProfile(ResultModel):
-    group_id: GroupId
+    group_id: str
     name: str
     member_count: int | None = None
     max_member_count: int | None = None
@@ -66,8 +66,8 @@ class GroupProfile(ResultModel):
 
 
 class GroupMemberProfile(ResultModel):
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
     display_name: str | None = None
     card: str | None = None
     role: MemberRole | None = None
@@ -90,7 +90,7 @@ class FileUrl(ResultModel):
 
 
 class BotProfile(ResultModel):
-    user_id: UserId
+    user_id: str
     display_name: str
 
     @override
@@ -150,7 +150,7 @@ class RawResult(ResultModel):
 
 
 class FileReference(ResultModel):
-    file_id: FileId
+    file_id: str
     name: str | None = None
     url: str | None = None
 

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/api/base.py

@@ -44,7 +44,7 @@ from ..actions import (
     UserProfile,
     VersionInfo,
 )
-from ..common import FileId, GroupId, MemberRole, MessageId, RequestId, SceneId, SceneType, UserId
+from ..common import MemberRole, SceneType
 from ..messages import Message, Quote
 from .context import APIContext
 
@@ -55,7 +55,7 @@ IdInput = str | int
 class SceneAPI:
     _context: APIContext
     _scene_type: SceneType
-    _scene_id: SceneId
+    _scene_id: str
 
     async def send(self, message: Message | str) -> SendResult:
         if isinstance(message, str):
@@ -68,7 +68,7 @@ class SceneAPI:
             )
         )
 
-    async def recall(self, message_id: MessageId) -> None:
+    async def recall(self, message_id: str) -> None:
         await self._context.execute(RecallMessageAction(message_id=message_id))
 
     async def poke(self, user_id: IdInput) -> None:
@@ -76,14 +76,14 @@ class SceneAPI:
             PokeAction(
                 scene_type=self._scene_type,
                 scene_id=self._scene_id,
-                user_id=UserId(str(user_id)),
+                user_id=str(user_id),
             )
         )
 
 
 @dataclass(frozen=True, slots=True)
 class UserAPI(SceneAPI):
-    user_id: UserId
+    user_id: str
 
     async def profile(self) -> UserProfile:
         return await self._context.execute(GetUserProfileAction(user_id=self.user_id))
@@ -92,8 +92,8 @@ class UserAPI(SceneAPI):
 @dataclass(frozen=True, slots=True)
 class GroupMemberAPI:
     _context: APIContext
-    group_id: GroupId
-    user_id: UserId
+    group_id: str
+    user_id: str
 
     async def profile(self) -> GroupMemberProfile:
         return await self._context.execute(
@@ -148,10 +148,10 @@ class GroupMemberAPI:
 
 @dataclass(frozen=True, slots=True)
 class GroupAPI(SceneAPI):
-    group_id: GroupId
+    group_id: str
 
     def member(self, user_id: IdInput) -> GroupMemberAPI:
-        return GroupMemberAPI(self._context, self.group_id, UserId(str(user_id)))
+        return GroupMemberAPI(self._context, self.group_id, str(user_id))
 
     async def profile(self) -> GroupProfile:
         return await self._context.execute(GetGroupProfileAction(group_id=self.group_id))
@@ -175,7 +175,7 @@ class GroupAPI(SceneAPI):
 @dataclass(frozen=True, slots=True)
 class MessageAPI:
     _context: APIContext
-    message_id: MessageId
+    message_id: str
 
     async def fetch(self) -> Message:
         return await self._context.execute(FetchMessageAction(message_id=self.message_id))
@@ -215,7 +215,7 @@ class MessageAPI:
 @dataclass(frozen=True, slots=True)
 class FriendRequestAPI:
     _context: APIContext
-    request_id: RequestId
+    request_id: str
 
     async def approve(self) -> None:
         await self._context.execute(ApproveFriendRequestAction(request_id=self.request_id))
@@ -232,7 +232,7 @@ class FriendRequestAPI:
 @dataclass(frozen=True, slots=True)
 class GroupRequestAPI:
     _context: APIContext
-    request_id: RequestId
+    request_id: str
 
     async def approve(self) -> None:
         await self._context.execute(ApproveGroupRequestAction(request_id=self.request_id))
@@ -249,7 +249,7 @@ class GroupRequestAPI:
 @dataclass(frozen=True, slots=True)
 class FileAPI:
     _context: APIContext
-    file_id: FileId
+    file_id: str
 
     async def info(self) -> FileReference:
         return await self._context.execute(GetFileInfoAction(file_id=self.file_id))
@@ -277,25 +277,25 @@ class ClientAPI:
         self._context = context
 
     def scene(self, scene_type: SceneType, scene_id: IdInput) -> SceneAPI:
-        return SceneAPI(self._context, scene_type, SceneId(str(scene_id)))
+        return SceneAPI(self._context, scene_type, str(scene_id))
 
     def user(self, user_id: IdInput) -> UserAPI:
-        return UserAPI(self._context, SceneType.USER, SceneId(str(user_id)), UserId(str(user_id)))
+        return UserAPI(self._context, SceneType.USER, str(user_id), str(user_id))
 
     def group(self, group_id: IdInput) -> GroupAPI:
-        return GroupAPI(self._context, SceneType.GROUP, SceneId(str(group_id)), GroupId(str(group_id)))
+        return GroupAPI(self._context, SceneType.GROUP, str(group_id), str(group_id))
 
     def message(self, message_id: IdInput) -> MessageAPI:
-        return MessageAPI(self._context, MessageId(str(message_id)))
+        return MessageAPI(self._context, str(message_id))
 
     def friend_request(self, request_id: IdInput) -> FriendRequestAPI:
-        return FriendRequestAPI(self._context, RequestId(str(request_id)))
+        return FriendRequestAPI(self._context, str(request_id))
 
     def group_request(self, request_id: IdInput) -> GroupRequestAPI:
-        return GroupRequestAPI(self._context, RequestId(str(request_id)))
+        return GroupRequestAPI(self._context, str(request_id))
 
     def file(self, file_id: IdInput) -> FileAPI:
-        return FileAPI(self._context, FileId(str(file_id)))
+        return FileAPI(self._context, str(file_id))
 
     async def raw(self, action: str, params: Mapping[str, JsonValue] | None = None) -> RawResult:
         return await self._context.execute(RawAction(action=action, params=dict(params or {})))

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/common/__init__.py

@@ -14,21 +14,9 @@ from .errors import (
     ExtensionNotAvailableError,
     HyperotError,
 )
-from .ids import (
-    AccountId,
-    EventId,
-    FileId,
-    GroupId,
-    MessageId,
-    RequestId,
-    SceneId,
-    SessionId,
-    UserId,
-)
 from .models import FileInfo, ReactionValue, UserSnapshot
 
 __all__ = [
-    "AccountId",
     "ActionError",
     "ActionNotFoundError",
     "ActionRejectedError",
@@ -40,21 +28,13 @@ __all__ = [
     "CapabilityNotSupportedError",
     "ClientNotRunningError",
     "ConfigurationError",
-    "EventId",
     "ExtensionNotAvailableError",
-    "FileId",
     "FileInfo",
-    "GroupId",
     "HyperotError",
     "MemberRole",
-    "MessageId",
     "ReactionKind",
     "ReactionValue",
-    "RequestId",
-    "SceneId",
     "SceneType",
-    "SessionId",
-    "UserId",
     "UserSex",
     "UserSnapshot",
 ]

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/common/models.py

@@ -1,13 +1,12 @@
 from pydantic import BaseModel, ConfigDict
 
 from .enums import MemberRole, ReactionKind, UserSex
-from .ids import FileId, UserId
 
 
 class FileInfo(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid", strict=True)
 
-    file_id: FileId
+    file_id: str
     name: str
     size: int
 
@@ -15,7 +14,7 @@ class FileInfo(BaseModel):
 class UserSnapshot(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid", strict=True)
 
-    user_id: UserId
+    user_id: str
     nick_name: str | None = None
     display_name: str | None = None
     sex: UserSex | None = None

{hyper_bot-2.0.0 → hyper_bot-2.0.1}/src/hyperot/v2/events/base.py

@@ -6,7 +6,7 @@ from uuid import uuid4
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from ..common import EventId, SceneId, SceneType, UserId
+from ..common import SceneType
 from ..hyperogger import Logger
 
 logger = Logger.fetch("hyperot.v2.events")
@@ -20,7 +20,7 @@ class Event(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid", strict=True)
 
     log_enabled: ClassVar[bool] = True
-    event_id: EventId = Field(default_factory=lambda: EventId(uuid4().hex))
+    event_id: str = Field(default_factory=lambda: uuid4().hex)
     timestamp: datetime = Field(default_factory=utc_now)
 
     def print_log(self) -> None:
@@ -37,5 +37,5 @@ class Event(BaseModel):
 
 class SceneEvent(Event):
     scene_type: SceneType
-    scene_id: SceneId
-    user_id: UserId | None = None
+    scene_id: str
+    user_id: str | None = None