Remove Generic to fix UP046 warning

Author: Eddasol

src/isar/models/events.py

@@ -1,7 +1,6 @@
 from collections import deque
 from queue import Empty, Full, Queue, ShutDown
 from threading import Lock
-from typing import Generic, TypeVar
 
 from isar.apis.models.models import (
     ControlMissionResponse,
@@ -17,11 +16,6 @@
 from robot_interface.models.mission.task import InspectionTask
 from robot_interface.telemetry.mqtt_client import MQTTQueueType
 
-T = TypeVar("T")
-T1 = TypeVar("T1")
-T2 = TypeVar("T2")
-
-
 InspectionQueueTuple = tuple[Inspection, Mission]
 
 
@@ -33,7 +27,7 @@ def __str__(self) -> str:
 AbortedMission = Mission
 
 
-class Event(Queue[T]):
+class Event[T](Queue[T]):
     def __init__(self, name: str) -> None:
         super().__init__(maxsize=1)
         self.name = name
@@ -105,7 +99,7 @@ def __init__(self) -> None:
         self.state: Event[States] = Event("state")
 
 
-class APIEvent(Generic[T1, T2]):
+class APIEvent[T1, T2]:
     """
     Creates request and response event. The events are defined such that the request is from
     api to state machine while the response is from state machine to api.

src/isar/state_machine/state.py

@@ -4,20 +4,18 @@
 from collections.abc import Callable
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Generic, TypeVar
+from typing import Any, TypeVar
 
 from isar.config.settings import settings
 from isar.models.events import EmptyMessage, Event, Events
 from isar.state_machine.states_enum import States
 
-T = TypeVar("T")
-
 T_state_co = TypeVar("T_state_co", bound="State", covariant=True)
 Transition = Callable[[Events], T_state_co]
 
 
 @dataclass
-class EventHandlerMapping(Generic[T]):
+class EventHandlerMapping[T]:
     name: str
     event: Event[T]
     handler: Callable[[T], Transition | None]

src/isar/storage/storage_interface.py

@@ -21,7 +21,7 @@ class LocalStoragePath(BaseModel):
 TPath = TypeVar("TPath", BlobStoragePath, LocalStoragePath)
 
 
-class StoragePaths(BaseModel, Generic[TPath]):
+class StoragePaths(BaseModel, Generic[TPath]):  # noqa: UP046
     data_path: TPath
     metadata_path: TPath