feat: support auth by api key for ark provider (#7845)

langgenius · Aug 31, 2024 · 1f56a20 · 1f56a20
1 parent 0c2a62f
commit 1f56a20
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/api/core/model_runtime/model_providers/volcengine_maas/client.py b/api/core/model_runtime/model_providers/volcengine_maas/client.py
@@ -71,11 +71,24 @@ def from_credentials(cls, credentials):
         args = {
             "base_url": credentials['api_endpoint_host'],
             "region": credentials['volc_region'],
-            "ak": credentials['volc_access_key_id'],
-            "sk": credentials['volc_secret_access_key'],
         }
+        if credentials.get("auth_method") == "api_key":
+            args = {
+                **args,
+                "api_key": credentials['volc_api_key'],
+            }
+        else:
+            args = {
+                **args,
+                "ak": credentials['volc_access_key_id'],
+                "sk": credentials['volc_secret_access_key'],
+            }
+
         if cls.is_compatible_with_legacy(credentials):
-            args["base_url"] = DEFAULT_V3_ENDPOINT
+            args = {
+                **args,
+                "base_url": DEFAULT_V3_ENDPOINT
+            }
 
         client = ArkClientV3(
             **args

diff --git a/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml b/api/core/model_runtime/model_providers/volcengine_maas/volcengine_maas.yaml
@@ -30,8 +30,28 @@ model_credential_schema:
       en_US: Enter your Model Name
       zh_Hans: 输入模型名称
   credential_form_schemas:
+    - variable: auth_method
+      required: true
+      label:
+        en_US: Authentication Method
+        zh_Hans: 鉴权方式
+      type: select
+      default: aksk
+      options:
+        - label:
+            en_US: API Key
+          value: api_key
+        - label:
+            en_US: Access Key / Secret Access Key
+          value: aksk
+      placeholder:
+        en_US: Enter your Authentication Method
+        zh_Hans: 选择鉴权方式
     - variable: volc_access_key_id
       required: true
+      show_on:
+        - variable: auth_method
+          value: aksk
       label:
         en_US: Access Key
         zh_Hans: Access Key
@@ -41,13 +61,27 @@ model_credential_schema:
         zh_Hans: 输入您的 Access Key
     - variable: volc_secret_access_key
       required: true
+      show_on:
+        - variable: auth_method
+          value: aksk
       label:
         en_US: Secret Access Key
         zh_Hans: Secret Access Key
       type: secret-input
       placeholder:
         en_US: Enter your Secret Access Key
         zh_Hans: 输入您的 Secret Access Key
+    - variable: volc_api_key
+      required: true
+      show_on:
+        - variable: auth_method
+          value: api_key
+      label:
+        en_US: API Key
+      type: secret-input
+      placeholder:
+        en_US: Enter your API Key
+        zh_Hans: 输入您的 API Key
     - variable: volc_region
       required: true
       label: