Skip to content

Commit e4002d6

Browse files
mfiedorowiczmfiedorowicz
committed
fix: ingester - PEP 604
Signed-off-by: Michal Fiedorowicz <mfiedorowicz@netboxlabs.com>
1 parent 4cde87f commit e4002d6

File tree

1 file changed

+97
-99
lines changed

1 file changed

+97
-99
lines changed

‎netboxlabs/diode/sdk/ingester.py‎

Lines changed: 97 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
"""NetBox Labs, Diode - SDK - ingester protobuf message wrappers."""
44

55
from typing import Any
6-
from typing import Optional as _Optional
7-
from typing import Union as _Union
86

97
from google.protobuf import timestamp_pb2 as _timestamp_pb2
108

@@ -55,9 +53,9 @@ class Tag:
5553

5654
def __new__(
5755
cls,
58-
name: _Optional[str] = None,
59-
slug: _Optional[str] = None,
60-
color: _Optional[str] = None,
56+
name: str | None = None,
57+
slug: str | None = None,
58+
color: str | None = None,
6159
) -> TagPb:
6260
"""Create a new Tag protobuf message."""
6361
return TagPb(name=name, slug=slug, color=color)
@@ -68,10 +66,10 @@ class Manufacturer:
6866

6967
def __new__(
7068
cls,
71-
name: _Optional[str] = None,
72-
slug: _Optional[str] = None,
73-
description: _Optional[str] = None,
74-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
69+
name: str | None = None,
70+
slug: str | None = None,
71+
description: str | None = None,
72+
tags: list[str | Tag | TagPb] | None = None,
7573
) -> ManufacturerPb:
7674
"""Create a new Manufacturer protobuf message."""
7775
if isinstance(tags, list) and all(isinstance(t, str) for t in tags):
@@ -90,11 +88,11 @@ class Platform:
9088

9189
def __new__(
9290
cls,
93-
name: _Optional[str] = None,
94-
slug: _Optional[str] = None,
95-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
96-
description: _Optional[str] = None,
97-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
91+
name: str | None = None,
92+
slug: str | None = None,
93+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
94+
description: str | None = None,
95+
tags: list[str | Tag | TagPb] | None = None,
9896
) -> PlatformPb:
9997
"""Create a new Platform protobuf message."""
10098
manufacturer = convert_to_protobuf(
@@ -118,11 +116,11 @@ class Role:
118116

119117
def __new__(
120118
cls,
121-
name: _Optional[str] = None,
122-
slug: _Optional[str] = None,
123-
color: _Optional[str] = None,
124-
description: _Optional[str] = None,
125-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
119+
name: str | None = None,
120+
slug: str | None = None,
121+
color: str | None = None,
122+
description: str | None = None,
123+
tags: list[str | Tag | TagPb] | None = None,
126124
) -> RolePb:
127125
"""Create a new Role protobuf message."""
128126
if isinstance(tags, list) and all(isinstance(t, str) for t in tags):
@@ -142,13 +140,13 @@ class DeviceType:
142140

143141
def __new__(
144142
cls,
145-
model: _Optional[str] = None,
146-
slug: _Optional[str] = None,
147-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
148-
description: _Optional[str] = None,
149-
comments: _Optional[str] = None,
150-
part_number: _Optional[str] = None,
151-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
143+
model: str | None = None,
144+
slug: str | None = None,
145+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
146+
description: str | None = None,
147+
comments: str | None = None,
148+
part_number: str | None = None,
149+
tags: list[str | Tag | TagPb] | None = None,
152150
) -> DeviceTypePb:
153151
"""Create a new DeviceType protobuf message."""
154152
manufacturer = convert_to_protobuf(
@@ -174,21 +172,21 @@ class Device:
174172

175173
def __new__(
176174
cls,
177-
name: _Optional[str] = None,
178-
device_type: _Optional[_Union[str, DeviceType, DeviceTypePb]] = None,
179-
device_fqdn: _Optional[str] = None,
180-
role: _Optional[_Union[str, Role, RolePb]] = None,
181-
platform: _Optional[_Union[str, Platform, PlatformPb]] = None,
182-
serial: _Optional[str] = None,
183-
site: _Optional[_Union[str, SitePb]] = None,
184-
asset_tag: _Optional[str] = None,
185-
status: _Optional[str] = None,
186-
description: _Optional[str] = None,
187-
comments: _Optional[str] = None,
188-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
189-
primary_ip4: _Optional[_Union[str, IPAddressPb]] = None,
190-
primary_ip6: _Optional[_Union[str, IPAddressPb]] = None,
191-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
175+
name: str | None = None,
176+
device_type: str | DeviceType | DeviceTypePb | None = None,
177+
device_fqdn: str | None = None,
178+
role: str | Role | RolePb | None = None,
179+
platform: str | Platform | PlatformPb | None = None,
180+
serial: str | None = None,
181+
site: str | SitePb | None = None,
182+
asset_tag: str | None = None,
183+
status: str | None = None,
184+
description: str | None = None,
185+
comments: str | None = None,
186+
tags: list[str | Tag | TagPb] | None = None,
187+
primary_ip4: str | IPAddressPb | None = None,
188+
primary_ip6: str | IPAddressPb | None = None,
189+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
192190
) -> DevicePb:
193191
"""Create a new Device protobuf message."""
194192
manufacturer = convert_to_protobuf(
@@ -248,24 +246,24 @@ class Interface:
248246

249247
def __new__(
250248
cls,
251-
name: _Optional[str] = None,
252-
device: _Optional[_Union[str, Device, DevicePb]] = None,
253-
device_type: _Optional[_Union[str, DeviceType, DeviceTypePb]] = None,
254-
role: _Optional[_Union[str, Role, RolePb]] = None,
255-
platform: _Optional[_Union[str, Platform, PlatformPb]] = None,
256-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
257-
site: _Optional[_Union[str, SitePb]] = None,
258-
type: _Optional[str] = None,
259-
enabled: _Optional[bool] = None,
260-
mtu: _Optional[int] = None,
261-
mac_address: _Optional[str] = None,
262-
speed: _Optional[int] = None,
263-
wwn: _Optional[str] = None,
264-
mgmt_only: _Optional[bool] = None,
265-
description: _Optional[str] = None,
266-
mark_connected: _Optional[bool] = None,
267-
mode: _Optional[str] = None,
268-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
249+
name: str | None = None,
250+
device: str | Device | DevicePb | None = None,
251+
device_type: str | DeviceType | DeviceTypePb | None = None,
252+
role: str | Role | RolePb | None = None,
253+
platform: str | Platform | PlatformPb | None = None,
254+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
255+
site: str | SitePb | None = None,
256+
type: str | None = None,
257+
enabled: bool | None = None,
258+
mtu: int | None = None,
259+
mac_address: str | None = None,
260+
speed: int | None = None,
261+
wwn: str | None = None,
262+
mgmt_only: bool | None = None,
263+
description: str | None = None,
264+
mark_connected: bool | None = None,
265+
mode: str | None = None,
266+
tags: list[str | Tag | TagPb] | None = None,
269267
) -> InterfacePb:
270268
"""Create a new Interface protobuf message."""
271269
manufacturer = convert_to_protobuf(
@@ -333,20 +331,20 @@ class IPAddress:
333331

334332
def __new__(
335333
cls,
336-
address: _Optional[str] = None,
337-
interface: _Optional[_Union[str, Interface, InterfacePb]] = None,
338-
device: _Optional[_Union[str, Device, DevicePb]] = None,
339-
device_type: _Optional[_Union[str, DeviceType, DeviceTypePb]] = None,
340-
device_role: _Optional[_Union[str, Role, RolePb]] = None,
341-
platform: _Optional[_Union[str, Platform, PlatformPb]] = None,
342-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
343-
site: _Optional[_Union[str, SitePb]] = None,
344-
status: _Optional[str] = None,
345-
role: _Optional[str] = None,
346-
dns_name: _Optional[str] = None,
347-
description: _Optional[str] = None,
348-
comments: _Optional[str] = None,
349-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
334+
address: str | None = None,
335+
interface: str | Interface | InterfacePb | None = None,
336+
device: str | Device | DevicePb | None = None,
337+
device_type: str | DeviceType | DeviceTypePb | None = None,
338+
device_role: str | Role | RolePb | None = None,
339+
platform: str | Platform | PlatformPb | None = None,
340+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
341+
site: str | SitePb | None = None,
342+
status: str | None = None,
343+
role: str | None = None,
344+
dns_name: str | None = None,
345+
description: str | None = None,
346+
comments: str | None = None,
347+
tags: list[str | Tag | TagPb] | None = None,
350348
) -> IPAddressPb:
351349
"""Create a new IPAddress protobuf message."""
352350
manufacturer = convert_to_protobuf(
@@ -416,14 +414,14 @@ class Prefix:
416414

417415
def __new__(
418416
cls,
419-
prefix: _Optional[str] = None,
420-
site: _Optional[_Union[str, SitePb]] = None,
421-
status: _Optional[str] = None,
422-
is_pool: _Optional[bool] = None,
423-
mark_utilized: _Optional[bool] = None,
424-
description: _Optional[str] = None,
425-
comments: _Optional[str] = None,
426-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
417+
prefix: str | None = None,
418+
site: str | SitePb | None = None,
419+
status: str | None = None,
420+
is_pool: bool | None = None,
421+
mark_utilized: bool | None = None,
422+
description: str | None = None,
423+
comments: str | None = None,
424+
tags: list[str | Tag | TagPb] | None = None,
427425
) -> PrefixPb:
428426
"""Create a new Prefix protobuf message."""
429427
site = convert_to_protobuf(site, SitePb, name=site)
@@ -448,14 +446,14 @@ class Site:
448446

449447
def __new__(
450448
cls,
451-
name: _Optional[str] = None,
452-
slug: _Optional[str] = None,
453-
status: _Optional[str] = None,
454-
facility: _Optional[str] = None,
455-
time_zone: _Optional[str] = None,
456-
description: _Optional[str] = None,
457-
comments: _Optional[str] = None,
458-
tags: _Optional[list[_Union[str, Tag, TagPb]]] = None,
449+
name: str | None = None,
450+
slug: str | None = None,
451+
status: str | None = None,
452+
facility: str | None = None,
453+
time_zone: str | None = None,
454+
description: str | None = None,
455+
comments: str | None = None,
456+
tags: list[str | Tag | TagPb] | None = None,
459457
) -> SitePb:
460458
"""Create a new Site protobuf message."""
461459
if isinstance(tags, list) and all(isinstance(t, str) for t in tags):
@@ -478,16 +476,16 @@ class Entity:
478476

479477
def __new__(
480478
cls,
481-
site: _Optional[_Union[str, Site, SitePb]] = None,
482-
platform: _Optional[_Union[str, Platform, PlatformPb]] = None,
483-
manufacturer: _Optional[_Union[str, Manufacturer, ManufacturerPb]] = None,
484-
device: _Optional[_Union[str, Device, DevicePb]] = None,
485-
device_role: _Optional[_Union[str, Role, RolePb]] = None,
486-
device_type: _Optional[_Union[str, DeviceType, DeviceTypePb]] = None,
487-
interface: _Optional[_Union[str, Interface, InterfacePb]] = None,
488-
ip_address: _Optional[_Union[str, IPAddress, IPAddressPb]] = None,
489-
prefix: _Optional[_Union[str, Prefix, PrefixPb]] = None,
490-
timestamp: _Optional[_timestamp_pb2.Timestamp] = None,
479+
site: str | Site | SitePb | None = None,
480+
platform: str | Platform | PlatformPb | None = None,
481+
manufacturer: str | Manufacturer | ManufacturerPb | None = None,
482+
device: str | Device | DevicePb | None = None,
483+
device_role: str | Role | RolePb | None = None,
484+
device_type: str | DeviceType | DeviceTypePb | None = None,
485+
interface: str | Interface | InterfacePb | None = None,
486+
ip_address: str | IPAddress | IPAddressPb | None = None,
487+
prefix: str | Prefix | PrefixPb | None = None,
488+
timestamp: _timestamp_pb2.Timestamp | None = None,
491489
):
492490
"""Create a new Entity protobuf message."""
493491
site = convert_to_protobuf(site, SitePb, name=site)

0 commit comments

Comments
 (0)