Skip to content

Commit 7d0c7b4

Browse files
committed
feat(viking_url): viking mem and db envs (DATABASE_VIKINGMEM_BASE_URL and DATABASE_VIKING_BASE_URL) only for http private and raise error
1 parent 9c06652 commit 7d0c7b4

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

veadk/integrations/ve_viking_db_memory/ve_viking_db_memory.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,20 @@ def __init__(
5151
ak="",
5252
sk="",
5353
sts_token="",
54-
scheme="http",
54+
scheme="https",
5555
connection_timeout=30,
5656
socket_timeout=30,
5757
):
58-
env_host = getenv("DATABASE_VIKINGMEM_BASE_URL", host)
59-
if env_host.startswith("http://"):
60-
env_host = env_host.replace("http://", "")
58+
env_host = getenv(
59+
"DATABASE_VIKINGMEM_BASE_URL", default_value=None, allow_false_values=True
60+
)
61+
if env_host is not None:
62+
if env_host.startswith("http://"):
63+
host = env_host.replace("http://", "")
64+
scheme = "http"
65+
else:
66+
raise ValueError("DATABASE_VIKINGMEM_BASE_URL must start with http://")
67+
6168
self.service_info = VikingDBMemoryClient.get_service_info(
6269
host, region, scheme, connection_timeout, socket_timeout
6370
)

veadk/knowledgebase/backends/vikingdb_knowledge_backend.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -557,16 +557,18 @@ def _do_request(
557557
path: str,
558558
method: Literal["GET", "POST", "PUT", "DELETE"] = "POST",
559559
) -> dict:
560-
VIKINGDB_KNOWLEDGEBASE_BASE_URL = getenv(
561-
"DATABASE_VIKING_BASE_URL", "api-knowledgebase.mlp.cn-beijing.volces.com"
560+
VIKINGDB_KNOWLEDGEBASE_BASE_URL = "api-knowledgebase.mlp.cn-beijing.volces.com"
561+
full_path = f"https://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
562+
563+
env_host = getenv(
564+
"DATABASE_VIKING_BASE_URL", default_value=None, allow_false_values=True
562565
)
563-
if VIKINGDB_KNOWLEDGEBASE_BASE_URL.startswith("http://"):
564-
VIKINGDB_KNOWLEDGEBASE_BASE_URL = VIKINGDB_KNOWLEDGEBASE_BASE_URL.replace(
565-
"http://", ""
566-
)
567-
full_path = f"http://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
568-
else:
569-
full_path = f"https://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
566+
if env_host is not None:
567+
if env_host.startswith("http://"):
568+
VIKINGDB_KNOWLEDGEBASE_BASE_URL = env_host.replace("http://", "")
569+
full_path = f"http://{VIKINGDB_KNOWLEDGEBASE_BASE_URL}{path}"
570+
else:
571+
raise ValueError("DATABASE_VIKING_BASE_URL must start with http://")
570572

571573
volcengine_access_key = self.volcengine_access_key
572574
volcengine_secret_key = self.volcengine_secret_key

0 commit comments

Comments
 (0)