|
1 | 1 | import asyncio |
2 | 2 | import json |
3 | | -import logging |
4 | 3 | import threading |
5 | 4 | import warnings |
6 | 5 | import weakref |
7 | | -from functools import wraps |
8 | | -from os import replace |
9 | | -from re import S |
10 | 6 | from typing import ( |
11 | 7 | TYPE_CHECKING, |
12 | 8 | Any, |
|
47 | 43 | logger = get_logger(__name__) |
48 | 44 |
|
49 | 45 |
|
| 46 | +REQUIRED_MODULES_FOR_INTROSPECTION = [ |
| 47 | + {"name": "search", "ver": 20810}, |
| 48 | + {"name": "searchlight", "ver": 20810}, |
| 49 | +] |
| 50 | + |
| 51 | + |
50 | 52 | def process_results( |
51 | 53 | results: "Result", query: BaseQuery, storage_type: StorageType |
52 | 54 | ) -> List[Dict[str, Any]]: |
@@ -242,11 +244,6 @@ class SearchIndex(BaseSearchIndex): |
242 | 244 |
|
243 | 245 | """ |
244 | 246 |
|
245 | | - required_modules = [ |
246 | | - {"name": "search", "ver": 20810}, |
247 | | - {"name": "searchlight", "ver": 20810}, |
248 | | - ] |
249 | | - |
250 | 247 | @deprecated_argument("connection_args", "Use connection_kwargs instead.") |
251 | 248 | def __init__( |
252 | 249 | self, |
@@ -324,12 +321,12 @@ def from_existing( |
324 | 321 | if redis_url: |
325 | 322 | redis_client = RedisConnectionFactory.get_redis_connection( |
326 | 323 | redis_url=redis_url, |
327 | | - required_modules=cls.required_modules, |
| 324 | + required_modules=REQUIRED_MODULES_FOR_INTROSPECTION, |
328 | 325 | **kwargs, |
329 | 326 | ) |
330 | 327 | elif redis_client: |
331 | 328 | RedisConnectionFactory.validate_sync_redis( |
332 | | - redis_client, required_modules=cls.required_modules |
| 329 | + redis_client, required_modules=REQUIRED_MODULES_FOR_INTROSPECTION |
333 | 330 | ) |
334 | 331 | except RedisModuleVersionError as e: |
335 | 332 | raise RedisModuleVersionError( |
@@ -829,11 +826,6 @@ class AsyncSearchIndex(BaseSearchIndex): |
829 | 826 |
|
830 | 827 | """ |
831 | 828 |
|
832 | | - required_modules = [ |
833 | | - {"name": "search", "ver": 20810}, |
834 | | - {"name": "searchlight", "ver": 20810}, |
835 | | - ] |
836 | | - |
837 | 829 | @deprecated_argument("redis_kwargs", "Use connection_kwargs instead.") |
838 | 830 | def __init__( |
839 | 831 | self, |
@@ -902,11 +894,13 @@ async def from_existing( |
902 | 894 | try: |
903 | 895 | if redis_url: |
904 | 896 | 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, |
906 | 900 | ) |
907 | 901 | elif redis_client: |
908 | 902 | await RedisConnectionFactory.validate_async_redis( |
909 | | - redis_client, required_modules=cls.required_modules |
| 903 | + redis_client, required_modules=REQUIRED_MODULES_FOR_INTROSPECTION |
910 | 904 | ) |
911 | 905 | except RedisModuleVersionError as e: |
912 | 906 | raise RedisModuleVersionError( |
|
0 commit comments