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(rag/utils): ensure_v1 must recognize v1beta/v1alpha-style version suffixes (#16916)
Andrew Chen77ed0aed43ea
diff --git a/rag/utils/url_utils.py b/rag/utils/url_utils.pyindex f2c2bce19d..51c8be90e2 100644--- a/rag/utils/url_utils.py+++ b/rag/utils/url_utils.py@@ -20,9 +20,10 @@ from urllib.parse import urlparse, urlunparsedef ensure_v1(url: str) -> str:"""Ensure the URL ends with a versioned path segment like ``/v1``.- If the path already contains a segment matching ``v{digit}`` (e.g. ``/v1``,- ``/v2``, ``/v3``), the URL is returned unchanged. Otherwise the base host- is kept and ``/v1`` is appended.+ If the path already contains a segment starting with ``v{digit}`` (e.g.+ ``/v1``, ``/v2``, ``/v3``, ``/v1beta``, ``/v1alpha1``), the URL is+ returned unchanged. Otherwise the base host is kept and ``/v1`` is+ appended.Examples::@@ -34,6 +35,8 @@ def ensure_v1(url: str) -> str:'https://api.example.com/v2/chat'>>> ensure_v1("https://api.example.com/api/v3")'https://api.example.com/api/v3'+ >>> ensure_v1("https://generativelanguage.googleapis.com/v1beta/openai/")+ 'https://generativelanguage.googleapis.com/v1beta/openai/'"""if not url:return url@@ -41,8 +44,9 @@ def ensure_v1(url: str) -> str:parsed = urlparse(url)path = parsed.path.rstrip("/")- # Check if any path segment matches v{digit}, e.g. /v1, /v2, /v3- if re.search(r"/v\d+(?:/|$)", path + "/"):+ # Check if any path segment starts with v{digit}, e.g. v1, v2beta, v1alpha1+ segments = path.split("/")+ if any(re.match(r"^v\d+", segment) for segment in segments):return url# No versioned segment found – append /v1diff --git a/test/unit_test/rag/utils/test_url_utils.py b/test/unit_test/rag/utils/test_url_utils.pynew file mode 100644index 0000000000..0ed8b9f0c3--- /dev/null+++ b/test/unit_test/rag/utils/test_url_utils.py@@ -0,0 +1,59 @@+#+# Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+#+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+#++"""+Unit tests for rag/utils/url_utils.py module.+"""++import pytest+from rag.utils.url_utils import ensure_v1+++class TestEnsureV1:+ def test_empty_url_returned_unchanged(self):+ assert ensure_v1("") == ""++ def test_bare_host_gets_v1_appended(self):+ assert ensure_v1("https://api.example.com") == "https://api.example.com/v1"++ def test_already_versioned_unchanged(self):+ assert ensure_v1("https://api.example.com/v1") == "https://api.example.com/v1"++ def test_versioned_with_trailing_path_unchanged(self):+ assert ensure_v1("https://api.example.com/v2/chat") == "https://api.example.com/v2/chat"++ def test_versioned_with_leading_path_unchanged(self):+ assert ensure_v1("https://api.example.com/api/v3") == "https://api.example.com/api/v3"++ @pytest.mark.parametrize(+ "url",+ [+ "https://generativelanguage.googleapis.com/v1beta/openai/",+ "https://generativelanguage.googleapis.com/v1beta/openai",+ "https://example.com/v1alpha1",+ ],+ )+ def test_version_suffix_with_letters_is_recognized(self, url):+ """A path segment like v1beta/v1alpha1 is already versioned - real+ OpenAI-compatible endpoints (e.g. Google's Gemini API) use this+ pattern, and ensure_v1 must not append a second /v1 onto it."""+ assert ensure_v1(url) == url++ def test_non_version_segment_starting_with_v_still_gets_v1(self):+ """A segment like 'vendors' merely starting with the letter v (with+ no digit right after) is not a version segment - /v1 must still be+ appended."""+ assert ensure_v1("https://api.example.com/vendors/list") == "https://api.example.com/vendors/list/v1"