Skip to content

Commit 5687d84

Browse files
[Chore] format files
1 parent 3392f70 commit 5687d84

File tree

4 files changed

+53
-30
lines changed

4 files changed

+53
-30
lines changed

examples/sms/sms.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
21
from solapi.message_service import SolapiMessageService
32
from solapi.model.message import Message
43

54
test = SolapiMessageService(api_key="YOUR_API_KEY", api_secret="YOUR_API_SECRET")
6-
test2 = Message(
7-
from_="01012345678",
8-
to="01012345678",
9-
text="test"
10-
)
5+
test2 = Message(from_="01012345678", to="01012345678", text="test")
116
test.send(test2)

solapi/message_service.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self, api_key: str, api_secret: str):
2121
def send(
2222
self,
2323
messages: Union[list[Message], Message],
24-
request_config: Optional[SendRequestConfig] = None
24+
request_config: Optional[SendRequestConfig] = None,
2525
):
2626
payload = []
2727
if isinstance(messages, Message):
@@ -32,20 +32,24 @@ def send(
3232
if len(payload) == 0:
3333
raise ValueError("데이터가 반드시 1건 이상 기입되어 있어야 합니다.")
3434

35-
request = SendMessageRequest(
36-
messages=payload
37-
)
35+
request = SendMessageRequest(messages=payload)
3836
if request_config is not None:
3937
request.app_id = request_config["app_id"]
4038
request.allow_duplicates = request_config["allow_duplicates"]
4139
request.show_message_list = request_config["show_message_list"]
4240

4341
if request_config.scheduled_date != "":
44-
request.scheduled_date = format_with_transfer(request_config.scheduled_date)
42+
request.scheduled_date = format_with_transfer(
43+
request_config.scheduled_date
44+
)
4545

4646
print(request.model_dump(exclude_none=True, by_alias=True))
4747

48-
return default_fetcher(self._auth_info, request={
49-
"method": RequestMethod.POST,
50-
"url": f"{self.baseUrl}/messages/v4/send-many/detail"
51-
}, data=request.model_dump(exclude_none=True, by_alias=True))
48+
return default_fetcher(
49+
self._auth_info,
50+
request={
51+
"method": RequestMethod.POST,
52+
"url": f"{self.baseUrl}/messages/v4/send-many/detail",
53+
},
54+
data=request.model_dump(exclude_none=True, by_alias=True),
55+
)

solapi/model/message.py

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class MessageType(Enum):
2424
FAX: 팩스
2525
VOICE: 음성문자(TTS)
2626
"""
27+
2728
SMS = "SMS"
2829
LMS = "LMS"
2930
MMS = "MMS"
@@ -40,9 +41,11 @@ class MessageType(Enum):
4041
FAX = "FAX"
4142
VOICE = "VOICE"
4243

44+
4345
class FileIdsType(BaseModel):
4446
file_ids: list[str]
4547

48+
4649
class Message(BaseModel):
4750
from_: Optional[str] = Field(default=None, serialization_alias="from")
4851
to: str
@@ -52,15 +55,29 @@ class Message(BaseModel):
5255
message_id: Optional[str] = Field(default=None, serialization_alias="messageId")
5356
group_id: Optional[str] = Field(default=None, serialization_alias="groupId")
5457
type: Optional[MessageType] = None
55-
auto_type_detect: Optional[bool] = Field(default=True, serialization_alias="autoTypeDetect")
56-
date_created: Optional[datetime] = Field(default=None, serialization_alias="dateCreated")
57-
date_updated: Optional[datetime] = Field(default=None, serialization_alias="dateUpdated")
58+
auto_type_detect: Optional[bool] = Field(
59+
default=True, serialization_alias="autoTypeDetect"
60+
)
61+
date_created: Optional[datetime] = Field(
62+
default=None, serialization_alias="dateCreated"
63+
)
64+
date_updated: Optional[datetime] = Field(
65+
default=None, serialization_alias="dateUpdated"
66+
)
5867
subject: Optional[str] = None
5968
log: Optional[list[dict[str, Any]]] = None
6069
replacements: Optional[list[dict[str, Any]]] = None
6170
status_code: Optional[str] = Field(default=None, serialization_alias="statusCode")
62-
custom_fields: Optional[dict[str, str]] = Field(default=None, serialization_alias="customFields")
71+
custom_fields: Optional[dict[str, str]] = Field(
72+
default=None, serialization_alias="customFields"
73+
)
6374
# TODO: kakaoOptions Model 정의해야 함..
64-
kakao_options: Optional[dict[str, Any]] = Field(default=None, serialization_alias="kakaoOptions")
65-
rcs_options: Optional[dict[str, Any]] = Field(default=None, serialization_alias="rcsOptions")
66-
fax_options: Optional[FileIdsType] = Field(default=None, serialization_alias="faxOptions")
75+
kakao_options: Optional[dict[str, Any]] = Field(
76+
default=None, serialization_alias="kakaoOptions"
77+
)
78+
rcs_options: Optional[dict[str, Any]] = Field(
79+
default=None, serialization_alias="rcsOptions"
80+
)
81+
fax_options: Optional[FileIdsType] = Field(
82+
default=None, serialization_alias="faxOptions"
83+
)

solapi/model/request/send_message_request.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,27 @@
99
class SendRequestConfig(BaseModel):
1010
app_id: Optional[str] = Field(default=None, serialization_alias="appId")
1111
allow_duplicates: bool = Field(default=False, serialization_alias="allowDuplicates")
12-
show_message_list: bool = Field(default=False, serialization_alias="showMessageList")
13-
scheduled_date: Optional[str] = Field(default=None, serialization_alias="scheduledDate")
14-
12+
show_message_list: bool = Field(
13+
default=False, serialization_alias="showMessageList"
14+
)
15+
scheduled_date: Optional[str] = Field(
16+
default=None, serialization_alias="scheduledDate"
17+
)
18+
1519

1620
class SendMessageRequest(BaseModel):
1721
messages: list[Message]
18-
scheduled_date: Optional[str] = Field(default=None, serialization_alias="scheduledDate")
19-
show_message_list: Optional[bool] = Field(default=False, serialization_alias="showMessageList")
22+
scheduled_date: Optional[str] = Field(
23+
default=None, serialization_alias="scheduledDate"
24+
)
25+
show_message_list: Optional[bool] = Field(
26+
default=False, serialization_alias="showMessageList"
27+
)
2028
allow_duplicates: bool = Field(default=False, serialization_alias="allowDuplicates")
2129
app_id: Optional[str] = Field(default=None, serialization_alias="appId")
2230

2331
# NOTE: Python SDK 버전 업데이트 할 때마다 변경해줘야 함
2432
agent: dict[str, str] = {
25-
"sdkVersion": 'python/5.0.0',
26-
"osPlatform": f"{platform.platform()} | {platform.python_version()}"
33+
"sdkVersion": "python/5.0.0",
34+
"osPlatform": f"{platform.platform()} | {platform.python_version()}",
2735
}
28-

0 commit comments

Comments
 (0)