test message models

Author: maxkahan

messages/src/vonage_messages/__init__.py

@@ -1,27 +1,12 @@
-# from .enums import ChannelType, Locale
-# from .errors import VerifyError
-# from .requests import (
-#     EmailChannel,
-#     SilentAuthChannel,
-#     SmsChannel,
-#     VerifyRequest,
-#     VoiceChannel,
-#     WhatsappChannel,
-# )
-# from .responses import CheckCodeResponse, StartVerificationResponse
-# from .verify_v2 import VerifyV2
+from . import models
+from .enums import ChannelType, EncodingType, MessageType, WebhookVersion
+from .messages import Messages
 
-# __all__ = [
-#     'VerifyV2',
-#     'VerifyError',
-#     'ChannelType',
-#     'CheckCodeResponse',
-#     'Locale',
-#     'VerifyRequest',
-#     'SilentAuthChannel',
-#     'SmsChannel',
-#     'WhatsappChannel',
-#     'VoiceChannel',
-#     'EmailChannel',
-#     'StartVerificationResponse',
-# ]
+__all__ = [
+    'models',
+    'Messages',
+    'ChannelType',
+    'MessageType',
+    'WebhookVersion',
+    'EncodingType',
+]

messages/src/vonage_messages/errors.py

@@ -1,7 +1,7 @@
 from pydantic import validate_call
 from vonage_http_client.http_client import HttpClient
 
-from .models.sms import BaseMessage
+from .models import BaseMessage
 from .responses import MessageUuid
 
 
@@ -22,7 +22,7 @@ def send(self, message: BaseMessage) -> MessageUuid:
         """Send a message using Vonage's Messages API.
 
         Args:
-            message (Message): The message to be sent.
+            message (BaseMessage): The message to be sent.
 
         Returns:
             MessageUuid: The unique identifier of the sent message.

messages/src/vonage_messages/messages.py

@@ -1 +1 @@
-python_sources()
+python_sources(name='models')

messages/src/vonage_messages/models/BUILD

@@ -1,4 +1,4 @@
-from .message import BaseMessage
+from .base_message import BaseMessage
 from .messenger import (
     MessengerAudio,
     MessengerFile,

messages/src/vonage_messages/models/__init__.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel, Field, model_validator
 
 from ..enums import ChannelType, MessageType
-from .message import BaseMessage
+from .base_message import BaseMessage
 
 
 class MessengerResource(BaseModel):
@@ -30,24 +30,24 @@ class BaseMessenger(BaseMessage):
 
 class MessengerText(BaseMessenger):
     text: str = Field(..., max_length=640)
-    type: MessageType = MessageType.TEXT
+    message_type: MessageType = MessageType.TEXT
 
 
 class MessengerImage(BaseMessenger):
     image: MessengerResource
-    type: MessageType = MessageType.IMAGE
+    message_type: MessageType = MessageType.IMAGE
 
 
 class MessengerAudio(BaseMessenger):
     audio: MessengerResource
-    type: MessageType = MessageType.AUDIO
+    message_type: MessageType = MessageType.AUDIO
 
 
 class MessengerVideo(BaseMessenger):
     video: MessengerResource
-    type: MessageType = MessageType.VIDEO
+    message_type: MessageType = MessageType.VIDEO
 
 
 class MessengerFile(BaseMessenger):
     file: MessengerResource
-    type: MessageType = MessageType.FILE
+    message_type: MessageType = MessageType.FILE

messages/src/vonage_messages/models/message.py renamed to messages/src/vonage_messages/models/base_message.py

@@ -4,7 +4,7 @@
 from vonage_utils.types.phone_number import PhoneNumber
 
 from ..enums import ChannelType, MessageType
-from .message import BaseMessage
+from .base_message import BaseMessage
 
 
 class MmsResource(BaseModel):

messages/src/vonage_messages/models/messenger.py

@@ -4,7 +4,7 @@
 from vonage_utils.types.phone_number import PhoneNumber
 
 from ..enums import ChannelType, EncodingType, MessageType
-from .message import BaseMessage
+from .base_message import BaseMessage
 
 
 class SmsOptions(BaseModel):

messages/src/vonage_messages/models/mms.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel, Field, field_validator
 
 from ..enums import ChannelType, MessageType
-from .message import BaseMessage
+from .base_message import BaseMessage
 
 
 class ViberAction(BaseModel):
@@ -77,7 +77,7 @@ def validate_file_size(cls, value):
 
 class ViberVideo(BaseViber):
     video: ViberVideoResource
-    viber_service: Optional[ViberVideoOptions] = None
+    viber_service: ViberVideoOptions
     message_type: MessageType = MessageType.VIDEO