@arke-institute/rhiza 0.9.3 → 0.11.0
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/__tests__/unit/worker/config.test.js.map +1 -1
- package/dist/logging/writer.d.ts +2 -0
- package/dist/logging/writer.d.ts.map +1 -1
- package/dist/logging/writer.js +67 -39
- package/dist/logging/writer.js.map +1 -1
- package/dist/worker/config.d.ts +0 -1
- package/dist/worker/config.d.ts.map +1 -1
- package/dist/worker/config.js.map +1 -1
- package/dist/worker/job.d.ts +12 -1
- package/dist/worker/job.d.ts.map +1 -1
- package/dist/worker/job.js +63 -34
- package/dist/worker/job.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../../src/__tests__/unit/worker/config.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../../src/__tests__/unit/worker/config.test.ts"],"names":[],"mappings":"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"}
|
package/dist/logging/writer.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/logging/writer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EAEd,UAAU,EACV,aAAa,EACd,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IAEnB,wBAAwB;IACxB,eAAe,EAAE,MAAM,CAAC;IAExB,4BAA4B;IAC5B,KAAK,EAAE,cAAc,CAAC;IAEtB,kCAAkC;IAClC,QAAQ,EAAE,UAAU,EAAE,CAAC;IAEvB,iBAAiB;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/logging/writer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EAEd,UAAU,EACV,aAAa,EACd,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IAEnB,wBAAwB;IACxB,eAAe,EAAE,MAAM,CAAC;IAExB,4BAA4B;IAC5B,KAAK,EAAE,cAAc,CAAC;IAEtB,kCAAkC;IAClC,QAAQ,EAAE,UAAU,EAAE,CAAC;IAEvB,iBAAiB;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IAErB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IAEd,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,cAAc,CAAC,CAiIzB;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC;IACxB,6CAA6C;IAC7C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,EACpC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAsJf"}
|
package/dist/logging/writer.js
CHANGED
|
@@ -22,7 +22,7 @@ export async function writeKladosLog(options) {
|
|
|
22
22
|
messages,
|
|
23
23
|
};
|
|
24
24
|
// Generate a human-readable label for the log
|
|
25
|
-
const logLabel = `${entry.klados_id} - ${entry.job_id}`;
|
|
25
|
+
const logLabel = options.agentLabel || `${entry.klados_id} - ${entry.job_id}`;
|
|
26
26
|
// 1. Create entity with log data
|
|
27
27
|
const { data: logEntity, error: createError } = await client.api.POST('/entities', {
|
|
28
28
|
body: {
|
|
@@ -200,50 +200,78 @@ export async function updateLogStatus(client, logFileId, status, options) {
|
|
|
200
200
|
},
|
|
201
201
|
});
|
|
202
202
|
}
|
|
203
|
-
// Link
|
|
203
|
+
// Link entities to/from this log (if enabled)
|
|
204
204
|
// Done here (after job completes) to avoid race conditions with worker's CAS updates
|
|
205
205
|
// IMPORTANT: Must await to ensure completion before worker terminates
|
|
206
|
-
if (options?.linkEntitiesToLogs
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
predicate: 'log_input',
|
|
214
|
-
peer: logFileId,
|
|
215
|
-
peer_type: 'klados_log',
|
|
216
|
-
}],
|
|
217
|
-
note: 'Link input entity to log',
|
|
218
|
-
})),
|
|
219
|
-
},
|
|
220
|
-
});
|
|
206
|
+
if (options?.linkEntitiesToLogs) {
|
|
207
|
+
// Forward direction: log → entities (consumed/produced)
|
|
208
|
+
const logRelationships = [];
|
|
209
|
+
if (inputEntityIds && inputEntityIds.length > 0) {
|
|
210
|
+
for (const entityId of inputEntityIds) {
|
|
211
|
+
logRelationships.push({ predicate: 'consumed', peer: entityId });
|
|
212
|
+
}
|
|
221
213
|
}
|
|
222
|
-
|
|
223
|
-
|
|
214
|
+
if (outputs && outputs.length > 0) {
|
|
215
|
+
for (const entityId of outputs) {
|
|
216
|
+
logRelationships.push({ predicate: 'produced', peer: entityId });
|
|
217
|
+
}
|
|
224
218
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
updates: outputs.map(entityId => ({
|
|
234
|
-
entity_id: entityId,
|
|
235
|
-
relationships_add: [{
|
|
236
|
-
predicate: 'log_output',
|
|
237
|
-
peer: logFileId,
|
|
238
|
-
peer_type: 'klados_log',
|
|
219
|
+
if (logRelationships.length > 0) {
|
|
220
|
+
try {
|
|
221
|
+
await client.api.POST('/updates/additive', {
|
|
222
|
+
body: {
|
|
223
|
+
updates: [{
|
|
224
|
+
entity_id: logFileId,
|
|
225
|
+
relationships_add: logRelationships,
|
|
226
|
+
note: 'Add consumed/produced relationships to log',
|
|
239
227
|
}],
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
228
|
+
},
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
catch (err) {
|
|
232
|
+
console.warn('[rhiza] Failed to add consumed/produced relationships to log:', err.message || err);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
// Reverse direction: entities → log (log_input/log_output)
|
|
236
|
+
if (inputEntityIds && inputEntityIds.length > 0) {
|
|
237
|
+
try {
|
|
238
|
+
await client.api.POST('/updates/additive', {
|
|
239
|
+
body: {
|
|
240
|
+
updates: inputEntityIds.map(entityId => ({
|
|
241
|
+
entity_id: entityId,
|
|
242
|
+
relationships_add: [{
|
|
243
|
+
predicate: 'log_input',
|
|
244
|
+
peer: logFileId,
|
|
245
|
+
peer_type: 'klados_log',
|
|
246
|
+
}],
|
|
247
|
+
note: 'Link input entity to log',
|
|
248
|
+
})),
|
|
249
|
+
},
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
catch (err) {
|
|
253
|
+
console.warn('[rhiza] Failed to link input entities to log:', err.message || err);
|
|
254
|
+
}
|
|
244
255
|
}
|
|
245
|
-
|
|
246
|
-
|
|
256
|
+
if (outputs && outputs.length > 0) {
|
|
257
|
+
try {
|
|
258
|
+
await client.api.POST('/updates/additive', {
|
|
259
|
+
body: {
|
|
260
|
+
updates: outputs.map(entityId => ({
|
|
261
|
+
entity_id: entityId,
|
|
262
|
+
relationships_add: [{
|
|
263
|
+
predicate: 'log_output',
|
|
264
|
+
peer: logFileId,
|
|
265
|
+
peer_type: 'klados_log',
|
|
266
|
+
}],
|
|
267
|
+
note: 'Link output entity to log',
|
|
268
|
+
})),
|
|
269
|
+
},
|
|
270
|
+
});
|
|
271
|
+
}
|
|
272
|
+
catch (err) {
|
|
273
|
+
console.warn('[rhiza] Failed to link output entities to log:', err.message || err);
|
|
274
|
+
}
|
|
247
275
|
}
|
|
248
276
|
}
|
|
249
277
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/logging/writer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/logging/writer.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/config.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IAEzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IAGvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IAEzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IAGvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAE9B;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,GACvB,eAAe,CA0BjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/worker/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAwBH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,eAAe,CAC7B,GAAe,EACf,OAAwB;IAExB,mCAAmC;IACnC,IAAI,OAAe,CAAC;IACpB,IAAI,OAAO,KAAK,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QAC5C,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC;IAC9B,CAAC;SAAM,IAAI,OAAO,KAAK,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,kCAAkC;IAClC,IAAI,SAAiB,CAAC;IACtB,IAAI,OAAO,KAAK,MAAM,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClD,SAAS,GAAG,GAAG,CAAC,mBAAmB,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,KAAK,MAAM,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;QACzD,SAAS,GAAG,GAAG,CAAC,mBAAmB,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,GAAG,CAAC,cAAc,CAAC;IACjC,CAAC;IAED,OAAO;QACL,OAAO;QACP,YAAY,EAAE,GAAG,CAAC,aAAa;QAC/B,SAAS;KACV,CAAC;AACJ,CAAC"}
|
package/dist/worker/job.d.ts
CHANGED
|
@@ -97,9 +97,12 @@ export declare class KladosJob {
|
|
|
97
97
|
* @param request - The incoming KladosRequest
|
|
98
98
|
* @param config - Job configuration
|
|
99
99
|
* @param rhizaConfig - Optional rhiza runtime configuration (for scatter utility delegation)
|
|
100
|
+
* @param options - Optional resume state (for DO alarm restarts)
|
|
100
101
|
* @returns A new KladosJob instance
|
|
101
102
|
*/
|
|
102
|
-
static accept(request: KladosRequest, config: KladosJobConfig, rhizaConfig?: RhizaRuntimeConfig
|
|
103
|
+
static accept(request: KladosRequest, config: KladosJobConfig, rhizaConfig?: RhizaRuntimeConfig, options?: {
|
|
104
|
+
logFileId?: string;
|
|
105
|
+
}): KladosJob;
|
|
103
106
|
/**
|
|
104
107
|
* Get the batch context (if in a scatter/gather)
|
|
105
108
|
*/
|
|
@@ -113,6 +116,11 @@ export declare class KladosJob {
|
|
|
113
116
|
* Returns 0 if not in a recursive workflow.
|
|
114
117
|
*/
|
|
115
118
|
get recurseDepth(): number;
|
|
119
|
+
/**
|
|
120
|
+
* The log entity ID (set after start(), null before).
|
|
121
|
+
* Used by DO workers to persist state between alarm cycles.
|
|
122
|
+
*/
|
|
123
|
+
get logEntityId(): string | null;
|
|
116
124
|
/**
|
|
117
125
|
* Run the job with automatic lifecycle management
|
|
118
126
|
*
|
|
@@ -133,6 +141,9 @@ export declare class KladosJob {
|
|
|
133
141
|
*
|
|
134
142
|
* For advanced use cases where you need more control over the lifecycle.
|
|
135
143
|
* Most users should use `run()` instead.
|
|
144
|
+
*
|
|
145
|
+
* If logFileId was provided via accept() options (DO resumption),
|
|
146
|
+
* skips log creation since the log already exists.
|
|
136
147
|
*/
|
|
137
148
|
start(): Promise<void>;
|
|
138
149
|
/**
|
package/dist/worker/job.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../src/worker/job.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAId,YAAY,EACZ,MAAM,EACP,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI3E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,4CAA4C;IAC5C,OAAO,CAAC,EAAE,eAAe,CAAC;IAE1B,uCAAuC;IACvC,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAOD;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,SAAS;IACpB,sBAAsB;IACtB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAE5B,0BAA0B;IAC1B,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC;IAE3B,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAEhC,kDAAkD;IAClD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAExC,wBAAwB;IACxB,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IAEjC,kCAAkC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IAE1C,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAGvB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,IAAI,CAAyC;IAErD;;OAEG;IACH,OAAO;
|
|
1
|
+
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../src/worker/job.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EAId,YAAY,EACZ,MAAM,EACP,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAI3E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,4CAA4C;IAC5C,OAAO,CAAC,EAAE,eAAe,CAAC;IAE1B,uCAAuC;IACvC,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAOD;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,SAAS;IACpB,sBAAsB;IACtB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAE5B,0BAA0B;IAC1B,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC;IAE3B,2BAA2B;IAC3B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAEhC,kDAAkD;IAClD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAExC,wBAAwB;IACxB,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IAEjC,kCAAkC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,kBAAkB,CAAC;IAE1C,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAGvB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,IAAI,CAAyC;IAErD;;OAEG;IACH,OAAO;IA+BP;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,MAAM,CACX,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,eAAe,EACvB,WAAW,CAAC,EAAE,kBAAkB,EAChC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/B,SAAS;IAIZ;;OAEG;IACH,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;OAGG;IACH,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED;;;OAGG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED;;;;;;;;;;;OAWG;IACG,GAAG,CACP,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,EAC3B,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GACvD,OAAO,CAAC,eAAe,CAAC;IAiB3B;;;;;;;;OAQG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6D5B;;;;;;;;;;;;OAYG;IACG,QAAQ,CACZ,OAAO,EAAE,MAAM,EAAE,EACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,eAAe,CAAC;IAqG3B;;;;;;OAMG;IACG,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BzC;;OAEG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACG,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC;QACxF,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,CAAC,CAAC;KACf,CAAC;IAoBF;;;;;OAKG;IACG,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CACxF,KAAK,CAAC;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,CAAC,CAAC;KACf,CAAC,CACH;IAwBD;;OAEG;YACW,SAAS;CAexB"}
|
package/dist/worker/job.js
CHANGED
|
@@ -52,12 +52,16 @@ export class KladosJob {
|
|
|
52
52
|
/**
|
|
53
53
|
* Create a new KladosJob (private - use static methods)
|
|
54
54
|
*/
|
|
55
|
-
constructor(request, config, rhizaConfig) {
|
|
55
|
+
constructor(request, config, rhizaConfig, options) {
|
|
56
56
|
this.request = request;
|
|
57
57
|
this.config = config;
|
|
58
58
|
this.rhizaConfig = rhizaConfig;
|
|
59
59
|
this.log = new KladosLogger();
|
|
60
60
|
this.logId = `log_${generateId()}`;
|
|
61
|
+
// Resume from existing log if provided (for DO alarm restarts)
|
|
62
|
+
if (options?.logFileId) {
|
|
63
|
+
this.logFileId = options.logFileId;
|
|
64
|
+
}
|
|
61
65
|
// Create Arke client with correct network
|
|
62
66
|
this.client = new ArkeClient({
|
|
63
67
|
baseUrl: request.api_base,
|
|
@@ -79,10 +83,11 @@ export class KladosJob {
|
|
|
79
83
|
* @param request - The incoming KladosRequest
|
|
80
84
|
* @param config - Job configuration
|
|
81
85
|
* @param rhizaConfig - Optional rhiza runtime configuration (for scatter utility delegation)
|
|
86
|
+
* @param options - Optional resume state (for DO alarm restarts)
|
|
82
87
|
* @returns A new KladosJob instance
|
|
83
88
|
*/
|
|
84
|
-
static accept(request, config, rhizaConfig) {
|
|
85
|
-
return new KladosJob(request, config, rhizaConfig);
|
|
89
|
+
static accept(request, config, rhizaConfig, options) {
|
|
90
|
+
return new KladosJob(request, config, rhizaConfig, options);
|
|
86
91
|
}
|
|
87
92
|
/**
|
|
88
93
|
* Get the batch context (if in a scatter/gather)
|
|
@@ -103,6 +108,13 @@ export class KladosJob {
|
|
|
103
108
|
get recurseDepth() {
|
|
104
109
|
return this.request.rhiza?.recurse_depth ?? 0;
|
|
105
110
|
}
|
|
111
|
+
/**
|
|
112
|
+
* The log entity ID (set after start(), null before).
|
|
113
|
+
* Used by DO workers to persist state between alarm cycles.
|
|
114
|
+
*/
|
|
115
|
+
get logEntityId() {
|
|
116
|
+
return this.logFileId;
|
|
117
|
+
}
|
|
106
118
|
/**
|
|
107
119
|
* Run the job with automatic lifecycle management
|
|
108
120
|
*
|
|
@@ -135,42 +147,59 @@ export class KladosJob {
|
|
|
135
147
|
*
|
|
136
148
|
* For advanced use cases where you need more control over the lifecycle.
|
|
137
149
|
* Most users should use `run()` instead.
|
|
150
|
+
*
|
|
151
|
+
* If logFileId was provided via accept() options (DO resumption),
|
|
152
|
+
* skips log creation since the log already exists.
|
|
138
153
|
*/
|
|
139
154
|
async start() {
|
|
140
155
|
if (this.state !== 'accepted') {
|
|
141
156
|
throw new Error(`Cannot start job in state: ${this.state}`);
|
|
142
157
|
}
|
|
143
|
-
//
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
158
|
+
// Skip log creation if resuming (logFileId already set from previous alarm)
|
|
159
|
+
if (!this.logFileId) {
|
|
160
|
+
// Fetch klados entity label for human-readable log labels (best-effort)
|
|
161
|
+
let agentLabel;
|
|
162
|
+
try {
|
|
163
|
+
const { data } = await this.client.api.GET('/entities/{id}', {
|
|
164
|
+
params: { path: { id: this.config.agentId } },
|
|
165
|
+
});
|
|
166
|
+
agentLabel = data?.properties?.label;
|
|
167
|
+
}
|
|
168
|
+
catch {
|
|
169
|
+
// Best-effort — fall back to ID-based label
|
|
170
|
+
}
|
|
171
|
+
// Build log entry
|
|
172
|
+
const logEntry = {
|
|
173
|
+
id: this.logId,
|
|
174
|
+
type: 'klados_log',
|
|
175
|
+
klados_id: this.config.agentId,
|
|
176
|
+
rhiza_id: this.request.rhiza?.id,
|
|
177
|
+
job_id: this.request.job_id,
|
|
178
|
+
started_at: new Date().toISOString(),
|
|
179
|
+
status: 'running',
|
|
180
|
+
received: {
|
|
181
|
+
target_entity: this.request.target_entity,
|
|
182
|
+
target_entities: this.request.target_entities,
|
|
183
|
+
target_collection: this.request.target_collection,
|
|
184
|
+
from_logs: this.request.rhiza?.parent_logs,
|
|
185
|
+
batch: this.request.rhiza?.batch,
|
|
186
|
+
scatter_total: this.request.rhiza?.scatter_total,
|
|
187
|
+
},
|
|
188
|
+
};
|
|
189
|
+
// Write initial log entry
|
|
190
|
+
// NOTE: Entity linking (log_input, log_output) happens in complete(),
|
|
191
|
+
// AFTER the job finishes, to avoid race conditions with worker's CAS updates.
|
|
192
|
+
const { fileId } = await writeKladosLog({
|
|
193
|
+
client: this.client,
|
|
194
|
+
jobCollectionId: this.request.job_collection,
|
|
195
|
+
entry: logEntry,
|
|
196
|
+
messages: this.log.getMessages(),
|
|
197
|
+
agentId: this.config.agentId,
|
|
198
|
+
agentVersion: this.config.agentVersion,
|
|
199
|
+
agentLabel,
|
|
200
|
+
});
|
|
201
|
+
this.logFileId = fileId;
|
|
202
|
+
}
|
|
174
203
|
this.state = 'started';
|
|
175
204
|
// Fetch rhiza flow if in a workflow
|
|
176
205
|
if (this.request.rhiza) {
|
package/dist/worker/job.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../src/worker/job.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAWjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAwB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAkDrD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,OAAO,SAAS;IACpB,sBAAsB;IACb,MAAM,CAAa;IAE5B,0BAA0B;IACjB,GAAG,CAAe;IAE3B,2BAA2B;IAClB,OAAO,CAAgB;IAEhC,kDAAkD;IACzC,cAAc,CAAiB;IAExC,wBAAwB;IACf,MAAM,CAAkB;IAEjC,kCAAkC;IACzB,WAAW,CAAsB;IAE1C,uBAAuB;IACd,KAAK,CAAS;IAEvB,iBAAiB;IACT,KAAK,GAAa,UAAU,CAAC;IAC7B,SAAS,GAAkB,IAAI,CAAC;IAChC,IAAI,GAAoC,IAAI,CAAC;IAErD;;OAEG;IACH,YACE,OAAsB,EACtB,MAAuB,EACvB,WAAgC;QAEhC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,OAAO,UAAU,EAAE,EAAE,CAAC;QAEnC,0CAA0C;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,UAAU,CAAC;YAC3B,OAAO,EAAE,OAAO,CAAC,QAAQ;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,CAAC,cAAc,GAAG;YACpB,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;IACJ,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../src/worker/job.ts"],"names":[],"mappings":"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"}
|