Faster enum impl

  - If a value is failed to be found, will just return the inputed value. This way, if Discord adds new fields, it wont break.

Co-authored-by: nekokatt <nekoka.tt@outlook.com>

hikari/api/rest.py

@@ -308,7 +308,7 @@ async def edit_permission_overwrites(
         channel: snowflakes.SnowflakeishOr[channels.GuildChannel],
         target: snowflakes.Snowflakeish,
         *,
-        target_type: typing.Union[channels.PermissionOverwriteType, str],
+        target_type: channels.PermissionOverwriteType,
         allow: undefined.UndefinedOr[permissions_.Permissions] = undefined.UNDEFINED,
         deny: undefined.UndefinedOr[permissions_.Permissions] = undefined.UNDEFINED,
         reason: undefined.UndefinedOr[str] = undefined.UNDEFINED,
@@ -323,7 +323,7 @@ async def edit_permission_overwrites(
             snowflakes.Snowflakeish, users.PartialUser, guilds.PartialRole, channels.PermissionOverwrite
         ],
         *,
-        target_type: undefined.UndefinedOr[typing.Union[channels.PermissionOverwriteType, str]] = undefined.UNDEFINED,
+        target_type: undefined.UndefinedOr[channels.PermissionOverwriteType] = undefined.UNDEFINED,
         allow: undefined.UndefinedOr[permissions_.Permissions] = undefined.UNDEFINED,
         deny: undefined.UndefinedOr[permissions_.Permissions] = undefined.UNDEFINED,
         reason: undefined.UndefinedOr[str] = undefined.UNDEFINED,
@@ -338,7 +338,7 @@ async def edit_permission_overwrites(
         target : typing.Union[hikari.users.PartialUser, hikari.guilds.PartialRole, hikari.channels.PermissionOverwrite, hikari.snowflakes.Snowflakeish]
             The channel overwrite to edit. This may be the object or the ID of an
             existing overwrite.
-        target_type : hikari.undefined.UndefinedOr[typing.Union[hikari.channels.PermissionOverwriteType, builtins.str]]
+        target_type : hikari.undefined.UndefinedOr[hikari.channels.PermissionOverwriteType]
             If provided, the type of the target to update. If unset, will attempt to get
             the type from `target`.
         allow : hikari.undefined.UndefinedOr[hikari.permissions.Permissions]
@@ -481,7 +481,7 @@ async def create_invite(
         target_user : hikari.undefined.UndefinedOr[hikari.snowflakes.SnowflakeishOr[hikari.users.PartialUser]]
             If provided, the target user id for this invite. This may be the
             object or the ID of an existing user.
-        target_user_type : hikari.undefined.UndefinedOr[typing.Union[hikari.invites.TargetUserType, builtins.int]]
+        target_user_type : hikari.undefined.UndefinedOr[hikari.invites.TargetUserType]
             If provided, the type of target user for this invite.
         reason : hikari.undefined.UndefinedOr[builtins.str]
             If provided, the reason that will be recorded in the audit logs.

hikari/api/shard.py

@@ -25,10 +25,10 @@
 __all__: typing.List[str] = ["GatewayDataFormat", "GatewayCompression", "GatewayShard"]
 
 import abc
-import enum
 import typing
 
 from hikari import undefined
+from hikari.utilities import enums
 
 if typing.TYPE_CHECKING:
     import datetime
@@ -41,9 +41,8 @@
     from hikari import users as users_
 
 
-@enum.unique
 @typing.final
-class GatewayDataFormat(str, enum.Enum):
+class GatewayDataFormat(str, enums.Enum):
     """Format of inbound gateway payloads."""
 
     JSON = "json"
@@ -52,9 +51,8 @@ class GatewayDataFormat(str, enum.Enum):
     """Erlang transmission format."""
 
 
-@enum.unique
 @typing.final
-class GatewayCompression(str, enum.Enum):
+class GatewayCompression(str, enums.Enum):
     """Types of gateway compression that may be supported."""
 
     TRANSPORT_ZLIB_STREAM = "transport_zlib_stream"

hikari/api/special_endpoints.py

@@ -179,7 +179,9 @@ class GuildBuilder(abc.ABC):
     If not overridden, the guild will use the default voice region for Discord.
     """
 
-    verification_level: undefined.UndefinedOr[guilds.GuildVerificationLevel] = attr.ib(default=undefined.UNDEFINED)
+    verification_level: undefined.UndefinedOr[typing.Union[guilds.GuildVerificationLevel, int]] = attr.ib(
+        default=undefined.UNDEFINED
+    )
     """Verification level required to join the guild that can be overwritten.
 
     If not overridden, the guild will use the default verification level for

hikari/applications.py

@@ -34,7 +34,6 @@
     "TeamMembershipState",
 ]
 
-import enum
 import typing
 
 import attr
@@ -44,6 +43,7 @@
 from hikari import snowflakes
 from hikari import urls
 from hikari.utilities import attr_extensions
+from hikari.utilities import enums
 from hikari.utilities import routes
 
 if typing.TYPE_CHECKING:
@@ -52,9 +52,8 @@
     from hikari import users
 
 
-@enum.unique
 @typing.final
-class OAuth2Scope(str, enum.Enum):
+class OAuth2Scope(str, enums.Enum):
     """OAuth2 Scopes that Discord allows.
 
     These are categories of permissions for applications using the OAuth2 API
@@ -184,9 +183,8 @@ def __str__(self) -> str:
         return self.name
 
 
-@enum.unique
 @typing.final
-class ConnectionVisibility(enum.IntEnum):
+class ConnectionVisibility(int, enums.Enum):
     """Describes who can see a connection with a third party account."""
 
     NONE = 0
@@ -235,7 +233,7 @@ class OwnConnection:
     is_activity_visible: bool = attr.ib(eq=False, hash=False, repr=False)
     """`builtins.True` if this connection's activities are shown in the user's presence."""
 
-    visibility: ConnectionVisibility = attr.ib(eq=False, hash=False, repr=True)
+    visibility: typing.Union[ConnectionVisibility, int] = attr.ib(eq=False, hash=False, repr=True)
     """The visibility of the connection."""
 
 
@@ -250,8 +248,8 @@ class OwnGuild(guilds.PartialGuild):
     """The guild-level permissions that apply to the current user or bot."""
 
 
-@enum.unique
-class TeamMembershipState(enum.IntEnum):
+@typing.final
+class TeamMembershipState(int, enums.Enum):
     """Represents the state of a user's team membership."""
 
     INVITED = 1
@@ -272,7 +270,7 @@ class TeamMember:
     app: traits.RESTAware = attr.ib(repr=False, metadata={attr_extensions.SKIP_DEEP_COPY: True})
     """The client application that models may use for procedures."""
 
-    membership_state: TeamMembershipState = attr.ib(repr=False)
+    membership_state: typing.Union[TeamMembershipState, int] = attr.ib(repr=False)
     """The state of this user's membership."""
 
     permissions: typing.Sequence[str] = attr.ib(repr=False)

hikari/audit_logs.py

@@ -42,13 +42,13 @@
 
 import abc
 import datetime
-import enum
 import typing
 
 import attr
 
 from hikari import snowflakes
 from hikari.utilities import attr_extensions
+from hikari.utilities import enums
 from hikari.utilities import mapping
 
 if typing.TYPE_CHECKING:
@@ -60,7 +60,7 @@
 
 
 @typing.final
-class AuditLogChangeKey(str, enum.Enum):
+class AuditLogChangeKey(str, enums.Enum):
     """Commonly known and documented keys for audit log change objects.
 
     Others may exist. These should be expected to default to the raw string
@@ -142,9 +142,8 @@ class AuditLogChange:
     """The name of the audit log change's key."""
 
 
-@enum.unique
 @typing.final
-class AuditLogEventType(enum.IntEnum):
+class AuditLogEventType(int, enums.Enum):
     """The type of event that occurred."""
 
     GUILD_UPDATE = 1
@@ -204,7 +203,7 @@ class ChannelOverwriteEntryInfo(BaseAuditLogEntryInfo, snowflakes.Unique):
     id: snowflakes.Snowflake = attr.ib(eq=True, hash=True, repr=True)
     """The ID of this entity."""
 
-    type: channels.PermissionOverwriteType = attr.ib(repr=True)
+    type: typing.Union[channels.PermissionOverwriteType, str] = attr.ib(repr=True)
     """The type of entity this overwrite targets."""
 
     role_name: typing.Optional[str] = attr.ib(repr=True)

hikari/channels.py

@@ -42,7 +42,6 @@
 ]
 
 import abc
-import enum
 import typing
 
 import attr
@@ -54,6 +53,7 @@
 from hikari import urls
 from hikari import users
 from hikari.utilities import attr_extensions
+from hikari.utilities import enums
 from hikari.utilities import routes
 
 if typing.TYPE_CHECKING:
@@ -67,9 +67,8 @@
     from hikari import webhooks
 
 
-@enum.unique
 @typing.final
-class ChannelType(enum.IntEnum):
+class ChannelType(int, enums.Enum):
     """The known channel types that are exposed to us by the API."""
 
     GUILD_TEXT = 0
@@ -201,9 +200,8 @@ def channel(self) -> typing.Union[GuildNewsChannel, GuildTextChannel]:
         return channel
 
 
-@enum.unique
 @typing.final
-class PermissionOverwriteType(str, enum.Enum):
+class PermissionOverwriteType(str, enums.Enum):
     """The type of entity a Permission Overwrite targets."""
 
     ROLE = "role"
@@ -252,7 +250,9 @@ class PermissionOverwrite(snowflakes.Unique):
     )
     """The ID of this entity."""
 
-    type: PermissionOverwriteType = attr.ib(converter=PermissionOverwriteType, eq=True, hash=True, repr=True)
+    type: typing.Union[PermissionOverwriteType, str] = attr.ib(
+        converter=PermissionOverwriteType, eq=True, hash=True, repr=True
+    )
     """The type of entity this overwrite targets."""
 
     # Flags are lazily loaded, due to the IntFlag mechanism being overly slow
@@ -306,7 +306,7 @@ class PartialChannel(snowflakes.Unique):
     name: typing.Optional[str] = attr.ib(eq=False, hash=False, repr=True)
     """The channel's name. This will be missing for DM channels."""
 
-    type: ChannelType = attr.ib(eq=False, hash=False, repr=True)
+    type: typing.Union[ChannelType, int] = attr.ib(eq=False, hash=False, repr=True)
     """The channel's type."""
 
     def __str__(self) -> str:

hikari/errors.py

@@ -47,13 +47,13 @@
     "VoiceError",
 ]
 
-import enum
 import http
 import typing
 
 import attr
 
 from hikari.utilities import attr_extensions
+from hikari.utilities import enums
 
 if typing.TYPE_CHECKING:
     from hikari import intents as intents_
@@ -109,9 +109,8 @@ def __str__(self) -> str:
         return self.reason
 
 
-@enum.unique
 @typing.final
-class ShardCloseCode(enum.IntEnum):
+class ShardCloseCode(int, enums.Enum):
     """Reasons for a shard connection closure."""
 
     NORMAL_CLOSURE = 1000