Fix/mention types (#344)

* fix: Entity id type, mention types imports.

* style: `__all__` order.

pybotx/__init__.py

@@ -71,7 +71,16 @@
     UserSender,
 )
 from pybotx.models.message.markup import BubbleMarkup, Button, KeyboardMarkup
-from pybotx.models.message.mentions import Mention, MentionBuilder, MentionList
+from pybotx.models.message.mentions import (
+    Mention,
+    MentionAll,
+    MentionBuilder,
+    MentionChannel,
+    MentionChat,
+    MentionContact,
+    MentionList,
+    MentionUser,
+)
 from pybotx.models.message.message_status import MessageStatus
 from pybotx.models.message.outgoing_message import OutgoingMessage
 from pybotx.models.message.reply import Reply
@@ -96,18 +105,20 @@
     "AnswerDestinationLookupError",
     "AttachmentTypes",
     "Bot",
-    "BotAccountWithSecret",
     "BotAPIBotDisabledResponse",
     "BotAPIMethodFailedCallback",
+    "BotAccount",
+    "BotAccountWithSecret",
     "BotIsNotChatMemberError",
     "BotMenu",
-    "BotAccount",
     "BotSender",
     "BotShuttingDownError",
     "BotXMethodCallbackNotFoundError",
     "BotXMethodFailedCallbackReceivedError",
     "BubbleMarkup",
     "Button",
+    "CTSLoginEvent",
+    "CTSLogoutEvent",
     "CallbackNotReceivedError",
     "CantUpdatePersonalChatError",
     "Chat",
@@ -121,12 +132,10 @@
     "ChatNotFoundError",
     "ChatTypes",
     "ClientPlatforms",
-    "CTSLoginEvent",
-    "CTSLogoutEvent",
     "DeletedFromChatEvent",
     "Document",
     "EditMessage",
-    "MessageStatus",
+    "EventNotFoundError",
     "File",
     "FileDeletedError",
     "FileMetadataNotFound",
@@ -143,13 +152,18 @@
     "InvalidEmojiError",
     "InvalidImageError",
     "InvalidUsersListError",
-    "EventNotFoundError",
     "KeyboardMarkup",
     "LeftFromChatEvent",
     "Mention",
+    "MentionAll",
     "MentionBuilder",
+    "MentionChannel",
+    "MentionChat",
+    "MentionContact",
     "MentionList",
     "MentionTypes",
+    "MentionUser",
+    "MessageStatus",
     "Middleware",
     "OutgoingAttachment",
     "OutgoingMessage",
@@ -165,8 +179,8 @@
     "StickerPack",
     "StickerPackOrStickerNotFoundError",
     "UnknownBotAccountError",
-    "UnsupportedBotAPIVersionError",
     "UnknownSystemEventError",
+    "UnsupportedBotAPIVersionError",
     "UserDevice",
     "UserFromSearch",
     "UserKinds",

pybotx/models/message/mentions.py

@@ -27,7 +27,7 @@ def build_embed_mention(
 
 @dataclass
 class BaseTargetMention:
-    entity_id: Optional[UUID]
+    entity_id: UUID
     name: Optional[str]
 
 
@@ -82,7 +82,7 @@ def __str__(self) -> str:
 
 class MentionBuilder:
     @classmethod
-    def user(cls, entity_id: Optional[UUID], name: Optional[str] = None) -> MentionUser:
+    def user(cls, entity_id: UUID, name: Optional[str] = None) -> MentionUser:
         return MentionUser(
             type=MentionTypes.USER,
             entity_id=entity_id,
@@ -92,7 +92,7 @@ def user(cls, entity_id: Optional[UUID], name: Optional[str] = None) -> MentionU
     @classmethod
     def contact(
         cls,
-        entity_id: Optional[UUID],
+        entity_id: UUID,
         name: Optional[str] = None,
     ) -> MentionContact:
         return MentionContact(
@@ -102,7 +102,7 @@ def contact(
         )
 
     @classmethod
-    def chat(cls, entity_id: Optional[UUID], name: Optional[str] = None) -> MentionChat:
+    def chat(cls, entity_id: UUID, name: Optional[str] = None) -> MentionChat:
         return MentionChat(
             type=MentionTypes.CHAT,
             entity_id=entity_id,
@@ -112,7 +112,7 @@ def chat(cls, entity_id: Optional[UUID], name: Optional[str] = None) -> MentionC
     @classmethod
     def channel(
         cls,
-        entity_id: Optional[UUID],
+        entity_id: UUID,
         name: Optional[str] = None,
     ) -> MentionChannel:
         return MentionChannel(

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybotx"
-version = "0.34.0"
+version = "0.34.1"
 description = "A python library for interacting with eXpress BotX API"
 authors = [
     "Sidnev Nikolay <[email protected]>",