diff --git a/docs/my-website/docs/proxy/guardrails/custom_guardrail.md b/docs/my-website/docs/proxy/guardrails/custom_guardrail.md index 469196d86..ce4d44414 100644 --- a/docs/my-website/docs/proxy/guardrails/custom_guardrail.md +++ b/docs/my-website/docs/proxy/guardrails/custom_guardrail.md @@ -55,6 +55,7 @@ class myCustomGuardrail(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank" ], ) -> Optional[Union[Exception, str, dict]]: """ diff --git a/litellm/integrations/custom_logger.py b/litellm/integrations/custom_logger.py index 47d28ab56..01fd35990 100644 --- a/litellm/integrations/custom_logger.py +++ b/litellm/integrations/custom_logger.py @@ -109,6 +109,7 @@ class CustomLogger: # https://docs.litellm.ai/docs/observability/custom_callbac "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[ Union[Exception, str, dict] diff --git a/litellm/proxy/custom_callbacks1.py b/litellm/proxy/custom_callbacks1.py index 05028f033..fbfbf6060 100644 --- a/litellm/proxy/custom_callbacks1.py +++ b/litellm/proxy/custom_callbacks1.py @@ -29,6 +29,7 @@ class MyCustomHandler( "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ): return data diff --git a/litellm/proxy/custom_guardrail.py b/litellm/proxy/custom_guardrail.py index 2ed989cfd..d8d63ab0a 100644 --- a/litellm/proxy/custom_guardrail.py +++ b/litellm/proxy/custom_guardrail.py @@ -32,6 +32,7 @@ class myCustomGuardrail(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[Union[Exception, str, dict]]: """ diff --git a/litellm/proxy/example_config_yaml/custom_guardrail.py b/litellm/proxy/example_config_yaml/custom_guardrail.py index 2ed989cfd..d8d63ab0a 100644 --- a/litellm/proxy/example_config_yaml/custom_guardrail.py +++ b/litellm/proxy/example_config_yaml/custom_guardrail.py @@ -32,6 +32,7 @@ class myCustomGuardrail(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[Union[Exception, str, dict]]: """ diff --git a/litellm/proxy/guardrails/guardrail_hooks/custom_guardrail.py b/litellm/proxy/guardrails/guardrail_hooks/custom_guardrail.py index 2ed989cfd..d8d63ab0a 100644 --- a/litellm/proxy/guardrails/guardrail_hooks/custom_guardrail.py +++ b/litellm/proxy/guardrails/guardrail_hooks/custom_guardrail.py @@ -32,6 +32,7 @@ class myCustomGuardrail(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[Union[Exception, str, dict]]: """ diff --git a/litellm/proxy/guardrails/guardrail_hooks/lakera_ai.py b/litellm/proxy/guardrails/guardrail_hooks/lakera_ai.py index e1ff55c82..364bcb222 100644 --- a/litellm/proxy/guardrails/guardrail_hooks/lakera_ai.py +++ b/litellm/proxy/guardrails/guardrail_hooks/lakera_ai.py @@ -127,6 +127,7 @@ class lakeraAI_Moderation(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ): if ( @@ -288,6 +289,7 @@ class lakeraAI_Moderation(CustomGuardrail): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[Union[Exception, str, Dict]]: from litellm.types.guardrails import GuardrailEventHooks diff --git a/litellm/proxy/hooks/dynamic_rate_limiter.py b/litellm/proxy/hooks/dynamic_rate_limiter.py index 57985e9a6..1ef674b7e 100644 --- a/litellm/proxy/hooks/dynamic_rate_limiter.py +++ b/litellm/proxy/hooks/dynamic_rate_limiter.py @@ -199,6 +199,7 @@ class _PROXY_DynamicRateLimitHandler(CustomLogger): "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> Optional[ Union[Exception, str, dict] diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 7e6f3c5e2..9d8d3fa2d 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -205,6 +205,7 @@ from litellm.proxy.pass_through_endpoints.pass_through_endpoints import ( from litellm.proxy.pass_through_endpoints.pass_through_endpoints import ( router as pass_through_router, ) +from litellm.proxy.rerank_endpoints.endpoints import router as rerank_router from litellm.proxy.route_llm_request import route_request from litellm.proxy.secret_managers.aws_secret_manager import ( load_aws_kms, @@ -9881,6 +9882,7 @@ def cleanup_router_config_variables(): app.include_router(router) +app.include_router(rerank_router) app.include_router(fine_tuning_router) app.include_router(vertex_router) app.include_router(gemini_router) diff --git a/litellm/proxy/rerank_endpoints/endpoints.py b/litellm/proxy/rerank_endpoints/endpoints.py new file mode 100644 index 000000000..6bc6dc948 --- /dev/null +++ b/litellm/proxy/rerank_endpoints/endpoints.py @@ -0,0 +1,124 @@ +#### Rerank Endpoints ##### +from datetime import datetime, timedelta, timezone +from typing import List, Optional + +import fastapi +import orjson +from fastapi import APIRouter, Depends, Header, HTTPException, Request, Response, status +from fastapi.responses import ORJSONResponse + +import litellm +from litellm._logging import verbose_proxy_logger +from litellm.proxy._types import * +from litellm.proxy.auth.user_api_key_auth import user_api_key_auth + +router = APIRouter() +import asyncio + + +@router.post( + "/v1/rerank", + dependencies=[Depends(user_api_key_auth)], + response_class=ORJSONResponse, + tags=["rerank"], +) +@router.post( + "/rerank", + dependencies=[Depends(user_api_key_auth)], + response_class=ORJSONResponse, + tags=["rerank"], +) +async def rerank( + request: Request, + fastapi_response: Response, + user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), +): + from litellm.proxy.proxy_server import ( + add_litellm_data_to_request, + general_settings, + get_custom_headers, + llm_router, + proxy_config, + proxy_logging_obj, + route_request, + user_model, + version, + ) + + data = {} + try: + body = await request.body() + data = orjson.loads(body) + + # Include original request and headers in the data + data = await add_litellm_data_to_request( + data=data, + request=request, + general_settings=general_settings, + user_api_key_dict=user_api_key_dict, + version=version, + proxy_config=proxy_config, + ) + + ### CALL HOOKS ### - modify incoming data / reject request before calling the model + data = await proxy_logging_obj.pre_call_hook( + user_api_key_dict=user_api_key_dict, data=data, call_type="rerank" + ) + + ## ROUTE TO CORRECT ENDPOINT ## + llm_call = await route_request( + data=data, + route_type="arerank", + llm_router=llm_router, + user_model=user_model, + ) + response = await llm_call + + ### ALERTING ### + asyncio.create_task( + proxy_logging_obj.update_request_status( + litellm_call_id=data.get("litellm_call_id", ""), status="success" + ) + ) + + ### RESPONSE HEADERS ### + hidden_params = getattr(response, "_hidden_params", {}) or {} + model_id = hidden_params.get("model_id", None) or "" + cache_key = hidden_params.get("cache_key", None) or "" + api_base = hidden_params.get("api_base", None) or "" + + fastapi_response.headers.update( + get_custom_headers( + user_api_key_dict=user_api_key_dict, + model_id=model_id, + cache_key=cache_key, + api_base=api_base, + version=version, + model_region=getattr(user_api_key_dict, "allowed_model_region", ""), + request_data=data, + ) + ) + + return response + except Exception as e: + await proxy_logging_obj.post_call_failure_hook( + user_api_key_dict=user_api_key_dict, original_exception=e, request_data=data + ) + verbose_proxy_logger.error( + "litellm.proxy.proxy_server.rerank(): Exception occured - {}".format(str(e)) + ) + if isinstance(e, HTTPException): + raise ProxyException( + message=getattr(e, "message", str(e)), + type=getattr(e, "type", "None"), + param=getattr(e, "param", "None"), + code=getattr(e, "status_code", status.HTTP_400_BAD_REQUEST), + ) + else: + error_msg = f"{str(e)}" + raise ProxyException( + message=getattr(e, "message", error_msg), + type=getattr(e, "type", "None"), + param=getattr(e, "param", "None"), + code=getattr(e, "status_code", 500), + ) diff --git a/litellm/proxy/route_llm_request.py b/litellm/proxy/route_llm_request.py index 7a7be55b2..361c5be0c 100644 --- a/litellm/proxy/route_llm_request.py +++ b/litellm/proxy/route_llm_request.py @@ -33,6 +33,7 @@ ROUTE_ENDPOINT_MAPPING = { "aspeech": "/audio/speech", "atranscription": "/audio/transcriptions", "amoderation": "/moderations", + "arerank": "/rerank", } @@ -48,6 +49,7 @@ async def route_request( "aspeech", "atranscription", "amoderation", + "arerank", ], ): """ diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py index 09fc014d5..ffd354224 100644 --- a/litellm/proxy/utils.py +++ b/litellm/proxy/utils.py @@ -375,6 +375,7 @@ class ProxyLogging: "moderation", "audio_transcription", "pass_through_endpoint", + "rerank", ], ) -> dict: """