fix typing and lint

Author: OlegZv

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/custom_types.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import Any, Callable, TypeVar
 
 import redis.asyncio.client
 import redis.asyncio.cluster
@@ -10,26 +10,25 @@
 
 from opentelemetry.trace import Span
 
-if TYPE_CHECKING:
-    RequestHook = Callable[
-        [Span, redis.connection.Connection, list[Any], dict[str, Any]], None
-    ]
-    ResponseHook = Callable[[Span, redis.connection.Connection, Any], None]
+RequestHook = Callable[
+    [Span, redis.connection.Connection, list[Any], dict[str, Any]], None
+]
+ResponseHook = Callable[[Span, redis.connection.Connection, Any], None]
 
-    AsyncPipelineInstance = TypeVar(
-        "AsyncPipelineInstance",
-        redis.asyncio.client.Pipeline,
-        redis.asyncio.cluster.ClusterPipeline,
-    )
-    AsyncRedisInstance = TypeVar(
-        "AsyncRedisInstance", redis.asyncio.Redis, redis.asyncio.RedisCluster
-    )
-    PipelineInstance = TypeVar(
-        "PipelineInstance",
-        redis.client.Pipeline,
-        redis.cluster.ClusterPipeline,
-    )
-    RedisInstance = TypeVar(
-        "RedisInstance", redis.client.Redis, redis.cluster.RedisCluster
-    )
-    R = TypeVar("R")
+AsyncPipelineInstance = TypeVar(
+    "AsyncPipelineInstance",
+    redis.asyncio.client.Pipeline,
+    redis.asyncio.cluster.ClusterPipeline,
+)
+AsyncRedisInstance = TypeVar(
+    "AsyncRedisInstance", redis.asyncio.Redis, redis.asyncio.RedisCluster
+)
+PipelineInstance = TypeVar(
+    "PipelineInstance",
+    redis.client.Pipeline,
+    redis.cluster.ClusterPipeline,
+)
+RedisInstance = TypeVar(
+    "RedisInstance", redis.client.Redis, redis.cluster.RedisCluster
+)
+R = TypeVar("R")

instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/util.py

@@ -20,19 +20,20 @@
 
 from typing import TYPE_CHECKING, Any
 
+from opentelemetry.semconv.trace import (
+    DbSystemValues,
+    NetTransportValues,
+    SpanAttributes,
+)
+from opentelemetry.trace import Span
+
 if TYPE_CHECKING:
     from opentelemetry.instrumentation.redis.custom_types import (
         AsyncPipelineInstance,
         AsyncRedisInstance,
         PipelineInstance,
         RedisInstance,
     )
-from opentelemetry.semconv.trace import (
-    DbSystemValues,
-    NetTransportValues,
-    SpanAttributes,
-)
-from opentelemetry.trace import Span
 
 _FIELD_TYPES = ["NUMERIC", "TEXT", "GEO", "TAG", "VECTOR"]