- some fix

Author: p1p1daster

pybotx/bot/bot.py

@@ -1300,7 +1300,7 @@ async def create_chat(
             self._bot_accounts_storage,
         )
 
-        payload = BotXAPICreateChatRequestPayload.from_domain(
+        payload = BotXAPICreateChatRequestPayload(
             name=name,
             chat_type=chat_type,
             members=huids,

pybotx/client/chats_api/create_chat.py

@@ -1,11 +1,12 @@
-from typing import Literal, Union
+from typing import Any, Literal
 from uuid import UUID
 
 from pydantic import (
     Field,
     ConfigDict,
     field_serializer,
     field_validator,
+    model_validator,
 )
 
 from pybotx.client.authorized_botx_method import AuthorizedBotXMethod
@@ -35,31 +36,12 @@ class BotXAPICreateChatRequestPayload(UnverifiedPayloadBaseModel):
     shared_history: Missing[bool]
     avatar: str | None = None
 
-    @classmethod
-    def from_domain(
-        cls,
-        name: str,
-        chat_type: Union[APIChatTypes, ChatTypes],
-        members: list[UUID],
-        shared_history: Missing[bool],
-        description: str | None = None,
-        avatar: str | None = None,
-    ) -> "BotXAPICreateChatRequestPayload":
-        converted_chat_type = cls._convert_chat_type(chat_type)
-        return cls(
-            name=name,
-            chat_type=converted_chat_type,
-            members=members,
-            shared_history=shared_history,
-            description=description,
-            avatar=avatar,
-        )
-
-    @classmethod
-    def _convert_chat_type(cls, v: Union[APIChatTypes, ChatTypes]) -> APIChatTypes:
-        if isinstance(v, ChatTypes):
-            return convert_chat_type_from_domain(v)
-        return v
+    @model_validator(mode="before")
+    def _convert_chat_type(cls, values: dict[str, Any]) -> dict[str, Any]:
+        chat_type = values.get("chat_type")
+        if isinstance(chat_type, ChatTypes):
+            values["chat_type"] = convert_chat_type_from_domain(chat_type)
+        return values
 
     @field_validator("avatar")
     def _validate_avatar(cls, v: str | None) -> str | None:

tests/client/chats_api/test_create_chat.py

@@ -7,7 +7,6 @@
 from respx.router import MockRouter
 
 from pybotx import ChatCreationError, ChatCreationProhibitedError, ChatTypes
-from pybotx.missing import Undefined
 from tests.testkit import BotXRequest, error_payload, mock_botx, ok_payload
 
 pytestmark = [
@@ -216,41 +215,20 @@ def test__create_chat_payload__convert_chat_type_validator() -> None:
     from pybotx.client.chats_api.create_chat import BotXAPICreateChatRequestPayload
     from pybotx.models.enums import ChatTypes, APIChatTypes
 
-    # Arrange
-    name = "Test Chat"
-    description = "Test Description"
-    chat_type = ChatTypes.PERSONAL_CHAT
-    members = [UUID("2fc83441-366a-49ba-81fc-6c39f065bb58")]
-    shared_history = Undefined
-    avatar = None
-
-    # Act
-    payload = BotXAPICreateChatRequestPayload.from_domain(
-        name=name,
-        chat_type=chat_type,
-        members=members,
-        shared_history=shared_history,
-        description=description,
-        avatar=avatar,
-    )
+    # Test with ChatTypes enum
+    values = {"chat_type": ChatTypes.GROUP_CHAT}
+    result = BotXAPICreateChatRequestPayload._convert_chat_type(values)  # type: ignore[operator]
+    assert result["chat_type"] == APIChatTypes.GROUP_CHAT
 
-    # Assert
-    assert payload.name == name
-    assert payload.description == description
-    assert payload.chat_type == APIChatTypes.CHAT
-    assert payload.members == members
-
-    # Test with APIChatTypes
-    api_chat_type = APIChatTypes.CHANNEL
-    payload = BotXAPICreateChatRequestPayload.from_domain(
-        name=name,
-        chat_type=api_chat_type,
-        members=members,
-        shared_history=shared_history,
-        description=description,
-        avatar=avatar,
-    )
-    assert payload.chat_type == api_chat_type
+    # Test with APIChatTypes value (should remain unchanged)
+    values = {"chat_type": APIChatTypes.CHAT}  # type: ignore[dict-item]
+    result = BotXAPICreateChatRequestPayload._convert_chat_type(values)  # type: ignore[operator]
+    assert result["chat_type"] == APIChatTypes.CHAT
+
+    # Test with missing chat_type key
+    values = {"name": "test"}  # type: ignore[dict-item]
+    result = BotXAPICreateChatRequestPayload._convert_chat_type(values)  # type: ignore[operator]
+    assert result == {"name": "test"}
 
 
 def test__create_chat_payload__serialize_chat_type_from_domain() -> None: