forked from phoenix/litellm-mirror
fix(router.py): support fallbacks / retries with sync embedding calls
This commit is contained in:
parent
e07174736f
commit
9735250db7
3 changed files with 181 additions and 37 deletions
|
@ -970,17 +970,37 @@ class Router:
|
|||
is_async: Optional[bool] = False,
|
||||
**kwargs,
|
||||
) -> Union[List[float], None]:
|
||||
# pick the one that is available (lowest TPM/RPM)
|
||||
try:
|
||||
kwargs["model"] = model
|
||||
kwargs["input"] = input
|
||||
kwargs["original_function"] = self._embedding
|
||||
kwargs["num_retries"] = kwargs.get("num_retries", self.num_retries)
|
||||
timeout = kwargs.get("request_timeout", self.timeout)
|
||||
kwargs.setdefault("metadata", {}).update({"model_group": model})
|
||||
response = self.function_with_fallbacks(**kwargs)
|
||||
return response
|
||||
except Exception as e:
|
||||
raise e
|
||||
|
||||
def _embedding(self, input: Union[str, List], model: str, **kwargs):
|
||||
try:
|
||||
verbose_router_logger.debug(
|
||||
f"Inside embedding()- model: {model}; kwargs: {kwargs}"
|
||||
)
|
||||
deployment = self.get_available_deployment(
|
||||
model=model,
|
||||
input=input,
|
||||
specific_deployment=kwargs.pop("specific_deployment", None),
|
||||
)
|
||||
kwargs.setdefault("model_info", {})
|
||||
kwargs.setdefault("metadata", {}).update(
|
||||
{"model_group": model, "deployment": deployment["litellm_params"]["model"]}
|
||||
) # [TODO]: move to using async_function_with_fallbacks
|
||||
{
|
||||
"deployment": deployment["litellm_params"]["model"],
|
||||
"model_info": deployment.get("model_info", {}),
|
||||
}
|
||||
)
|
||||
kwargs["model_info"] = deployment.get("model_info", {})
|
||||
data = deployment["litellm_params"].copy()
|
||||
model_name = data["model"]
|
||||
for k, v in self.default_litellm_params.items():
|
||||
if (
|
||||
k not in kwargs
|
||||
|
@ -988,7 +1008,10 @@ class Router:
|
|||
kwargs[k] = v
|
||||
elif k == "metadata":
|
||||
kwargs[k].update(v)
|
||||
potential_model_client = self._get_client(deployment=deployment, kwargs=kwargs)
|
||||
|
||||
potential_model_client = self._get_client(
|
||||
deployment=deployment, kwargs=kwargs, client_type="sync"
|
||||
)
|
||||
# check if provided keys == client keys #
|
||||
dynamic_api_key = kwargs.get("api_key", None)
|
||||
if (
|
||||
|
@ -999,7 +1022,9 @@ class Router:
|
|||
model_client = None
|
||||
else:
|
||||
model_client = potential_model_client
|
||||
return litellm.embedding(
|
||||
|
||||
self.total_calls[model_name] += 1
|
||||
response = litellm.embedding(
|
||||
**{
|
||||
**data,
|
||||
"input": input,
|
||||
|
@ -1008,6 +1033,18 @@ class Router:
|
|||
**kwargs,
|
||||
}
|
||||
)
|
||||
self.success_calls[model_name] += 1
|
||||
verbose_router_logger.info(
|
||||
f"litellm.embedding(model={model_name})\033[32m 200 OK\033[0m"
|
||||
)
|
||||
return response
|
||||
except Exception as e:
|
||||
verbose_router_logger.info(
|
||||
f"litellm.embedding(model={model_name})\033[31m Exception {str(e)}\033[0m"
|
||||
)
|
||||
if model_name is not None:
|
||||
self.fail_calls[model_name] += 1
|
||||
raise e
|
||||
|
||||
async def aembedding(
|
||||
self,
|
||||
|
|
|
@ -227,6 +227,57 @@ async def test_async_fallbacks():
|
|||
# test_async_fallbacks()
|
||||
|
||||
|
||||
def test_sync_fallbacks_embeddings():
|
||||
litellm.set_verbose = False
|
||||
model_list = [
|
||||
{ # list of model deployments
|
||||
"model_name": "bad-azure-embedding-model", # openai model name
|
||||
"litellm_params": { # params for litellm completion/embedding call
|
||||
"model": "azure/azure-embedding-model",
|
||||
"api_key": "bad-key",
|
||||
"api_version": os.getenv("AZURE_API_VERSION"),
|
||||
"api_base": os.getenv("AZURE_API_BASE"),
|
||||
},
|
||||
"tpm": 240000,
|
||||
"rpm": 1800,
|
||||
},
|
||||
{ # list of model deployments
|
||||
"model_name": "good-azure-embedding-model", # openai model name
|
||||
"litellm_params": { # params for litellm completion/embedding call
|
||||
"model": "azure/azure-embedding-model",
|
||||
"api_key": os.getenv("AZURE_API_KEY"),
|
||||
"api_version": os.getenv("AZURE_API_VERSION"),
|
||||
"api_base": os.getenv("AZURE_API_BASE"),
|
||||
},
|
||||
"tpm": 240000,
|
||||
"rpm": 1800,
|
||||
},
|
||||
]
|
||||
|
||||
router = Router(
|
||||
model_list=model_list,
|
||||
fallbacks=[{"bad-azure-embedding-model": ["good-azure-embedding-model"]}],
|
||||
set_verbose=False,
|
||||
)
|
||||
customHandler = MyCustomHandler()
|
||||
litellm.callbacks = [customHandler]
|
||||
user_message = "Hello, how are you?"
|
||||
input = [user_message]
|
||||
try:
|
||||
kwargs = {"model": "bad-azure-embedding-model", "input": input}
|
||||
response = router.embedding(**kwargs)
|
||||
print(f"customHandler.previous_models: {customHandler.previous_models}")
|
||||
time.sleep(0.05) # allow a delay as success_callbacks are on a separate thread
|
||||
assert customHandler.previous_models == 1 # 0 retries, 1 fallback
|
||||
router.reset()
|
||||
except litellm.Timeout as e:
|
||||
pass
|
||||
except Exception as e:
|
||||
pytest.fail(f"An exception occurred: {e}")
|
||||
finally:
|
||||
router.reset()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_async_fallbacks_embeddings():
|
||||
litellm.set_verbose = False
|
||||
|
|
56
litellm/tests/test_router_with_fallbacks.py
Normal file
56
litellm/tests/test_router_with_fallbacks.py
Normal file
|
@ -0,0 +1,56 @@
|
|||
# [LOCAL TEST] - runs against mock openai proxy
|
||||
# # What this tests?
|
||||
# ## This tests if fallbacks works for 429 errors
|
||||
|
||||
# import sys, os, time
|
||||
# import traceback, asyncio
|
||||
# import pytest
|
||||
|
||||
# sys.path.insert(
|
||||
# 0, os.path.abspath("../..")
|
||||
# ) # Adds the parent directory to the system path
|
||||
# import litellm
|
||||
# from litellm import Router
|
||||
|
||||
# model_list = [
|
||||
# { # list of model deployments
|
||||
# "model_name": "text-embedding-ada-002", # model alias
|
||||
# "litellm_params": { # params for litellm completion/embedding call
|
||||
# "model": "text-embedding-ada-002", # actual model name
|
||||
# "api_key": "sk-fakekey",
|
||||
# "api_base": "http://0.0.0.0:8080",
|
||||
# },
|
||||
# "tpm": 1000,
|
||||
# "rpm": 6,
|
||||
# },
|
||||
# {
|
||||
# "model_name": "text-embedding-ada-002-fallback",
|
||||
# "litellm_params": { # params for litellm completion/embedding call
|
||||
# "model": "openai/text-embedding-ada-002-anything-else", # actual model name
|
||||
# "api_key": "sk-fakekey2",
|
||||
# "api_base": "http://0.0.0.0:8080",
|
||||
# },
|
||||
# "tpm": 1000,
|
||||
# "rpm": 6,
|
||||
# },
|
||||
# ]
|
||||
|
||||
# router = Router(
|
||||
# model_list=model_list,
|
||||
# fallbacks=[
|
||||
# {"text-embedding-ada-002": ["text-embedding-ada-002-fallback"]},
|
||||
# {"text-embedding-ada-002-fallback": ["text-embedding-ada-002"]},
|
||||
# ],
|
||||
# set_verbose=True,
|
||||
# num_retries=0,
|
||||
# debug_level="INFO",
|
||||
# routing_strategy="usage-based-routing",
|
||||
# )
|
||||
|
||||
|
||||
# def test_embedding_with_fallbacks():
|
||||
# response = router.embedding(model="text-embedding-ada-002", input=["Hello world"])
|
||||
# print(f"response: {response}")
|
||||
|
||||
|
||||
# test_embedding_with_fallbacks()
|
Loading…
Add table
Add a link
Reference in a new issue