Skip to content

Commit da80020

Browse files
rbs333rbs333
committed
move to utility
1 parent de3e92d commit da80020

File tree

9 files changed

+14
-27
lines changed

9 files changed

+14
-27
lines changed

‎redisvl/extensions/llmcache/semantic.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
CacheHit,
2222
SemanticCacheIndexSchema,
2323
)
24-
from redisvl.extensions.threshold_optimizer.schema import TestData
2524
from redisvl.index import AsyncSearchIndex, SearchIndex
2625
from redisvl.query import RangeQuery
2726
from redisvl.query.filter import FilterExpression

redisvl/extensions/threshold_optimizer/__init__.py renamed to redisvl/utils/threshold_optimizer/__init__.py

File renamed without changes.

redisvl/extensions/threshold_optimizer/base.py renamed to redisvl/utils/threshold_optimizer/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from enum import Enum
33
from typing import Any, Callable, Dict, List, TypeVar
44

5-
from redisvl.extensions.threshold_optimizer.utils import _validate_test_dict
5+
from redisvl.utils.threshold_optimizer.utils import _validate_test_dict
66

77

88
class EvalMetric(Enum):

redisvl/extensions/threshold_optimizer/cache.py renamed to redisvl/utils/threshold_optimizer/cache.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
from ranx import Qrels, Run, evaluate
55

66
from redisvl.extensions.llmcache.semantic import SemanticCache
7-
from redisvl.extensions.threshold_optimizer.base import (
8-
BaseThresholdOptimizer,
9-
EvalMetric,
10-
)
11-
from redisvl.extensions.threshold_optimizer.schema import TestData
12-
from redisvl.extensions.threshold_optimizer.utils import (
13-
NULL_RESPONSE_KEY,
14-
_format_qrels,
15-
)
167
from redisvl.query import RangeQuery
8+
from redisvl.utils.threshold_optimizer.base import BaseThresholdOptimizer, EvalMetric
9+
from redisvl.utils.threshold_optimizer.schema import TestData
10+
from redisvl.utils.threshold_optimizer.utils import NULL_RESPONSE_KEY, _format_qrels
1711

1812

1913
def _generate_run_cache(test_data: List[TestData], threshold: float) -> Run:

redisvl/extensions/threshold_optimizer/router.py renamed to redisvl/utils/threshold_optimizer/router.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@
55
from ranx import Qrels, Run, evaluate
66

77
from redisvl.extensions.router.semantic import SemanticRouter
8-
from redisvl.extensions.threshold_optimizer.base import (
9-
BaseThresholdOptimizer,
10-
EvalMetric,
11-
)
12-
from redisvl.extensions.threshold_optimizer.schema import TestData
13-
from redisvl.extensions.threshold_optimizer.utils import (
14-
NULL_RESPONSE_KEY,
15-
_format_qrels,
16-
)
8+
from redisvl.utils.threshold_optimizer.base import BaseThresholdOptimizer, EvalMetric
9+
from redisvl.utils.threshold_optimizer.schema import TestData
10+
from redisvl.utils.threshold_optimizer.utils import NULL_RESPONSE_KEY, _format_qrels
1711

1812

1913
def _generate_run_router(test_data: List[TestData], router: SemanticRouter) -> Run:

redisvl/extensions/threshold_optimizer/schema.py renamed to redisvl/utils/threshold_optimizer/schema.py

File renamed without changes.

redisvl/extensions/threshold_optimizer/utils.py renamed to redisvl/utils/threshold_optimizer/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ranx import Qrels
44

5-
from redisvl.extensions.threshold_optimizer.schema import TestData
5+
from redisvl.utils.threshold_optimizer.schema import TestData
66

77
NULL_RESPONSE_KEY = "no_match"
88

‎tests/integration/test_threshold_optimizer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
from redisvl.extensions.llmcache import SemanticCache
99
from redisvl.extensions.router import Route, SemanticRouter
1010
from redisvl.extensions.router.schema import RoutingConfig
11-
from redisvl.extensions.threshold_optimizer.base import EvalMetric
12-
from redisvl.extensions.threshold_optimizer.cache import CacheThresholdOptimizer
13-
from redisvl.extensions.threshold_optimizer.router import RouterThresholdOptimizer
1411
from redisvl.redis.connection import compare_versions
12+
from redisvl.utils.threshold_optimizer.base import EvalMetric
13+
from redisvl.utils.threshold_optimizer.cache import CacheThresholdOptimizer
14+
from redisvl.utils.threshold_optimizer.router import RouterThresholdOptimizer
1515

1616

1717
@pytest.fixture

‎tests/unit/test_threshold_optimizer_utility.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
from ranx import evaluate
99

10-
from redisvl.extensions.threshold_optimizer.cache import _generate_run_cache
11-
from redisvl.extensions.threshold_optimizer.schema import TestData
12-
from redisvl.extensions.threshold_optimizer.utils import _format_qrels
10+
from redisvl.utils.threshold_optimizer.cache import _generate_run_cache
11+
from redisvl.utils.threshold_optimizer.schema import TestData
12+
from redisvl.utils.threshold_optimizer.utils import _format_qrels
1313

1414
# Note: these tests are not intended to test ranx but to test that our data formatting for the package is correct
1515

0 commit comments

Comments
 (0)