Hacky way of removing the need to type Literal for AutoLiteral

Author: fkglr

src/gallia/command/config.py

@@ -5,6 +5,7 @@
 import binascii
 import os
 import tomllib
+import typing
 from abc import ABC
 from collections.abc import Callable
 from enum import Enum
@@ -116,7 +117,6 @@ def _process_ranges(value: Any) -> Any:
 
 T = TypeVar("T")
 EnumType = TypeVar("EnumType", bound=Enum)
-LiteralType = TypeVar("LiteralType")
 
 
 def auto_enum(x: str, enum_type: type[EnumType]) -> EnumType:
@@ -137,7 +137,12 @@ def auto_enum(x: str, enum_type: type[EnumType]) -> EnumType:
 if TYPE_CHECKING:
     InitializeIdempotent: TypeAlias = Annotated[T, ""]
     EnumArg: TypeAlias = Annotated[EnumType, ""]
-    AutoLiteral: TypeAlias = Annotated[LiteralType, ""]
+
+    # For mypy to accept AutoLiteral as a direct alias to Literal, using TyeAliases seems to not work
+    # Exporting literal under a new name seems to be the only way this works
+    from typing import Literal as AutoLiteral
+
+    __all__ = ["AutoLiteral"]
 else:
 
     class _TrickType:
@@ -201,11 +206,14 @@ def try_auto_literal(value: Any):
 
         return Annotated[cls, BeforeValidator(try_auto_literal)]
 
-    AutoLiteral = _TrickType(auto_literal)
+    class AutoLiteral:
+        def __class_getitem__(cls, literals) -> type[T]:
+            return _TrickType(auto_literal)[typing.Literal[literals]]
+
     """
     Wrapper for Literal fields to provide automatic handling of enum, int and bytes parsing for values defined in Literals similar to EnumArg, AutoInt and HexBytes.
 
-    Usage: x: AutoLiteral[Literal[1, 2, 3]] = ...
+    Usage: x: AutoLiteral[1, 2, 3] = ...
     """
 
 

src/gallia/commands/fuzz/uds/pdu.py

@@ -5,7 +5,6 @@
 import asyncio
 import random
 import sys
-from typing import Literal
 
 assert sys.platform.startswith("linux"), "unsupported platform"
 
@@ -26,11 +25,11 @@
 
 class PDUFuzzerConfig(UDSScannerConfig):
     sessions: Ranges = Field([1], description="Set list of sessions to be tested; 0x01 if None")
-    service: AutoLiteral[
-        Literal[UDSIsoServices.WriteDataByIdentifier, UDSIsoServices.RoutineControl]
-    ] = Field(
-        UDSIsoServices.WriteDataByIdentifier,
-        description="Service ID to create payload for; defaults to 0x2e WriteDataByIdentifier;\ncurrently supported:\n0x2e WriteDataByIdentifier, 0x31 RoutineControl (startRoutine)\n",
+    service: AutoLiteral[UDSIsoServices.WriteDataByIdentifier, UDSIsoServices.RoutineControl] = (
+        Field(
+            UDSIsoServices.WriteDataByIdentifier,
+            description="Service ID to create payload for; defaults to 0x2e WriteDataByIdentifier;\ncurrently supported:\n0x2e WriteDataByIdentifier, 0x31 RoutineControl (startRoutine)\n",
+        )
     )
     max_length: AutoInt = Field(42, description="maximum length of the payload")
     min_length: AutoInt = Field(1, description="minimum length of the payload")

src/gallia/commands/scan/uds/memory.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import sys
-from typing import Literal
 
 from gallia.command import UDSScanner
 from gallia.command.config import AutoInt, AutoLiteral, Field, HexBytes
@@ -24,12 +23,10 @@ class MemoryFunctionsScannerConfig(UDSScannerConfig):
         const=1,
     )
     service: AutoLiteral[
-        Literal[
-            Services.ReadMemoryByAddress,
-            Services.WriteMemoryByAddress,
-            Services.RequestDownload,
-            Services.RequestUpload,
-        ]
+        Services.ReadMemoryByAddress,
+        Services.WriteMemoryByAddress,
+        Services.RequestDownload,
+        Services.RequestUpload,
     ] = Field(
         description="Choose between 0x23 ReadMemoryByAddress 0x3d WriteMemoryByAddress, 0x34 RequestDownload and 0x35 RequestUpload"
     )