inference-server 1.0.0-beta.24 → 1.0.0-beta.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -16
- package/dist/api/openai/handlers/chat.d.ts +2 -2
- package/dist/api/openai/handlers/chat.js +11 -10
- package/dist/api/openai/handlers/chat.js.map +1 -1
- package/dist/api/openai/handlers/completions.d.ts +2 -2
- package/dist/api/openai/handlers/completions.js +5 -5
- package/dist/api/openai/handlers/completions.js.map +1 -1
- package/dist/api/openai/handlers/embeddings.d.ts +2 -2
- package/dist/api/openai/handlers/embeddings.js +3 -3
- package/dist/api/openai/handlers/embeddings.js.map +1 -1
- package/dist/api/openai/handlers/models.d.ts +2 -2
- package/dist/api/openai/handlers/models.js +2 -2
- package/dist/api/openai/handlers/models.js.map +1 -1
- package/dist/api/openai/index.d.ts +2 -2
- package/dist/api/openai/index.js +5 -5
- package/dist/api/openai/index.js.map +1 -1
- package/dist/cli/lib/loadConfig.d.ts +2 -2
- package/dist/cli/lib/loadConfig.js +4 -4
- package/dist/cli/lib/loadConfig.js.map +1 -1
- package/dist/cli/lib/parseModelPathInfo.d.ts +8 -0
- package/dist/cli/lib/parseModelPathInfo.js +29 -0
- package/dist/cli/lib/parseModelPathInfo.js.map +1 -0
- package/dist/cli/prepareCommand.js.map +1 -1
- package/dist/cli/removeCommand.js +11 -6
- package/dist/cli/removeCommand.js.map +1 -1
- package/dist/cli/showCommand.js +10 -49
- package/dist/cli/showCommand.js.map +1 -1
- package/dist/engines/gpt4all/engine.d.ts +9 -6
- package/dist/engines/gpt4all/engine.js +74 -68
- package/dist/engines/gpt4all/engine.js.map +1 -1
- package/dist/engines/node-llama-cpp/engine.d.ts +11 -9
- package/dist/engines/node-llama-cpp/engine.js +63 -55
- package/dist/engines/node-llama-cpp/engine.js.map +1 -1
- package/dist/engines/node-llama-cpp/util.d.ts +2 -2
- package/dist/engines/node-llama-cpp/util.js +1 -1
- package/dist/engines/node-llama-cpp/util.js.map +1 -1
- package/dist/engines/stable-diffusion-cpp/engine.d.ts +3 -3
- package/dist/engines/stable-diffusion-cpp/engine.js +41 -71
- package/dist/engines/stable-diffusion-cpp/engine.js.map +1 -1
- package/dist/engines/transformers-js/engine.d.ts +10 -9
- package/dist/engines/transformers-js/engine.js +269 -72
- package/dist/engines/transformers-js/engine.js.map +1 -1
- package/dist/engines/transformers-js/validateModelFiles.js +19 -4
- package/dist/engines/transformers-js/validateModelFiles.js.map +1 -1
- package/dist/experiments/ChatWithVision.d.ts +2 -2
- package/dist/experiments/ChatWithVision.js +7 -12
- package/dist/experiments/ChatWithVision.js.map +1 -1
- package/dist/experiments/VoiceFunctionCall.d.ts +3 -3
- package/dist/experiments/VoiceFunctionCall.js +6 -7
- package/dist/experiments/VoiceFunctionCall.js.map +1 -1
- package/dist/http.d.ts +4 -18
- package/dist/http.js +10 -36
- package/dist/http.js.map +1 -1
- package/dist/instance.d.ts +19 -19
- package/dist/instance.js +74 -67
- package/dist/instance.js.map +1 -1
- package/dist/lib/acquireFileLock.js +1 -1
- package/dist/lib/acquireFileLock.js.map +1 -1
- package/dist/lib/calculateContextIdentity.d.ts +2 -2
- package/dist/lib/calculateContextIdentity.js +4 -5
- package/dist/lib/calculateContextIdentity.js.map +1 -1
- package/dist/lib/loadAudio.d.ts +1 -1
- package/dist/lib/resolveModelFileLocation.js +3 -2
- package/dist/lib/resolveModelFileLocation.js.map +1 -1
- package/dist/pool.d.ts +2 -2
- package/dist/pool.js +16 -18
- package/dist/pool.js.map +1 -1
- package/dist/server.d.ts +48 -42
- package/dist/server.js +119 -74
- package/dist/server.js.map +1 -1
- package/dist/standalone.js +50 -19
- package/dist/standalone.js.map +1 -1
- package/dist/store.js +1 -1
- package/dist/store.js.map +1 -1
- package/dist/types/{completions.d.ts → chat.d.ts} +0 -15
- package/dist/types/chat.js +2 -0
- package/dist/types/chat.js.map +1 -0
- package/dist/types/engine.d.ts +63 -101
- package/dist/types/index.d.ts +100 -11
- package/dist/types/index.js +2 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/tasks.d.ts +67 -0
- package/dist/types/tasks.js +2 -0
- package/dist/types/tasks.js.map +1 -0
- package/docs/cli.md +68 -0
- package/examples/all-options.js +11 -12
- package/examples/chat-cli.js +9 -13
- package/examples/chat-server.js +3 -2
- package/examples/concurrency.js +7 -4
- package/examples/express.js +5 -5
- package/examples/pool.js +1 -1
- package/package.json +10 -10
- package/src/api/openai/handlers/chat.ts +15 -15
- package/src/api/openai/handlers/completions.ts +8 -8
- package/src/api/openai/handlers/embeddings.ts +6 -6
- package/src/api/openai/handlers/models.ts +3 -3
- package/src/api/openai/index.ts +6 -6
- package/src/cli/lib/loadConfig.ts +7 -11
- package/src/cli/lib/parseModelPathInfo.ts +37 -0
- package/src/cli/prepareCommand.ts +2 -2
- package/src/cli/removeCommand.ts +11 -6
- package/src/cli/showCommand.ts +10 -59
- package/src/engines/gpt4all/engine.ts +81 -71
- package/src/engines/node-llama-cpp/engine.ts +87 -75
- package/src/engines/node-llama-cpp/util.ts +3 -3
- package/src/engines/stable-diffusion-cpp/engine.ts +49 -80
- package/src/engines/transformers-js/engine.ts +322 -99
- package/src/engines/transformers-js/validateModelFiles.ts +24 -8
- package/src/experiments/ChatWithVision.ts +48 -54
- package/src/experiments/VoiceFunctionCall.ts +9 -8
- package/src/http.ts +15 -52
- package/src/instance.ts +116 -113
- package/src/lib/acquireFileLock.ts +1 -1
- package/src/lib/calculateContextIdentity.ts +5 -6
- package/src/lib/resolveModelFileLocation.ts +3 -2
- package/src/pool.ts +39 -108
- package/src/server.ts +177 -118
- package/src/standalone.ts +51 -19
- package/src/store.ts +1 -1
- package/src/types/{completions.ts → chat.ts} +0 -15
- package/src/types/engine.ts +123 -153
- package/src/types/index.ts +127 -35
- package/src/types/tasks.ts +110 -0
- package/dist/api/v1/index.d.ts +0 -2
- package/dist/api/v1/index.js +0 -29
- package/dist/api/v1/index.js.map +0 -1
- package/dist/engines/node-llama-cpp/validateModelFile.d.ts +0 -8
- package/dist/engines/node-llama-cpp/validateModelFile.js +0 -36
- package/dist/engines/node-llama-cpp/validateModelFile.js.map +0 -1
- package/dist/types/completions.js +0 -2
- package/dist/types/completions.js.map +0 -1
- package/src/api/v1/DRAFT.md +0 -16
- package/src/api/v1/index.ts +0 -37
- package/src/engines/node-llama-cpp/validateModelFile.ts +0 -46
package/README.md
CHANGED
|
@@ -23,21 +23,21 @@ The project includes a model resource pool, an inference queue and a HTTP API se
|
|
|
23
23
|
Example with minimal configuration:
|
|
24
24
|
|
|
25
25
|
```ts basic.ts
|
|
26
|
-
import {
|
|
26
|
+
import { InferenceServer } from 'inference-server'
|
|
27
27
|
|
|
28
|
-
const
|
|
28
|
+
const localModels = new InferenceServer({
|
|
29
29
|
log: 'info', // default is 'warn'
|
|
30
30
|
models: {
|
|
31
31
|
'my-model': { // Identifiers can use a-zA-Z0-9_:\-\.
|
|
32
32
|
// Required are `task`, `engine`, `url` and/or `file`.
|
|
33
33
|
task: 'text-completion', // text-completion models can be used for chat and text generation tasks
|
|
34
34
|
engine: 'node-llama-cpp', // each engine comes with a peer dep. `npm install node-llama-cpp@3`
|
|
35
|
-
url: 'https://huggingface.co/HuggingFaceTB/
|
|
35
|
+
url: 'https://huggingface.co/HuggingFaceTB/SmolLM2-1.7B-Instruct-GGUF/blob/main/smollm2-1.7b-instruct-q4_k_m.gguf',
|
|
36
36
|
},
|
|
37
37
|
},
|
|
38
38
|
})
|
|
39
|
-
await
|
|
40
|
-
const result = await
|
|
39
|
+
await localModels.start()
|
|
40
|
+
const result = await localModels.processChatCompletionTask({
|
|
41
41
|
model: 'my-model',
|
|
42
42
|
messages: [
|
|
43
43
|
{
|
|
@@ -47,23 +47,24 @@ const result = await modelServer.processChatCompletionTask({
|
|
|
47
47
|
],
|
|
48
48
|
})
|
|
49
49
|
console.debug(result)
|
|
50
|
-
|
|
50
|
+
localModels.stop()
|
|
51
51
|
```
|
|
52
52
|
|
|
53
|
-
Or, to
|
|
53
|
+
Or, to launch an OpenAI-compatible HTTP server with two concurrent instances of the same model:
|
|
54
|
+
|
|
54
55
|
|
|
55
56
|
```ts http-api.ts
|
|
56
|
-
import {
|
|
57
|
+
import { InferenceServer, createExpressServer } from 'inference-server'
|
|
57
58
|
import OpenAI from 'openai'
|
|
58
59
|
|
|
59
|
-
const
|
|
60
|
-
|
|
60
|
+
const localModels = new InferenceServer({
|
|
61
|
+
log: 'info', // default is 'warn'
|
|
61
62
|
concurrency: 2, // two inference processes may run at the same time
|
|
62
63
|
models: {
|
|
63
64
|
'smollm': {
|
|
64
65
|
task: 'text-completion',
|
|
65
66
|
engine: 'node-llama-cpp',
|
|
66
|
-
url: 'https://huggingface.co/HuggingFaceTB/
|
|
67
|
+
url: 'https://huggingface.co/HuggingFaceTB/SmolLM2-1.7B-Instruct-GGUF/blob/main/smollm2-1.7b-instruct-q4_k_m.gguf',
|
|
67
68
|
maxInstances: 2, // two instances of this model may be loaded into memory
|
|
68
69
|
device: {
|
|
69
70
|
cpuThreads: 4, // limit cpu threads so we dont occupy all cores
|
|
@@ -71,6 +72,9 @@ const server = await startHTTPServer({
|
|
|
71
72
|
},
|
|
72
73
|
},
|
|
73
74
|
})
|
|
75
|
+
localModels.start()
|
|
76
|
+
const httpServer = createExpressServer(localModels)
|
|
77
|
+
httpServer.listen(3000)
|
|
74
78
|
|
|
75
79
|
const client = new OpenAI({
|
|
76
80
|
baseURL: 'http://localhost:3000/openai/v1/',
|
|
@@ -88,9 +92,12 @@ for await (const chunk of completion) {
|
|
|
88
92
|
process.stdout.write(chunk.choices[0].delta.content)
|
|
89
93
|
}
|
|
90
94
|
}
|
|
91
|
-
|
|
95
|
+
localModels.stop()
|
|
96
|
+
httpServer.close()
|
|
92
97
|
```
|
|
93
98
|
|
|
99
|
+
In addition to the OpenAI endpoints, the server created by `createExpressServer` will also display some internal state at `/`. The endpoint implementations are also exported from the package and can be used with any http server.
|
|
100
|
+
|
|
94
101
|
More usage examples:
|
|
95
102
|
- Using all available options / model options API doc [./examples/all-options](./examples/all-options.js).
|
|
96
103
|
- Custom engines [./tests/engines/experiments.test.ts](./tests/engines/experiments.test.ts).
|
|
@@ -127,6 +134,9 @@ Only available when using node-llama-cpp and a model that supports function call
|
|
|
127
134
|
##### Huge node_modules when installing all engines
|
|
128
135
|
CUDA binaries are distributed with each engine seperately, which leads to an extra 0.5-1GB of disk use. Unfortunately there is nothing I can do about that.
|
|
129
136
|
|
|
137
|
+
##### Can't use larger models with transformers.js
|
|
138
|
+
Models using the ONNX external data format are currently ([not supported in node.js+transformers.js](https://github.com/huggingface/transformers.js/blob/e129c47c65a049173f35e6263fd8d9f660dfc1a7/src/models.js#L240-L242)).
|
|
139
|
+
|
|
130
140
|
#### TODO / Roadmap
|
|
131
141
|
|
|
132
142
|
Not in any particular order:
|
|
@@ -139,20 +149,25 @@ Not in any particular order:
|
|
|
139
149
|
- [x] Add stable-diffusion engine
|
|
140
150
|
- [x] Implement more transformer.js tasks
|
|
141
151
|
- [x] [CLI](https://github.com/iimez/inference-server/discussions/7)
|
|
152
|
+
- [x] Rename ModelServer -> InferenceServer and refactor task types
|
|
153
|
+
- [x] Support for transformer.js text-completion and chat-completion tasks
|
|
142
154
|
- [ ] Add some light jsdoc for server/pool/store methods
|
|
155
|
+
- [ ] Should support adding a json schema grammar on completion requests (not just a grammar name)
|
|
143
156
|
- [ ] utilize node-llama-cpp's support to reuse LlamaModel weights with multiple contexts (across instances)
|
|
144
|
-
- [ ]
|
|
157
|
+
- [ ] Add `n` parameter support to node-llama-cpp+transformers chat completions
|
|
145
158
|
- [ ] Infill completion support https://github.com/withcatai/node-llama-cpp/blob/beta/src/evaluator/LlamaCompletion.ts#L322-L336
|
|
146
159
|
- [ ] Support HF auth and support HF-like model repositories on other domains
|
|
147
|
-
- [ ] Find a way to type available custom engines (and their options?)
|
|
148
160
|
- [ ] Rework GPU+device usage / lock (Support multiple models on gpu in cases where its possible)
|
|
149
161
|
- [ ] Add engine interfaces for resource use (and estimates, see https://github.com/ggerganov/llama.cpp/issues/4315 and https://github.com/withcatai/node-llama-cpp/blob/beta/src/gguf/insights/utils/resolveContextContextSizeOption.ts)
|
|
150
162
|
- [ ] Allow configuring a pools max memory usage
|
|
163
|
+
- [ ] Support logits with transformers and node-llama-cpp
|
|
151
164
|
- [ ] Test deno/bun support
|
|
152
165
|
- [ ] Add image generation endpoint in oai api
|
|
153
166
|
- [ ] Add transcript endpoint in oai api
|
|
154
|
-
- [ ] Add
|
|
167
|
+
- [ ] Add createSpeech endpoint in oai api
|
|
168
|
+
- [ ] Read more model metadata and expose it in API+CLI
|
|
155
169
|
- [ ] Replace express with tinyhttp
|
|
170
|
+
- [ ] Find a way to type available custom engines (and their options?)
|
|
156
171
|
|
|
157
172
|
### Contributing
|
|
158
173
|
|
|
@@ -163,7 +178,6 @@ If you are using this package - let me know where [you would like this to go](ht
|
|
|
163
178
|
- Create a separate HTTP API thats independent of the OpenAI spec and stateful. See [discussion](https://github.com/iimez/inference-server/discussions/8).
|
|
164
179
|
- Add a clientside library (React hooks?) for use of above API.
|
|
165
180
|
- Provide a Docker image. And maybe a Prometheus endpoint.
|
|
166
|
-
- Logprobs support for node-llama-cpp.
|
|
167
181
|
|
|
168
182
|
#### Currently not the Goals
|
|
169
183
|
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function createChatCompletionHandler(
|
|
2
|
+
import type { InferenceServer } from '../../../server.js';
|
|
3
|
+
export declare function createChatCompletionHandler(inferenceServer: InferenceServer): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
|
|
@@ -87,7 +87,7 @@ function createResponseMessageContent(content) {
|
|
|
87
87
|
}
|
|
88
88
|
return text;
|
|
89
89
|
}
|
|
90
|
-
export function createChatCompletionHandler(
|
|
90
|
+
export function createChatCompletionHandler(inferenceServer) {
|
|
91
91
|
return async (req, res) => {
|
|
92
92
|
let args;
|
|
93
93
|
try {
|
|
@@ -106,7 +106,7 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
106
106
|
res.end(JSON.stringify({ error: 'Invalid request (need at least model and messages)' }));
|
|
107
107
|
return;
|
|
108
108
|
}
|
|
109
|
-
if (!
|
|
109
|
+
if (!inferenceServer.modelExists(args.model)) {
|
|
110
110
|
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
111
111
|
res.end(JSON.stringify({ error: 'Model does not exist' }));
|
|
112
112
|
return;
|
|
@@ -151,7 +151,7 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
151
151
|
completionGrammar = 'json';
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
|
-
let
|
|
154
|
+
let toolDefinitions;
|
|
155
155
|
if (args.tools) {
|
|
156
156
|
const functionTools = args.tools
|
|
157
157
|
.filter((tool) => tool.type === 'function')
|
|
@@ -163,11 +163,11 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
163
163
|
};
|
|
164
164
|
});
|
|
165
165
|
if (functionTools.length) {
|
|
166
|
-
if (!
|
|
167
|
-
|
|
166
|
+
if (!toolDefinitions) {
|
|
167
|
+
toolDefinitions = {};
|
|
168
168
|
}
|
|
169
169
|
for (const tool of functionTools) {
|
|
170
|
-
|
|
170
|
+
toolDefinitions[tool.name] = {
|
|
171
171
|
description: tool.description,
|
|
172
172
|
parameters: tool.parameters,
|
|
173
173
|
};
|
|
@@ -179,7 +179,7 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
179
179
|
model: args.model,
|
|
180
180
|
messages,
|
|
181
181
|
temperature: args.temperature ? args.temperature : undefined,
|
|
182
|
-
stream: args.stream ? Boolean(args.stream) : false,
|
|
182
|
+
// stream: args.stream ? Boolean(args.stream) : false,
|
|
183
183
|
maxTokens: args.max_tokens ? args.max_tokens : undefined,
|
|
184
184
|
seed: args.seed ? args.seed : undefined,
|
|
185
185
|
stop,
|
|
@@ -192,7 +192,7 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
192
192
|
topP: args.top_p ? args.top_p : undefined,
|
|
193
193
|
tokenBias: args.logit_bias ? args.logit_bias : undefined,
|
|
194
194
|
grammar: completionGrammar,
|
|
195
|
-
tools:
|
|
195
|
+
tools: toolDefinitions ? { definitions: toolDefinitions } : undefined,
|
|
196
196
|
// additional non-spec params
|
|
197
197
|
repeatPenaltyNum: args.repeat_penalty_num
|
|
198
198
|
? args.repeat_penalty_num
|
|
@@ -200,11 +200,12 @@ export function createChatCompletionHandler(modelServer) {
|
|
|
200
200
|
minP: args.min_p ? args.min_p : undefined,
|
|
201
201
|
topK: args.top_k ? args.top_k : undefined,
|
|
202
202
|
});
|
|
203
|
-
const { instance, release } = await
|
|
203
|
+
const { instance, release } = await inferenceServer.requestInstance(completionReq, controller.signal);
|
|
204
204
|
if (ssePing) {
|
|
205
205
|
clearInterval(ssePing);
|
|
206
206
|
}
|
|
207
|
-
const task = instance.processChatCompletionTask(
|
|
207
|
+
const task = instance.processChatCompletionTask({
|
|
208
|
+
...completionReq,
|
|
208
209
|
signal: controller.signal,
|
|
209
210
|
onChunk: (chunk) => {
|
|
210
211
|
if (args.stream) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/chat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function createCompletionHandler(
|
|
2
|
+
import type { InferenceServer } from '../../../server.js';
|
|
3
|
+
export declare function createCompletionHandler(inferenceServer: InferenceServer): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { parseJSONRequestBody } from '../../../api/parseJSONRequestBody.js';
|
|
2
2
|
import { omitEmptyValues } from '../../../lib/util.js';
|
|
3
3
|
import { finishReasonMap } from '../enums.js';
|
|
4
|
-
export function createCompletionHandler(
|
|
4
|
+
export function createCompletionHandler(inferenceServer) {
|
|
5
5
|
return async (req, res) => {
|
|
6
6
|
let args;
|
|
7
7
|
try {
|
|
@@ -20,7 +20,7 @@ export function createCompletionHandler(modelServer) {
|
|
|
20
20
|
res.end(JSON.stringify({ error: 'Invalid request' }));
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
|
-
if (!
|
|
23
|
+
if (!inferenceServer.modelExists(args.model)) {
|
|
24
24
|
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
25
25
|
res.end(JSON.stringify({ error: 'Invalid model' }));
|
|
26
26
|
return;
|
|
@@ -55,7 +55,6 @@ export function createCompletionHandler(modelServer) {
|
|
|
55
55
|
model: args.model,
|
|
56
56
|
prompt: args.prompt,
|
|
57
57
|
temperature: args.temperature ? args.temperature : undefined,
|
|
58
|
-
stream: args.stream ? Boolean(args.stream) : false,
|
|
59
58
|
maxTokens: args.max_tokens ? args.max_tokens : undefined,
|
|
60
59
|
seed: args.seed ? args.seed : undefined,
|
|
61
60
|
stop,
|
|
@@ -74,8 +73,9 @@ export function createCompletionHandler(modelServer) {
|
|
|
74
73
|
minP: args.min_p ? args.min_p : undefined,
|
|
75
74
|
topK: args.top_k ? args.top_k : undefined,
|
|
76
75
|
});
|
|
77
|
-
const { instance, release } = await
|
|
78
|
-
const task = instance.processTextCompletionTask(
|
|
76
|
+
const { instance, release } = await inferenceServer.requestInstance(completionReq, controller.signal);
|
|
77
|
+
const task = instance.processTextCompletionTask({
|
|
78
|
+
...completionReq,
|
|
79
79
|
signal: controller.signal,
|
|
80
80
|
onChunk: (chunk) => {
|
|
81
81
|
if (args.stream) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/completions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAiB7C,MAAM,UAAU,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/completions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
|
-
import {
|
|
3
|
-
export declare function createEmbeddingsHandler(
|
|
2
|
+
import { InferenceServer } from '../../../server.js';
|
|
3
|
+
export declare function createEmbeddingsHandler(inferenceServer: InferenceServer): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { parseJSONRequestBody } from '../../../api/parseJSONRequestBody.js';
|
|
2
2
|
import { omitEmptyValues } from '../../../lib/util.js';
|
|
3
|
-
export function createEmbeddingsHandler(
|
|
3
|
+
export function createEmbeddingsHandler(inferenceServer) {
|
|
4
4
|
return async (req, res) => {
|
|
5
5
|
let args;
|
|
6
6
|
try {
|
|
@@ -19,7 +19,7 @@ export function createEmbeddingsHandler(modelServer) {
|
|
|
19
19
|
res.end(JSON.stringify({ error: 'Invalid request' }));
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
-
if (!
|
|
22
|
+
if (!inferenceServer.modelExists(args.model)) {
|
|
23
23
|
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
24
24
|
res.end(JSON.stringify({ error: 'Invalid model' }));
|
|
25
25
|
return;
|
|
@@ -42,7 +42,7 @@ export function createEmbeddingsHandler(modelServer) {
|
|
|
42
42
|
model: args.model,
|
|
43
43
|
input: args.input,
|
|
44
44
|
});
|
|
45
|
-
const { instance, release } = await
|
|
45
|
+
const { instance, release } = await inferenceServer.requestInstance(embeddingsReq, controller.signal);
|
|
46
46
|
const task = instance.processEmbeddingTask(embeddingsReq);
|
|
47
47
|
const result = await task.result;
|
|
48
48
|
release();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embeddings.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/embeddings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAQtD,MAAM,UAAU,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"embeddings.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/embeddings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function createModelsHandler(
|
|
2
|
+
import type { InferenceServer } from '../../../server';
|
|
3
|
+
export declare function createModelsHandler(inferenceServer: InferenceServer): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// handler for v1/models
|
|
2
2
|
// https://platform.openai.com/docs/api-reference/models/list
|
|
3
|
-
export function createModelsHandler(
|
|
3
|
+
export function createModelsHandler(inferenceServer) {
|
|
4
4
|
return async (req, res) => {
|
|
5
|
-
const models =
|
|
5
|
+
const models = inferenceServer.store.getStatus();
|
|
6
6
|
const data = Object.entries(models).map(([id, info]) => {
|
|
7
7
|
return {
|
|
8
8
|
object: 'model',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/models.ts"],"names":[],"mappings":"AAIA,wBAAwB;AACxB,6DAA6D;AAC7D,MAAM,UAAU,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/api/openai/handlers/models.ts"],"names":[],"mappings":"AAIA,wBAAwB;AACxB,6DAA6D;AAC7D,MAAM,UAAU,mBAAmB,CAAC,eAAgC;IACnE,OAAO,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAE,EAAE;QAE1D,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;QAChD,MAAM,IAAI,GAAmB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CACtD,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;YACd,OAAO;gBACN,MAAM,EAAE,OAAO;gBACf,EAAE;gBACF,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,IAAI,CAAC,MAAM;aACrB,CAAA;QACF,CAAC,CACD,CAAA;QAED,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC1D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3D,CAAC,CAAA;AACF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function createOpenAIRequestHandlers(
|
|
1
|
+
import type { InferenceServer } from '../../server.js';
|
|
2
|
+
export declare function createOpenAIRequestHandlers(inferenceServer: InferenceServer): {
|
|
3
3
|
chatCompletions: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;
|
|
4
4
|
completions: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;
|
|
5
5
|
models: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => Promise<void>;
|
package/dist/api/openai/index.js
CHANGED
|
@@ -3,12 +3,12 @@ import { createCompletionHandler } from './handlers/completions.js';
|
|
|
3
3
|
import { createModelsHandler } from './handlers/models.js';
|
|
4
4
|
import { createEmbeddingsHandler } from './handlers/embeddings.js';
|
|
5
5
|
// See OpenAI API specs at https://github.com/openai/openai-openapi/blob/master/openapi.yaml
|
|
6
|
-
export function createOpenAIRequestHandlers(
|
|
6
|
+
export function createOpenAIRequestHandlers(inferenceServer) {
|
|
7
7
|
return {
|
|
8
|
-
chatCompletions: createChatCompletionHandler(
|
|
9
|
-
completions: createCompletionHandler(
|
|
10
|
-
models: createModelsHandler(
|
|
11
|
-
embeddings: createEmbeddingsHandler(
|
|
8
|
+
chatCompletions: createChatCompletionHandler(inferenceServer),
|
|
9
|
+
completions: createCompletionHandler(inferenceServer),
|
|
10
|
+
models: createModelsHandler(inferenceServer),
|
|
11
|
+
embeddings: createEmbeddingsHandler(inferenceServer),
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/openai/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAGlE,4FAA4F;AAC5F,MAAM,UAAU,2BAA2B,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/openai/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAGlE,4FAA4F;AAC5F,MAAM,UAAU,2BAA2B,CAAC,eAAgC;IAC3E,OAAO;QACN,eAAe,EAAE,2BAA2B,CAAC,eAAe,CAAC;QAC7D,WAAW,EAAE,uBAAuB,CAAC,eAAe,CAAC;QACrD,MAAM,EAAE,mBAAmB,CAAC,eAAe,CAAC;QAC5C,UAAU,EAAE,uBAAuB,CAAC,eAAe,CAAC;KACpD,CAAA;AACF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { InferenceServerOptions } from '../../server.js';
|
|
2
2
|
export declare function loadConfig(customPath?: string): Promise<{
|
|
3
3
|
path: string;
|
|
4
|
-
options:
|
|
4
|
+
options: InferenceServerOptions;
|
|
5
5
|
} | null>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import fs from 'node:fs
|
|
1
|
+
import { promises as fs } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import url from 'node:url';
|
|
4
4
|
export async function loadConfig(customPath) {
|
|
@@ -23,9 +23,9 @@ export async function loadConfig(customPath) {
|
|
|
23
23
|
// For package.json, we need to check for the 'infs' or 'inference-server' key
|
|
24
24
|
if (configName === 'package.json') {
|
|
25
25
|
const packageJson = options;
|
|
26
|
-
const
|
|
27
|
-
if (
|
|
28
|
-
return { path: configPath, options:
|
|
26
|
+
const inferenceServerOptions = packageJson.infs || packageJson['inference-server'];
|
|
27
|
+
if (inferenceServerOptions) {
|
|
28
|
+
return { path: configPath, options: inferenceServerOptions };
|
|
29
29
|
}
|
|
30
30
|
continue;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../../../src/cli/lib/loadConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../../../src/cli/lib/loadConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,GAAG,MAAM,UAAU,CAAA;AAG1B,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAAmB;IACnD,yCAAyC;IACzC,IAAI,UAAU,EAAE,CAAC;QAChB,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAC3C,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAA;YACrD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,UAAU,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;QACzF,CAAC;IACF,CAAC;IAED,yBAAyB;IACzB,MAAM,WAAW,GAAG,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAA;IAE7F,gCAAgC;IAChC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAA;YAC1D,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAA;YAErD,8EAA8E;YAC9E,IAAI,UAAU,KAAK,cAAc,EAAE,CAAC;gBACnC,MAAM,WAAW,GAAG,OAAc,CAAA;gBAClC,MAAM,sBAAsB,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,kBAAkB,CAAC,CAAA;gBAClF,IAAI,sBAAsB,EAAE,CAAC;oBAC5B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAA;gBAC7D,CAAC;gBACD,SAAQ;YACT,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAA;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,kCAAkC;YAClC,SAAQ;QACT,CAAC;IACF,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,UAAkB;IACpD,kCAAkC;IAClC,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;SAAM,CAAC;QACP,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAA;QACjE,OAAO,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAA;IAC3C,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
export function parseModelPathInfo(modelPath) {
|
|
3
|
+
const parts = modelPath.split(path.sep).filter(Boolean); // Remove empty parts
|
|
4
|
+
if (parts.length === 0) {
|
|
5
|
+
throw new Error('Invalid model path: empty path');
|
|
6
|
+
}
|
|
7
|
+
// Special handling for huggingface.co paths with branch
|
|
8
|
+
if (parts[0] === 'huggingface.co') {
|
|
9
|
+
const lastPart = parts[parts.length - 1];
|
|
10
|
+
if (lastPart.includes('-')) {
|
|
11
|
+
const lastMinusIndex = lastPart.lastIndexOf('-');
|
|
12
|
+
const repoName = lastPart.slice(0, lastMinusIndex);
|
|
13
|
+
const branch = lastPart.slice(lastMinusIndex + 1);
|
|
14
|
+
return {
|
|
15
|
+
domain: parts[0],
|
|
16
|
+
org: parts[1],
|
|
17
|
+
name: repoName,
|
|
18
|
+
branch: branch,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
const name = parts[parts.length - 1];
|
|
23
|
+
const domain = parts[0];
|
|
24
|
+
return {
|
|
25
|
+
domain,
|
|
26
|
+
name,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=parseModelPathInfo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseModelPathInfo.js","sourceRoot":"","sources":["../../../src/cli/lib/parseModelPathInfo.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAS5B,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IACnD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA,CAAC,qBAAqB;IAC7E,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAClD,CAAC;IAED,wDAAwD;IACxD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,gBAAgB,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACxC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;YAClD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAA;YACjD,OAAO;gBACN,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;gBAChB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,MAAM;aACd,CAAA;QACF,CAAC;IACF,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACvB,OAAO;QACN,MAAM;QACN,IAAI;KACJ,CAAA;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareCommand.js","sourceRoot":"","sources":["../../src/cli/prepareCommand.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAA;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAO3D,KAAK,UAAU,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"prepareCommand.js","sourceRoot":"","sources":["../../src/cli/prepareCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,27 +80,32 @@ async function removeModels(pattern, skipPrompt) {
|
|
|
80
80
|
});
|
|
81
81
|
const matches = matchCachedModels(cacheInfo, pattern);
|
|
82
82
|
if (matches.length === 0) {
|
|
83
|
-
console.
|
|
83
|
+
console.error(chalk.red(`No models found matching the given pattern`));
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
if (!skipPrompt) {
|
|
87
87
|
const treeLines = renderTreeView(matches);
|
|
88
88
|
console.log(treeLines.join('\n'));
|
|
89
89
|
const { totalSize, fileCount } = calculateTreeAggs(matches);
|
|
90
|
-
console.log(chalk.cyan(`Total size: ${prettyBytes(totalSize)} bytes`))
|
|
91
|
-
const
|
|
90
|
+
// console.log(chalk.cyan(`Total size: ${prettyBytes(totalSize)} bytes`))
|
|
91
|
+
const fileText = fileCount === 1 ? `one file` : `${fileCount} files`;
|
|
92
|
+
const modelText = matches.length === 1 ? chalk.bold(matches[0].relPath) : `${matches.length} models`;
|
|
93
|
+
console.log(`\nThis will remove ${fileText} freeing ${prettyBytes(totalSize)} total.`);
|
|
94
|
+
const confirmed = await promptConfirmation(`Delete ${modelText} from disk?`);
|
|
92
95
|
if (!confirmed) {
|
|
93
96
|
console.log('Aborted');
|
|
94
97
|
return;
|
|
95
98
|
}
|
|
96
99
|
}
|
|
97
100
|
try {
|
|
98
|
-
|
|
101
|
+
// const subject = matches.length === 1 ? 'model' : 'models'
|
|
102
|
+
const modelText = matches.length === 1 ? matches[0].name : `${matches.length} models`;
|
|
103
|
+
console.log(`Deleting ${modelText} ...`);
|
|
99
104
|
await deleteFiles(matches);
|
|
100
|
-
console.log(chalk.green('
|
|
105
|
+
console.log(chalk.green('Done'));
|
|
101
106
|
}
|
|
102
107
|
catch (error) {
|
|
103
|
-
console.error(chalk.red(`Error
|
|
108
|
+
console.error(chalk.red(`Error during removal: ${error.message}`));
|
|
104
109
|
}
|
|
105
110
|
}
|
|
106
111
|
export const removeCommand = {
|