@ai-sdk/alibaba 2.0.0-beta.0 → 2.0.0-beta.10

package/src/alibaba-video-model.ts

@@ -1,7 +1,7 @@
 import {
   AISDKError,
-  type Experimental_VideoModelV3,
-  type SharedV3Warning,
+  type Experimental_VideoModelV4,
+  type SharedV4Warning,
 } from '@ai-sdk/provider';
 import {
   combineHeaders,
@@ -133,8 +133,8 @@ function detectMode(modelId: string): 't2v' | 'i2v' | 'r2v' {
   return 't2v';
 }
 
-export class AlibabaVideoModel implements Experimental_VideoModelV3 {
-  readonly specificationVersion = 'v3';
+export class AlibabaVideoModel implements Experimental_VideoModelV4 {
+  readonly specificationVersion = 'v4';
   readonly maxVideosPerCall = 1;
 
   get provider(): string {
@@ -147,10 +147,10 @@ export class AlibabaVideoModel implements Experimental_VideoModelV3 {
   ) {}
 
   async doGenerate(
-    options: Parameters<Experimental_VideoModelV3['doGenerate']>[0],
-  ): Promise<Awaited<ReturnType<Experimental_VideoModelV3['doGenerate']>>> {
+    options: Parameters<Experimental_VideoModelV4['doGenerate']>[0],
+  ): Promise<Awaited<ReturnType<Experimental_VideoModelV4['doGenerate']>>> {
     const currentDate = this.config._internal?.currentDate?.() ?? new Date();
-    const warnings: SharedV3Warning[] = [];
+    const warnings: SharedV4Warning[] = [];
     const mode = detectMode(this.modelId);
 
     const alibabaOptions = (await parseProviderOptions({

package/src/convert-alibaba-usage.ts

@@ -1,5 +1,5 @@
 import { convertOpenAICompatibleChatUsage } from '@ai-sdk/openai-compatible/internal';
-import type { LanguageModelV3Usage } from '@ai-sdk/provider';
+import type { LanguageModelV4Usage } from '@ai-sdk/provider';
 
 export type AlibabaUsage = {
   prompt_tokens?: number | null;
@@ -16,7 +16,7 @@ export type AlibabaUsage = {
 
 export function convertAlibabaUsage(
   usage: AlibabaUsage | undefined | null,
-): LanguageModelV3Usage {
+): LanguageModelV4Usage {
   const baseUsage = convertOpenAICompatibleChatUsage(usage);
 
   const cacheWriteTokens =

package/src/convert-to-alibaba-chat-messages.ts

@@ -1,6 +1,6 @@
 import {
-  type LanguageModelV3DataContent,
-  type LanguageModelV3Prompt,
+  type LanguageModelV4DataContent,
+  type LanguageModelV4Prompt,
   UnsupportedFunctionalityError,
 } from '@ai-sdk/provider';
 import { convertToBase64 } from '@ai-sdk/provider-utils';
@@ -11,7 +11,7 @@ function formatImageUrl({
   data,
   mediaType,
 }: {
-  data: LanguageModelV3DataContent;
+  data: LanguageModelV4DataContent;
   mediaType: string;
 }): string {
   return data instanceof URL
@@ -23,7 +23,7 @@ export function convertToAlibabaChatMessages({
   prompt,
   cacheControlValidator,
 }: {
-  prompt: LanguageModelV3Prompt;
+  prompt: LanguageModelV4Prompt;
   cacheControlValidator?: CacheControlValidator;
 }): AlibabaChatPrompt {
   const messages: AlibabaChatPrompt = [];
@@ -53,26 +53,13 @@ export function convertToAlibabaChatMessages({
       }
 
       case 'user': {
-        const isSinglePart = content.length === 1;
-
-        if (
-          isSinglePart &&
-          content[0].type === 'text' &&
-          !messageCacheControl
-        ) {
-          messages.push({
-            role: 'user',
-            content: content[0].text,
-          });
-          break;
-        }
-
         messages.push({
           role: 'user',
-          content: content.map(part => {
-            const partCacheControl = isSinglePart
-              ? messageCacheControl
-              : cacheControlValidator?.getCacheControl(part.providerOptions);
+          content: content.map((part, index) => {
+            const isLastPart = index === content.length - 1;
+            const partCacheControl =
+              cacheControlValidator?.getCacheControl(part.providerOptions) ??
+              (isLastPart ? messageCacheControl : undefined);
 
             switch (part.type) {
               case 'text': {
@@ -163,17 +150,15 @@ export function convertToAlibabaChatMessages({
           r => r.type !== 'tool-approval-response',
         );
 
-        const isSinglePart = toolResponses.length === 1;
-
         for (let i = 0; i < toolResponses.length; i++) {
           const toolResponse = toolResponses[i];
           const output = toolResponse.output;
+          const isLastPart = i === toolResponses.length - 1;
 
-          const partCacheControl = isSinglePart
-            ? messageCacheControl
-            : cacheControlValidator?.getCacheControl(
-                (toolResponse as any).providerOptions,
-              );
+          const partCacheControl =
+            cacheControlValidator?.getCacheControl(
+              toolResponse.providerOptions,
+            ) ?? (isLastPart ? messageCacheControl : undefined);
 
           let contentValue: string;
           switch (output.type) {

package/src/get-cache-control.ts

@@ -1,6 +1,6 @@
 import type {
-  SharedV3ProviderMetadata,
-  SharedV3Warning,
+  SharedV4ProviderMetadata,
+  SharedV4Warning,
 } from '@ai-sdk/provider';
 import type { AlibabaCacheControl } from './alibaba-chat-prompt';
 
@@ -8,7 +8,7 @@ import type { AlibabaCacheControl } from './alibaba-chat-prompt';
 const MAX_CACHE_BREAKPOINTS = 4;
 
 function getCacheControl(
-  providerMetadata: SharedV3ProviderMetadata | undefined,
+  providerMetadata: SharedV4ProviderMetadata | undefined,
 ): AlibabaCacheControl | undefined {
   const alibaba = providerMetadata?.alibaba;
 
@@ -21,10 +21,10 @@ function getCacheControl(
 
 export class CacheControlValidator {
   private breakpointCount = 0;
-  private warnings: SharedV3Warning[] = [];
+  private warnings: SharedV4Warning[] = [];
 
   getCacheControl(
-    providerMetadata: SharedV3ProviderMetadata | undefined,
+    providerMetadata: SharedV4ProviderMetadata | undefined,
   ): AlibabaCacheControl | undefined {
     const cacheControlValue = getCacheControl(providerMetadata);
 
@@ -43,7 +43,7 @@ export class CacheControlValidator {
     return cacheControlValue;
   }
 
-  getWarnings(): SharedV3Warning[] {
+  getWarnings(): SharedV4Warning[] {
     return this.warnings;
   }
 }