Update models

Author: Palbahngmiyine

solapi/message_service.py

@@ -65,11 +65,12 @@ def send(
             },
             data=request.model_dump(exclude_none=True, by_alias=True),
         )
+        print(response)
         deserialized_response: SendMessageResponse = SendMessageResponse.model_validate(
             response
         )
 
-        count = deserialized_response.count
+        count = deserialized_response.group_info.count
         failed_messages = deserialized_response.failed_message_list
         registered_failed_count = count.registered_failed
         if len(failed_messages) > 0 and count.total == registered_failed_count:

solapi/model/message.py

@@ -3,6 +3,7 @@
 from typing import Any, Optional
 
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
 
 
 class MessageType(Enum):
@@ -98,4 +99,6 @@ class Message(BaseModel):
         default=None, serialization_alias="faxOptions", validation_alias="faxOptions"
     )
 
-    model_config = ConfigDict(extra="ignore")
+    model_config = ConfigDict(
+        extra="ignore", populate_by_name=True, alias_generator=to_camel
+    )

solapi/model/response/common_response.py

@@ -1,7 +1,8 @@
 from datetime import datetime
-from typing import Any
+from typing import Any, Optional
 
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
 
 
 class CountResponse(BaseModel):
@@ -18,10 +19,10 @@ class CountResponse(BaseModel):
 
 
 class CommonCashResponse(BaseModel):
-    requested: int
-    replacement: int
-    refund: int
-    sum: int
+    requested: float
+    replacement: float
+    refund: float
+    sum: float
 
     model_config = ConfigDict(extra="ignore")
 
@@ -43,45 +44,28 @@ class CountForChargeResponse(BaseModel):
 
 
 class GroupMessageResponse(BaseModel):
-    # export type GroupMessageResponse = {
-    #   count: Count;
-    #   countForCharge: CountForCharge;
-    #   balance: CommonCashResponse;
-    #   point: CommonCashResponse;
-    #   app: App;
-    #   log: Log;
-    #   status: string;
-    #   allowDuplicates: boolean;
-    #   isRefunded: boolean;
-    #   accountId: string;
-    #   masterAccountId: string | null;
-    #   apiVersion: string;
-    #   groupId: string;
-    #   price: object;
-    #   dateCreated: string;
-    #   dateUpdated: string;
-    #   scheduledDate?: string;
-    #   dateSent?: string;
-    #   dateCompleted?: string;
-    # };
     count: CountResponse
-    count_for_charge: Any = Field(..., validation_alias="countForCharge")
+    count_for_charge: Any
     balance: CommonCashResponse
     point: CommonCashResponse
     app: Any
     log: Any
     status: str
-    allow_duplicates: bool = Field(..., validation_alias="allowDuplicates")
-    is_refunded: bool = Field(..., validation_alias="isRefunded")
-    account_id: str = Field(..., validation_alias="accountId")
-    master_account_id: str = Field(..., validation_alias="masterAccountId")
-    api_version: str = Field(..., validation_alias="apiVersion")
-    group_id: str = Field(..., validation_alias="groupId")
+    allow_duplicates: bool
+    is_refunded: bool
+    account_id: str
+    master_account_id: Optional[str]
+    api_version: str
+    group_id: str
     price: Any
-    date_created: datetime = Field(..., validation_alias="dateCreated")
-    date_updated: datetime = Field(..., validation_alias="dateUpdated")
-    scheduled_date: datetime = Field(..., validation_alias="scheduledDate")
-    date_sent: datetime = Field(..., validation_alias="dateSent")
-    date_completed: datetime = Field(..., validation_alias="dateCompleted")
+    date_created: Optional[datetime]
+    date_updated: Optional[datetime]
+    scheduled_date: Optional[datetime] = Field(default=None)
+    date_sent: Optional[datetime]
+    date_completed: Optional[datetime]
 
-    model_config = ConfigDict(extra="ignore")
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True,
+        extra="ignore",
+    )

solapi/model/response/send_message_response.py

@@ -1,27 +1,28 @@
 from typing import Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
 
 from solapi.model.response.common_response import GroupMessageResponse
 
 
 class FailedMessage(BaseModel):
     to: str
-    from_: str = Field(..., alias="from")
+    from_: str = Field(..., serialization_alias="from", validation_alias="from")
     type: str
     status_message: str = Field(..., alias="statusMessage")
     country: str
     message_id: str = Field(..., alias="messageId")
     status_code: str = Field(..., alias="statusCode")
     account_id: str = Field(..., alias="accountId")
-    custom_fields: Optional[dict[str, str]] = Field(
-        default=None, alias="customFields"
-    )
+    custom_fields: Optional[dict[str, str]] = Field(default=None)
+
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
 
 
 class SendMessageResponse(BaseModel):
-    failed_message_list: list[FailedMessage] = Field(
-        ..., alias="failedMessageList"
-    )
-    group_info: GroupMessageResponse = Field(..., alias="groupInfo")
-    message_list: Optional[list] = Field(default=None, alias="messageList")
+    failed_message_list: Optional[list[FailedMessage]] = None
+    group_info: GroupMessageResponse
+    message_list: Optional[list] = Field(default=None)
+
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)