feat(viking_url): viking mem and db envs (DATABASE_VIKINGMEM_BASE_URL and DATABASE_VIKING_BASE_URL) only for http private

Author: floritange

veadk/consts.py

@@ -72,6 +72,3 @@
 DEFAULT_IMAGE_GENERATE_MODEL_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 
 VEFAAS_IAM_CRIDENTIAL_PATH = "/var/run/secrets/iam/credential"
-
-DEFAULT_VIKING_BASE_URL = "api-knowledgebase.mlp.cn-beijing.volces.com"
-DEFAULT_VIKINGMEM_BASE_URL = "api-knowledgebase.mlp.cn-beijing.volces.com"

veadk/integrations/ve_viking_db_memory/ve_viking_db_memory.py

@@ -55,21 +55,9 @@ def __init__(
         connection_timeout=30,
         socket_timeout=30,
     ):
-        env_host = getenv(
-            "DATABASE_VIKINGMEM_BASE_URL", "api-knowledgebase.mlp.cn-beijing.volces.com"
-        )
-        # check if the environment variable contains protocol
+        env_host = getenv("DATABASE_VIKINGMEM_BASE_URL", host)
         if env_host.startswith("http://"):
-            host = env_host.replace("http://", "")
-            scheme = "http"
-        elif env_host.startswith("https://"):
-            host = env_host.replace("https://", "")
-            scheme = "https"
-        else:
-            # default http
-            host = env_host
-            scheme = "http"
-
+            env_host = env_host.replace("http://", "")
         self.service_info = VikingDBMemoryClient.get_service_info(
             host, region, scheme, connection_timeout, socket_timeout
         )

veadk/knowledgebase/backends/vikingdb_knowledge_backend.py

@@ -58,23 +58,6 @@ def get_files_in_directory(directory: str):
     return file_paths
 
 
-def _normalize_base_url(base_url: str) -> str:
-    """Normalize base URL: if already has scheme, return as-is; otherwise add http://
-
-    Args:
-        base_url: Base URL string
-
-    Returns:
-        Normalized URL with scheme
-    """
-    if not base_url:
-        return base_url
-    if base_url.startswith(("http://", "https://")):
-        return base_url
-    # PrivateLink URLs use http only
-    return f"http://{base_url}"
-
-
 class VikingDBKnowledgeBackend(BaseKnowledgebaseBackend):
     """Volcengine Viking DB knowledgebase backend.
 
@@ -574,18 +557,16 @@ def _do_request(
         path: str,
         method: Literal["GET", "POST", "PUT", "DELETE"] = "POST",
     ) -> dict:
-        base_url = getenv(
+        VIKINGDB_KNOWLEDGEBASE_BASE_URL = getenv(
             "DATABASE_VIKING_BASE_URL", "api-knowledgebase.mlp.cn-beijing.volces.com"
         )
-        if base_url.startswith(("http://", "https://")):
-            full_url = f"{base_url}{path}"
-        else:
-            scheme = (
-                "https"
-                if base_url == "api-knowledgebase.mlp.cn-beijing.volces.com"
-                else "http"
+        if VIKINGDB_KNOWLEDGEBASE_BASE_URL.startswith("http://"):
+            VIKINGDB_KNOWLEDGEBASE_BASE_URL = VIKINGDB_KNOWLEDGEBASE_BASE_URL.replace(
+                "http://", ""
             )
-            full_url = f"{scheme}://{base_url}{path}"
+            full_path = f"http://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
+        else:
+            full_path = f"https://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
 
         volcengine_access_key = self.volcengine_access_key
         volcengine_secret_key = self.volcengine_secret_key
@@ -605,10 +586,9 @@ def _do_request(
             method=method,
             data=body,
         )
-
         response = requests.request(
             method=method,
-            url=full_url,
+            url=full_path,
             headers=request.headers,
             data=request.body,
         )