Skip to content

Commit 33cf7c5

Browse files
committed
Use default required mods unless needing introspection
1 parent b33c543 commit 33cf7c5

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

redisvl/index/index.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import asyncio
22
import json
3-
import logging
43
import threading
54
import warnings
65
import weakref
7-
from functools import wraps
8-
from os import replace
9-
from re import S
106
from typing import (
117
TYPE_CHECKING,
128
Any,
@@ -47,6 +43,12 @@
4743
logger = get_logger(__name__)
4844

4945

46+
REQUIRED_MODULES_FOR_INTROSPECTION = [
47+
{"name": "search", "ver": 20810},
48+
{"name": "searchlight", "ver": 20810},
49+
]
50+
51+
5052
def process_results(
5153
results: "Result", query: BaseQuery, storage_type: StorageType
5254
) -> List[Dict[str, Any]]:
@@ -242,11 +244,6 @@ class SearchIndex(BaseSearchIndex):
242244
243245
"""
244246

245-
required_modules = [
246-
{"name": "search", "ver": 20810},
247-
{"name": "searchlight", "ver": 20810},
248-
]
249-
250247
@deprecated_argument("connection_args", "Use connection_kwargs instead.")
251248
def __init__(
252249
self,
@@ -324,12 +321,12 @@ def from_existing(
324321
if redis_url:
325322
redis_client = RedisConnectionFactory.get_redis_connection(
326323
redis_url=redis_url,
327-
required_modules=cls.required_modules,
324+
required_modules=REQUIRED_MODULES_FOR_INTROSPECTION,
328325
**kwargs,
329326
)
330327
elif redis_client:
331328
RedisConnectionFactory.validate_sync_redis(
332-
redis_client, required_modules=cls.required_modules
329+
redis_client, required_modules=REQUIRED_MODULES_FOR_INTROSPECTION
333330
)
334331
except RedisModuleVersionError as e:
335332
raise RedisModuleVersionError(
@@ -829,11 +826,6 @@ class AsyncSearchIndex(BaseSearchIndex):
829826
830827
"""
831828

832-
required_modules = [
833-
{"name": "search", "ver": 20810},
834-
{"name": "searchlight", "ver": 20810},
835-
]
836-
837829
@deprecated_argument("redis_kwargs", "Use connection_kwargs instead.")
838830
def __init__(
839831
self,
@@ -902,11 +894,13 @@ async def from_existing(
902894
try:
903895
if redis_url:
904896
redis_client = await RedisConnectionFactory._get_aredis_connection(
905-
url=redis_url, required_modules=cls.required_modules, **kwargs
897+
url=redis_url,
898+
required_modules=REQUIRED_MODULES_FOR_INTROSPECTION,
899+
**kwargs,
906900
)
907901
elif redis_client:
908902
await RedisConnectionFactory.validate_async_redis(
909-
redis_client, required_modules=cls.required_modules
903+
redis_client, required_modules=REQUIRED_MODULES_FOR_INTROSPECTION
910904
)
911905
except RedisModuleVersionError as e:
912906
raise RedisModuleVersionError(

redisvl/utils/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
from pydantic import BaseModel
1414
from ulid import ULID
1515

16-
from redisvl.utils.log import get_logger
17-
1816

1917
def create_ulid() -> str:
2018
"""Generate a unique identifier to group related Redis documents."""
@@ -157,6 +155,7 @@ def decorator(func):
157155

158156
@wraps(func)
159157
def wrapper(*args, **kwargs):
158+
print("???")
160159
warn(warning_message, category=DeprecationWarning, stacklevel=3)
161160
return func(*args, **kwargs)
162161

0 commit comments

Comments
 (0)