fetcher.py에서 HTTPTransport를 사용하여 재시도 로직 추가, string_date_transfer.py에서 시간대 처리 개선, kakao_option.py에 Bms 모델 추가, message.py에서 전화번호 정규화 로직 추가, voice_option.py 및 bms.py 파일 추가, GetGroupsCriteriaType 이름 수정 및 버전 업데이트

Author: Palbahngmiyine

solapi/lib/fetcher.py

@@ -39,11 +39,17 @@ def default_fetcher(
     headers = {
         "Authorization": authorization_header_data,
         "Content-Type": "application/json",
+        "Connection": "keep-alive",
     }
 
-    with httpx.Client() as client:
+    transport = httpx.HTTPTransport(retries=3)
+
+    with httpx.Client(transport=transport) as client:
         response: Response = client.request(
-            method=request["method"], url=request["url"], headers=headers, json=data
+            method=request["method"],
+            url=request["url"],
+            headers=headers,
+            json=data,
         )
 
     # 4xx 에러 처리: 클라이언트 오류일 경우

solapi/lib/string_date_transfer.py

@@ -27,7 +27,14 @@ def format_iso(date: datetime) -> str:
     """
     utc_offset_sec = time.altzone if time.localtime().tm_isdst else time.timezone
     utc_offset = timedelta(seconds=-utc_offset_sec)
-    return date.replace(tzinfo=timezone(offset=utc_offset)).isoformat()
+    local_tz = timezone(offset=utc_offset)
+
+    if date.tzinfo is None:
+        date = date.replace(tzinfo=local_tz)
+    else:
+        date = date.astimezone(local_tz)
+
+    return date.isoformat()
 
 
 def parse_iso(date_string: str) -> datetime:

solapi/model/__init__.py

@@ -1,6 +1,7 @@
 from .kakao.kakao_option import KakaoOption
 from .message_type import MessageType
 from .request.groups.get_groups import GetGroupsRequest
+from .request.kakao.bms import Bms
 from .request.message import Message as RequestMessage
 from .request.send_message_request import SendRequestConfig
 from .response.message import Message as ResponseMessage
@@ -12,4 +13,5 @@
     "KakaoOption",
     "GetGroupsRequest",
     "MessageType",
+    "Bms",
 ]

solapi/model/kakao/kakao_option.py

@@ -4,19 +4,30 @@
 from pydantic import BaseModel, ConfigDict, field_validator
 from pydantic.alias_generators import to_camel
 
+from solapi.model.request.kakao.bms import Bms
+
 
 class KakaoOption(BaseModel):
     pf_id: Optional[str] = None
     template_id: Optional[str] = None
     variables: Optional[dict[str, str]] = None
     disable_sms: bool = False
     image_id: Optional[str] = None
+    bms: Optional[Bms] = None
 
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
 
     @field_validator("variables", mode="before")
     @classmethod
     def stringify_values(cls, v: Mapping[str, object]):
         if isinstance(v, Mapping):
-            # 모든 value를 str로 캐스팅
-            return {k: str(val) for k, val in v.items()}
+            # 키값을 #{변수명} 형태로 변환하고 모든 value를 str로 캐스팅
+            processed_dict = {}
+            for k, val in v.items():
+                # 키가 이미 #{변수명} 형태가 아니면 자동으로 감싸기
+                if not (k.startswith("#{") and k.endswith("}")):
+                    processed_key = f"#{{{k}}}"
+                else:
+                    processed_key = k
+                processed_dict[processed_key] = str(val)
+            return processed_dict

solapi/model/request/__init__.py

@@ -1,2 +1,2 @@
 # NOTE: Python SDK가 업데이트 될 때마다 Version도 갱신해야 함!
-VERSION = "python/5.0.1"
+VERSION = "python/5.0.2"

solapi/model/request/groups/get_groups.py

@@ -16,7 +16,7 @@ class GetGroupsRequest(BaseModel):
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
 
 
-class GetGroupsCrteriaType(str, Enum):
+class GetGroupsCriteriaType(str, Enum):
     group_id = "groupId"
     date_created = "dateCreated"
     scheduled_date = "scheduledDate"

solapi/model/request/kakao/bms.py

@@ -0,0 +1,12 @@
+from typing import Literal
+
+from pydantic import BaseModel, ConfigDict
+
+
+class Bms(BaseModel):
+    targeting: Literal["M", "N", "I"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        extra="ignore",
+    )

solapi/model/request/kakao/kakao_option.py

@@ -4,6 +4,7 @@
 from pydantic.alias_generators import to_camel
 
 from solapi.model.kakao.kakao_button import KakaoButton
+from solapi.model.request.kakao.bms import Bms
 
 
 class KakaoOption(BaseModel):
@@ -13,5 +14,6 @@ class KakaoOption(BaseModel):
     disable_sms: bool = False
     image_id: Optional[str] = None
     buttons: Optional[list[KakaoButton]] = None
+    bms: Optional[Bms] = None
 
     model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)

solapi/model/request/message.py

@@ -1,11 +1,12 @@
 from typing import Any, Optional, Union
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 from pydantic.alias_generators import to_camel
 
 from solapi.model import KakaoOption
 from solapi.model.message_type import MessageType
 from solapi.model.rcs.rcs_options import RcsOption
+from solapi.model.request.voice.voice_option import VoiceOption
 
 
 class FileIdsType(BaseModel):
@@ -52,6 +53,29 @@ class Message(BaseModel):
     fax_options: Optional[FileIdsType] = Field(
         default=None, serialization_alias="faxOptions", validation_alias="faxOptions"
     )
+    voice_options: Optional[VoiceOption] = Field(
+        default=None,
+        serialization_alias="voiceOptions",
+        validation_alias="voiceOptions",
+    )
+
+    @field_validator("from_", mode="before")
+    @classmethod
+    def normalize_from_phone_number(cls, v: Optional[str]) -> Optional[str]:
+        if v is None:
+            return v
+        return v.replace("-", "")
+
+    @field_validator("to", mode="before")
+    @classmethod
+    def normalize_to_phone_number(
+        cls, v: Union[str, list[str]]
+    ) -> Union[str, list[str]]:
+        if isinstance(v, str):
+            return v.replace("-", "")
+        elif isinstance(v, list):
+            return [phone.replace("-", "") for phone in v]
+        return v
 
     model_config = ConfigDict(
         extra="ignore",

solapi/model/request/voice/voice_option.py

@@ -0,0 +1,18 @@
+from typing import Literal, Optional
+
+from pydantic import BaseModel, ConfigDict
+from pydantic.alias_generators import to_camel
+
+
+class VoiceOption(BaseModel):
+    voice_type: Literal["FEMALE", "MALE"]
+    header_message: Optional[str] = None
+    tail_message: Optional[str] = None
+    reply_range: Optional[int] = None
+    counselor_number: Optional[str] = None
+
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True,
+        extra="ignore",
+    )