RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix Azure embedding endpoint handling (#16993)
zcxGGmu3f0cf5a1ba2a
diff --git a/rag/llm/embedding_model.py b/rag/llm/embedding_model.pyindex 2953f14593..f1f18da986 100644--- a/rag/llm/embedding_model.py+++ b/rag/llm/embedding_model.py@@ -317,6 +317,12 @@ def _resolve_azure_credentials(key):return key, "2024-02-01"+def _normalize_azure_endpoint(base_url):+ if not base_url:+ return base_url+ return base_url.strip().rstrip("/")++class AzureEmbed(OpenAIEmbed):_FACTORY_NAME = "Azure-OpenAI"@@ -324,7 +330,7 @@ class AzureEmbed(OpenAIEmbed):from openai.lib.azure import AzureOpenAIapi_key, api_version = _resolve_azure_credentials(key)- self.base_url = ensure_v1(kwargs["base_url"])+ self.base_url = _normalize_azure_endpoint(kwargs["base_url"])self.client = AzureOpenAI(api_key=api_key, azure_endpoint=self.base_url, api_version=api_version)self.model_name = model_namediff --git a/test/unit_test/rag/llm/test_embedding_model.py b/test/unit_test/rag/llm/test_embedding_model.pyindex b548c82422..13fec627e3 100644--- a/test/unit_test/rag/llm/test_embedding_model.py+++ b/test/unit_test/rag/llm/test_embedding_model.py@@ -36,6 +36,7 @@ import pytestfrom rag.llm.embedding_model import (DEFAULT_MAX_TOKENS,+ AzureEmbed,BedrockEmbed,EmbeddingError,LocalAIEmbed,@@ -319,6 +320,30 @@ class TestBatching:# --------------------------------------------------------------------------- ## 5. Provider-specific request/response shapes# --------------------------------------------------------------------------- #+class TestAzureEmbeddingEndpoint:+ def test_uses_azure_resource_endpoint_without_openai_v1_suffix(self, monkeypatch):+ captured = {}++ class FakeAzureOpenAI:+ def __init__(self, **kwargs):+ captured.update(kwargs)+ self.embeddings = SimpleNamespace(create=MagicMock())++ monkeypatch.setattr("openai.lib.azure.AzureOpenAI", FakeAzureOpenAI)++ embed = AzureEmbed(+ json.dumps({"api_key": "azure-key", "api_version": "2024-02-01"}),+ "text-embedding-3-small",+ base_url="https://example.openai.azure.com/",+ )++ assert embed.base_url == "https://example.openai.azure.com"+ assert captured["azure_endpoint"] == "https://example.openai.azure.com"+ assert captured["api_key"] == "azure-key"+ assert captured["api_version"] == "2024-02-01"++@pytest.mark.p2class TestNvidiaInputType:"""NVIDIA NIM expects input_type=passage for documents and =query for queries;