diff --git a/litellm/proxy/vector_store_endpoints/endpoints.py b/litellm/proxy/vector_store_endpoints/endpoints.py index 90f1f00eed5..b6a0ebe3c58 100644 --- a/litellm/proxy/vector_store_endpoints/endpoints.py +++ b/litellm/proxy/vector_store_endpoints/endpoints.py @@ -57,8 +57,10 @@ def reject_caller_embedding_selection_params(payload: Mapping[str, object], sour def reject_caller_opensearch_index_name( caller_body: Mapping[str, object], request_fields: Mapping[str, object], source: str ) -> None: + provider: Final = request_fields.get("custom_llm_provider") if ( - request_fields.get("custom_llm_provider") == LlmProviders.OPENSEARCH.value + isinstance(provider, str) + and provider.split("/", 1)[0] == LlmProviders.OPENSEARCH.value and "opensearch_index_name" in caller_body ): raise HTTPException( diff --git a/tests/unit/proxy/rag_endpoints/test_rag_endpoints.py b/tests/unit/proxy/rag_endpoints/test_rag_endpoints.py index 1f838547065..bf4b5d5d77a 100644 --- a/tests/unit/proxy/rag_endpoints/test_rag_endpoints.py +++ b/tests/unit/proxy/rag_endpoints/test_rag_endpoints.py @@ -1673,7 +1673,7 @@ def test_rag_query_rejects_caller_embedding_selection_params(client_internal_use @pytest.mark.parametrize( ("provider", "expected_status", "expected_searches"), - [("opensearch", 400, 0), ("openai", 200, 1)], + [("opensearch", 400, 0), ("opensearch/x", 400, 0), ("openai", 200, 1)], ) def test_rag_query_rejects_caller_opensearch_index_name_only_on_opensearch_stores( client_internal_user, provider, expected_status, expected_searches diff --git a/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py b/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py index 3e20806bc1a..e128b5eb1f1 100644 --- a/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py +++ b/tests/unit/proxy/vector_store_endpoints/test_vector_store_endpoints.py @@ -3068,7 +3068,7 @@ def test_vector_store_search_rejects_caller_embedding_selection_params(blocked_k @pytest.mark.parametrize( ("provider", "expected_status", "expected_searches"), - [("opensearch", 400, 0), ("openai", 200, 1)], + [("opensearch", 400, 0), ("opensearch/x", 400, 0), ("openai", 200, 1)], ) def test_vector_store_search_rejects_caller_opensearch_index_name_only_on_opensearch_stores( provider, expected_status, expected_searches