Merge branch 'integration_2024-05-30_272922903810' into 'master'

merge branch integration_2024-05-30_272922903810 into master

See merge request iaasng/volcengine-python-sdk!314

Author: liuweiwei-xyz

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.83",
-	"meta_commit": "dbced919d27fc04b92b10148f0771d171e63cf37"
-}
+	"lasted": "1.0.84",
+	"meta_commit": "60964df89935b212f82fe97624e3638432316a31"
+}

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.83"
+VERSION = "1.0.84"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkarkruntime/_client.py

@@ -38,6 +38,7 @@ def __init__(
         base_url: str | URL = BASE_URL,
         ak: str | None = None,
         sk: str | None = None,
+        api_key: str | None = None,
         timeout: float | Timeout | None = DEFAULT_TIMEOUT,
         max_retries: int = DEFAULT_MAX_RETRIES,
         http_client: Client | None = None,
@@ -48,6 +49,7 @@ def __init__(
             Args:
                 ak: access key id
                 sk: secret access key
+                api_key: api key，this api key will not be refreshed
                 timeout: timeout of client. default httpx.Timeout(timeout=60.0, connect=60.0)
                 max_retries: times of retry when request failed. default 1
                 http_client: specify customized http_client
@@ -59,8 +61,13 @@ def __init__(
             ak = os.environ.get("VOLC_ACCESSKEY")
         if sk is None:
             sk = os.environ.get("VOLC_SECRETKEY")
+        if api_key is None:
+            api_key = os.environ.get("ARK_API_KEY")
         self.ak = ak
         self.sk = sk
+        self.api_key = api_key
+
+        assert (api_key is not None) or (ak is not None and sk is not None), "you need to support api_key or ak&sk"
 
         super().__init__(
             base_url=base_url,
@@ -82,6 +89,11 @@ def _get_endpoint_sts_token(self, endpoint_id: str):
             self._sts_token_manager = StsTokenManager(self.ak, self.sk)
         return self._sts_token_manager.get(endpoint_id)
 
+    @property
+    def auth_headers(self) -> dict[str, str]:
+        api_key = self.api_key
+        return {"Authorization": f"Bearer {api_key}"}
+
 
 class AsyncArk(AsyncAPIClient):
     chat: resources.AsyncChat
@@ -91,6 +103,7 @@ def __init__(
         *,
         ak: str | None = None,
         sk: str | None = None,
+        api_key: str | None = None,
         base_url: str | URL = BASE_URL,
         timeout: float | Timeout | None = DEFAULT_TIMEOUT,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -101,6 +114,7 @@ def __init__(
             Args:
                 ak: access key id
                 sk: secret access key
+                api_key: api key，this api key will not be refreshed
                 timeout: timeout of client. default httpx.Timeout(timeout=60.0, connect=60.0)
                 max_retries: times of retry when request failed. default 1
                 http_client: specify customized http_client
@@ -112,8 +126,13 @@ def __init__(
             ak = os.environ.get("VOLC_ACCESSKEY")
         if sk is None:
             sk = os.environ.get("VOLC_SECRETKEY")
+        if api_key is None:
+            api_key = os.environ.get("ARK_API_KEY")
         self.ak = ak
         self.sk = sk
+        self.api_key = api_key
+
+        assert (api_key is not None) or (ak is not None and sk is not None), "you need to support api_key or ak&sk"
 
         super().__init__(
             base_url=base_url,
@@ -135,6 +154,11 @@ def _get_endpoint_sts_token(self, endpoint_id: str):
             self._sts_token_manager = StsTokenManager(self.ak, self.sk)
         return self._sts_token_manager.get(endpoint_id)
 
+    @property
+    def auth_headers(self) -> dict[str, str]:
+        api_key = self.api_key
+        return {"Authorization": f"Bearer {api_key}"}
+
 
 class StsTokenManager(object):
 

volcenginesdkarkruntime/_utils/_utils.py

@@ -80,6 +80,6 @@ def _insert_sts_token(args, kwargs):
 
     ark_client = args[0]._client
     model = kwargs.get("model", "")
-    if model and model.startswith("ep-") and ark_client.ak and ark_client.sk:
+    if ark_client.api_key is None and model and model.startswith("ep-") and ark_client.ak and ark_client.sk:
         default_auth_header = {"Authorization": "Bearer " + ark_client._get_endpoint_sts_token(model)}
         kwargs["extra_headers"] = {**default_auth_header, **kwargs.get("extra_headers", {})}

volcenginesdkcdn/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from volcenginesdkcdn.api.cdn_api import CDNApi