Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/plugin-sdk/test-helpers/provider-http-mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ interface ProviderHttpMocks {
pollProviderOperationJsonMock: AnyMock;
assertOkOrThrowHttpErrorMock: Mock<(response: Response, label: string) => Promise<void>>;
assertOkOrThrowProviderErrorMock: Mock<(response: Response, label: string) => Promise<void>>;
readProviderJsonResponseMock: Mock<<T>(response: Response, label: string) => Promise<T>>;
sanitizeConfiguredModelProviderRequestMock: Mock<
(
request: SanitizeConfiguredModelProviderRequestParams,
Expand All @@ -65,6 +66,9 @@ const providerHttpMocks = vi.hoisted(() => ({
pollProviderOperationJsonMock: vi.fn(),
assertOkOrThrowHttpErrorMock: vi.fn(async (_response: Response, _label: string) => {}),
assertOkOrThrowProviderErrorMock: vi.fn(async (_response: Response, _label: string) => {}),
readProviderJsonResponseMock: vi.fn(
async <T>(response: Response, _label: string): Promise<T> => response.json() as T,
),
sanitizeConfiguredModelProviderRequestMock: vi.fn(
(request: SanitizeConfiguredModelProviderRequestParams) => request,
),
Expand Down Expand Up @@ -234,6 +238,7 @@ vi.mock("openclaw/plugin-sdk/provider-http", () => ({
postJsonRequest: providerHttpMocks.postJsonRequestMock,
postMultipartRequest: providerHttpMocks.postMultipartRequestMock,
providerOperationRetryConfig: (_stage: string) => true,
readProviderJsonResponse: providerHttpMocks.readProviderJsonResponseMock,
resolveProviderOperationTimeoutMs: ({ defaultTimeoutMs }: { defaultTimeoutMs: number }) =>
defaultTimeoutMs,
resolveProviderHttpRequestConfig: providerHttpMocks.resolveProviderHttpRequestConfigMock,
Expand All @@ -259,6 +264,7 @@ export function installProviderHttpMockCleanup(): void {
providerHttpMocks.pollProviderOperationJsonMock.mockClear();
providerHttpMocks.assertOkOrThrowHttpErrorMock.mockClear();
providerHttpMocks.assertOkOrThrowProviderErrorMock.mockClear();
providerHttpMocks.readProviderJsonResponseMock.mockClear();
providerHttpMocks.sanitizeConfiguredModelProviderRequestMock.mockClear();
providerHttpMocks.resolveProviderHttpRequestConfigMock.mockClear();
});
Expand Down
11 changes: 9 additions & 2 deletions src/video-generation/dashscope-compatible.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
fetchProviderDownloadResponse,
fetchProviderOperationResponse,
postJsonRequest,
readProviderJsonResponse,
resolveProviderOperationTimeoutMs,
waitProviderOperationPollInterval,
type ProviderOperationTimeoutMs,
Expand Down Expand Up @@ -199,7 +200,10 @@ export async function pollDashscopeVideoTaskUntilComplete(params: {
provider: params.providerLabel,
requestFailedMessage: `${params.providerLabel} video-generation task poll failed`,
});
const payload = (await response.json()) as DashscopeVideoGenerationResponse;
const payload = await readProviderJsonResponse<DashscopeVideoGenerationResponse>(
response,
`${params.providerLabel} video-generation task poll`,
);
const status = payload.output?.task_status?.trim().toUpperCase();
if (status === "SUCCEEDED") {
return payload;
Expand Down Expand Up @@ -266,7 +270,10 @@ export async function runDashscopeVideoGenerationTask(params: {

try {
await assertOkOrThrowHttpError(response, `${params.providerLabel} video generation failed`);
const submitted = (await response.json()) as DashscopeVideoGenerationResponse;
const submitted = await readProviderJsonResponse<DashscopeVideoGenerationResponse>(
response,
`${params.providerLabel} video generation`,
);
const taskId = submitted.output?.task_id?.trim();
if (!taskId) {
throw new Error(`${params.providerLabel} video generation response missing task_id`);
Expand Down
Loading