@gns-foundation/hive-worker 0.1.7 → 0.1.8
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/dist/cli.js +72 -5
- package/dist/cli.js.map +1 -1
- package/dist/executor.d.ts +2 -1
- package/dist/executor.js +9 -0
- package/dist/executor.js.map +1 -1
- package/dist/jobs.d.ts +12 -0
- package/dist/jobs.js +60 -1
- package/dist/jobs.js.map +1 -1
- package/dist/registry.d.ts +4 -2
- package/dist/registry.js +9 -3
- package/dist/registry.js.map +1 -1
- package/package.json +1 -1
- package/src/cli.ts +78 -6
- package/src/executor.ts +12 -1
- package/src/jobs.ts +88 -1
- package/src/registry.ts +9 -1
package/dist/cli.js
CHANGED
|
@@ -15,9 +15,21 @@ import { detectHardware, detectGeo } from './hardware.js';
|
|
|
15
15
|
import { registerNode, heartbeat, deregisterNode, fetchSwarmStats, fetchTokenBalance } from './registry.js';
|
|
16
16
|
import { findRpcBinary, startRpcServer, stopRpcServer, DEFAULT_RPC_PORT } from './llama.js';
|
|
17
17
|
import { printBanner, printSuccess, printInfo, printWarn, printError, renderDashboard, clearDashboard, hideCursor, } from './dashboard.js';
|
|
18
|
-
import { startJobPoller } from './jobs.js';
|
|
18
|
+
import { startJobPoller, claimJobPipeline, markComputing, postResult, postFailure } from './jobs.js';
|
|
19
19
|
import { executeJob, downloadModel, listCachedModels, resolveModelUrl, findLlamaCli } from './executor.js';
|
|
20
20
|
import { creditWorker, SPLIT } from './settlement.js';
|
|
21
|
+
import os from 'os';
|
|
22
|
+
// ─── Get local LAN IP ─────────────────────────────────────────
|
|
23
|
+
function getLocalIp() {
|
|
24
|
+
const nets = os.networkInterfaces();
|
|
25
|
+
for (const name of Object.keys(nets)) {
|
|
26
|
+
for (const net of nets[name] ?? []) {
|
|
27
|
+
if (net.family === 'IPv4' && !net.internal)
|
|
28
|
+
return net.address;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
21
33
|
const HEARTBEAT_INTERVAL_MS = 30_000;
|
|
22
34
|
const STATS_REFRESH_INTERVAL_MS = 60_000;
|
|
23
35
|
const DASHBOARD_REFRESH_MS = 1_000;
|
|
@@ -80,7 +92,8 @@ async function cmdJoin(opts) {
|
|
|
80
92
|
printInfo('Registering with GEIANT Hive swarm...');
|
|
81
93
|
try {
|
|
82
94
|
const cachedModelIds = listCachedModels().map(m => m.modelId);
|
|
83
|
-
|
|
95
|
+
const localIp = rpcHandle ? getLocalIp() : null;
|
|
96
|
+
await registerNode(identity, hw, geo, handle, rpcHandle?.port ?? null, cachedModelIds, localIp, !!rpcHandle);
|
|
84
97
|
printSuccess('Registered in swarm registry');
|
|
85
98
|
}
|
|
86
99
|
catch (err) {
|
|
@@ -131,7 +144,8 @@ async function cmdJoin(opts) {
|
|
|
131
144
|
const heartbeatTimer = setInterval(async () => {
|
|
132
145
|
try {
|
|
133
146
|
const freshModels = listCachedModels().map(m => m.modelId);
|
|
134
|
-
|
|
147
|
+
const localIp = rpcHandle ? getLocalIp() : null;
|
|
148
|
+
await heartbeat(identity.pk, state.status, freshModels, localIp);
|
|
135
149
|
heartbeatCount++;
|
|
136
150
|
lastHeartbeat = new Date();
|
|
137
151
|
state.heartbeatCount = heartbeatCount;
|
|
@@ -184,14 +198,67 @@ async function cmdJoin(opts) {
|
|
|
184
198
|
addLog(`Job ${job.id.slice(0, 8)} failed: ${error.slice(0, 60)}`);
|
|
185
199
|
},
|
|
186
200
|
onLog: addLog,
|
|
187
|
-
executor: async (job) => {
|
|
201
|
+
executor: async (job, onToken) => {
|
|
188
202
|
return executeJob(job, {
|
|
189
|
-
onToken
|
|
203
|
+
onToken,
|
|
190
204
|
onLog: addLog,
|
|
205
|
+
// No RPC peers in standard mode — solo execution
|
|
191
206
|
});
|
|
192
207
|
},
|
|
193
208
|
});
|
|
194
209
|
addLog('Job poller started — polling every 5s');
|
|
210
|
+
// ── Pipeline poll loop (only when RPC server is running) ──
|
|
211
|
+
// Polls for jobs and uses split inference when peers are available.
|
|
212
|
+
if (rpcHandle) {
|
|
213
|
+
const PIPELINE_INTERVAL = 7000; // slightly offset from standard poll
|
|
214
|
+
const pipelineTimer = setInterval(async () => {
|
|
215
|
+
if (state.status === 'computing')
|
|
216
|
+
return; // already busy
|
|
217
|
+
try {
|
|
218
|
+
const result = await claimJobPipeline(identity.pk, geo.h3Cell);
|
|
219
|
+
if (!result)
|
|
220
|
+
return;
|
|
221
|
+
const { job, peers } = result;
|
|
222
|
+
if (peers.length === 0) {
|
|
223
|
+
// No peers — let standard poller handle it, release this claim
|
|
224
|
+
// (job will timeout and return to pending)
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
state.status = 'computing';
|
|
228
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} · ${peers.length} peer(s) · ${peers.map(p => p.rpc_host).join(', ')}`);
|
|
229
|
+
try {
|
|
230
|
+
await markComputing(job.id);
|
|
231
|
+
const execResult = await executeJob(job, {
|
|
232
|
+
onLog: addLog,
|
|
233
|
+
rpcPeers: peers,
|
|
234
|
+
});
|
|
235
|
+
await postResult(job.id, execResult);
|
|
236
|
+
jobsCompleted++;
|
|
237
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} done · ${execResult.tokensPerSecond} tok/s (distributed)`);
|
|
238
|
+
state.tokensEarned += job.gns_reward * SPLIT.WORKER;
|
|
239
|
+
}
|
|
240
|
+
catch (execErr) {
|
|
241
|
+
const errMsg = execErr instanceof Error ? execErr.message : String(execErr);
|
|
242
|
+
await postFailure(job.id, errMsg).catch(() => { });
|
|
243
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} failed: ${errMsg.slice(0, 60)}`);
|
|
244
|
+
}
|
|
245
|
+
finally {
|
|
246
|
+
state.status = 'idle';
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
catch (err) {
|
|
250
|
+
// Non-fatal — log and continue
|
|
251
|
+
addLog(`Pipeline poll error: ${err instanceof Error ? err.message : String(err)}`);
|
|
252
|
+
}
|
|
253
|
+
}, PIPELINE_INTERVAL);
|
|
254
|
+
// Store timer for cleanup
|
|
255
|
+
const origStop = jobPoller.stop.bind(jobPoller);
|
|
256
|
+
jobPoller = {
|
|
257
|
+
...jobPoller,
|
|
258
|
+
stop: () => { origStop(); clearInterval(pipelineTimer); },
|
|
259
|
+
};
|
|
260
|
+
addLog('Pipeline poller started — RPC server ready for distributed inference');
|
|
261
|
+
}
|
|
195
262
|
}
|
|
196
263
|
else if (opts.noJobs) {
|
|
197
264
|
addLog('Job execution disabled (--no-jobs flag)');
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,+DAA+D;AAC/D,kBAAkB;AAClB,SAAS;AACT,gFAAgF;AAChF,2CAA2C;AAC3C,0CAA0C;AAC1C,2CAA2C;AAC3C,gDAAgD;AAChD,4DAA4D;AAC5D,+DAA+D;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAuB,MAAM,YAAY,CAAC;AACjH,OAAO,EACL,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAC3D,eAAe,EAAE,cAAc,EAAE,UAAU,GAE5C,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAgE,MAAM,WAAW,CAAC;AACnK,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3G,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,iEAAiE;AACjE,SAAS,UAAU;IACjB,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACnC,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ;gBAAE,OAAO,GAAG,CAAC,OAAO,CAAC;QACjE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,qBAAqB,GAAO,MAAM,CAAC;AACzC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AACzC,MAAM,oBAAoB,GAAQ,KAAK,CAAC;AACxC,MAAM,oBAAoB,GAAQ,KAAK,CAAC,CAAG,6BAA6B;AAExE,iEAAiE;AAEjE,KAAK,UAAU,OAAO,CAAC,IAKtB;IACC,WAAW,EAAE,CAAC;IAEd,cAAc;IACd,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,oBAAoB,EAAE,CAAC;IACnD,IAAI,KAAK,EAAE,CAAC;QACV,YAAY,CAAC,2BAA2B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAChE,SAAS,CAAC,aAAa,YAAY,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,oBAAoB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,YAAY;IACZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;IACtD,IAAI,MAAM;QAAE,YAAY,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;;QAC1C,SAAS,CAAC,kDAAkD,CAAC,CAAC;IAEnE,cAAc;IACd,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5B,YAAY,CAAC,GAAG,EAAE,CAAC,QAAQ,SAAS,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC,KAAK,cAAc,EAAE,CAAC,eAAe,SAAS,CAAC,CAAC;IACpG,IAAI,EAAE,CAAC,QAAQ;QAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAErD,SAAS;IACT,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC;IAC9B,YAAY,CAAC,aAAa,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,cAAc,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAE5F,yCAAyC;IACzC,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;IAC3C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,iBAAiB,EAAE,CAAC;YACtB,YAAY,CAAC,yCAAyC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,gEAAgE,CAAC,CAAC;YAC5E,SAAS,CAAC,uEAAuE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,MAAM,IAAI,GAAa,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAEjE,0CAA0C;IAC1C,IAAI,SAAS,GAA0B,IAAI,CAAC;IAC5C,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;QAC/B,SAAS,CAAC,qCAAqC,OAAO,KAAK,CAAC,CAAC;QAC7D,SAAS,GAAG,cAAc,CAAC,OAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChE,IAAI,SAAS;YAAE,YAAY,CAAC,kBAAkB,SAAS,CAAC,GAAG,QAAQ,OAAO,EAAE,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,SAAS,CAAC,gDAAgD,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc;IACd,SAAS,CAAC,uCAAuC,CAAC,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;QAC7G,YAAY,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,UAAU,CAAC,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvF,SAAS,CAAC,sDAAsD,CAAC,CAAC;IACpE,CAAC;IAED,mBAAmB;IACnB,IAAI,UAAU,GAAG,MAAM,eAAe,EAAE,CAAC;IACzC,IAAI,YAAY,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACxD,YAAY,CAAC,UAAU,UAAU,CAAC,WAAW,mBAAmB,UAAU,CAAC,WAAW,SAAS,CAAC,CAAC;IAEjG,gBAAgB;IAChB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,kBAAkB,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAC7C,SAAS,CAAC,kEAAkE,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,SAAS,CAAC,mDAAmD,CAAC,CAAC;IAE/D,iEAAiE;IAEjE,UAAU,EAAE,CAAC;IAEb,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,aAAa,GAAgB,IAAI,CAAC;IACtC,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;QAC7B,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,KAAK,GAAG,EAAE,CAAC,CAAC;QACzD,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE;YAAE,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;IAEF,MAAM,KAAK,GAAmB;QAC5B,EAAE,EAAa,QAAQ,CAAC,EAAE;QAC1B,MAAM;QACN,MAAM,EAAS,MAAM;QACrB,EAAE;QACF,GAAG;QACH,OAAO,EAAQ,SAAS,EAAE,IAAI,IAAI,IAAI;QACtC,YAAY,EAAG,CAAC,CAAC,SAAS;QAC1B,YAAY;QACZ,UAAU;QACV,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,IAAI;QACnB,IAAI;KACL,CAAC;IAEF,gEAAgE;IAEhE,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3D,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAChD,MAAM,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YACjE,cAAc,EAAE,CAAC;YACjB,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC;YACtC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;YACpC,MAAM,CAAC,cAAc,cAAc,EAAE,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,oBAAoB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC,EAAE,qBAAqB,CAAC,CAAC;IAE1B,gEAAgE;IAEhE,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,IAAI,CAAC;YACH,UAAU,GAAM,MAAM,eAAe,EAAE,CAAC;YACxC,YAAY,GAAI,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrD,KAAK,CAAC,UAAU,GAAK,UAAU,CAAC;YAChC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;QACpC,CAAC;QAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAC7B,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAE9B,iEAAiE;IAEjE,IAAI,SAAS,GAA0B,IAAI,CAAC;IAE5C,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QACnE,SAAS,GAAG,cAAc,CAAC;YACzB,QAAQ,EAAI,QAAQ,CAAC,EAAE;YACvB,MAAM,EAAM,GAAG,CAAC,MAAM;YACtB,UAAU,EAAE,oBAAoB;YAEhC,YAAY,EAAE,CAAC,GAAY,EAAE,EAAE;gBAC7B,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC;gBAC3B,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,UAAU,SAAS,CAAC,CAAC;YAClG,CAAC;YAED,cAAc,EAAE,CAAC,GAAY,EAAE,MAAiB,EAAE,EAAE;gBAClD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBACtB,aAAa,EAAE,CAAC;gBAChB,MAAM,CACJ,OAAO,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,MAAM,CAAC,eAAe,WAAW;oBACrE,UAAU,CAAC,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAC3D,CAAC;gBACF,4DAA4D;gBAC5D,KAAK,CAAC,YAAY,IAAI,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;gBACpD,iCAAiC;gBACjC,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC;qBAC9C,IAAI,CAAC,GAAG,CAAC,EAAE;oBACV,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;wBACtB,MAAM,CAAC,gBAAgB,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,qBAAqB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YACnG,CAAC;YAED,WAAW,EAAE,CAAC,GAAY,EAAE,KAAa,EAAE,EAAE;gBAC3C,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBACtB,MAAM,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACpE,CAAC;YAED,KAAK,EAAE,MAAM;YAEb,QAAQ,EAAE,KAAK,EAAE,GAAY,EAAE,OAA6B,EAAE,EAAE;gBAC9D,OAAO,UAAU,CAAC,GAAG,EAAE;oBACrB,OAAO;oBACP,KAAK,EAAE,MAAM;oBACb,iDAAiD;iBAClD,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAEhD,6DAA6D;QAC7D,oEAAoE;QACpE,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,qCAAqC;YACrE,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW;oBAAE,OAAO,CAAC,eAAe;gBAEzD,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,QAAQ,CAAC,EAAE,EACX,GAAG,CAAC,MAAM,CACX,CAAC;oBACF,IAAI,CAAC,MAAM;wBAAE,OAAO;oBAEpB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;oBAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACvB,+DAA+D;wBAC/D,2CAA2C;wBAC3C,OAAO;oBACT,CAAC;oBAED,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC;oBAC3B,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,cAAc,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAElH,IAAI,CAAC;wBACH,MAAM,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC5B,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE;4BACvC,KAAK,EAAE,MAAM;4BACb,QAAQ,EAAE,KAAK;yBAChB,CAAC,CAAC;wBACH,MAAM,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;wBACrC,aAAa,EAAE,CAAC;wBAChB,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,UAAU,CAAC,eAAe,sBAAsB,CAAC,CAAC;wBACtG,KAAK,CAAC,YAAY,IAAI,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;oBACtD,CAAC;oBAAC,OAAO,OAAO,EAAE,CAAC;wBACjB,MAAM,MAAM,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBAC5E,MAAM,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;wBAClD,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBAC9E,CAAC;4BAAS,CAAC;wBACT,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;oBACxB,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,+BAA+B;oBAC/B,MAAM,CAAC,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC,EAAE,iBAAiB,CAAC,CAAC;YAEtB,0BAA0B;YAC1B,MAAM,QAAQ,GAAG,SAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjD,SAAS,GAAG;gBACV,GAAG,SAAU;gBACb,IAAI,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;aAC1D,CAAC;YACF,MAAM,CAAC,sEAAsE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,yCAAyC,CAAC,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,mEAAmE,CAAC,CAAC;IAC9E,CAAC;IAED,iEAAiE;IAEjE,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;QAClE,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAEzB,eAAe,CAAC,KAAK,CAAC,CAAC;IAEvB,iEAAiE;IAEjE,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;QACxC,aAAa,CAAC,cAAc,CAAC,CAAC;QAC9B,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1B,aAAa,CAAC,SAAS,CAAC,CAAC;QACzB,SAAS,EAAE,IAAI,EAAE,CAAC;QAClB,cAAc,EAAE,CAAC;QAEjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,SAAS,CAAC,YAAY,MAAM,+BAA+B,CAAC,CAAC;QAE7D,IAAI,CAAC;YACH,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAClC,YAAY,CAAC,kCAAkC,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAE7B,IAAI,SAAS,EAAE,CAAC;YACd,aAAa,CAAC,SAAS,CAAC,CAAC;YACzB,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACrC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACpF,YAAY,CAAC,sBAAsB,aAAa,WAAW,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,iEAAiE;AAEjE,KAAK,UAAU,SAAS;IACtB,WAAW,EAAE,CAAC;IACd,MAAM,EAAE,QAAQ,EAAE,GAAG,oBAAoB,EAAE,CAAC;IAC5C,SAAS,CAAC,aAAa,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAI,MAAM,eAAe,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACpD,SAAS,CAAC,UAAU,KAAK,CAAC,WAAW,mBAAmB,KAAK,CAAC,WAAW,SAAS,CAAC,CAAC;IACpF,SAAS,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,SAAS,CAAC,kBAAkB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,4DAA4D,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAChC,MAAM,MAAM,GAAK,aAAa,EAAE,CAAC;IACjC,SAAS,CAAC,cAAc,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;IACnD,SAAS,CAAC,eAAe,MAAM,IAAI,WAAW,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,iEAAiE;AAEjE,KAAK,UAAU,QAAQ;IACrB,WAAW,EAAE,CAAC;IACd,MAAM,EAAE,QAAQ,EAAE,GAAG,oBAAoB,EAAE,CAAC;IAC5C,SAAS,CAAC,iBAAiB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;IACjE,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClC,YAAY,CAAC,wCAAwC,GAAG,YAAY,EAAE,CAAC,CAAC;IACxE,SAAS,CAAC,mCAAmC,CAAC,CAAC;AACjD,CAAC;AAED,iEAAiE;AAEjE,KAAK,UAAU,SAAS;IACtB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,oBAAoB,EAAE,CAAC;IACnD,IAAI,KAAK;QAAE,SAAS,CAAC,mDAAmD,CAAC,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,cAAc,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,cAAc,YAAY,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,iEAAiE;AAEjE,KAAK,UAAU,aAAa;IAC1B,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,SAAS,CAAC,uBAAuB,CAAC,CAAC;QACnC,SAAS,CAAC,gDAAgD,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,mBAAmB,CAAC,CAAC;QAClD,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,SAAS,CAAC,qDAAqD,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,iEAAiE;AAEjE,KAAK,UAAU,cAAc,CAAC,OAAe;IAC3C,WAAW,EAAE,CAAC;IACd,MAAM,GAAG,GAAG;QACV,QAAQ,EAAG,OAAO;QAClB,SAAS,EAAE,IAAI;KAC2B,CAAC;IAE7C,MAAM,GAAG,GAAG,eAAe,CAAC,GAAc,CAAC,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,UAAU,CAAC,kBAAkB,OAAO,iDAAiD,CAAC,CAAC;QACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,eAAe,OAAO,KAAK,CAAC,CAAC;IACvC,SAAS,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IAC5B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC;IACjB,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtE,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,GAAG,MAAM,MAAM,MAAM,OAAO,SAAS,CAAC,CAAC;YAClF,OAAO,GAAG,GAAG,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,YAAY,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjC,SAAS,CAAC,mCAAmC,CAAC,CAAC;AACjD,CAAC;AAED,iEAAiE;AAEjE,OAAO;KACJ,IAAI,CAAC,aAAa,CAAC;KACnB,WAAW,CAAC,6DAA6D,CAAC;KAC1E,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,kDAAkD,CAAC;KAC/D,MAAM,CAAC,cAAc,EAAO,+BAA+B,CAAC;KAC5D,MAAM,CAAC,mBAAmB,EAAE,+BAA+B,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;KACtF,MAAM,CAAC,YAAY,EAAU,0BAA0B,CAAC;KACxD,MAAM,CAAC,WAAW,EAAU,+CAA+C,CAAC;KAC5E,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpD,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,0CAA0C,CAAC;KACvD,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,sCAAsC,CAAC;KACnD,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAE7C,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,yBAAyB,CAAC;KACtC,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,MAAM,MAAM,GAAG,OAAO;KACnB,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,wCAAwC,CAAC,CAAC;AAEzD,MAAM;KACH,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,oBAAoB,CAAC;KACjC,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAElD,MAAM;KACH,OAAO,CAAC,kBAAkB,CAAC;KAC3B,WAAW,CAAC,sDAAsD,CAAC;KACnE,MAAM,CAAC,KAAK,EAAE,OAAe,EAAE,EAAE,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzE,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
package/dist/executor.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { HiveJob, JobResult } from './jobs.js';
|
|
1
|
+
import type { HiveJob, JobResult, RpcPeer } from './jobs.js';
|
|
2
2
|
export declare function findLlamaCli(): string | null;
|
|
3
3
|
export declare function ensureModelCacheDir(): void;
|
|
4
4
|
export declare function modelCachePath(modelId: string): string;
|
|
@@ -8,6 +8,7 @@ export declare function downloadModel(modelId: string, url: string, onProgress:
|
|
|
8
8
|
export interface ExecutorOptions {
|
|
9
9
|
onToken?: (token: string) => void;
|
|
10
10
|
onLog?: (line: string) => void;
|
|
11
|
+
rpcPeers?: RpcPeer[];
|
|
11
12
|
}
|
|
12
13
|
export declare function executeJob(job: HiveJob, onTokenOrOpts?: ((t: string) => void) | ExecutorOptions): Promise<JobResult>;
|
|
13
14
|
export declare function listCachedModels(): Array<{
|
package/dist/executor.js
CHANGED
|
@@ -123,6 +123,15 @@ function runLlamaCli(binary, modelPath, job, opts) {
|
|
|
123
123
|
'--single-turn', // exit after one completion
|
|
124
124
|
'-ngl', '0', // CPU-only (Metal tensor API disabled on pre-M5)
|
|
125
125
|
];
|
|
126
|
+
// Pipeline parallelism: add --rpc for each peer worker
|
|
127
|
+
const peers = opts.rpcPeers ?? [];
|
|
128
|
+
for (const peer of peers) {
|
|
129
|
+
args.push('--rpc', `${peer.rpc_host}:${peer.rpc_port}`);
|
|
130
|
+
opts.onLog?.(`Pipeline peer: ${peer.rpc_host}:${peer.rpc_port} (${peer.tflops} TFLOPS)`);
|
|
131
|
+
}
|
|
132
|
+
if (peers.length > 0) {
|
|
133
|
+
opts.onLog?.(`Pipeline mode: ${peers.length + 1} nodes, splitting ${job.max_tokens} tokens`);
|
|
134
|
+
}
|
|
126
135
|
opts.onLog?.(`Executing ${job.model_id} (${job.max_tokens} tokens)`);
|
|
127
136
|
const proc = spawn(binary, args, {
|
|
128
137
|
stdio: ['ignore', 'pipe', 'pipe'],
|
package/dist/executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/jobs.d.ts
CHANGED
|
@@ -32,12 +32,24 @@ export interface JobResult {
|
|
|
32
32
|
tokensPerSecond: number;
|
|
33
33
|
error?: string;
|
|
34
34
|
}
|
|
35
|
+
export interface RpcPeer {
|
|
36
|
+
pk: string;
|
|
37
|
+
handle: string | null;
|
|
38
|
+
rpc_host: string;
|
|
39
|
+
rpc_port: number;
|
|
40
|
+
tflops: number;
|
|
41
|
+
}
|
|
42
|
+
export interface PipelineClaimResult {
|
|
43
|
+
job: HiveJob;
|
|
44
|
+
peers: RpcPeer[];
|
|
45
|
+
}
|
|
35
46
|
export declare function claimJob(workerPk: string, h3Cell: string, modelId?: string): Promise<HiveJob | null>;
|
|
36
47
|
export declare function markComputing(jobId: string): Promise<void>;
|
|
37
48
|
export declare function postResult(jobId: string, result: JobResult & {
|
|
38
49
|
chunksCount?: number;
|
|
39
50
|
}): Promise<void>;
|
|
40
51
|
export declare function postChunk(jobId: string, chunkIndex: number, content: string): Promise<void>;
|
|
52
|
+
export declare function claimJobPipeline(workerPk: string, h3Cell: string, modelId?: string): Promise<PipelineClaimResult | null>;
|
|
41
53
|
export declare function postFailure(jobId: string, errorMsg: string): Promise<void>;
|
|
42
54
|
export declare function cleanupTimedOutJobs(): Promise<void>;
|
|
43
55
|
export declare function fetchJob(jobId: string): Promise<HiveJob | null>;
|
package/dist/jobs.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// SKIP LOCKED (Postgres handles races — no app-level locking needed)
|
|
5
5
|
// ============================================================
|
|
6
6
|
const SUPABASE_URL = 'https://kaqwkxfaclyqjlfhxrmt.supabase.co';
|
|
7
|
-
const SUPABASE_ANON = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
7
|
+
const SUPABASE_ANON = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImthcXdreGZhY2x5cWpsZmh4cm10Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDA3NTE1NjEsImV4cCI6MjA1NjMyNzU2MX0.ClyWNGRxQjpKYzIROPZBqTXDsWvJioGe9pQymDOYBTc';
|
|
8
8
|
const HEADERS = {
|
|
9
9
|
'apikey': SUPABASE_ANON,
|
|
10
10
|
'Authorization': `Bearer ${SUPABASE_ANON}`,
|
|
@@ -56,6 +56,65 @@ export async function postChunk(jobId, chunkIndex, content) {
|
|
|
56
56
|
console.error(`postChunk failed: ${resp.status}`);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
+
// ─── Pipeline claim ──────────────────────────────────────────
|
|
60
|
+
// Claims a job AND returns available RPC peers in same H3 cell.
|
|
61
|
+
// Used when 2+ compute nodes are available for split inference.
|
|
62
|
+
export async function claimJobPipeline(workerPk, h3Cell, modelId) {
|
|
63
|
+
const resp = await fetch(`${SUPABASE_URL}/rest/v1/rpc/claim_hive_job_pipeline`, {
|
|
64
|
+
method: 'POST',
|
|
65
|
+
headers: HEADERS,
|
|
66
|
+
body: JSON.stringify({
|
|
67
|
+
p_primary_pk: workerPk,
|
|
68
|
+
p_h3_cell: h3Cell,
|
|
69
|
+
p_model_id: modelId ?? null,
|
|
70
|
+
}),
|
|
71
|
+
});
|
|
72
|
+
if (!resp.ok) {
|
|
73
|
+
const text = await resp.text();
|
|
74
|
+
throw new Error(`claimJobPipeline RPC failed: ${resp.status} ${text}`);
|
|
75
|
+
}
|
|
76
|
+
const rows = await resp.json();
|
|
77
|
+
if (!rows || rows.length === 0)
|
|
78
|
+
return null;
|
|
79
|
+
const row = rows[0];
|
|
80
|
+
const job = {
|
|
81
|
+
id: row.job_id,
|
|
82
|
+
h3_cell: h3Cell,
|
|
83
|
+
jurisdiction: null,
|
|
84
|
+
model_id: row.job_model_id,
|
|
85
|
+
model_url: null,
|
|
86
|
+
layer_start: 0,
|
|
87
|
+
layer_end: 31,
|
|
88
|
+
prompt: row.job_prompt,
|
|
89
|
+
max_tokens: row.job_max_tokens,
|
|
90
|
+
temperature: row.job_temperature,
|
|
91
|
+
status: 'assigned',
|
|
92
|
+
worker_pk: workerPk,
|
|
93
|
+
assigned_at: new Date().toISOString(),
|
|
94
|
+
result_text: null,
|
|
95
|
+
tokens_generated: null,
|
|
96
|
+
tokens_per_second: null,
|
|
97
|
+
completed_at: null,
|
|
98
|
+
error_message: null,
|
|
99
|
+
gns_reward: row.job_gns_reward,
|
|
100
|
+
settled: false,
|
|
101
|
+
stellar_tx_hash: null,
|
|
102
|
+
submitter_pk: '',
|
|
103
|
+
created_at: new Date().toISOString(),
|
|
104
|
+
timeout_at: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
|
|
105
|
+
streaming: false,
|
|
106
|
+
chunks_count: null,
|
|
107
|
+
// min_trust_tier not needed in client-side HiveJob
|
|
108
|
+
};
|
|
109
|
+
const peers = (row.rpc_peers ?? []).map((p) => ({
|
|
110
|
+
pk: p.pk,
|
|
111
|
+
handle: p.handle,
|
|
112
|
+
rpc_host: p.rpc_host,
|
|
113
|
+
rpc_port: p.rpc_port ?? 50052,
|
|
114
|
+
tflops: parseFloat(p.tflops ?? '0'),
|
|
115
|
+
}));
|
|
116
|
+
return { job, peers };
|
|
117
|
+
}
|
|
59
118
|
// ─── Post failure ─────────────────────────────────────────────
|
|
60
119
|
export async function postFailure(jobId, errorMsg) {
|
|
61
120
|
await patchJob(jobId, {
|
package/dist/jobs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,0BAA0B;AAC1B,2DAA2D;AAC3D,qEAAqE;AACrE,+DAA+D;AAE/D,MAAM,YAAY,GAAG,0CAA0C,CAAC;AAChE,MAAM,aAAa,GAAG,kNAAkN,CAAC;AAEzO,MAAM,OAAO,GAAG;IACd,QAAQ,EAAE,aAAa;IACvB,eAAe,EAAE,UAAU,aAAa,EAAE;IAC1C,cAAc,EAAE,kBAAkB;CACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../src/jobs.ts"],"names":[],"mappings":"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"}
|
package/dist/registry.d.ts
CHANGED
|
@@ -13,14 +13,16 @@ export interface SwarmNode {
|
|
|
13
13
|
rpc_port: number | null;
|
|
14
14
|
worker_version: string;
|
|
15
15
|
models: string[];
|
|
16
|
+
rpc_host: string | null;
|
|
17
|
+
rpc_available: boolean;
|
|
16
18
|
}
|
|
17
19
|
export interface RegistryStats {
|
|
18
20
|
totalNodes: number;
|
|
19
21
|
activeNodes: number;
|
|
20
22
|
totalTflops: number;
|
|
21
23
|
}
|
|
22
|
-
export declare function registerNode(identity: HiveIdentity, hw: HardwareProfile, geo: GeoProfile, handle: string | null, rpcPort: number | null, models?: string[]): Promise<void>;
|
|
23
|
-
export declare function heartbeat(pk: string, status: WorkerStatus, models?: string[]): Promise<void>;
|
|
24
|
+
export declare function registerNode(identity: HiveIdentity, hw: HardwareProfile, geo: GeoProfile, handle: string | null, rpcPort: number | null, models?: string[], rpcHost?: string | null, rpcAvailable?: boolean): Promise<void>;
|
|
25
|
+
export declare function heartbeat(pk: string, status: WorkerStatus, models?: string[], rpcHost?: string | null): Promise<void>;
|
|
24
26
|
export declare function deregisterNode(pk: string): Promise<void>;
|
|
25
27
|
export declare function fetchSwarmStats(): Promise<RegistryStats>;
|
|
26
28
|
export declare function fetchTokenBalance(pk: string): Promise<number>;
|
package/dist/registry.js
CHANGED
|
@@ -20,7 +20,7 @@ async function supabase(method, table, body, query) {
|
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
// ─── Registration ─────────────────────────────────────────────
|
|
23
|
-
export async function registerNode(identity, hw, geo, handle, rpcPort, models = []) {
|
|
23
|
+
export async function registerNode(identity, hw, geo, handle, rpcPort, models = [], rpcHost = null, rpcAvailable = false) {
|
|
24
24
|
const node = {
|
|
25
25
|
pk: identity.pk,
|
|
26
26
|
h3_cell: geo.h3Cell,
|
|
@@ -31,8 +31,10 @@ export async function registerNode(identity, hw, geo, handle, rpcPort, models =
|
|
|
31
31
|
last_heartbeat: new Date().toISOString(),
|
|
32
32
|
tokens_earned: await getExistingTokens(identity.pk),
|
|
33
33
|
rpc_port: rpcPort,
|
|
34
|
-
worker_version: '0.1.
|
|
34
|
+
worker_version: '0.1.7',
|
|
35
35
|
models,
|
|
36
|
+
rpc_host: rpcHost,
|
|
37
|
+
rpc_available: rpcAvailable,
|
|
36
38
|
};
|
|
37
39
|
// Upsert — on conflict update everything except tokens_earned
|
|
38
40
|
const resp = await supabase('POST', 'swarm_nodes', node, 'on_conflict=pk');
|
|
@@ -54,10 +56,14 @@ async function getExistingTokens(pk) {
|
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
// ─── Heartbeat ─────────────────────────────────────────────
|
|
57
|
-
export async function heartbeat(pk, status, models) {
|
|
59
|
+
export async function heartbeat(pk, status, models, rpcHost) {
|
|
58
60
|
const patch = { status, last_heartbeat: new Date().toISOString() };
|
|
59
61
|
if (models)
|
|
60
62
|
patch.models = models;
|
|
63
|
+
if (rpcHost !== undefined) {
|
|
64
|
+
patch.rpc_host = rpcHost;
|
|
65
|
+
patch.rpc_available = rpcHost !== null;
|
|
66
|
+
}
|
|
61
67
|
const resp = await supabase('PATCH', 'swarm_nodes', patch, `pk=eq.${pk}`);
|
|
62
68
|
if (!resp.ok && resp.status !== 204) {
|
|
63
69
|
throw new Error(`Heartbeat failed: ${resp.status}`);
|
package/dist/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,yBAAyB;AACzB,wDAAwD;AACxD,6CAA6C;AAC7C,+DAA+D;AAK/D,MAAM,YAAY,GAAG,0CAA0C,CAAC;AAChE,MAAM,aAAa,GAAG,kNAAkN,CAAC;AAEzO,MAAM,OAAO,GAAG;IACd,QAAQ,EAAE,aAAa;IACvB,eAAe,EAAE,UAAU,aAAa,EAAE;IAC1C,cAAc,EAAE,kBAAkB;IAClC,QAAQ,EAAE,gBAAgB;CAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/cli.ts
CHANGED
|
@@ -20,10 +20,23 @@ import {
|
|
|
20
20
|
renderDashboard, clearDashboard, hideCursor,
|
|
21
21
|
type DashboardState,
|
|
22
22
|
} from './dashboard.js';
|
|
23
|
-
import { startJobPoller, type PollController, type HiveJob, type JobResult } from './jobs.js';
|
|
23
|
+
import { startJobPoller, claimJobPipeline, markComputing, postResult, postFailure, postChunk, type PollController, type HiveJob, type JobResult } from './jobs.js';
|
|
24
24
|
import { executeJob, downloadModel, listCachedModels, resolveModelUrl, findLlamaCli } from './executor.js';
|
|
25
25
|
import { creditWorker, SPLIT } from './settlement.js';
|
|
26
26
|
|
|
27
|
+
import os from 'os';
|
|
28
|
+
|
|
29
|
+
// ─── Get local LAN IP ─────────────────────────────────────────
|
|
30
|
+
function getLocalIp(): string | null {
|
|
31
|
+
const nets = os.networkInterfaces();
|
|
32
|
+
for (const name of Object.keys(nets)) {
|
|
33
|
+
for (const net of nets[name] ?? []) {
|
|
34
|
+
if (net.family === 'IPv4' && !net.internal) return net.address;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
|
|
27
40
|
const HEARTBEAT_INTERVAL_MS = 30_000;
|
|
28
41
|
const STATS_REFRESH_INTERVAL_MS = 60_000;
|
|
29
42
|
const DASHBOARD_REFRESH_MS = 1_000;
|
|
@@ -95,7 +108,8 @@ async function cmdJoin(opts: {
|
|
|
95
108
|
printInfo('Registering with GEIANT Hive swarm...');
|
|
96
109
|
try {
|
|
97
110
|
const cachedModelIds = listCachedModels().map(m => m.modelId);
|
|
98
|
-
|
|
111
|
+
const localIp = rpcHandle ? getLocalIp() : null;
|
|
112
|
+
await registerNode(identity, hw, geo, handle, rpcHandle?.port ?? null, cachedModelIds, localIp, !!rpcHandle);
|
|
99
113
|
printSuccess('Registered in swarm registry');
|
|
100
114
|
} catch (err) {
|
|
101
115
|
printError(`Registration failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -153,7 +167,8 @@ async function cmdJoin(opts: {
|
|
|
153
167
|
const heartbeatTimer = setInterval(async () => {
|
|
154
168
|
try {
|
|
155
169
|
const freshModels = listCachedModels().map(m => m.modelId);
|
|
156
|
-
|
|
170
|
+
const localIp = rpcHandle ? getLocalIp() : null;
|
|
171
|
+
await heartbeat(identity.pk, state.status, freshModels, localIp);
|
|
157
172
|
heartbeatCount++;
|
|
158
173
|
lastHeartbeat = new Date();
|
|
159
174
|
state.heartbeatCount = heartbeatCount;
|
|
@@ -216,15 +231,72 @@ async function cmdJoin(opts: {
|
|
|
216
231
|
|
|
217
232
|
onLog: addLog,
|
|
218
233
|
|
|
219
|
-
executor: async (job: HiveJob) => {
|
|
234
|
+
executor: async (job: HiveJob, onToken?: (t: string) => void) => {
|
|
220
235
|
return executeJob(job, {
|
|
221
|
-
onToken
|
|
222
|
-
onLog:
|
|
236
|
+
onToken,
|
|
237
|
+
onLog: addLog,
|
|
238
|
+
// No RPC peers in standard mode — solo execution
|
|
223
239
|
});
|
|
224
240
|
},
|
|
225
241
|
});
|
|
226
242
|
|
|
227
243
|
addLog('Job poller started — polling every 5s');
|
|
244
|
+
|
|
245
|
+
// ── Pipeline poll loop (only when RPC server is running) ──
|
|
246
|
+
// Polls for jobs and uses split inference when peers are available.
|
|
247
|
+
if (rpcHandle) {
|
|
248
|
+
const PIPELINE_INTERVAL = 7000; // slightly offset from standard poll
|
|
249
|
+
const pipelineTimer = setInterval(async () => {
|
|
250
|
+
if (state.status === 'computing') return; // already busy
|
|
251
|
+
|
|
252
|
+
try {
|
|
253
|
+
const result = await claimJobPipeline(
|
|
254
|
+
identity.pk,
|
|
255
|
+
geo.h3Cell,
|
|
256
|
+
);
|
|
257
|
+
if (!result) return;
|
|
258
|
+
|
|
259
|
+
const { job, peers } = result;
|
|
260
|
+
if (peers.length === 0) {
|
|
261
|
+
// No peers — let standard poller handle it, release this claim
|
|
262
|
+
// (job will timeout and return to pending)
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
state.status = 'computing';
|
|
267
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} · ${peers.length} peer(s) · ${peers.map(p => p.rpc_host).join(', ')}`);
|
|
268
|
+
|
|
269
|
+
try {
|
|
270
|
+
await markComputing(job.id);
|
|
271
|
+
const execResult = await executeJob(job, {
|
|
272
|
+
onLog: addLog,
|
|
273
|
+
rpcPeers: peers,
|
|
274
|
+
});
|
|
275
|
+
await postResult(job.id, execResult);
|
|
276
|
+
jobsCompleted++;
|
|
277
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} done · ${execResult.tokensPerSecond} tok/s (distributed)`);
|
|
278
|
+
state.tokensEarned += job.gns_reward * SPLIT.WORKER;
|
|
279
|
+
} catch (execErr) {
|
|
280
|
+
const errMsg = execErr instanceof Error ? execErr.message : String(execErr);
|
|
281
|
+
await postFailure(job.id, errMsg).catch(() => {});
|
|
282
|
+
addLog(`Pipeline job ${job.id.slice(0, 8)} failed: ${errMsg.slice(0, 60)}`);
|
|
283
|
+
} finally {
|
|
284
|
+
state.status = 'idle';
|
|
285
|
+
}
|
|
286
|
+
} catch (err) {
|
|
287
|
+
// Non-fatal — log and continue
|
|
288
|
+
addLog(`Pipeline poll error: ${err instanceof Error ? err.message : String(err)}`);
|
|
289
|
+
}
|
|
290
|
+
}, PIPELINE_INTERVAL);
|
|
291
|
+
|
|
292
|
+
// Store timer for cleanup
|
|
293
|
+
const origStop = jobPoller!.stop.bind(jobPoller);
|
|
294
|
+
jobPoller = {
|
|
295
|
+
...jobPoller!,
|
|
296
|
+
stop: () => { origStop(); clearInterval(pipelineTimer); },
|
|
297
|
+
};
|
|
298
|
+
addLog('Pipeline poller started — RPC server ready for distributed inference');
|
|
299
|
+
}
|
|
228
300
|
} else if (opts.noJobs) {
|
|
229
301
|
addLog('Job execution disabled (--no-jobs flag)');
|
|
230
302
|
} else {
|
package/src/executor.ts
CHANGED
|
@@ -16,7 +16,7 @@ import { spawn } from 'child_process';
|
|
|
16
16
|
import { execSync } from 'child_process';
|
|
17
17
|
import os from 'os';
|
|
18
18
|
import path from 'path';
|
|
19
|
-
import type { HiveJob, JobResult } from './jobs.js';
|
|
19
|
+
import type { HiveJob, JobResult, RpcPeer } from './jobs.js';
|
|
20
20
|
|
|
21
21
|
// ─── Binary detection ─────────────────────────────────────────
|
|
22
22
|
|
|
@@ -127,6 +127,7 @@ export async function downloadModel(
|
|
|
127
127
|
export interface ExecutorOptions {
|
|
128
128
|
onToken?: (token: string) => void;
|
|
129
129
|
onLog?: (line: string) => void;
|
|
130
|
+
rpcPeers?: RpcPeer[]; // peer RPC servers for pipeline parallelism
|
|
130
131
|
}
|
|
131
132
|
|
|
132
133
|
export async function executeJob(
|
|
@@ -176,6 +177,16 @@ function runLlamaCli(
|
|
|
176
177
|
'-ngl', '0', // CPU-only (Metal tensor API disabled on pre-M5)
|
|
177
178
|
];
|
|
178
179
|
|
|
180
|
+
// Pipeline parallelism: add --rpc for each peer worker
|
|
181
|
+
const peers = opts.rpcPeers ?? [];
|
|
182
|
+
for (const peer of peers) {
|
|
183
|
+
args.push('--rpc', `${peer.rpc_host}:${peer.rpc_port}`);
|
|
184
|
+
opts.onLog?.(`Pipeline peer: ${peer.rpc_host}:${peer.rpc_port} (${peer.tflops} TFLOPS)`);
|
|
185
|
+
}
|
|
186
|
+
if (peers.length > 0) {
|
|
187
|
+
opts.onLog?.(`Pipeline mode: ${peers.length + 1} nodes, splitting ${job.max_tokens} tokens`);
|
|
188
|
+
}
|
|
189
|
+
|
|
179
190
|
opts.onLog?.(`Executing ${job.model_id} (${job.max_tokens} tokens)`);
|
|
180
191
|
|
|
181
192
|
const proc = spawn(binary, args, {
|
package/src/jobs.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
// ============================================================
|
|
6
6
|
|
|
7
7
|
const SUPABASE_URL = 'https://kaqwkxfaclyqjlfhxrmt.supabase.co';
|
|
8
|
-
const SUPABASE_ANON = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
8
|
+
const SUPABASE_ANON = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImthcXdreGZhY2x5cWpsZmh4cm10Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDA3NTE1NjEsImV4cCI6MjA1NjMyNzU2MX0.ClyWNGRxQjpKYzIROPZBqTXDsWvJioGe9pQymDOYBTc';
|
|
9
9
|
|
|
10
10
|
const HEADERS = {
|
|
11
11
|
'apikey': SUPABASE_ANON,
|
|
@@ -51,6 +51,21 @@ export interface JobResult {
|
|
|
51
51
|
error?: string;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
+
// ─── Pipeline types ──────────────────────────────────────────
|
|
55
|
+
|
|
56
|
+
export interface RpcPeer {
|
|
57
|
+
pk: string;
|
|
58
|
+
handle: string | null;
|
|
59
|
+
rpc_host: string;
|
|
60
|
+
rpc_port: number;
|
|
61
|
+
tflops: number;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface PipelineClaimResult {
|
|
65
|
+
job: HiveJob;
|
|
66
|
+
peers: RpcPeer[];
|
|
67
|
+
}
|
|
68
|
+
|
|
54
69
|
// ─── Claim (atomic via Postgres RPC) ─────────────────────────
|
|
55
70
|
|
|
56
71
|
export async function claimJob(
|
|
@@ -124,6 +139,78 @@ export async function postChunk(
|
|
|
124
139
|
}
|
|
125
140
|
}
|
|
126
141
|
|
|
142
|
+
// ─── Pipeline claim ──────────────────────────────────────────
|
|
143
|
+
// Claims a job AND returns available RPC peers in same H3 cell.
|
|
144
|
+
// Used when 2+ compute nodes are available for split inference.
|
|
145
|
+
|
|
146
|
+
export async function claimJobPipeline(
|
|
147
|
+
workerPk: string,
|
|
148
|
+
h3Cell: string,
|
|
149
|
+
modelId?: string,
|
|
150
|
+
): Promise<PipelineClaimResult | null> {
|
|
151
|
+
const resp = await fetch(
|
|
152
|
+
`${SUPABASE_URL}/rest/v1/rpc/claim_hive_job_pipeline`,
|
|
153
|
+
{
|
|
154
|
+
method: 'POST',
|
|
155
|
+
headers: HEADERS,
|
|
156
|
+
body: JSON.stringify({
|
|
157
|
+
p_primary_pk: workerPk,
|
|
158
|
+
p_h3_cell: h3Cell,
|
|
159
|
+
p_model_id: modelId ?? null,
|
|
160
|
+
}),
|
|
161
|
+
},
|
|
162
|
+
);
|
|
163
|
+
|
|
164
|
+
if (!resp.ok) {
|
|
165
|
+
const text = await resp.text();
|
|
166
|
+
throw new Error(`claimJobPipeline RPC failed: ${resp.status} ${text}`);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const rows = await resp.json() as any[];
|
|
170
|
+
if (!rows || rows.length === 0) return null;
|
|
171
|
+
|
|
172
|
+
const row = rows[0];
|
|
173
|
+
const job: HiveJob = {
|
|
174
|
+
id: row.job_id,
|
|
175
|
+
h3_cell: h3Cell,
|
|
176
|
+
jurisdiction: null,
|
|
177
|
+
model_id: row.job_model_id,
|
|
178
|
+
model_url: null,
|
|
179
|
+
layer_start: 0,
|
|
180
|
+
layer_end: 31,
|
|
181
|
+
prompt: row.job_prompt,
|
|
182
|
+
max_tokens: row.job_max_tokens,
|
|
183
|
+
temperature: row.job_temperature,
|
|
184
|
+
status: 'assigned',
|
|
185
|
+
worker_pk: workerPk,
|
|
186
|
+
assigned_at: new Date().toISOString(),
|
|
187
|
+
result_text: null,
|
|
188
|
+
tokens_generated: null,
|
|
189
|
+
tokens_per_second: null,
|
|
190
|
+
completed_at: null,
|
|
191
|
+
error_message: null,
|
|
192
|
+
gns_reward: row.job_gns_reward,
|
|
193
|
+
settled: false,
|
|
194
|
+
stellar_tx_hash: null,
|
|
195
|
+
submitter_pk: '',
|
|
196
|
+
created_at: new Date().toISOString(),
|
|
197
|
+
timeout_at: new Date(Date.now() + 5 * 60 * 1000).toISOString(),
|
|
198
|
+
streaming: false,
|
|
199
|
+
chunks_count: null,
|
|
200
|
+
// min_trust_tier not needed in client-side HiveJob
|
|
201
|
+
};
|
|
202
|
+
|
|
203
|
+
const peers: RpcPeer[] = (row.rpc_peers as any[] ?? []).map((p: any) => ({
|
|
204
|
+
pk: p.pk,
|
|
205
|
+
handle: p.handle,
|
|
206
|
+
rpc_host: p.rpc_host,
|
|
207
|
+
rpc_port: p.rpc_port ?? 50052,
|
|
208
|
+
tflops: parseFloat(p.tflops ?? '0'),
|
|
209
|
+
}));
|
|
210
|
+
|
|
211
|
+
return { job, peers };
|
|
212
|
+
}
|
|
213
|
+
|
|
127
214
|
// ─── Post failure ─────────────────────────────────────────────
|
|
128
215
|
|
|
129
216
|
export async function postFailure(jobId: string, errorMsg: string): Promise<void> {
|
package/src/registry.ts
CHANGED
|
@@ -31,6 +31,8 @@ export interface SwarmNode {
|
|
|
31
31
|
rpc_port: number | null;
|
|
32
32
|
worker_version: string;
|
|
33
33
|
models: string[]; // cached model IDs e.g. ['tinyllama', 'phi-3-mini']
|
|
34
|
+
rpc_host: string | null;
|
|
35
|
+
rpc_available: boolean;
|
|
34
36
|
}
|
|
35
37
|
|
|
36
38
|
export interface RegistryStats {
|
|
@@ -62,6 +64,8 @@ export async function registerNode(
|
|
|
62
64
|
handle: string | null,
|
|
63
65
|
rpcPort: number | null,
|
|
64
66
|
models: string[] = [],
|
|
67
|
+
rpcHost: string | null = null,
|
|
68
|
+
rpcAvailable: boolean = false,
|
|
65
69
|
): Promise<void> {
|
|
66
70
|
const node: SwarmNode = {
|
|
67
71
|
pk: identity.pk,
|
|
@@ -73,8 +77,10 @@ export async function registerNode(
|
|
|
73
77
|
last_heartbeat: new Date().toISOString(),
|
|
74
78
|
tokens_earned: await getExistingTokens(identity.pk),
|
|
75
79
|
rpc_port: rpcPort,
|
|
76
|
-
worker_version: '0.1.
|
|
80
|
+
worker_version: '0.1.7',
|
|
77
81
|
models,
|
|
82
|
+
rpc_host: rpcHost,
|
|
83
|
+
rpc_available: rpcAvailable,
|
|
78
84
|
};
|
|
79
85
|
|
|
80
86
|
// Upsert — on conflict update everything except tokens_earned
|
|
@@ -108,9 +114,11 @@ export async function heartbeat(
|
|
|
108
114
|
pk: string,
|
|
109
115
|
status: WorkerStatus,
|
|
110
116
|
models?: string[],
|
|
117
|
+
rpcHost?: string | null,
|
|
111
118
|
): Promise<void> {
|
|
112
119
|
const patch: Record<string, unknown> = { status, last_heartbeat: new Date().toISOString() };
|
|
113
120
|
if (models) patch.models = models;
|
|
121
|
+
if (rpcHost !== undefined) { patch.rpc_host = rpcHost; patch.rpc_available = rpcHost !== null; }
|
|
114
122
|
const resp = await supabase(
|
|
115
123
|
'PATCH',
|
|
116
124
|
'swarm_nodes',
|