Migrate poetry to uv:

Update BaseModels

Author: Palbahngmiyine

examples/sms/sms.py

@@ -1 +1,11 @@
-print("test")
+
+from solapi.message_service import SolapiMessageService
+from solapi.model.message import Message
+
+test = SolapiMessageService(api_key="", api_secret="")
+test2 = Message(
+    from_="029302266",
+    to="01012345678",
+    text="test"
+)
+test.send(test2)

poetry.lock

@@ -6,7 +6,6 @@ authors = [
     { name = "SOLAPI Team", email = "contact@solapi.com" }
 ]
 classifiers = [
-    'Development Status :: 5 - Production/Stable',
     'Programming Language :: Python',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
@@ -27,17 +26,15 @@ classifiers = [
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
-    "requests (>=2.32.3,<3.0.0)",
     "httpx (>=0.28.1,<0.29.0)",
     "pydantic (>=2.10.6,<3.0.0)"
 ]
 
-[tool.poetry]
-packages = [{ include = "solapi", from = "src" }]
-
-[tool.poetry.group.dev.dependencies]
-ruff = "^0.9.10"
+[project.optional-dependencies]
+dev = [
+    "ruff>=0.11.0"
+]
 
 [build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"

pyproject.toml

@@ -20,6 +20,35 @@ ignore = []
 # 언더스코어로 시작하는 변수는 미사용 변수로 간주하지 않음
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".ipynb_checkpoints",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pyenv",
+    ".pytest_cache",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    ".vscode",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "site-packages",
+    "venv",
+]
+
 [format]
 # 문자열에 큰따옴표 사용
 quote-style = "double"

.ruff.toml ruff.toml.ruff.toml renamed to ruff.toml

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, TypedDict, TypeVar
+from typing import Any, Optional, TypedDict
 
 import httpx
 from httpx import Response
@@ -14,22 +14,17 @@ class RequestMethod(str, Enum):
     DELETE = "DELETE"
 
 
-class RequestType(TypedDict):
+class RequestParameterType(TypedDict):
     method: RequestMethod
     url: str
 
 
-T = TypeVar("T")
-R = TypeVar("R")
-
-
-async def default_fetcher(
+def default_fetcher(
     auth_parameter: AuthenticationParameter,
-    request: RequestType,
-    data: T | None = None,
-) -> R:
+    request: RequestParameterType,
+    data: Optional[Any] = None,
+):
     """
-
     Args:
         auth_parameter: API Key, Api Secret Key Dictionary. 반드시 활성화된 유효한 API Key, API Secret Key를 입력하셔야 합니다.
         request: HTTP Request를 위한 파라미터, 정확한 API URL, HTTP Method를 입력해주세요!
@@ -46,8 +41,8 @@ async def default_fetcher(
         "Content-Type": "application/json",
     }
 
-    async with httpx.AsyncClient() as client:
-        response: Response = await client.request(
+    with httpx.Client() as client:
+        response: Response = client.request(
             method=request["method"], url=request["url"], headers=headers, json=data
         )
 

solapi/lib/fetcher.py

@@ -60,7 +60,7 @@ def parse_iso(date_string: str) -> datetime:
         raise InvalidDateError("Invalid Date") from e
 
 
-def string_date_transfer(value: str | datetime) -> datetime:
+def string_date_transfer(value: str | datetime):
     """
     일반 문자열 날짜가 있을 경우 datetime 타입으로 변환해주는 함수
 
@@ -82,7 +82,7 @@ def string_date_transfer(value: str | datetime) -> datetime:
     return value
 
 
-def format_with_transfer(value: str | datetime) -> str:
+def format_with_transfer(value: str) -> str:
     """
     string_date_transfer와 format_iso를 한번에 실행하는 함수
 

solapi/lib/string_date_transfer.py

@@ -1,14 +1,13 @@
-from typing import Optional
+from typing import Optional, Union
 
 from solapi.lib.authenticator import AuthenticationParameter
 from solapi.lib.fetcher import RequestMethod, default_fetcher
 from solapi.lib.string_date_transfer import format_with_transfer
 from solapi.model.message import Message
-from solapi.requests.request_confiog import SendRequestConfig
-from solapi.requests.send.send_request import (
-    MultipleDetailMessageSendingRequest,
+from solapi.model.request.send_message_request import (
+    SendMessageRequest,
+    SendRequestConfig,
 )
-from solapi.responses.send.send_repsonse import DetailGroupMessageResponse
 
 
 class SolapiMessageService:
@@ -19,48 +18,31 @@ def __init__(self, api_key: str, api_secret: str):
             "api_secret": api_secret,
         }
 
-    # TODO: Request도 pydantic 모델로 진행
-    async def send(
+    def send(
         self,
-        messages: list[Message] | Message,
-        request_config: Optional[SendRequestConfig] = None,
+        messages: Union[list[Message], Message],
+        request_config: Optional[SendRequestConfig] = None
     ):
         payload = []
-        if isinstance(messages, list):
-            for value in messages:
-                payload.append(value)
-        else:
+        if isinstance(messages, Message):
             payload.append(messages)
-        pass
+        elif isinstance(messages, list):
+            payload.extend(messages)
 
         if len(payload) == 0:
-            raise Exception("데이터가 반드시 1건 이상 기입되어 있어야 합니다.")
+            raise ValueError("데이터가 반드시 1건 이상 기입되어 있어야 합니다.")
 
-        parameter: MultipleDetailMessageSendingRequest = {"messages": payload}
-        if request_config["appId"] is not None:
-            parameter.appId = request_config["appId"]
-        if request_config["showMessageList"] is not None:
-            parameter.showMessageList = request_config["showMessageList"]
-        if request_config["scheduledDate"] is not None:
-            parameter.scheduledDate = format_with_transfer(
-                request_config["scheduledDate"]
-            )
-
-        response = await default_fetcher(
-            self._auth_info,
-            {
-                "method": RequestMethod("POST"),
-                "url": f"${self.baseUrl}/messages/v4/send-many/detail",
-            },
-            parameter,
+        request = SendMessageRequest(
+            messages=payload,
+            app_id=request_config.app_id,
+            allow_duplicates=request_config.allow_duplicates,
+            show_message_list=request_config.show_message_list,
         )
-        validated_response = DetailGroupMessageResponse.model_validate(response)
-        count = validated_response.group_info.count
-        if (
-            len(validated_response.failed_message_list) > 0
-            and count.total == count.registeredFailed
-        ):
-            raise Exception("")
-
-        return validated_response
-
+        # TODO: 일어나면 여기부터 시작!
+        if request_config.scheduled_date != "":
+            request.scheduled_date = format_with_transfer(request_config.scheduled_date)
+
+        return default_fetcher(self._auth_info, request={
+            "method": RequestMethod.POST,
+            "url": f"{self.baseUrl}/messages/v4/send-many/detail"
+        }, data=request.model_dump())

solapi/message_service.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class FileIdsType(BaseModel):
+    file_ids: list[str]