Merge branch 'feat/ark/hotfix_240515' into 'master'

feat: 降低python版本；新增extras_require

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

Author: liuweiwei-xyz

setup.py

@@ -11,21 +11,24 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = [
-    "certifi>=2017.4.17",
-    "python-dateutil>=2.1",
-    "six>=1.10",
-    "urllib3>=1.23"
-]
+REQUIRES = ["certifi>=2017.4.17", "python-dateutil>=2.1", "six>=1.10", "urllib3>=1.23"]
 
 setup(
     name=NAME,
     version=VERSION,
     install_requires=REQUIRES,
     packages=find_packages(),
     include_package_data=True,
-    description='Volcengine SDK for Python',
+    description="Volcengine SDK for Python",
     license="Apache License 2.0",
-    platforms='any',
-    url='https://github.com/volcengine/volcengine-python-sdk',
+    platforms="any",
+    url="https://github.com/volcengine/volcengine-python-sdk",
+    extras_require={
+        "ark": [
+            "pydantic>=1.9.0, <3",
+            "httpx>=0.23.0, <1",
+            "anyio>=3.5.0, <5",
+            "cached-property; python_version < '3.8'",
+        ]
+    },
 )

volcenginesdkarkruntime/_request_options.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from typing import Dict, Union, Any, ClassVar, TypedDict, TYPE_CHECKING, cast
+from typing import Dict, Union, Any, TYPE_CHECKING, cast
 
 import pydantic
 from httpx import Timeout
-from typing_extensions import Unpack
+from typing_extensions import Unpack, TypedDict, ClassVar
 
 from ._compat import PYDANTIC_V2, ConfigDict
 from ._models import BaseModel

volcenginesdkarkruntime/_utils/_transform.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from typing import Literal
-from typing_extensions import override
+from typing_extensions import Literal, override
 
 PropertyFormat = Literal["iso8601", "base64", "custom"]
 

volcenginesdkarkruntime/_utils/_typing.py

@@ -1,5 +1,7 @@
-from typing import get_args, cast, get_origin, Annotated
-from typing_extensions import Required
+from __future__ import annotations
+
+from typing import cast
+from typing_extensions import Required, get_args, get_origin, Annotated
 
 
 def extract_type_arg(typ: type, index: int = 0) -> type:

volcenginesdkarkruntime/resources/chat/chat.py

@@ -2,23 +2,20 @@
 
 from __future__ import annotations
 
-from functools import cache
-
 from .completions import Completions, AsyncCompletions
+from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 
 __all__ = ["Chat", "AsyncChat"]
 
 
 class Chat(SyncAPIResource):
-    @property
-    @cache
+    @cached_property
     def completions(self) -> Completions:
         return Completions(self._client)
 
 
 class AsyncChat(AsyncAPIResource):
-    @property
-    @cache
+    @cached_property
     def completions(self) -> AsyncCompletions:
         return AsyncCompletions(self._client)

volcenginesdkarkruntime/resources/chat/completions.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-from functools import cache
+from typing import Dict, List, Union, Iterable, Optional
 
 import httpx
+from typing_extensions import Literal
 
 from ..._base_client import make_request_options
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from typing import Dict, List, Union, Iterable, Optional, overload
-from typing_extensions import Literal
+from ..._compat import cached_property
 
 from ..._response import (
     to_raw_response_wrapper,
@@ -29,13 +29,11 @@
 
 
 class Completions(SyncAPIResource):
-    @property
-    @cache
+    @cached_property
     def with_raw_response(self) -> CompletionsWithRawResponse:
         return CompletionsWithRawResponse(self)
 
-    @property
-    @cache
+    @cached_property
     def with_streaming_response(self) -> CompletionsWithStreamingResponse:
         return CompletionsWithStreamingResponse(self)
 
@@ -98,13 +96,11 @@ def create(
 
 
 class AsyncCompletions(AsyncAPIResource):
-    @property
-    @cache
+    @cached_property
     def with_raw_response(self) -> AsyncCompletionsWithRawResponse:
         return AsyncCompletionsWithRawResponse(self)
 
-    @property
-    @cache
+    @cached_property
     def with_streaming_response(self) -> AsyncCompletionsWithStreamingResponse:
         return AsyncCompletionsWithStreamingResponse(self)