Skip to content

refactor(dashscope): apply cache_control to all content types #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(dashscope): apply cache_control to all content types #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions packages/core/src/core/openaiContentGenerator/provider/dashscope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ describe('DashScopeOpenAICompatibleProvider', () => {
});
});

it('should add empty text item with cache control if last item is not text for streaming requests', () => {
it('should add cache control directly to image content if last item is not text for streaming requests', () => {
const requestWithNonTextLast: OpenAI.Chat.ChatCompletionCreateParams = {
model: 'qwen-max',
stream: true, // This will trigger cache control on last message
Expand All @@ -612,12 +612,12 @@ describe('DashScopeOpenAICompatibleProvider', () => {

const content = result.messages[0]
.content as OpenAI.Chat.ChatCompletionContentPart[];
expect(content).toHaveLength(3);
expect(content).toHaveLength(2);

// Should add empty text item with cache control
expect(content[2]).toEqual({
type: 'text',
text: '',
// Should add cache control directly to the image item
expect(content[1]).toEqual({
type: 'image_url',
image_url: { url: 'https://example.com/image.jpg' },
cache_control: { type: 'ephemeral' },
});
});
Expand Down Expand Up @@ -691,7 +691,7 @@ describe('DashScopeOpenAICompatibleProvider', () => {
expect(content).toEqual([
{
type: 'text',
text: '',
text: ' ',
cache_control: { type: 'ephemeral' },
},
]);
Expand Down
27 changes: 8 additions & 19 deletions packages/core/src/core/openaiContentGenerator/provider/dashscope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { tokenLimit } from '../../tokenLimits.js';
import type {
OpenAICompatibleProvider,
DashScopeRequestMetadata,
ChatCompletionContentPartTextWithCache,
ChatCompletionContentPartWithCache,
ChatCompletionToolWithCache,
} from './types.js';
Expand Down Expand Up @@ -225,7 +224,7 @@ export class DashScopeOpenAICompatibleProvider
{
type: 'text',
text: content,
} as ChatCompletionContentPartTextWithCache,
} as ChatCompletionContentPartWithCache,
];
}
return [...content] as ChatCompletionContentPartWithCache[];
Expand All @@ -241,28 +240,18 @@ export class DashScopeOpenAICompatibleProvider
return [
{
type: 'text',
text: '',
text: ' ',
cache_control: { type: 'ephemeral' },
} as ChatCompletionContentPartTextWithCache,
} as ChatCompletionContentPartWithCache,
];
}

// Add cache_control to the last item regardless of its type (text, image, or refusal)
const lastItem = contentArray[contentArray.length - 1];

if (lastItem.type === 'text') {
// Add cache_control to the last text item
contentArray[contentArray.length - 1] = {
...lastItem,
cache_control: { type: 'ephemeral' },
} as ChatCompletionContentPartTextWithCache;
} else {
// If the last item is not text, add a new text item with cache_control
contentArray.push({
type: 'text',
text: '',
cache_control: { type: 'ephemeral' },
} as ChatCompletionContentPartTextWithCache);
}
contentArray[contentArray.length - 1] = {
...lastItem,
cache_control: { type: 'ephemeral' },
} as ChatCompletionContentPartWithCache;

return contentArray;
}
Expand Down
1 change: 0 additions & 1 deletion packages/core/src/core/openaiContentGenerator/provider/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ export { DefaultOpenAICompatibleProvider } from './default.js';
export type {
OpenAICompatibleProvider,
DashScopeRequestMetadata,
ChatCompletionContentPartTextWithCache,
ChatCompletionContentPartWithCache,
} from './types.js';
11 changes: 3 additions & 8 deletions packages/core/src/core/openaiContentGenerator/provider/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import type OpenAI from 'openai';

// Extended types to support cache_control for DashScope
export interface ChatCompletionContentPartTextWithCache
extends OpenAI.Chat.ChatCompletionContentPartText {
cache_control?: { type: 'ephemeral' };
}

export type ChatCompletionContentPartWithCache =
| ChatCompletionContentPartTextWithCache
| OpenAI.Chat.ChatCompletionContentPartImage
| OpenAI.Chat.ChatCompletionContentPartRefusal;
OpenAI.Chat.ChatCompletionContentPart & {
cache_control?: { type: 'ephemeral' };
};

export type ChatCompletionToolWithCache = OpenAI.Chat.ChatCompletionTool & {
cache_control?: { type: 'ephemeral' };
Expand Down