mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-25 10:44:24 +00:00
redis otel tracing + async support for latency routing (#6452)
* docs(exception_mapping.md): add missing exception types Fixes https://github.com/Aider-AI/aider/issues/2120#issuecomment-2438971183 * fix(main.py): register custom model pricing with specific key Ensure custom model pricing is registered to the specific model+provider key combination * test: make testing more robust for custom pricing * fix(redis_cache.py): instrument otel logging for sync redis calls ensures complete coverage for all redis cache calls * refactor: pass parent_otel_span for redis caching calls in router allows for more observability into what calls are causing latency issues * test: update tests with new params * refactor: ensure e2e otel tracing for router * refactor(router.py): add more otel tracing acrosss router catch all latency issues for router requests * fix: fix linting error * fix(router.py): fix linting error * fix: fix test * test: fix tests * fix(dual_cache.py): pass ttl to redis cache * fix: fix param
This commit is contained in:
parent
d9e7818e6b
commit
4f8a3fd4cf
25 changed files with 559 additions and 147 deletions
|
@ -4,11 +4,18 @@ Wrapper around router cache. Meant to handle model cooldown logic
|
|||
|
||||
import json
|
||||
import time
|
||||
from typing import List, Optional, Tuple, TypedDict
|
||||
from typing import TYPE_CHECKING, Any, List, Optional, Tuple, TypedDict
|
||||
|
||||
from litellm import verbose_logger
|
||||
from litellm.caching.caching import DualCache
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from opentelemetry.trace import Span as _Span
|
||||
|
||||
Span = _Span
|
||||
else:
|
||||
Span = Any
|
||||
|
||||
|
||||
class CooldownCacheValue(TypedDict):
|
||||
exception_received: str
|
||||
|
@ -77,13 +84,18 @@ class CooldownCache:
|
|||
raise e
|
||||
|
||||
async def async_get_active_cooldowns(
|
||||
self, model_ids: List[str]
|
||||
self, model_ids: List[str], parent_otel_span: Optional[Span]
|
||||
) -> List[Tuple[str, CooldownCacheValue]]:
|
||||
# Generate the keys for the deployments
|
||||
keys = [f"deployment:{model_id}:cooldown" for model_id in model_ids]
|
||||
|
||||
# Retrieve the values for the keys using mget
|
||||
results = await self.cache.async_batch_get_cache(keys=keys) or []
|
||||
results = (
|
||||
await self.cache.async_batch_get_cache(
|
||||
keys=keys, parent_otel_span=parent_otel_span
|
||||
)
|
||||
or []
|
||||
)
|
||||
|
||||
active_cooldowns = []
|
||||
# Process the results
|
||||
|
@ -95,13 +107,15 @@ class CooldownCache:
|
|||
return active_cooldowns
|
||||
|
||||
def get_active_cooldowns(
|
||||
self, model_ids: List[str]
|
||||
self, model_ids: List[str], parent_otel_span: Optional[Span]
|
||||
) -> List[Tuple[str, CooldownCacheValue]]:
|
||||
# Generate the keys for the deployments
|
||||
keys = [f"deployment:{model_id}:cooldown" for model_id in model_ids]
|
||||
|
||||
# Retrieve the values for the keys using mget
|
||||
results = self.cache.batch_get_cache(keys=keys) or []
|
||||
results = (
|
||||
self.cache.batch_get_cache(keys=keys, parent_otel_span=parent_otel_span)
|
||||
or []
|
||||
)
|
||||
|
||||
active_cooldowns = []
|
||||
# Process the results
|
||||
|
@ -112,14 +126,19 @@ class CooldownCache:
|
|||
|
||||
return active_cooldowns
|
||||
|
||||
def get_min_cooldown(self, model_ids: List[str]) -> float:
|
||||
def get_min_cooldown(
|
||||
self, model_ids: List[str], parent_otel_span: Optional[Span]
|
||||
) -> float:
|
||||
"""Return min cooldown time required for a group of model id's."""
|
||||
|
||||
# Generate the keys for the deployments
|
||||
keys = [f"deployment:{model_id}:cooldown" for model_id in model_ids]
|
||||
|
||||
# Retrieve the values for the keys using mget
|
||||
results = self.cache.batch_get_cache(keys=keys) or []
|
||||
results = (
|
||||
self.cache.batch_get_cache(keys=keys, parent_otel_span=parent_otel_span)
|
||||
or []
|
||||
)
|
||||
|
||||
min_cooldown_time: Optional[float] = None
|
||||
# Process the results
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue