Merge branch 'feat/ark-content-generation-task' into 'fxj/feat/moderation'

feat: ark content generation task

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

Author: xaviergoh-bytedance

volcenginesdkarkruntime/_base_client.py

@@ -557,6 +557,44 @@ def post(
             ResponseT, self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)
         )
 
+    def get(
+            self,
+            path: str,
+            *,
+            cast_to: Type[ResponseT],
+            params: list[tuple[str, str]] | None = None,
+            options: ExtraRequestOptions = {},
+            stream: bool = False,
+            stream_cls: type[_StreamT] | None = None,
+    ) -> ResponseT | _StreamT:
+        opts = RequestOptions.construct(
+            method="get",
+            url=path,
+            params=params,
+            **options,
+        )
+
+        return cast(
+            ResponseT, self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)
+        )
+
+    def delete(
+            self,
+            path: str,
+            *,
+            cast_to: Type[ResponseT],
+            params: list[tuple[str, str]] | None = None,
+            options: ExtraRequestOptions = {},
+    ) -> ResponseT:
+        opts = RequestOptions.construct(  # type: ignore
+            method="delete",
+            url=path,
+            params=params,
+            **options,
+        )
+
+        return cast(ResponseT, self.request(cast_to, opts))
+
     def request(
             self,
             cast_to: Type[ResponseT],
@@ -681,6 +719,42 @@ async def post(
 
         return await self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)
 
+    async def get(
+            self,
+            path: str,
+            *,
+            cast_to: Type[ResponseT],
+            params: list[tuple[str, str]] | None = None,
+            options: ExtraRequestOptions = {},
+            stream: bool = False,
+            stream_cls: type[_AsyncStreamT] | None = None,
+    ) -> ResponseT | _AsyncStreamT:
+        opts = RequestOptions.construct(
+            method="get",
+            url=path,
+            params=params,
+            **options,
+        )
+
+        return await self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)
+
+    async def delete(
+            self,
+            path: str,
+            *,
+            cast_to: Type[ResponseT],
+            params: list[tuple[str, str]] | None = None,
+            options: ExtraRequestOptions = {},
+    ) -> ResponseT:
+        opts = RequestOptions.construct(
+            method="delete",
+            url=path,
+            params=params,
+            **options,
+        )
+
+        return await self.request(cast_to, opts)
+
     async def request(
             self,
             cast_to: Type[ResponseT],

volcenginesdkarkruntime/_client.py

@@ -38,6 +38,7 @@ class Ark(SyncAPIClient):
     embeddings: resources.Embeddings
     tokenization: resources.Tokenization
     context: resources.Context
+    content_generation: resources.ContentGeneration
 
     def __init__(
         self,
@@ -96,6 +97,7 @@ def __init__(
         self.embeddings = resources.Embeddings(self)
         self.tokenization = resources.Tokenization(self)
         self.context = resources.Context(self)
+        self.content_generation = resources.ContentGeneration(self)
         # self.classification = resources.Classification(self)
 
     def _get_endpoint_sts_token(self, endpoint_id: str):
@@ -133,6 +135,7 @@ class AsyncArk(AsyncAPIClient):
     embeddings: resources.AsyncEmbeddings
     tokenization: resources.AsyncTokenization
     context: resources.AsyncContext
+    content_generation: resources.AsyncContentGeneration
 
     def __init__(
         self,
@@ -190,6 +193,7 @@ def __init__(
         self.embeddings = resources.AsyncEmbeddings(self)
         self.tokenization = resources.AsyncTokenization(self)
         self.context = resources.AsyncContext(self)
+        self.content_generation = resources.AsyncContentGeneration(self)
         # self.classification = resources.AsyncClassification(self)
 
     def _get_endpoint_sts_token(self, endpoint_id: str):

volcenginesdkarkruntime/_resource.py

@@ -10,6 +10,8 @@ class SyncAPIResource:
     def __init__(self, client: "Ark") -> None:
         self._client = client
         self._post = client.post
+        self._get = client.get
+        self._delete = client.delete
 
 
 class AsyncAPIResource:
@@ -18,3 +20,5 @@ class AsyncAPIResource:
     def __init__(self, client: "AsyncArk") -> None:
         self._client = client
         self._post = client.post
+        self._get = client.get
+        self._delete = client.delete

volcenginesdkarkruntime/_utils/_utils.py

@@ -11,6 +11,7 @@
     cast,
     TypeVar,
 )
+
 from typing_extensions import TypeGuard
 
 from .._types import NotGiven
@@ -87,4 +88,28 @@ def _insert_sts_token(args, kwargs):
     elif ark_client.api_key is None and model and model.startswith("bot-") and ark_client.ak and ark_client.sk:
         default_auth_header = {"Authorization": "Bearer " + ark_client._get_bot_sts_token(model)}
         extra_headers = kwargs.get("extra_headers") if kwargs.get("extra_headers") else {}
-        kwargs["extra_headers"] = {**default_auth_header, **extra_headers}
+        kwargs["extra_headers"] = {**default_auth_header, **extra_headers}
+
+
+def apikey_required(func):
+    def wrapper(*args, **kwargs):
+        _assert_apikey(args, kwargs)
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
+def async_apikey_required(func):
+    async def wrapper(*args, **kwargs):
+        _assert_apikey(args, kwargs)
+        return await func(*args, **kwargs)
+
+    return wrapper
+
+
+def _assert_apikey(args, kwargs):
+    assert len(args) > 0
+
+    ark_client = args[0]._client
+    assert ark_client.api_key is not None, \
+        "ak&sk authentication is currently not supported for this method, please use api key instead"

volcenginesdkarkruntime/resources/__init__.py

@@ -4,6 +4,7 @@
 from .classification import Classification, AsyncClassification
 from .bot import BotChat, AsyncBotChat
 from .context import Context, AsyncContext
+from .content_generation import ContentGeneration, AsyncContentGeneration
 
 __all__ = [
     "Chat",
@@ -15,5 +16,7 @@
     "Tokenization",
     "AsyncTokenization",
     "Context",
-    "AsyncContext"
+    "AsyncContext",
+    "ContentGeneration",
+    "AsyncContentGeneration"
 ]

volcenginesdkarkruntime/resources/content_generation/__init__.py

@@ -0,0 +1,4 @@
+from volcenginesdkarkruntime.resources.content_generation.content_generation import ContentGeneration, \
+    AsyncContentGeneration
+
+__all__ = ["ContentGeneration", "AsyncContentGeneration"]

volcenginesdkarkruntime/resources/content_generation/content_generation.py

@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from .tasks import Tasks, AsyncTasks
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+
+
+class ContentGeneration(SyncAPIResource):
+    @cached_property
+    def tasks(self) -> Tasks:
+        return Tasks(self._client)
+
+
+class AsyncContentGeneration(AsyncAPIResource):
+    @cached_property
+    def tasks(self) -> AsyncTasks:
+        return AsyncTasks(self._client)