Skip to content

Commit 5d1e3ba

Browse files
authored
chore (ai): remove provider re-exports (#5734)
1 parent c4a2fec commit 5d1e3ba

File tree

10 files changed

+24
-48
lines changed

10 files changed

+24
-48
lines changed

‎.changeset/brown-poems-boil.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'ai': patch
3+
---
4+
5+
chore (ai): remove provider re-exports

‎examples/ai-core/src/e2e/google-vertex-anthropic.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dotenv/config';
2-
import { describe, it, expect } from 'vitest';
31
import {
42
createVertexAnthropic as createVertexAnthropicNode,
53
vertexAnthropic,
@@ -9,8 +7,11 @@ import {
97
createVertexAnthropic as createVertexAnthropicEdge,
108
vertexAnthropic as vertexAnthropicEdge,
119
} from '@ai-sdk/google-vertex/anthropic/edge';
12-
import { generateText, APICallError, LanguageModelV2 } from 'ai';
10+
import { LanguageModelV2 } from '@ai-sdk/provider';
11+
import { APICallError, generateText } from 'ai';
12+
import 'dotenv/config';
1313
import fs from 'fs';
14+
import { describe, expect, it } from 'vitest';
1415
import {
1516
createFeatureTestSuite,
1617
createLanguageModelWithCapabilities,

‎examples/ai-core/src/e2e/google-vertex.test.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
import { vertex as vertexNode } from '@ai-sdk/google-vertex';
2+
import { vertex as vertexEdge } from '@ai-sdk/google-vertex/edge';
3+
import { ImageModelV1, LanguageModelV2 } from '@ai-sdk/provider';
4+
import { APICallError, experimental_generateImage as generateImage } from 'ai';
15
import 'dotenv/config';
26
import { describe, expect, it, vi } from 'vitest';
3-
import { vertex as vertexEdge } from '@ai-sdk/google-vertex/edge';
4-
import { vertex as vertexNode } from '@ai-sdk/google-vertex';
5-
import {
6-
APICallError,
7-
LanguageModelV2,
8-
experimental_generateImage as generateImage,
9-
} from 'ai';
107
import {
118
createEmbeddingModelWithCapabilities,
129
createFeatureTestSuite,
@@ -15,7 +12,6 @@ import {
1512
defaultChatModelCapabilities,
1613
ModelWithCapabilities,
1714
} from './feature-test-suite';
18-
import { ImageModelV1 } from '@ai-sdk/provider';
1915

2016
const RUNTIME_VARIANTS = {
2117
edge: {

‎examples/ai-core/src/e2e/google.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { GoogleErrorData, google as provider } from '@ai-sdk/google';
2+
import { LanguageModelV2 } from '@ai-sdk/provider';
3+
import { APICallError } from 'ai';
14
import 'dotenv/config';
25
import { expect } from 'vitest';
3-
import { GoogleErrorData, google as provider } from '@ai-sdk/google';
4-
import { APICallError, LanguageModelV2 } from 'ai';
56
import {
67
ModelWithCapabilities,
78
createEmbeddingModelWithCapabilities,

‎examples/ai-core/src/e2e/openai.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { openai as provider } from '@ai-sdk/openai';
2+
import { LanguageModelV2 } from '@ai-sdk/provider';
3+
import { APICallError } from 'ai';
14
import 'dotenv/config';
25
import { expect } from 'vitest';
3-
import { openai as provider } from '@ai-sdk/openai';
4-
import { APICallError, LanguageModelV2 } from 'ai';
56
import {
67
ModelWithCapabilities,
78
createEmbeddingModelWithCapabilities,

‎examples/ai-core/src/middleware/add-to-last-user-message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LanguageModelV2CallOptions } from 'ai';
1+
import { LanguageModelV2CallOptions } from '@ai-sdk/provider';
22

33
export function addToLastUserMessage({
44
text,

‎examples/ai-core/src/middleware/get-last-user-message-text.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LanguageModelV2Prompt } from 'ai';
1+
import { LanguageModelV2Prompt } from '@ai-sdk/provider';
22

33
export function getLastUserMessageText({
44
prompt,

‎packages/ai/core/generate-text/output.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
import { LanguageModelV2CallOptions } from '@ai-sdk/provider';
12
import { safeParseJSON, safeValidateTypes } from '@ai-sdk/provider-utils';
2-
import { asSchema, DeepPartial, parsePartialJson, Schema } from '../../core';
33
import { z } from 'zod';
4+
import { asSchema, DeepPartial, parsePartialJson, Schema } from '../../core';
45
import { NoObjectGeneratedError } from '../../errors';
56
import { injectJsonInstruction } from '../generate-object/inject-json-instruction';
6-
import {
7-
FinishReason,
8-
LanguageModel,
9-
LanguageModelV2CallOptions,
10-
} from '../types/language-model';
7+
import { FinishReason, LanguageModel } from '../types/language-model';
118
import { LanguageModelResponseMetadata } from '../types/language-model-response-metadata';
129
import { LanguageModelUsage } from '../types/usage';
1310

‎packages/ai/core/types/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ export type {
99
CoreToolChoice,
1010
FinishReason,
1111
LanguageModel,
12-
LanguageModelV2,
13-
LanguageModelV2CallOptions,
14-
LanguageModelV2Prompt,
15-
LanguageModelV2StreamPart,
1612
LogProbs,
1713
ToolChoice,
1814
} from './language-model';

‎packages/ai/core/types/language-model.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,6 @@ import {
66
LanguageModelV2Source,
77
} from '@ai-sdk/provider';
88

9-
// Re-export LanguageModelV2 types for the middleware:
10-
// TODO remove in v5
11-
export type {
12-
LanguageModelV2,
13-
LanguageModelV2CallOptions,
14-
LanguageModelV2CallWarning,
15-
LanguageModelV2FilePart,
16-
LanguageModelV2FinishReason,
17-
LanguageModelV2FunctionToolCall,
18-
LanguageModelV2Message,
19-
LanguageModelV2ObjectGenerationMode,
20-
LanguageModelV2Prompt,
21-
LanguageModelV2ProviderDefinedTool,
22-
SharedV2ProviderMetadata,
23-
LanguageModelV2StreamPart,
24-
LanguageModelV2TextPart,
25-
LanguageModelV2ToolCallPart,
26-
LanguageModelV2ToolChoice,
27-
LanguageModelV2ToolResultPart,
28-
} from '@ai-sdk/provider';
29-
309
/**
3110
Language model that is used by the AI SDK Core functions.
3211
*/

0 commit comments

Comments
 (0)