♻️ Declare types in file instead of importing from types.py

realtime/connection.py

@@ -1,21 +1,29 @@
+import sys
 import asyncio
 import json
 import logging
 from collections import defaultdict
 from functools import wraps
-from typing import Any, Callable, List, Dict, cast
+from typing import Any, Callable, List, Dict, cast, TypeVar
+
+if sys.version_info > (3, 9):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
 
 import websockets
 
 from realtime.channel import Channel
 from realtime.exceptions import NotConnectedError
 from realtime.message import HEARTBEAT_PAYLOAD, PHOENIX_CHANNEL, ChannelEvents, Message
-from realtime.types import T_ParamSpec, T_Retval
+
+
+T_Retval = TypeVar("T_Retval")
+T_ParamSpec = ParamSpec("T_ParamSpec")
 
 logging.basicConfig(
     format="%(asctime)s:%(levelname)s - %(message)s", level=logging.INFO)
 
-
 def ensure_connection(func: Callable[T_ParamSpec, T_Retval]):
     @wraps(func)
     def wrapper(*args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs) -> T_Retval:

realtime/types.py

@@ -7,10 +7,8 @@
     from typing_extensions import ParamSpec
 
 
-# Generic types
-T = TypeVar("T")
-T_Retval = TypeVar("T_Retval")
 T_ParamSpec = ParamSpec("T_ParamSpec")
+T_Retval = TypeVar("T_Retval")
 
 # Custom types
 Callback = Callable[T_ParamSpec, T_Retval]