genai-electron 0.4.3 → 0.6.1
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/LICENSE +21 -21
- package/README.md +87 -84
- package/dist/config/defaults.d.ts +37 -54
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +53 -60
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/paths.d.ts +1 -0
- package/dist/config/paths.d.ts.map +1 -1
- package/dist/config/paths.js +3 -0
- package/dist/config/paths.js.map +1 -1
- package/dist/config/reasoning-models.d.ts.map +1 -1
- package/dist/config/reasoning-models.js.map +1 -1
- package/dist/index.d.ts +6 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/managers/BinaryManager.d.ts +1 -0
- package/dist/managers/BinaryManager.d.ts.map +1 -1
- package/dist/managers/BinaryManager.js +21 -30
- package/dist/managers/BinaryManager.js.map +1 -1
- package/dist/managers/DiffusionServerManager.d.ts +6 -0
- package/dist/managers/DiffusionServerManager.d.ts.map +1 -1
- package/dist/managers/DiffusionServerManager.js +186 -50
- package/dist/managers/DiffusionServerManager.js.map +1 -1
- package/dist/managers/GenerationRegistry.d.ts.map +1 -1
- package/dist/managers/GenerationRegistry.js +1 -1
- package/dist/managers/GenerationRegistry.js.map +1 -1
- package/dist/managers/LlamaServerManager.d.ts +17 -0
- package/dist/managers/LlamaServerManager.d.ts.map +1 -1
- package/dist/managers/LlamaServerManager.js +284 -28
- package/dist/managers/LlamaServerManager.js.map +1 -1
- package/dist/managers/ModelManager.d.ts +6 -0
- package/dist/managers/ModelManager.d.ts.map +1 -1
- package/dist/managers/ModelManager.js +424 -2
- package/dist/managers/ModelManager.js.map +1 -1
- package/dist/managers/ResourceOrchestrator.d.ts.map +1 -1
- package/dist/managers/ResourceOrchestrator.js +52 -51
- package/dist/managers/ResourceOrchestrator.js.map +1 -1
- package/dist/managers/ServerManager.d.ts +2 -2
- package/dist/managers/ServerManager.d.ts.map +1 -1
- package/dist/managers/ServerManager.js +8 -3
- package/dist/managers/ServerManager.js.map +1 -1
- package/dist/managers/StorageManager.d.ts.map +1 -1
- package/dist/managers/StorageManager.js +143 -12
- package/dist/managers/StorageManager.js.map +1 -1
- package/dist/process/health-check.d.ts +4 -3
- package/dist/process/health-check.d.ts.map +1 -1
- package/dist/process/health-check.js +12 -6
- package/dist/process/health-check.js.map +1 -1
- package/dist/process/log-manager.d.ts +11 -1
- package/dist/process/log-manager.d.ts.map +1 -1
- package/dist/process/log-manager.js +49 -2
- package/dist/process/log-manager.js.map +1 -1
- package/dist/process/port-utils.d.ts +3 -0
- package/dist/process/port-utils.d.ts.map +1 -0
- package/dist/process/port-utils.js +28 -0
- package/dist/process/port-utils.js.map +1 -0
- package/dist/types/images.d.ts +4 -2
- package/dist/types/images.d.ts.map +1 -1
- package/dist/types/index.d.ts +2 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/models.d.ts +31 -0
- package/dist/types/models.d.ts.map +1 -1
- package/dist/types/servers.d.ts +20 -2
- package/dist/types/servers.d.ts.map +1 -1
- package/dist/utils/debug-log.d.ts +3 -0
- package/dist/utils/debug-log.d.ts.map +1 -0
- package/dist/utils/debug-log.js +10 -0
- package/dist/utils/debug-log.js.map +1 -0
- package/package.json +73 -73
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SystemInfo } from '../system/SystemInfo.js';
|
|
2
2
|
import { ModelManager } from './ModelManager.js';
|
|
3
3
|
import { ServerError } from '../errors/index.js';
|
|
4
|
+
import { debugLog } from '../utils/debug-log.js';
|
|
4
5
|
export class ResourceOrchestrator {
|
|
5
6
|
static RELOAD_RETRY_DELAY_MS = 2000;
|
|
6
7
|
systemInfo;
|
|
@@ -16,101 +17,101 @@ export class ResourceOrchestrator {
|
|
|
16
17
|
this.modelManager = modelManager;
|
|
17
18
|
}
|
|
18
19
|
async orchestrateImageGeneration(config) {
|
|
19
|
-
|
|
20
|
+
debugLog('[Orchestrator] orchestrateImageGeneration called');
|
|
20
21
|
if (this.pendingReload) {
|
|
21
|
-
|
|
22
|
+
debugLog('[Orchestrator] Awaiting pending LLM reload from previous generation...');
|
|
22
23
|
await this.pendingReload;
|
|
23
24
|
this.pendingReload = null;
|
|
24
25
|
}
|
|
25
26
|
const needsOffload = await this.needsOffloadForImage();
|
|
26
27
|
const llamaIsRunning = this.llamaServer.isRunning();
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
debugLog('[Orchestrator] needsOffload:', needsOffload);
|
|
29
|
+
debugLog('[Orchestrator] llamaServer.isRunning():', llamaIsRunning);
|
|
29
30
|
if (needsOffload && llamaIsRunning) {
|
|
30
|
-
|
|
31
|
+
debugLog('[Orchestrator] ⚠️ Resources constrained - offloading LLM before generation');
|
|
31
32
|
await this.offloadLLM();
|
|
32
33
|
let result;
|
|
33
34
|
try {
|
|
34
|
-
|
|
35
|
+
debugLog('[Orchestrator] Generating image with LLM offloaded...');
|
|
35
36
|
result = await this.diffusionServer.executeImageGeneration(config);
|
|
36
37
|
}
|
|
37
38
|
catch (error) {
|
|
38
|
-
|
|
39
|
+
debugLog('[Orchestrator] Image generation failed, reloading LLM in background...');
|
|
39
40
|
this.fireAndForgetReload();
|
|
40
41
|
throw error;
|
|
41
42
|
}
|
|
42
|
-
|
|
43
|
+
debugLog('[Orchestrator] Image ready, reloading LLM in background...');
|
|
43
44
|
this.fireAndForgetReload();
|
|
44
45
|
return result;
|
|
45
46
|
}
|
|
46
47
|
else {
|
|
47
48
|
if (!needsOffload) {
|
|
48
|
-
|
|
49
|
+
debugLog('[Orchestrator] ✅ Sufficient resources - generating directly without offload');
|
|
49
50
|
}
|
|
50
51
|
else {
|
|
51
|
-
|
|
52
|
+
debugLog('[Orchestrator] ✅ LLM not running - generating directly');
|
|
52
53
|
}
|
|
53
54
|
return await this.diffusionServer.executeImageGeneration(config);
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
async needsOffloadForImage() {
|
|
57
|
-
|
|
58
|
+
debugLog('[Orchestrator] Checking if offload needed...');
|
|
58
59
|
const memory = this.systemInfo.getMemoryInfo();
|
|
59
60
|
const capabilities = await this.systemInfo.detect();
|
|
60
61
|
const llamaUsage = await this.estimateLLMUsage();
|
|
61
62
|
const diffusionUsage = await this.estimateDiffusionUsage();
|
|
62
63
|
const isGPUSystem = capabilities.gpu.available && capabilities.gpu.vram;
|
|
63
|
-
|
|
64
|
+
debugLog('[Orchestrator] System type:', isGPUSystem ? 'GPU' : 'CPU-only');
|
|
64
65
|
if (isGPUSystem) {
|
|
65
66
|
const totalVRAM = capabilities.gpu.vram || 0;
|
|
66
67
|
const vramNeeded = (llamaUsage.vram || 0) + (diffusionUsage.vram || 0);
|
|
67
68
|
const threshold = totalVRAM * 0.75;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
69
|
+
debugLog('[Orchestrator] VRAM Analysis:');
|
|
70
|
+
debugLog(' - LLM VRAM usage:', (llamaUsage.vram || 0) / 1024 ** 3, 'GB');
|
|
71
|
+
debugLog(' - Diffusion VRAM usage:', (diffusionUsage.vram || 0) / 1024 ** 3, 'GB');
|
|
72
|
+
debugLog(' - Total VRAM needed:', vramNeeded / 1024 ** 3, 'GB');
|
|
73
|
+
debugLog(' - Total VRAM available:', totalVRAM / 1024 ** 3, 'GB');
|
|
74
|
+
debugLog(' - Threshold (75%):', threshold / 1024 ** 3, 'GB');
|
|
75
|
+
debugLog(' - Offload needed:', vramNeeded > threshold);
|
|
75
76
|
return vramNeeded > threshold;
|
|
76
77
|
}
|
|
77
78
|
else {
|
|
78
79
|
const ramNeeded = llamaUsage.ram + diffusionUsage.ram;
|
|
79
80
|
const threshold = memory.available * 0.75;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
debugLog('[Orchestrator] RAM Analysis:');
|
|
82
|
+
debugLog(' - LLM RAM usage:', llamaUsage.ram / 1024 ** 3, 'GB');
|
|
83
|
+
debugLog(' - Diffusion RAM usage:', diffusionUsage.ram / 1024 ** 3, 'GB');
|
|
84
|
+
debugLog(' - Total RAM needed:', ramNeeded / 1024 ** 3, 'GB');
|
|
85
|
+
debugLog(' - Available RAM:', memory.available / 1024 ** 3, 'GB');
|
|
86
|
+
debugLog(' - Threshold (75%):', threshold / 1024 ** 3, 'GB');
|
|
87
|
+
debugLog(' - Offload needed:', ramNeeded > threshold);
|
|
87
88
|
return ramNeeded > threshold;
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
async estimateLLMUsage() {
|
|
91
92
|
if (!this.llamaServer.isRunning()) {
|
|
92
|
-
|
|
93
|
+
debugLog('[Orchestrator] LLM not running - usage: 0');
|
|
93
94
|
return { ram: 0, vram: 0 };
|
|
94
95
|
}
|
|
95
96
|
const config = this.llamaServer.getConfig();
|
|
96
97
|
if (!config) {
|
|
97
|
-
|
|
98
|
+
debugLog('[Orchestrator] LLM config not found - usage: 0');
|
|
98
99
|
return { ram: 0, vram: 0 };
|
|
99
100
|
}
|
|
100
101
|
try {
|
|
101
102
|
const modelInfo = await this.modelManager.getModelInfo(config.modelId);
|
|
102
103
|
const gpuLayers = config.gpuLayers || 0;
|
|
103
104
|
const totalLayers = await this.modelManager.getModelLayerCount(config.modelId);
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
debugLog('[Orchestrator] LLM model:', config.modelId);
|
|
106
|
+
debugLog('[Orchestrator] LLM model size:', modelInfo.size / 1024 ** 3, 'GB');
|
|
107
|
+
debugLog('[Orchestrator] LLM GPU layers:', gpuLayers, '/', totalLayers);
|
|
107
108
|
if (gpuLayers > 0) {
|
|
108
109
|
const gpuRatio = Math.min(gpuLayers / totalLayers, 1.0);
|
|
109
110
|
const result = {
|
|
110
111
|
ram: modelInfo.size * (1 - gpuRatio) * 1.2,
|
|
111
112
|
vram: modelInfo.size * gpuRatio * 1.2,
|
|
112
113
|
};
|
|
113
|
-
|
|
114
|
+
debugLog('[Orchestrator] LLM usage (mixed):', {
|
|
114
115
|
ram: `${result.ram / 1024 ** 3} GB`,
|
|
115
116
|
vram: `${result.vram / 1024 ** 3} GB`,
|
|
116
117
|
});
|
|
@@ -121,7 +122,7 @@ export class ResourceOrchestrator {
|
|
|
121
122
|
ram: modelInfo.size * 1.2,
|
|
122
123
|
vram: 0,
|
|
123
124
|
};
|
|
124
|
-
|
|
125
|
+
debugLog('[Orchestrator] LLM usage (CPU-only):', {
|
|
125
126
|
ram: `${result.ram / 1024 ** 3} GB`,
|
|
126
127
|
vram: '0 GB',
|
|
127
128
|
});
|
|
@@ -129,7 +130,7 @@ export class ResourceOrchestrator {
|
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
catch (error) {
|
|
132
|
-
|
|
133
|
+
debugLog('[Orchestrator] Failed to get LLM model info:', error);
|
|
133
134
|
return { ram: 0, vram: 0 };
|
|
134
135
|
}
|
|
135
136
|
}
|
|
@@ -137,39 +138,39 @@ export class ResourceOrchestrator {
|
|
|
137
138
|
const config = this.diffusionServer.getConfig();
|
|
138
139
|
if (!config) {
|
|
139
140
|
const defaultSize = 6.5 * 1024 * 1024 * 1024;
|
|
140
|
-
|
|
141
|
+
debugLog('[Orchestrator] Diffusion config not found - using default estimate: 6.5GB');
|
|
141
142
|
return { ram: defaultSize * 1.2, vram: defaultSize * 1.2 };
|
|
142
143
|
}
|
|
143
144
|
try {
|
|
144
145
|
const modelInfo = await this.modelManager.getModelInfo(config.modelId);
|
|
145
|
-
|
|
146
|
-
|
|
146
|
+
debugLog('[Orchestrator] Diffusion model:', config.modelId);
|
|
147
|
+
debugLog('[Orchestrator] Diffusion model size:', modelInfo.size / 1024 ** 3, 'GB');
|
|
147
148
|
const usage = modelInfo.size * 1.2;
|
|
148
149
|
const result = {
|
|
149
150
|
ram: usage,
|
|
150
151
|
vram: usage,
|
|
151
152
|
};
|
|
152
|
-
|
|
153
|
+
debugLog('[Orchestrator] Diffusion usage:', usage / 1024 ** 3, 'GB (both RAM and VRAM)');
|
|
153
154
|
return result;
|
|
154
155
|
}
|
|
155
156
|
catch (error) {
|
|
156
|
-
|
|
157
|
+
debugLog('[Orchestrator] Failed to get diffusion model info:', error);
|
|
157
158
|
const defaultSize = 6.5 * 1024 * 1024 * 1024;
|
|
158
|
-
|
|
159
|
+
debugLog('[Orchestrator] Using default estimate: 6.5GB');
|
|
159
160
|
return { ram: defaultSize * 1.2, vram: defaultSize * 1.2 };
|
|
160
161
|
}
|
|
161
162
|
}
|
|
162
163
|
async offloadLLM() {
|
|
163
|
-
|
|
164
|
+
debugLog('[Orchestrator] offloadLLM called');
|
|
164
165
|
if (!this.llamaServer.isRunning()) {
|
|
165
|
-
|
|
166
|
+
debugLog('[Orchestrator] LLM not running - nothing to offload');
|
|
166
167
|
return;
|
|
167
168
|
}
|
|
168
169
|
const config = this.llamaServer.getConfig();
|
|
169
170
|
if (!config) {
|
|
170
171
|
throw new ServerError('Cannot offload LLM: no configuration found');
|
|
171
172
|
}
|
|
172
|
-
|
|
173
|
+
debugLog('[Orchestrator] Saving LLM state:', {
|
|
173
174
|
modelId: config.modelId,
|
|
174
175
|
port: config.port,
|
|
175
176
|
gpuLayers: config.gpuLayers,
|
|
@@ -179,24 +180,24 @@ export class ResourceOrchestrator {
|
|
|
179
180
|
wasRunning: true,
|
|
180
181
|
savedAt: new Date(),
|
|
181
182
|
};
|
|
182
|
-
|
|
183
|
+
debugLog('[Orchestrator] Stopping LLM server...');
|
|
183
184
|
await this.llamaServer.stop();
|
|
184
|
-
|
|
185
|
+
debugLog('[Orchestrator] ✅ LLM server stopped successfully');
|
|
185
186
|
}
|
|
186
187
|
async reloadLLM() {
|
|
187
|
-
|
|
188
|
+
debugLog('[Orchestrator] reloadLLM called');
|
|
188
189
|
if (!this.savedLLMState || !this.savedLLMState.wasRunning) {
|
|
189
|
-
|
|
190
|
+
debugLog('[Orchestrator] No saved LLM state - nothing to reload');
|
|
190
191
|
return;
|
|
191
192
|
}
|
|
192
193
|
const savedConfig = this.savedLLMState.config;
|
|
193
194
|
try {
|
|
194
|
-
|
|
195
|
+
debugLog('[Orchestrator] Restarting LLM with saved config:', {
|
|
195
196
|
modelId: savedConfig.modelId,
|
|
196
197
|
port: savedConfig.port,
|
|
197
198
|
});
|
|
198
199
|
await this.llamaServer.start(savedConfig);
|
|
199
|
-
|
|
200
|
+
debugLog('[Orchestrator] ✅ LLM server restarted successfully');
|
|
200
201
|
this.savedLLMState = undefined;
|
|
201
202
|
return;
|
|
202
203
|
}
|
|
@@ -204,11 +205,11 @@ export class ResourceOrchestrator {
|
|
|
204
205
|
console.warn('[Orchestrator] ⚠️ First reload attempt failed:', firstError);
|
|
205
206
|
}
|
|
206
207
|
try {
|
|
207
|
-
|
|
208
|
+
debugLog(`[Orchestrator] Retrying reload after ${ResourceOrchestrator.RELOAD_RETRY_DELAY_MS}ms...`);
|
|
208
209
|
await this.delay(ResourceOrchestrator.RELOAD_RETRY_DELAY_MS);
|
|
209
210
|
this.systemInfo.clearCache();
|
|
210
211
|
await this.llamaServer.start(savedConfig);
|
|
211
|
-
|
|
212
|
+
debugLog('[Orchestrator] ✅ LLM server restarted on retry');
|
|
212
213
|
this.savedLLMState = undefined;
|
|
213
214
|
}
|
|
214
215
|
catch (retryError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceOrchestrator.js","sourceRoot":"","sources":["../../src/managers/ResourceOrchestrator.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAkDjD,MAAM,OAAO,oBAAoB;IACvB,MAAM,CAAU,qBAAqB,GAAG,IAAI,CAAC;IAE7C,UAAU,CAAa;IACvB,WAAW,CAAqB;IAChC,eAAe,CAAyB;IACxC,YAAY,CAAe;IAC3B,aAAa,CAAiB;IAC9B,aAAa,GAAyB,IAAI,CAAC;IAUnD,YACE,aAAyB,UAAU,CAAC,WAAW,EAAE,EACjD,WAA+B,EAC/B,eAAuC,EACvC,eAA6B,YAAY,CAAC,WAAW,EAAE;QAEvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAsBD,KAAK,CAAC,0BAA0B,CAAC,MAA6B;QAC5D,
|
|
1
|
+
{"version":3,"file":"ResourceOrchestrator.js","sourceRoot":"","sources":["../../src/managers/ResourceOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,9 +28,9 @@ export declare abstract class ServerManager extends EventEmitter {
|
|
|
28
28
|
clearLogs(): Promise<void>;
|
|
29
29
|
getLogPath(): string | undefined;
|
|
30
30
|
protected validateConfigFields(config: Record<string, unknown>, validFields: ReadonlySet<string>, serverName: string): void;
|
|
31
|
-
protected checkPortAvailability(port: number, timeout?: number): Promise<void>;
|
|
31
|
+
protected checkPortAvailability(port: number, timeout?: number, host?: string): Promise<void>;
|
|
32
32
|
protected initializeLogManager(logFileName: string, startupMessage: string): Promise<void>;
|
|
33
33
|
protected handleStartupError(serverName: string, error: unknown, cleanup?: () => Promise<void>): Promise<never>;
|
|
34
|
-
protected ensureBinaryHelper(type: 'llama' | 'diffusion', binaryName: string, binaryConfig: any, testModelPath?: string, forceValidation?: boolean): Promise<string>;
|
|
34
|
+
protected ensureBinaryHelper(type: 'llama' | 'diffusion', binaryName: string, binaryConfig: any, testModelPath?: string, forceValidation?: boolean, testModelArgs?: string[]): Promise<string>;
|
|
35
35
|
}
|
|
36
36
|
//# sourceMappingURL=ServerManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerManager.d.ts","sourceRoot":"","sources":["../../src/managers/ServerManager.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQ7F,OAAO,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAmCtE,8BAAsB,aAAc,SAAQ,YAAY;IAEtD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAa;IAG5C,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAGxB,SAAS,CAAC,KAAK,SAAK;IAGpB,SAAS,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC;IAGjC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC;IAG5B,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAWlC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IASzD,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;IA0BpC,SAAS,IAAI,YAAY;IASzB,OAAO,IAAI,UAAU;IAgBrB,OAAO,IAAI,MAAM;IASjB,MAAM,IAAI,MAAM,GAAG,SAAS;IAS5B,SAAS,IAAI,YAAY,GAAG,SAAS;IASrC,SAAS,IAAI,OAAO;IASpB,SAAS,IAAI,OAAO;IASpB,UAAU,IAAI,OAAO;IASrB,UAAU,IAAI,OAAO;IASrB,UAAU,IAAI,OAAO;IAYrB,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAe/C,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAUpE,OAAO,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA6BvC,iBAAiB,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAkCnD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBhC,UAAU,IAAI,MAAM,GAAG,SAAS;IA4BhC,SAAS,CAAC,oBAAoB,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAChC,UAAU,EAAE,MAAM,GACjB,IAAI;cAkBS,qBAAqB,
|
|
1
|
+
{"version":3,"file":"ServerManager.d.ts","sourceRoot":"","sources":["../../src/managers/ServerManager.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQ7F,OAAO,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAmCtE,8BAAsB,aAAc,SAAQ,YAAY;IAEtD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAa;IAG5C,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAGxB,SAAS,CAAC,KAAK,SAAK;IAGpB,SAAS,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC;IAGjC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC;IAG5B,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAWlC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;IASzD,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;IA0BpC,SAAS,IAAI,YAAY;IASzB,OAAO,IAAI,UAAU;IAgBrB,OAAO,IAAI,MAAM;IASjB,MAAM,IAAI,MAAM,GAAG,SAAS;IAS5B,SAAS,IAAI,YAAY,GAAG,SAAS;IASrC,SAAS,IAAI,OAAO;IASpB,SAAS,IAAI,OAAO;IASpB,UAAU,IAAI,OAAO;IASrB,UAAU,IAAI,OAAO;IASrB,UAAU,IAAI,OAAO;IAYrB,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAe/C,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI;IAUpE,OAAO,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA6BvC,iBAAiB,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAkCnD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBhC,UAAU,IAAI,MAAM,GAAG,SAAS;IA4BhC,SAAS,CAAC,oBAAoB,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAChC,UAAU,EAAE,MAAM,GACjB,IAAI;cAkBS,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,SAAO,EACd,IAAI,SAAc,GACjB,OAAO,CAAC,IAAI,CAAC;cAyBA,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAmBhF,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,KAAK,CAAC;cAwDD,kBAAkB,CAChC,IAAI,EAAE,OAAO,GAAG,WAAW,EAC3B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,GAAG,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,eAAe,UAAQ,EACvB,aAAa,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,MAAM,CAAC;CAwBnB"}
|
|
@@ -129,9 +129,13 @@ export class ServerManager extends EventEmitter {
|
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
async checkPortAvailability(port, timeout = 2000) {
|
|
132
|
+
async checkPortAvailability(port, timeout = 2000, host = '127.0.0.1') {
|
|
133
133
|
const { isServerResponding } = await import('../process/health-check.js');
|
|
134
|
-
|
|
134
|
+
const { isPortBindable } = await import('../process/port-utils.js');
|
|
135
|
+
if (await isServerResponding(port, timeout, host)) {
|
|
136
|
+
throw new PortInUseError(port);
|
|
137
|
+
}
|
|
138
|
+
if (!(await isPortBindable(port, host))) {
|
|
135
139
|
throw new PortInUseError(port);
|
|
136
140
|
}
|
|
137
141
|
}
|
|
@@ -164,7 +168,7 @@ export class ServerManager extends EventEmitter {
|
|
|
164
168
|
}
|
|
165
169
|
throw new ServerError(`Failed to start ${serverName}: ${error instanceof Error ? error.message : 'Unknown error'}`, { error: error instanceof Error ? error.message : String(error) });
|
|
166
170
|
}
|
|
167
|
-
async ensureBinaryHelper(type, binaryName, binaryConfig, testModelPath, forceValidation = false) {
|
|
171
|
+
async ensureBinaryHelper(type, binaryName, binaryConfig, testModelPath, forceValidation = false, testModelArgs) {
|
|
168
172
|
const platformKey = getPlatformKey();
|
|
169
173
|
const variants = binaryConfig.variants[platformKey];
|
|
170
174
|
const binaryManager = new BinaryManager({
|
|
@@ -173,6 +177,7 @@ export class ServerManager extends EventEmitter {
|
|
|
173
177
|
platformKey,
|
|
174
178
|
variants: variants || [],
|
|
175
179
|
testModelPath,
|
|
180
|
+
testModelArgs,
|
|
176
181
|
version: binaryConfig.version,
|
|
177
182
|
log: (message, level = 'info') => {
|
|
178
183
|
this.logManager?.write(message, level).catch(() => void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerManager.js","sourceRoot":"","sources":["../../src/managers/ServerManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ServerManager.js","sourceRoot":"","sources":["../../src/managers/ServerManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../../src/managers/StorageManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../../src/managers/StorageManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAqB9D,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAS;IAM5B,OAAO;WAKO,WAAW,IAAI,cAAc;IAmB9B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAgBvD,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAuBxD,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BtD,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAwCvE,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6GjE,cAAc,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAuClD,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IA+BjC,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkGxE,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAuCvD,mBAAmB,IAAI,IAAI;CAGnC;AAGD,eAAO,MAAM,cAAc,gBAA+B,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { readdir, readFile, writeFile } from 'node:fs/promises';
|
|
1
|
+
import { readdir, readFile, writeFile, rmdir } from 'node:fs/promises';
|
|
2
|
+
import path from 'node:path';
|
|
2
3
|
import { FileSystemError, ChecksumError } from '../errors/index.js';
|
|
3
4
|
import { ensureDirectories, getModelMetadataPath, getModelFilePath, PATHS, } from '../config/paths.js';
|
|
4
5
|
import { fileExists, deleteFile, calculateChecksum } from '../utils/file-utils.js';
|
|
@@ -70,17 +71,83 @@ export class StorageManager {
|
|
|
70
71
|
async deleteModelFiles(type, modelId) {
|
|
71
72
|
const metadata = await this.loadModelMetadata(type, modelId);
|
|
72
73
|
const metadataPath = this.getModelMetadataPath(type, modelId);
|
|
73
|
-
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
if (metadata.components) {
|
|
75
|
+
const sharedPaths = new Set();
|
|
76
|
+
const otherModelIds = await this.listModelFiles(type);
|
|
77
|
+
for (const otherId of otherModelIds) {
|
|
78
|
+
if (otherId === modelId)
|
|
79
|
+
continue;
|
|
80
|
+
try {
|
|
81
|
+
const otherMeta = await this.loadModelMetadata(type, otherId);
|
|
82
|
+
if (otherMeta.components) {
|
|
83
|
+
for (const comp of Object.values(otherMeta.components)) {
|
|
84
|
+
sharedPaths.add(comp.path);
|
|
85
|
+
}
|
|
86
|
+
sharedPaths.add(otherMeta.path);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
for (const component of Object.values(metadata.components)) {
|
|
93
|
+
if (sharedPaths.has(component.path)) {
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
try {
|
|
97
|
+
const exists = await fileExists(component.path);
|
|
98
|
+
if (exists) {
|
|
99
|
+
await deleteFile(component.path);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
throw new FileSystemError(`Failed to delete component file: ${component.path}`, {
|
|
104
|
+
path: component.path,
|
|
105
|
+
error,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
try {
|
|
110
|
+
const modelDir = path.dirname(metadata.path);
|
|
111
|
+
await rmdir(modelDir);
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
77
114
|
}
|
|
78
115
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
116
|
+
else if (metadata.shards && metadata.shards.length > 0) {
|
|
117
|
+
for (const shard of metadata.shards) {
|
|
118
|
+
try {
|
|
119
|
+
const exists = await fileExists(shard.path);
|
|
120
|
+
if (exists) {
|
|
121
|
+
await deleteFile(shard.path);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
throw new FileSystemError(`Failed to delete shard file: ${shard.path}`, {
|
|
126
|
+
path: shard.path,
|
|
127
|
+
error,
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
try {
|
|
132
|
+
const modelDir = path.dirname(metadata.path);
|
|
133
|
+
await rmdir(modelDir);
|
|
134
|
+
}
|
|
135
|
+
catch {
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
try {
|
|
140
|
+
const modelExists = await fileExists(metadata.path);
|
|
141
|
+
if (modelExists) {
|
|
142
|
+
await deleteFile(metadata.path);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
throw new FileSystemError(`Failed to delete model file: ${metadata.path}`, {
|
|
147
|
+
path: metadata.path,
|
|
148
|
+
error,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
84
151
|
}
|
|
85
152
|
try {
|
|
86
153
|
await deleteFile(metadataPath);
|
|
@@ -115,6 +182,54 @@ export class StorageManager {
|
|
|
115
182
|
}
|
|
116
183
|
async verifyModelIntegrity(type, modelId) {
|
|
117
184
|
const metadata = await this.loadModelMetadata(type, modelId);
|
|
185
|
+
if (metadata.components) {
|
|
186
|
+
let hasAnyChecksum = false;
|
|
187
|
+
for (const [role, component] of Object.entries(metadata.components)) {
|
|
188
|
+
const exists = await fileExists(component.path);
|
|
189
|
+
if (!exists) {
|
|
190
|
+
throw new FileSystemError(`Component file not found (${role}): ${component.path}`, {
|
|
191
|
+
path: component.path,
|
|
192
|
+
modelId,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
if (component.checksum) {
|
|
196
|
+
hasAnyChecksum = true;
|
|
197
|
+
const actualChecksum = await calculateChecksum(component.path);
|
|
198
|
+
const expected = component.checksum.replace(/^sha256:/, '');
|
|
199
|
+
if (actualChecksum !== expected) {
|
|
200
|
+
throw new ChecksumError(`SHA256 checksum mismatch for component: ${role}`, {
|
|
201
|
+
expected,
|
|
202
|
+
actual: actualChecksum,
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
return hasAnyChecksum;
|
|
208
|
+
}
|
|
209
|
+
if (metadata.shards && metadata.shards.length > 0) {
|
|
210
|
+
let hasAnyChecksum = false;
|
|
211
|
+
for (const shard of metadata.shards) {
|
|
212
|
+
const exists = await fileExists(shard.path);
|
|
213
|
+
if (!exists) {
|
|
214
|
+
throw new FileSystemError(`Shard file not found: ${shard.path}`, {
|
|
215
|
+
path: shard.path,
|
|
216
|
+
modelId,
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
if (shard.checksum) {
|
|
220
|
+
hasAnyChecksum = true;
|
|
221
|
+
const actualChecksum = await calculateChecksum(shard.path);
|
|
222
|
+
const expected = shard.checksum.replace(/^sha256:/, '');
|
|
223
|
+
if (actualChecksum !== expected) {
|
|
224
|
+
throw new ChecksumError(`SHA256 checksum mismatch for shard: ${shard.path}`, {
|
|
225
|
+
expected,
|
|
226
|
+
actual: actualChecksum,
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
return hasAnyChecksum;
|
|
232
|
+
}
|
|
118
233
|
if (!metadata.checksum) {
|
|
119
234
|
return false;
|
|
120
235
|
}
|
|
@@ -137,18 +252,34 @@ export class StorageManager {
|
|
|
137
252
|
}
|
|
138
253
|
async getStorageUsed(type) {
|
|
139
254
|
const types = type ? [type] : ['llm', 'diffusion'];
|
|
140
|
-
|
|
255
|
+
const uniqueFiles = new Map();
|
|
141
256
|
for (const modelType of types) {
|
|
142
257
|
const modelIds = await this.listModelFiles(modelType);
|
|
143
258
|
for (const modelId of modelIds) {
|
|
144
259
|
try {
|
|
145
260
|
const metadata = await this.loadModelMetadata(modelType, modelId);
|
|
146
|
-
|
|
261
|
+
if (metadata.components) {
|
|
262
|
+
for (const comp of Object.values(metadata.components)) {
|
|
263
|
+
uniqueFiles.set(comp.path, comp.size);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
else if (metadata.shards && metadata.shards.length > 0) {
|
|
267
|
+
for (const shard of metadata.shards) {
|
|
268
|
+
uniqueFiles.set(shard.path, shard.size);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
uniqueFiles.set(metadata.path, metadata.size);
|
|
273
|
+
}
|
|
147
274
|
}
|
|
148
275
|
catch {
|
|
149
276
|
}
|
|
150
277
|
}
|
|
151
278
|
}
|
|
279
|
+
let totalSize = 0;
|
|
280
|
+
for (const size of uniqueFiles.values()) {
|
|
281
|
+
totalSize += size;
|
|
282
|
+
}
|
|
152
283
|
return totalSize;
|
|
153
284
|
}
|
|
154
285
|
resetInitialization() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageManager.js","sourceRoot":"","sources":["../../src/managers/StorageManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"StorageManager.js","sourceRoot":"","sources":["../../src/managers/StorageManager.ts"],"names":[],"mappings":"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"}
|