Skip to content

Commit e09802b

Browse files
coyotte508coyotte508
committed
fixup! Rework InferneceProvider internal types
1 parent e93e55e commit e09802b

File tree

15 files changed

+121
-115
lines changed

15 files changed

+121
-115
lines changed

‎packages/inference/src/providers/black-forest-labs.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const BLACK_FOREST_LABS_AI_API_BASE_URL = "https://api.us1.bfl.ai";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return BLACK_FOREST_LABS_AI_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return params.args;
2727
};
2828

29-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
29+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3030
if (params.authMethod === "provider-key") {
3131
return { "X-Key": `${params.accessToken}` };
3232
} else {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
}
3535
};
3636

37-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
37+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3838
return `${params.baseUrl}/v1/${params.model}`;
3939
};
4040

41-
export const BLACK_FOREST_LABS_CONFIG: InferenceProvider.Config = {
41+
export const BLACK_FOREST_LABS_CONFIG: InferenceProviderTypes.Config = {
4242
makeBaseUrl,
4343
makeBody,
4444
makeHeaders,

‎packages/inference/src/providers/cerebras.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const CEREBRAS_API_BASE_URL = "https://api.cerebras.ai";
2020

2121
const makeBaseUrl = (): string => {
2222
return CEREBRAS_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
model: params.model,
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
return `${params.baseUrl}/v1/chat/completions`;
3838
};
3939

40-
export const CEREBRAS_CONFIG: InferenceProvider.Config = {
40+
export const CEREBRAS_CONFIG: InferenceProviderTypes.Config = {
4141
makeBaseUrl,
4242
makeBody,
4343
makeHeaders,

‎packages/inference/src/providers/cohere.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const COHERE_API_BASE_URL = "https://api.cohere.com";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return COHERE_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
model: params.model,
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
return `${params.baseUrl}/compatibility/v1/chat/completions`;
3838
};
3939

40-
export const COHERE_CONFIG: InferenceProvider.Config = {
40+
export const COHERE_CONFIG: InferenceProviderTypes.Config = {
4141
makeBaseUrl,
4242
makeBody,
4343
makeHeaders,

‎packages/inference/src/providers/fal-ai.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
*/
1717
import { InferenceOutputError } from "../lib/InferenceOutputError";
1818
import { isUrl } from "../lib/isUrl";
19-
import type { InferenceProvider } from "../types";
19+
import type { InferenceProviderTypes } from "./types";
2020
import { delay } from "../utils/delay";
2121

2222
const FAL_AI_API_BASE_URL = "https://fal.run";
2323
const FAL_AI_API_BASE_URL_QUEUE = "https://queue.fal.run";
2424

25-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = (task) => {
25+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = (task) => {
2626
return task === "text-to-video" ? FAL_AI_API_BASE_URL_QUEUE : FAL_AI_API_BASE_URL;
2727
};
2828

29-
const makeBody: InferenceProvider.MakeBody = (params) => {
29+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
3030
return params.args;
3131
};
3232

33-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
33+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3434
return {
3535
Authorization: params.authMethod === "provider-key" ? `Key ${params.accessToken}` : `Bearer ${params.accessToken}`,
3636
};
3737
};
3838

39-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
39+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
4040
const baseUrl = `${params.baseUrl}/${params.model}`;
4141
if (params.authMethod !== "provider-key" && params.task === "text-to-video") {
4242
return `${baseUrl}?_subdomain=queue`;
4343
}
4444
return baseUrl;
4545
};
4646

47-
export const FAL_AI_CONFIG: InferenceProvider.Config = {
47+
export const FAL_AI_CONFIG: InferenceProviderTypes.Config = {
4848
makeBaseUrl,
4949
makeBody,
5050
makeHeaders,

‎packages/inference/src/providers/fireworks-ai.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,33 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const FIREWORKS_AI_API_BASE_URL = "https://api.fireworks.ai";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return FIREWORKS_AI_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
...(params.chatCompletion ? { model: params.model } : undefined),
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
if (params.chatCompletion) {
3838
return `${params.baseUrl}/inference/v1/chat/completions`;
3939
}
4040
return `${params.baseUrl}/inference`;
4141
};
4242

43-
export const FIREWORKS_AI_CONFIG: InferenceProvider.Config = {
43+
export const FIREWORKS_AI_CONFIG: InferenceProviderTypes.Config = {
4444
makeBaseUrl,
4545
makeBody,
4646
makeHeaders,

‎packages/inference/src/providers/hf-inference.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111
* Thanks!
1212
*/
1313
import { HF_ROUTER_URL } from "../config";
14-
import type { InferenceProvider } from "../types";
14+
import type { InferenceProviderTypes } from "./types";
1515

16-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
16+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
1717
return `${HF_ROUTER_URL}/hf-inference`;
1818
};
1919

20-
const makeBody: InferenceProvider.MakeBody = (params) => {
20+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2121
return {
2222
...params.args,
2323
...(params.chatCompletion ? { model: params.model } : undefined),
2424
};
2525
};
2626

27-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
27+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
2828
return { Authorization: `Bearer ${params.accessToken}` };
2929
};
3030

31-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
31+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3232
if (params.task && ["feature-extraction", "sentence-similarity"].includes(params.task)) {
3333
// When deployed on hf-inference, these two tasks are automatically compatible with one another.
3434
return `${params.baseUrl}/pipeline/${params.task}/${params.model}`;
@@ -39,7 +39,7 @@ const makeUrl: InferenceProvider.MakeUrl = (params) => {
3939
return `${params.baseUrl}/models/${params.model}`;
4040
};
4141

42-
export const HF_INFERENCE_CONFIG: InferenceProvider.Config = {
42+
export const HF_INFERENCE_CONFIG: InferenceProviderTypes.Config = {
4343
makeBaseUrl,
4444
makeBody,
4545
makeHeaders,

‎packages/inference/src/providers/hyperbolic.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,33 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const HYPERBOLIC_API_BASE_URL = "https://api.hyperbolic.xyz";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return HYPERBOLIC_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
...(params.task === "text-to-image" ? { model_name: params.model } : { model: params.model }),
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
if (params.task === "text-to-image") {
3838
return `${params.baseUrl}/v1/images/generations`;
3939
}
4040
return `${params.baseUrl}/v1/chat/completions`;
4141
};
4242

43-
export const HYPERBOLIC_CONFIG: InferenceProvider.Config = {
43+
export const HYPERBOLIC_CONFIG: InferenceProviderTypes.Config = {
4444
makeBaseUrl,
4545
makeBody,
4646
makeHeaders,

‎packages/inference/src/providers/nebius.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const NEBIUS_API_BASE_URL = "https://api.studio.nebius.ai";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return NEBIUS_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
model: params.model,
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
if (params.task === "text-to-image") {
3838
return `${params.baseUrl}/v1/images/generations`;
3939
}
@@ -46,7 +46,7 @@ const makeUrl: InferenceProvider.MakeUrl = (params) => {
4646
return params.baseUrl;
4747
};
4848

49-
export const NEBIUS_CONFIG: InferenceProvider.Config = {
49+
export const NEBIUS_CONFIG: InferenceProviderTypes.Config = {
5050
makeBaseUrl,
5151
makeBody,
5252
makeHeaders,

‎packages/inference/src/providers/novita.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414
*
1515
* Thanks!
1616
*/
17-
import type { InferenceProvider } from "../types";
17+
import type { InferenceProviderTypes } from "./types";
1818

1919
const NOVITA_API_BASE_URL = "https://api.novita.ai";
2020

21-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
21+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
2222
return NOVITA_API_BASE_URL;
2323
};
2424

25-
const makeBody: InferenceProvider.MakeBody = (params) => {
25+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
2626
return {
2727
...params.args,
2828
...(params.chatCompletion ? { model: params.model } : undefined),
2929
};
3030
};
3131

32-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
32+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
3333
return { Authorization: `Bearer ${params.accessToken}` };
3434
};
3535

36-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
36+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
3737
if (params.chatCompletion) {
3838
return `${params.baseUrl}/v3/openai/chat/completions`;
3939
} else if (params.task === "text-generation") {
@@ -44,7 +44,7 @@ const makeUrl: InferenceProvider.MakeUrl = (params) => {
4444
return params.baseUrl;
4545
};
4646

47-
export const NOVITA_CONFIG: InferenceProvider.Config = {
47+
export const NOVITA_CONFIG: InferenceProviderTypes.Config = {
4848
makeBaseUrl,
4949
makeBody,
5050
makeHeaders,

‎packages/inference/src/providers/openai.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/**
22
* Special case: provider configuration for a private models provider (OpenAI in this case).
33
*/
4-
import type { InferenceProvider } from "../types";
4+
import type { InferenceProviderTypes } from "./types";
55

66
const OPENAI_API_BASE_URL = "https://api.openai.com";
77

8-
const makeBaseUrl: InferenceProvider.MakeBaseUrl = () => {
8+
const makeBaseUrl: InferenceProviderTypes.MakeBaseUrl = () => {
99
return OPENAI_API_BASE_URL;
1010
};
1111

12-
const makeBody: InferenceProvider.MakeBody = (params) => {
12+
const makeBody: InferenceProviderTypes.MakeBody = (params) => {
1313
if (!params.chatCompletion) {
1414
throw new Error("OpenAI only supports chat completions.");
1515
}
@@ -19,18 +19,18 @@ const makeBody: InferenceProvider.MakeBody = (params) => {
1919
};
2020
};
2121

22-
const makeHeaders: InferenceProvider.MakeHeaders = (params) => {
22+
const makeHeaders: InferenceProviderTypes.MakeHeaders = (params) => {
2323
return { Authorization: `Bearer ${params.accessToken}` };
2424
};
2525

26-
const makeUrl: InferenceProvider.MakeUrl = (params) => {
26+
const makeUrl: InferenceProviderTypes.MakeUrl = (params) => {
2727
if (!params.chatCompletion) {
2828
throw new Error("OpenAI only supports chat completions.");
2929
}
3030
return `${params.baseUrl}/v1/chat/completions`;
3131
};
3232

33-
export const OPENAI_CONFIG: InferenceProvider.Config = {
33+
export const OPENAI_CONFIG: InferenceProviderTypes.Config = {
3434
makeBaseUrl,
3535
makeBody,
3636
makeHeaders,

0 commit comments

Comments
 (0)