Skip to content

Commit dbed967

Browse files
author
yiguang
committed
feat: add subdivisionlevel and fileformat in resp
1 parent 04e891a commit dbed967

File tree

4 files changed

+95
-58
lines changed

4 files changed

+95
-58
lines changed

volcenginesdkarkruntime/resources/images/images.py

Lines changed: 71 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ..._base_client import make_request_options
2222
from ..._utils._utils import apikey_required, async_apikey_required
2323
from ..._resource import SyncAPIResource, AsyncAPIResource
24-
from ...types.images import SequentialImageGenerationOptions, ImagesResponse
24+
from ...types.images import OptimizePromptOptions, SequentialImageGenerationOptions, ImagesResponse
2525
from ...types.images.image_gen_stream_event import ImageGenStreamEvent
2626
from ..._types import Body, Query, Headers
2727
from ..._streaming import Stream
@@ -41,6 +41,7 @@ def generate(
4141
guidance_scale: float | None = None,
4242
watermark: bool | None = None,
4343
optimize_prompt: bool | None = None,
44+
optimize_prompt_options: OptimizePromptOptions | None = None,
4445
extra_headers: Headers | None = None,
4546
extra_query: Query | None = None,
4647
extra_body: Body | None = None,
@@ -72,6 +73,7 @@ def generate(
7273
guidance_scale: float | None = None,
7374
watermark: bool | None = None,
7475
optimize_prompt: bool | None = None,
76+
optimize_prompt_options: OptimizePromptOptions | None = None,
7577
extra_headers: Headers | None = None,
7678
extra_query: Query | None = None,
7779
extra_body: Body | None = None,
@@ -95,6 +97,7 @@ def generate(
9597
guidance_scale: float | None = None,
9698
watermark: bool | None = None,
9799
optimize_prompt: bool | None = None,
100+
optimize_prompt_options: OptimizePromptOptions | None = None,
98101
extra_headers: Headers | None = None,
99102
extra_query: Query | None = None,
100103
extra_body: Body | None = None,
@@ -118,6 +121,7 @@ def generate(
118121
guidance_scale: float | None = None,
119122
watermark: bool | None = None,
120123
optimize_prompt: bool | None = None,
124+
optimize_prompt_options: OptimizePromptOptions | None = None,
121125
extra_headers: Headers | None = None,
122126
extra_query: Query | None = None,
123127
extra_body: Body | None = None,
@@ -138,6 +142,10 @@ def generate(
138142
"guidance_scale": guidance_scale,
139143
"watermark": watermark,
140144
"optimize_prompt": optimize_prompt,
145+
"optimize_prompt_options": (
146+
optimize_prompt_options.model_dump(mode="json")
147+
if optimize_prompt_options is not None else None
148+
),
141149
"sequential_image_generation": sequential_image_generation,
142150
"sequential_image_generation_options": (
143151
sequential_image_generation_options.model_dump(mode="json")
@@ -162,70 +170,73 @@ def generate(
162170
class AsyncImages(AsyncAPIResource):
163171
@overload
164172
async def generate(
165-
self,
166-
*,
167-
model: str,
168-
prompt: str,
169-
image: str | list[str] | None = None,
170-
response_format: str | None = None,
171-
size: str | None = None,
172-
seed: int | None = None,
173-
guidance_scale: float | None = None,
174-
watermark: bool | None = None,
175-
optimize_prompt: bool | None = None,
176-
extra_headers: Headers | None = None,
177-
extra_query: Query | None = None,
178-
extra_body: Body | None = None,
179-
timeout: float | httpx.Timeout | None = None,
180-
sequential_image_generation: str | None = None,
181-
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
182-
stream: Optional[Literal[False]] | NotGiven = NOT_GIVEN,
173+
self,
174+
*,
175+
model: str,
176+
prompt: str,
177+
image: str | list[str] | None = None,
178+
response_format: str | None = None,
179+
size: str | None = None,
180+
seed: int | None = None,
181+
guidance_scale: float | None = None,
182+
watermark: bool | None = None,
183+
optimize_prompt: bool | None = None,
184+
optimize_prompt_options: OptimizePromptOptions | None = None,
185+
extra_headers: Headers | None = None,
186+
extra_query: Query | None = None,
187+
extra_body: Body | None = None,
188+
timeout: float | httpx.Timeout | None = None,
189+
sequential_image_generation: str | None = None,
190+
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
191+
stream: Optional[Literal[False]] | NotGiven = NOT_GIVEN,
183192
) -> ImagesResponse:
184193
...
185194

186195
@overload
187196
async def generate(
188-
self,
189-
*,
190-
model: str,
191-
prompt: str,
192-
image: str | list[str] | None = None,
193-
response_format: str | None = None,
194-
size: str | None = None,
195-
seed: int | None = None,
196-
guidance_scale: float | None = None,
197-
watermark: bool | None = None,
198-
optimize_prompt: bool | None = None,
199-
extra_headers: Headers | None = None,
200-
extra_query: Query | None = None,
201-
extra_body: Body | None = None,
202-
timeout: float | httpx.Timeout | None = None,
203-
sequential_image_generation: str | None = None,
204-
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
205-
stream: Literal[True],
197+
self,
198+
*,
199+
model: str,
200+
prompt: str,
201+
image: str | list[str] | None = None,
202+
response_format: str | None = None,
203+
size: str | None = None,
204+
seed: int | None = None,
205+
guidance_scale: float | None = None,
206+
watermark: bool | None = None,
207+
optimize_prompt: bool | None = None,
208+
optimize_prompt_options: OptimizePromptOptions | None = None,
209+
extra_headers: Headers | None = None,
210+
extra_query: Query | None = None,
211+
extra_body: Body | None = None,
212+
timeout: float | httpx.Timeout | None = None,
213+
sequential_image_generation: str | None = None,
214+
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
215+
stream: Literal[True],
206216
) -> Stream[ImageGenStreamEvent]:
207217
...
208218

209219
@overload
210220
async def generate(
211-
self,
212-
*,
213-
model: str,
214-
prompt: str,
215-
image: str | list[str] | None = None,
216-
response_format: str | None = None,
217-
size: str | None = None,
218-
seed: int | None = None,
219-
guidance_scale: float | None = None,
220-
watermark: bool | None = None,
221-
optimize_prompt: bool | None = None,
222-
extra_headers: Headers | None = None,
223-
extra_query: Query | None = None,
224-
extra_body: Body | None = None,
225-
timeout: float | httpx.Timeout | None = None,
226-
sequential_image_generation: str | None = None,
227-
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
228-
stream: bool,
221+
self,
222+
*,
223+
model: str,
224+
prompt: str,
225+
image: str | list[str] | None = None,
226+
response_format: str | None = None,
227+
size: str | None = None,
228+
seed: int | None = None,
229+
guidance_scale: float | None = None,
230+
watermark: bool | None = None,
231+
optimize_prompt: bool | None = None,
232+
optimize_prompt_options: OptimizePromptOptions | None = None,
233+
extra_headers: Headers | None = None,
234+
extra_query: Query | None = None,
235+
extra_body: Body | None = None,
236+
timeout: float | httpx.Timeout | None = None,
237+
sequential_image_generation: str | None = None,
238+
sequential_image_generation_options: SequentialImageGenerationOptions | None = None,
239+
stream: bool,
229240
) -> ImagesResponse | Stream[ImageGenStreamEvent]:
230241
...
231242

@@ -242,6 +253,7 @@ async def generate(
242253
guidance_scale: float | None = None,
243254
watermark: bool | None = None,
244255
optimize_prompt: bool | None = None,
256+
optimize_prompt_options: OptimizePromptOptions | None = None,
245257
extra_headers: Headers | None = None,
246258
extra_query: Query | None = None,
247259
extra_body: Body | None = None,
@@ -262,6 +274,10 @@ async def generate(
262274
"guidance_scale": guidance_scale,
263275
"watermark": watermark,
264276
"optimize_prompt": optimize_prompt,
277+
"optimize_prompt_options": (
278+
optimize_prompt_options.model_dump(mode="json")
279+
if optimize_prompt_options is not None else None
280+
),
265281
"sequential_image_generation": sequential_image_generation,
266282
"sequential_image_generation_options": (
267283
sequential_image_generation_options.model_dump(mode="json")

volcenginesdkarkruntime/types/content_generation/content_generation_task.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ class Content(BaseModel):
2727
last_frame_url: str
2828
"""The URL of the last frame of the generated video, if any."""
2929

30+
file_url: str
31+
"""The URL of the generated file, if any."""
32+
3033

3134
class ContentGenerationError(BaseModel):
3235
message: str
@@ -55,6 +58,18 @@ class ContentGenerationTask(BaseModel):
5558
usage: Usage
5659
"""The usage information for the task."""
5760

61+
subdivisionlevel: str
62+
"""The subdivision level of the task."""
63+
64+
fileformat: str
65+
"""The file format of the generated content."""
66+
67+
frames: int
68+
"""The number of frames in the generated content."""
69+
70+
framespersecond: int
71+
"""The number of frames per second in the generated content."""
72+
5873
created_at: int
5974
"""The Unix timestamp when the task was created."""
6075

volcenginesdkarkruntime/types/images/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# This modified file is released under the same license.
1212

13-
from .images import SequentialImageGenerationOptions, ImagesResponse
13+
from .images import OptimizePromptOptions, SequentialImageGenerationOptions, ImagesResponse
1414

1515

16-
__all__ = ["SequentialImageGenerationOptions", "ImagesResponse"]
16+
__all__ = ["OptimizePromptOptions", "SequentialImageGenerationOptions", "ImagesResponse"]

volcenginesdkarkruntime/types/images/images.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,19 @@
1414

1515
from volcenginesdkarkruntime._models import BaseModel
1616

17-
__all__ = ["SequentialImageGenerationOptions", "ImagesResponse"]
17+
__all__ = ["OptimizePromptOptions", "SequentialImageGenerationOptions", "ImagesResponse"]
18+
19+
20+
class OptimizePromptOptions(BaseModel):
21+
thinking: Optional[str] = None
22+
mode: Optional[str] = None
1823

1924

2025
class SequentialImageGenerationOptions(BaseModel):
2126
max_images: Optional[int] = None
2227
""" Maximum number of images to generate in this request; effective only when the multi-image feature is enabled """
2328

29+
2430
class Usage(BaseModel):
2531
generated_images: int
2632
"""The number of images generated."""

0 commit comments

Comments
 (0)