Fix errors on ruff check

nnsnodnb · nnsnodnb · commit 709b88314922 · 2025-02-01T18:39:19.000+09:00
diff --git a/kalyke/clients/__init__.py b/kalyke/clients/__init__.py
@@ -1,27 +1,27 @@
 import importlib
 import urllib.parse
 from pathlib import Path
-from typing import Any, Dict, Union
+from typing import Any, Union
 
 from httpx import AsyncClient, Response
 
 from ..exceptions import ApnsProviderException
 from ..models import ApnsConfig, Payload
 
 
-class __Client(object):
+class __Client:
     use_sandbox: bool
     auth_key_filepath: Union[str, Path]
 
     async def send_message(
         self,
         device_token: str,
-        payload: Union[Payload, Dict[str, Any]],
+        payload: Union[Payload, dict[str, Any]],
         apns_config: ApnsConfig,
     ) -> str:
         if isinstance(payload, Payload):
             data = payload.dict()
-        elif isinstance(payload, Dict):
+        elif isinstance(payload, dict):
             data = payload
         else:
             raise ValueError("Type of 'payload' must be specified by Payload or Dict[str, Any].")
@@ -48,10 +48,10 @@ def _init_client(self, apns_config: ApnsConfig) -> AsyncClient:
     def _make_url(self, device_token: str) -> str:
         return f"{self._base_url}/3/device/{urllib.parse.quote(device_token)}"
 
-    async def _send(self, client: AsyncClient, url: str, data: Dict[str, Any]) -> Response:
+    async def _send(self, client: AsyncClient, url: str, data: dict[str, Any]) -> Response:
         return await client.post(url=url, json=data)
 
-    def _handle_error(self, error_json: Dict[str, Any]) -> ApnsProviderException:
+    def _handle_error(self, error_json: dict[str, Any]) -> ApnsProviderException:
         reason = error_json.pop("reason")
         exceptions_module = importlib.import_module("kalyke.exceptions")
         exception_class = getattr(exceptions_module, reason)
diff --git a/kalyke/clients/apns.py b/kalyke/clients/apns.py
@@ -1,4 +1,4 @@
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
 from typing import Union
diff --git a/kalyke/clients/live_activity.py b/kalyke/clients/live_activity.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Any, Dict, Union
+from typing import Any, Union
 
 from httpx import AsyncClient
 
@@ -12,7 +12,7 @@ class LiveActivityClient(ApnsClient):
     async def send_message(
         self,
         device_token: str,
-        payload: Union[LiveActivityPayload, Dict[str, Any]],  # type: ignore[override]
+        payload: Union[LiveActivityPayload, dict[str, Any]],  # type: ignore[override]
         apns_config: LiveActivityApnsConfig,  # type: ignore[override]
     ) -> str:
         return await super().send_message(
diff --git a/kalyke/clients/voip.py b/kalyke/clients/voip.py
@@ -1,7 +1,7 @@
 import warnings
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Dict, Optional, Union
+from typing import Any, Optional, Union
 
 import httpx
 from httpx import AsyncClient
@@ -19,12 +19,12 @@ class VoIPClient(BaseClient):
 
     def __post_init__(self) -> None:
         if self.key_filepath is None and self.password is not None:
-            warnings.warn(UserWarning("password is ignored because key_filepath is None."))
+            warnings.warn(UserWarning("password is ignored because key_filepath is None."), stacklevel=2)
 
     async def send_message(
         self,
         device_token: str,
-        payload: Dict[str, Any],  # type: ignore[override]
+        payload: dict[str, Any],  # type: ignore[override]
         apns_config: VoIPApnsConfig,  # type: ignore[override]
     ) -> str:
         return await super().send_message(
diff --git a/kalyke/exceptions.py b/kalyke/exceptions.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 
 class VolumeOutOfRangeException(Exception):
@@ -33,7 +33,7 @@ def __str__(self) -> str:
 
 # https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/handling_notification_responses_from_apns#3394535
 class ApnsProviderException(Exception):
-    def __init__(self, error: Dict[str, Any]) -> None:
+    def __init__(self, error: dict[str, Any]) -> None:
         self.error = error
 
     def __str__(self) -> str:
diff --git a/kalyke/models/apns_config.py b/kalyke/models/apns_config.py
@@ -1,7 +1,7 @@
 import time
 import uuid
 from dataclasses import dataclass, field
-from typing import Dict, Optional
+from typing import Optional
 
 import httpx
 
@@ -22,11 +22,11 @@ def __post_init__(self):
         if self.identifier:
             try:
                 _ = uuid.UUID(hex=self.identifier, version=4)
-            except ValueError:
-                raise ValueError(f"{self.identifier} is invalid format.")
+            except ValueError as e:
+                raise ValueError(f"{self.identifier} is invalid format.") from e
 
-    def make_headers(self) -> Dict[str, str]:
-        headers: Dict[str, Optional[str]] = {
+    def make_headers(self) -> dict[str, str]:
+        headers: dict[str, Optional[str]] = {
             "apns-push-type": self.push_type.value,
             "apns-id": self.identifier,
             "apns-expiration": str(self.expiration),
@@ -35,7 +35,7 @@ def make_headers(self) -> Dict[str, str]:
             "apns-collapse-id": self.collapse_id,
             "user-agent": f"python-httpx/{httpx.__version__} {self.topic}",
         }
-        attached_headers: Dict[str, str] = {k: v for k, v in headers.items() if v is not None}
+        attached_headers: dict[str, str] = {k: v for k, v in headers.items() if v is not None}
         return attached_headers
 
 
diff --git a/kalyke/models/critical_sound.py b/kalyke/models/critical_sound.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, Optional, Union
+from typing import Optional, Union
 
 from ..exceptions import VolumeOutOfRangeException
 
@@ -16,8 +16,8 @@ def __post_init__(self):
         else:
             raise VolumeOutOfRangeException(volume=self.volume)
 
-    def dict(self) -> Dict[str, Union[int, str, float]]:
-        sound: Dict[str, Union[int, str, float]] = {
+    def dict(self) -> dict[str, Union[int, str, float]]:
+        sound: dict[str, Union[int, str, float]] = {
             "critical": int(self.critical),
             "volume": self.volume,
         }
diff --git a/kalyke/models/payload.py b/kalyke/models/payload.py
@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Any, Dict, Optional, Union
+from typing import Any, Optional, Union
 
 from ..exceptions import (
     LiveActivityAttributesIsNotJSONSerializable,
@@ -27,7 +27,7 @@ class Payload:
     interruption_level: Optional[InterruptionLevel] = field(default=None)
     relevance_score: Optional[float] = field(default=None)
     filter_criteria: Optional[str] = field(default=None)
-    custom: Optional[Dict[str, Any]] = field(default=None)
+    custom: Optional[dict[str, Any]] = field(default=None)
 
     def __post_init__(self):
         if self.relevance_score:
@@ -39,8 +39,8 @@ def _validate_relevance_score(self):
         else:
             raise RelevanceScoreOutOfRangeException(relevance_score=self.relevance_score)
 
-    def dict(self) -> Dict[str, Any]:
-        aps: Dict[str, Any] = {
+    def dict(self) -> dict[str, Any]:
+        aps: dict[str, Any] = {
             "alert": self.alert.dict() if isinstance(self.alert, PayloadAlert) else self.alert,
             "badge": self.badge,
             "sound": self.sound,
@@ -70,19 +70,19 @@ def dict(self) -> Dict[str, Any]:
 class LiveActivityPayload(Payload):
     timestamp: datetime = field(default_factory=datetime.now)
     event: LiveActivityEvent = field(default=LiveActivityEvent.UPDATE)
-    content_state: Dict[str, Any] = field(default_factory=dict)
+    content_state: dict[str, Any] = field(default_factory=dict)
     stale_date: Optional[datetime] = field(default=None)
     dismissal_date: Optional[datetime] = field(default=None)
     attributes_type: Optional[str] = field(default=None)
-    attributes: Optional[Dict[str, Any]] = field(default=None)
+    attributes: Optional[dict[str, Any]] = field(default=None)
 
     def __post_init__(self):
         if self.event == LiveActivityEvent.START:
             self._validate_event_is_start()
         try:
             _ = json.dumps(self.content_state)
-        except TypeError:
-            raise LiveActivityContentStateIsNotJSONSerializable()
+        except TypeError as e:
+            raise LiveActivityContentStateIsNotJSONSerializable() from e
         super().__post_init__()
 
     def _validate_relevance_score(self):
@@ -96,12 +96,12 @@ def _validate_event_is_start(self):
             )
         try:
             _ = json.dumps(self.attributes)
-        except TypeError:
-            raise LiveActivityAttributesIsNotJSONSerializable()
+        except TypeError as e:
+            raise LiveActivityAttributesIsNotJSONSerializable() from e
 
-    def dict(self) -> Dict[str, Any]:
+    def dict(self) -> dict[str, Any]:
         payload = super().dict()
-        additional: Dict[str, Optional[Any]] = {
+        additional: dict[str, Optional[Any]] = {
             "timestamp": int(self.timestamp.timestamp()),
             "event": self.event.value,
             "content-state": self.content_state,
diff --git a/kalyke/models/payload_alert.py b/kalyke/models/payload_alert.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Union
+from typing import Optional, Union
 
 
 @dataclass(frozen=True)
@@ -9,14 +9,14 @@ class PayloadAlert:
     body: Optional[str] = field(default=None)
     launch_image: Optional[str] = field(default=None)
     title_loc_key: Optional[str] = field(default=None)
-    title_loc_args: Optional[List[str]] = field(default=None)
+    title_loc_args: Optional[list[str]] = field(default=None)
     subtitle_loc_key: Optional[str] = field(default=None)
-    subtitle_loc_args: Optional[List[str]] = field(default=None)
+    subtitle_loc_args: Optional[list[str]] = field(default=None)
     loc_key: Optional[str] = field(default=None)
-    loc_args: Optional[List[str]] = field(default=None)
+    loc_args: Optional[list[str]] = field(default=None)
 
-    def dict(self) -> Dict[str, Union[str, List[str]]]:
-        alert: Dict[str, Optional[Union[str, List[str]]]] = {
+    def dict(self) -> dict[str, Union[str, list[str]]]:
+        alert: dict[str, Optional[Union[str, list[str]]]] = {
             "title": self.title,
             "subtitle": self.subtitle,
             "body": self.body,
@@ -28,5 +28,5 @@ def dict(self) -> Dict[str, Union[str, List[str]]]:
             "loc-key": self.loc_key,
             "loc-args": self.loc_args,
         }
-        attached_alert: Dict[str, Union[str, List[str]]] = {k: v for k, v in alert.items() if v is not None}
+        attached_alert: dict[str, Union[str, list[str]]] = {k: v for k, v in alert.items() if v is not None}
         return attached_alert
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from dataclasses import dataclass, field`
	`1`	`+from dataclasses import dataclass`
`2`	`2`	`from datetime import datetime`
`3`	`3`	`from pathlib import Path`
`4`	`4`	`from typing import Union`