AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-15 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update default endpoint for ark provider (#7741)

Browse Source
This commit is contained in:
sino 2024-08-28 13:56:50 +08:00 committed by GitHub
parent 693fe912f2
commit 7cfebffbb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/core/model_runtime/model_providers/volcengine_maas/client.py
View File

@ -32,6 +32,9 @@ from core.model_runtime.entities.message_entities import (
UserPromptMessage, UserPromptMessage,
) )
DEFAULT_V2_ENDPOINT = "maas-api.ml-platform-cn-beijing.volces.com"
DEFAULT_V3_ENDPOINT = "https://ark.cn-beijing.volces.com/api/v3"
class ArkClientV3: class ArkClientV3:
endpoint_id: Optional[str] = None endpoint_id: Optional[str] = None
@ -43,16 +46,24 @@ class ArkClientV3:
@staticmethod @staticmethod
def is_legacy(credentials: dict) -> bool: def is_legacy(credentials: dict) -> bool:
# match default v2 endpoint
if ArkClientV3.is_compatible_with_legacy(credentials): if ArkClientV3.is_compatible_with_legacy(credentials):
return False return False
sdk_version = credentials.get("sdk_version", "v2") # match default v3 endpoint
return sdk_version != "v3" if credentials.get("api_endpoint_host") == DEFAULT_V3_ENDPOINT:
return False
# only v3 support api_key
if credentials.get("auth_method") == "api_key":
return False
# these cases are considered as sdk v2
# - modified default v2 endpoint
# - modified default v3 endpoint and auth without api_key
return True
@staticmethod @staticmethod
def is_compatible_with_legacy(credentials: dict) -> bool: def is_compatible_with_legacy(credentials: dict) -> bool:
sdk_version = credentials.get("sdk_version")
endpoint = credentials.get("api_endpoint_host") endpoint = credentials.get("api_endpoint_host")
return sdk_version is None and endpoint == "maas-api.ml-platform-cn-beijing.volces.com" return endpoint == DEFAULT_V2_ENDPOINT
@classmethod @classmethod
def from_credentials(cls, credentials): def from_credentials(cls, credentials):
@ -64,7 +75,7 @@ class ArkClientV3:
"sk": credentials['volc_secret_access_key'], "sk": credentials['volc_secret_access_key'],
} }
if cls.is_compatible_with_legacy(credentials): if cls.is_compatible_with_legacy(credentials):
args["base_url"] = "https://ark.cn-beijing.volces.com/api/v3" args["base_url"] = DEFAULT_V3_ENDPOINT
client = ArkClientV3( client = ArkClientV3(
**args **args

2
api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml
View File

@ -64,7 +64,7 @@ model_credential_schema:
en_US: API Endpoint Host en_US: API Endpoint Host
zh_Hans: API Endpoint Host zh_Hans: API Endpoint Host
type: text-input type: text-input
default: maas-api.ml-platform-cn-beijing.volces.com default: https://ark.cn-beijing.volces.com/api/v3
placeholder: placeholder:
en_US: Enter your API Endpoint Host en_US: Enter your API Endpoint Host
zh_Hans: 输入 API Endpoint Host zh_Hans: 输入 API Endpoint Host