Skip to content

Commit ed1ae49

Browse files
sirkirbysirkirby
committed
Refactor type hints to use built-in list and dict types for consistency based on review suggestions
1 parent 52343d4 commit ed1ae49

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎custom_components/unifi_network_rules/models/network_object.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from __future__ import annotations
66

77
from dataclasses import dataclass
8-
from typing import Any, Dict, List, Literal, Optional, TypedDict
8+
from typing import Any, Literal, Optional, TypedDict
99

1010
from aiounifi.models.api import ApiItem
1111

@@ -31,7 +31,7 @@ class TypedNetworkObject(TypedDict, total=False):
3131
"ipv6-address-group",
3232
"port-group",
3333
]
34-
members: List[TypedObjectMember]
34+
members: list[TypedObjectMember]
3535
site_id: str
3636

3737

@@ -54,10 +54,10 @@ def type(self) -> str:
5454
return self.raw.get("type", "")
5555

5656
@property
57-
def members(self) -> List[TypedObjectMember]:
57+
def members(self) -> list[TypedObjectMember]:
5858
return self.raw.get("members", [])
5959

60-
def to_dict(self) -> Dict[str, Any]:
60+
def to_dict(self) -> dict[str, Any]:
6161
return dict(self.raw)
6262

6363

‎custom_components/unifi_network_rules/udm/objects.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import Any, Dict, List, Optional
5+
from typing import Any, Optional
66

77
from ..const import (
88
LOGGER,
@@ -13,12 +13,12 @@
1313

1414

1515
class ObjectsMixin:
16-
async def get_objects(self) -> List[NetworkObject]:
16+
async def get_objects(self) -> list[NetworkObject]:
1717
"""List firewall groups as network objects (primary path)."""
1818
try:
1919
req = self.create_api_request("GET", API_PATH_FIREWALL_GROUPS)
2020
data = await self.controller.request(req)
21-
items: List[NetworkObject] = []
21+
items: list[NetworkObject] = []
2222
if isinstance(data, dict) and "data" in data:
2323
for grp in data["data"]:
2424
grp_type = grp.get("group_type", "address-group")
@@ -48,7 +48,7 @@ async def get_objects(self) -> List[NetworkObject]:
4848
LOGGER.error("Failed to get firewall groups: %s", err)
4949
return []
5050

51-
async def add_object(self, payload: Dict[str, Any]) -> Optional[NetworkObject]:
51+
async def add_object(self, payload: dict[str, Any]) -> Optional[NetworkObject]:
5252
"""Create a firewall group from a network object payload."""
5353
try:
5454
obj_type = payload.get("type", "address-group")
@@ -86,7 +86,7 @@ async def add_object(self, payload: Dict[str, Any]) -> Optional[NetworkObject]:
8686
LOGGER.error("Failed to add firewall group: %s", err)
8787
return None
8888

89-
async def update_object(self, obj: NetworkObject | Dict[str, Any]) -> bool:
89+
async def update_object(self, obj: NetworkObject | dict[str, Any]) -> bool:
9090
"""Update a firewall group from a network object payload."""
9191
try:
9292
payload = obj.to_dict() if isinstance(obj, NetworkObject) else obj

‎custom_components/unifi_network_rules/udm/profiles.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import Any, Dict, List, Optional
5+
from typing import Any, Optional
66

77
from ..const import (
88
LOGGER,
@@ -18,7 +18,7 @@
1818

1919

2020
class PortProfilesMixin:
21-
async def get_port_profiles(self) -> List[Dict[str, Any]]:
21+
async def get_port_profiles(self) -> list[dict[str, Any]]:
2222
try:
2323
request = self.create_api_request("GET", API_PATH_PORT_PROFILES)
2424
data = await self.controller.request(request)
@@ -27,7 +27,7 @@ async def get_port_profiles(self) -> List[Dict[str, Any]]:
2727
LOGGER.error("Failed to get port profiles: %s", str(err))
2828
return []
2929

30-
async def add_port_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
30+
async def add_port_profile(self, payload: dict[str, Any]) -> Optional[dict[str, Any]]:
3131
try:
3232
request = self.create_api_request("POST", API_PATH_PORT_PROFILES, data=payload)
3333
data = await self.controller.request(request)
@@ -36,7 +36,7 @@ async def add_port_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str,
3636
LOGGER.error("Failed to add port profile: %s", str(err))
3737
return None
3838

39-
async def update_port_profile(self, payload: Dict[str, Any]) -> bool:
39+
async def update_port_profile(self, payload: dict[str, Any]) -> bool:
4040
try:
4141
profile_id = payload.get("_id") or payload.get("id")
4242
path = API_PATH_PORT_PROFILE_DETAIL.format(profile_id=profile_id)
@@ -59,7 +59,7 @@ async def remove_port_profile(self, profile_id: str) -> bool:
5959

6060

6161
class WlanRateProfilesMixin:
62-
async def get_wlan_rate_profiles(self) -> List[Dict[str, Any]]:
62+
async def get_wlan_rate_profiles(self) -> list[dict[str, Any]]:
6363
try:
6464
request = self.create_api_request("GET", API_PATH_WLAN_RATE_PROFILES, is_v2=True)
6565
data = await self.controller.request(request)
@@ -68,7 +68,7 @@ async def get_wlan_rate_profiles(self) -> List[Dict[str, Any]]:
6868
LOGGER.error("Failed to get WLAN rate profiles: %s", str(err))
6969
return []
7070

71-
async def add_wlan_rate_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
71+
async def add_wlan_rate_profile(self, payload: dict[str, Any]) -> Optional[dict[str, Any]]:
7272
try:
7373
request = self.create_api_request("POST", API_PATH_WLAN_RATE_PROFILES, data=payload, is_v2=True)
7474
data = await self.controller.request(request)
@@ -77,7 +77,7 @@ async def add_wlan_rate_profile(self, payload: Dict[str, Any]) -> Optional[Dict[
7777
LOGGER.error("Failed to add WLAN rate profile: %s", str(err))
7878
return None
7979

80-
async def update_wlan_rate_profile(self, payload: Dict[str, Any]) -> bool:
80+
async def update_wlan_rate_profile(self, payload: dict[str, Any]) -> bool:
8181
try:
8282
profile_id = payload.get("_id") or payload.get("id")
8383
path = API_PATH_WLAN_RATE_PROFILE_DETAIL.format(profile_id=profile_id)
@@ -100,7 +100,7 @@ async def remove_wlan_rate_profile(self, profile_id: str) -> bool:
100100

101101

102102
class RadiusProfilesMixin:
103-
async def get_radius_profiles(self) -> List[Dict[str, Any]]:
103+
async def get_radius_profiles(self) -> list[dict[str, Any]]:
104104
try:
105105
request = self.create_api_request("GET", API_PATH_RADIUS_PROFILES)
106106
data = await self.controller.request(request)
@@ -109,7 +109,7 @@ async def get_radius_profiles(self) -> List[Dict[str, Any]]:
109109
LOGGER.error("Failed to get RADIUS profiles: %s", str(err))
110110
return []
111111

112-
async def add_radius_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
112+
async def add_radius_profile(self, payload: dict[str, Any]) -> Optional[dict[str, Any]]:
113113
try:
114114
request = self.create_api_request("POST", API_PATH_RADIUS_PROFILES, data=payload)
115115
data = await self.controller.request(request)
@@ -118,7 +118,7 @@ async def add_radius_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str
118118
LOGGER.error("Failed to add RADIUS profile: %s", str(err))
119119
return None
120120

121-
async def update_radius_profile(self, payload: Dict[str, Any]) -> bool:
121+
async def update_radius_profile(self, payload: dict[str, Any]) -> bool:
122122
try:
123123
profile_id = payload.get("_id") or payload.get("id")
124124
path = API_PATH_RADIUS_PROFILE_DETAIL.format(profile_id=profile_id)
@@ -141,7 +141,7 @@ async def remove_radius_profile(self, profile_id: str) -> bool:
141141

142142

143143
class WanSlaProfilesMixin:
144-
async def get_wan_sla_profiles(self) -> List[Dict[str, Any]]:
144+
async def get_wan_sla_profiles(self) -> list[dict[str, Any]]:
145145
try:
146146
request = self.create_api_request("GET", API_PATH_WAN_SLA_PROFILES, is_v2=True)
147147
data = await self.controller.request(request)
@@ -150,7 +150,7 @@ async def get_wan_sla_profiles(self) -> List[Dict[str, Any]]:
150150
LOGGER.error("Failed to get WAN SLA profiles: %s", str(err))
151151
return []
152152

153-
async def add_wan_sla_profile(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
153+
async def add_wan_sla_profile(self, payload: dict[str, Any]) -> Optional[dict[str, Any]]:
154154
try:
155155
request = self.create_api_request("POST", API_PATH_WAN_SLA_PROFILES, data=payload, is_v2=True)
156156
data = await self.controller.request(request)
@@ -159,7 +159,7 @@ async def add_wan_sla_profile(self, payload: Dict[str, Any]) -> Optional[Dict[st
159159
LOGGER.error("Failed to add WAN SLA profile: %s", str(err))
160160
return None
161161

162-
async def update_wan_sla_profile(self, payload: Dict[str, Any]) -> bool:
162+
async def update_wan_sla_profile(self, payload: dict[str, Any]) -> bool:
163163
try:
164164
profile_id = payload.get("_id") or payload.get("id")
165165
path = API_PATH_WAN_SLA_PROFILE_DETAIL.format(profile_id=profile_id)

0 commit comments

Comments
 (0)