@nodetool-ai/runtime 0.8.2 → 0.8.3
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/.nodetool-build-stamp +1 -1
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +3 -2
- package/dist/context.js.map +1 -1
- package/dist/image-model-tasks.d.ts +20 -0
- package/dist/image-model-tasks.d.ts.map +1 -1
- package/dist/image-model-tasks.js +44 -1
- package/dist/image-model-tasks.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/prompt-asset-refs.d.ts +12 -1
- package/dist/prompt-asset-refs.d.ts.map +1 -1
- package/dist/prompt-asset-refs.js +9 -4
- package/dist/prompt-asset-refs.js.map +1 -1
- package/dist/providers/api-route-provider.d.ts +22 -0
- package/dist/providers/api-route-provider.d.ts.map +1 -0
- package/dist/providers/api-route-provider.js +56 -0
- package/dist/providers/api-route-provider.js.map +1 -0
- package/dist/providers/base-provider.d.ts.map +1 -1
- package/dist/providers/base-provider.js +22 -3
- package/dist/providers/base-provider.js.map +1 -1
- package/dist/providers/chatgpt-provider.d.ts +48 -0
- package/dist/providers/chatgpt-provider.d.ts.map +1 -0
- package/dist/providers/chatgpt-provider.js +506 -0
- package/dist/providers/chatgpt-provider.js.map +1 -0
- package/dist/providers/context-window.d.ts.map +1 -1
- package/dist/providers/context-window.js +1 -0
- package/dist/providers/context-window.js.map +1 -1
- package/dist/providers/cost-calculator.d.ts.map +1 -1
- package/dist/providers/cost-calculator.js +9 -0
- package/dist/providers/cost-calculator.js.map +1 -1
- package/dist/providers/credential-check.d.ts +8 -0
- package/dist/providers/credential-check.d.ts.map +1 -1
- package/dist/providers/credential-check.js +22 -0
- package/dist/providers/credential-check.js.map +1 -1
- package/dist/providers/custom-openai-provider.d.ts.map +1 -1
- package/dist/providers/custom-openai-provider.js +19 -1
- package/dist/providers/custom-openai-provider.js.map +1 -1
- package/dist/providers/dreamina-provider.d.ts +5 -3
- package/dist/providers/dreamina-provider.d.ts.map +1 -1
- package/dist/providers/dreamina-provider.js +245 -34
- package/dist/providers/dreamina-provider.js.map +1 -1
- package/dist/providers/extension-tab.d.ts +29 -0
- package/dist/providers/extension-tab.d.ts.map +1 -0
- package/dist/providers/extension-tab.js +144 -0
- package/dist/providers/extension-tab.js.map +1 -0
- package/dist/providers/fake-provider.d.ts +3 -1
- package/dist/providers/fake-provider.d.ts.map +1 -1
- package/dist/providers/fake-provider.js +63 -9
- package/dist/providers/fake-provider.js.map +1 -1
- package/dist/providers/fake-schema-answer.d.ts +10 -0
- package/dist/providers/fake-schema-answer.d.ts.map +1 -0
- package/dist/providers/fake-schema-answer.js +64 -0
- package/dist/providers/fake-schema-answer.js.map +1 -0
- package/dist/providers/fal-provider.d.ts.map +1 -1
- package/dist/providers/fal-provider.js +5 -2
- package/dist/providers/fal-provider.js.map +1 -1
- package/dist/providers/gemini-web-provider.d.ts +76 -0
- package/dist/providers/gemini-web-provider.d.ts.map +1 -0
- package/dist/providers/gemini-web-provider.js +752 -0
- package/dist/providers/gemini-web-provider.js.map +1 -0
- package/dist/providers/huggingface-provider.d.ts.map +1 -1
- package/dist/providers/huggingface-provider.js +17 -1
- package/dist/providers/huggingface-provider.js.map +1 -1
- package/dist/providers/index.d.ts +10 -2
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +36 -8
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/llama-provider.d.ts +8 -0
- package/dist/providers/llama-provider.d.ts.map +1 -1
- package/dist/providers/llama-provider.js +23 -5
- package/dist/providers/llama-provider.js.map +1 -1
- package/dist/providers/lmstudio-provider.js +2 -2
- package/dist/providers/lmstudio-provider.js.map +1 -1
- package/dist/providers/manifest-models.d.ts +2 -12
- package/dist/providers/manifest-models.d.ts.map +1 -1
- package/dist/providers/manifest-models.js +45 -3
- package/dist/providers/manifest-models.js.map +1 -1
- package/dist/providers/meta-provider.d.ts +53 -6
- package/dist/providers/meta-provider.d.ts.map +1 -1
- package/dist/providers/meta-provider.js +289 -6
- package/dist/providers/meta-provider.js.map +1 -1
- package/dist/providers/meta-segmentation.d.ts +27 -0
- package/dist/providers/meta-segmentation.d.ts.map +1 -0
- package/dist/providers/meta-segmentation.js +141 -0
- package/dist/providers/meta-segmentation.js.map +1 -0
- package/dist/providers/meta-transcription.d.ts +31 -0
- package/dist/providers/meta-transcription.d.ts.map +1 -0
- package/dist/providers/meta-transcription.js +187 -0
- package/dist/providers/meta-transcription.js.map +1 -0
- package/dist/providers/node-llama-cpp-provider.d.ts +6 -3
- package/dist/providers/node-llama-cpp-provider.d.ts.map +1 -1
- package/dist/providers/node-llama-cpp-provider.js +75 -58
- package/dist/providers/node-llama-cpp-provider.js.map +1 -1
- package/dist/providers/ollama-provider.d.ts +23 -0
- package/dist/providers/ollama-provider.d.ts.map +1 -1
- package/dist/providers/ollama-provider.js +140 -27
- package/dist/providers/ollama-provider.js.map +1 -1
- package/dist/providers/openai-compat/client.d.ts +10 -1
- package/dist/providers/openai-compat/client.d.ts.map +1 -1
- package/dist/providers/openai-compat/client.js +21 -3
- package/dist/providers/openai-compat/client.js.map +1 -1
- package/dist/providers/openai-compat/index.d.ts +1 -1
- package/dist/providers/openai-compat/index.d.ts.map +1 -1
- package/dist/providers/openai-compat/index.js +1 -1
- package/dist/providers/openai-compat/index.js.map +1 -1
- package/dist/providers/openai-compat/types.d.ts +4 -0
- package/dist/providers/openai-compat/types.d.ts.map +1 -1
- package/dist/providers/openai-compat-provider.d.ts +11 -0
- package/dist/providers/openai-compat-provider.d.ts.map +1 -1
- package/dist/providers/openai-compat-provider.js +47 -2
- package/dist/providers/openai-compat-provider.js.map +1 -1
- package/dist/providers/openai-provider.d.ts +13 -0
- package/dist/providers/openai-provider.d.ts.map +1 -1
- package/dist/providers/openai-provider.js +41 -7
- package/dist/providers/openai-provider.js.map +1 -1
- package/dist/providers/opper-provider.d.ts +31 -0
- package/dist/providers/opper-provider.d.ts.map +1 -0
- package/dist/providers/opper-provider.js +91 -0
- package/dist/providers/opper-provider.js.map +1 -0
- package/dist/providers/provider-request-log.d.ts.map +1 -1
- package/dist/providers/provider-request-log.js +3 -2
- package/dist/providers/provider-request-log.js.map +1 -1
- package/dist/providers/python-provider.d.ts.map +1 -1
- package/dist/providers/python-provider.js +5 -3
- package/dist/providers/python-provider.js.map +1 -1
- package/dist/providers/responses-api.d.ts +12 -2
- package/dist/providers/responses-api.d.ts.map +1 -1
- package/dist/providers/responses-api.js +54 -3
- package/dist/providers/responses-api.js.map +1 -1
- package/dist/providers/scripted-provider.d.ts.map +1 -1
- package/dist/providers/scripted-provider.js +6 -1
- package/dist/providers/scripted-provider.js.map +1 -1
- package/dist/providers/types.d.ts +16 -0
- package/dist/providers/types.d.ts.map +1 -1
- package/dist/providers/types.js.map +1 -1
- package/dist/providers/vllm-provider.d.ts +7 -0
- package/dist/providers/vllm-provider.d.ts.map +1 -1
- package/dist/providers/vllm-provider.js +15 -3
- package/dist/providers/vllm-provider.js.map +1 -1
- package/dist/python-bridge-base.d.ts +16 -6
- package/dist/python-bridge-base.d.ts.map +1 -1
- package/dist/python-bridge-base.js +117 -40
- package/dist/python-bridge-base.js.map +1 -1
- package/dist/python-bridge-codec.d.ts +16 -1
- package/dist/python-bridge-codec.d.ts.map +1 -1
- package/dist/python-bridge-codec.js +60 -2
- package/dist/python-bridge-codec.js.map +1 -1
- package/dist/python-bridge-framing.d.ts +10 -1
- package/dist/python-bridge-framing.d.ts.map +1 -1
- package/dist/python-bridge-framing.js +33 -8
- package/dist/python-bridge-framing.js.map +1 -1
- package/dist/python-bridge-types.d.ts +26 -5
- package/dist/python-bridge-types.d.ts.map +1 -1
- package/dist/python-bridge-types.js.map +1 -1
- package/dist/python-node-executor.d.ts +14 -3
- package/dist/python-node-executor.d.ts.map +1 -1
- package/dist/python-node-executor.js +185 -3
- package/dist/python-node-executor.js.map +1 -1
- package/dist/python-stdio-bridge.d.ts +6 -0
- package/dist/python-stdio-bridge.d.ts.map +1 -1
- package/dist/python-stdio-bridge.js +25 -2
- package/dist/python-stdio-bridge.js.map +1 -1
- package/dist/run-trace-context.d.ts +2 -27
- package/dist/run-trace-context.d.ts.map +1 -1
- package/dist/run-trace-context.js +4 -51
- package/dist/run-trace-context.js.map +1 -1
- package/dist/run-trace-processor.d.ts.map +1 -1
- package/dist/run-trace-processor.js +7 -6
- package/dist/run-trace-processor.js.map +1 -1
- package/dist/run-trace-scope.d.ts +28 -0
- package/dist/run-trace-scope.d.ts.map +1 -0
- package/dist/run-trace-scope.js +51 -0
- package/dist/run-trace-scope.js.map +1 -0
- package/dist/run-trace-serialization.d.ts.map +1 -1
- package/dist/run-trace-serialization.js +4 -3
- package/dist/run-trace-serialization.js.map +1 -1
- package/dist/span-record.d.ts +4 -0
- package/dist/span-record.d.ts.map +1 -0
- package/dist/span-record.js +48 -0
- package/dist/span-record.js.map +1 -0
- package/dist/swappable-python-bridge.d.ts +6 -6
- package/dist/swappable-python-bridge.d.ts.map +1 -1
- package/dist/swappable-python-bridge.js +10 -10
- package/dist/swappable-python-bridge.js.map +1 -1
- package/dist/testing.d.ts +1 -1
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +55 -3
- package/dist/testing.js.map +1 -1
- package/dist/trace-exporters.d.ts +1 -2
- package/dist/trace-exporters.d.ts.map +1 -1
- package/dist/trace-exporters.js +1 -47
- package/dist/trace-exporters.js.map +1 -1
- package/dist/traced-storage.d.ts +17 -0
- package/dist/traced-storage.d.ts.map +1 -0
- package/dist/traced-storage.js +41 -0
- package/dist/traced-storage.js.map +1 -0
- package/package.json +7 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python-node-executor.d.ts","sourceRoot":"","sources":["../src/python-node-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AAOlC,2DAA2D;AAC3D,UAAU,gBAAgB;IACxB,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EAC3C,QAAQ,CAAC,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"python-node-executor.d.ts","sourceRoot":"","sources":["../src/python-node-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,aAAa,EACd,MAAM,0BAA0B,CAAC;AAOlC,2DAA2D;AAC3D,UAAU,gBAAgB;IACxB,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EAC3C,QAAQ,CAAC,EAAE,eAAe,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,aAAa,CAAC,CACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,EAC3C,QAAQ,CAAC,EAAE,eAAe,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,cAAc,CAAC,aAAa,CAAC,CAAC;CAClC;AA+MD,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,gBAAgB;IACxB,8EAA8E;IAC9E,OAAO,CAAC,MAAM,CAAC;IACf;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAAC;IAbzB,YACU,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,gBAAgB,EAAE,MAAM,EAAE;IAClC,8EAA8E;IACtE,MAAM,CAAC,EAAE,MAAM,YAAA;IACvB;;;;OAIG;IACK,cAAc,CAAC,EAAE,MAAM,YAAA,EAC7B;IAEJ;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ;IAoBhB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAiDrB,qEAAqE;IACrE,OAAO,CAAC,cAAc;YAQR,gBAAgB;YA6EhB,kBAAkB;IA6EhC,6EAA6E;YAC/D,iBAAiB;IAkDzB,OAAO,CACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAalC;IAEM,UAAU,CACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAkBzC;CACF"}
|
|
@@ -111,6 +111,70 @@ function isMediaRef(value) {
|
|
|
111
111
|
function isMediaRefList(value) {
|
|
112
112
|
return Array.isArray(value) && value.every(isMediaRef);
|
|
113
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* Secrets a Python node receives when the user has set them, whether or not
|
|
116
|
+
* the node lists them in `required_settings`, keyed by node-type namespace.
|
|
117
|
+
* Hugging Face nodes read `HF_TOKEN` for gated repositories (FLUX Control,
|
|
118
|
+
* Kontext, pyannote) and most do not declare it, so without this a token
|
|
119
|
+
* stored in NodeTool settings never reaches the worker and the gated download
|
|
120
|
+
* fails. Scoped to the `huggingface.` namespace so other Python packages do
|
|
121
|
+
* not receive a credential they never asked for.
|
|
122
|
+
*/
|
|
123
|
+
const IMPLICIT_SECRETS_BY_NAMESPACE = [["huggingface.", ["HF_TOKEN"]]];
|
|
124
|
+
function implicitSecrets(nodeType) {
|
|
125
|
+
return IMPLICIT_SECRETS_BY_NAMESPACE.flatMap(([prefix, secrets]) => nodeType.startsWith(prefix) ? secrets : []);
|
|
126
|
+
}
|
|
127
|
+
/** Prefix of the uri the worker gives a ref whose bytes travel as a blob. */
|
|
128
|
+
const BLOB_URI_PREFIX = "blob://";
|
|
129
|
+
/**
|
|
130
|
+
* Replace every ref nested in `value` whose uri is `blob://<key>` for a key in
|
|
131
|
+
* `blobs` with the result of `resolve`. Returns the input itself when nothing
|
|
132
|
+
* matched. The worker keys the bytes of a ref that is not a top-level output
|
|
133
|
+
* (an item of a `list[ImageRef]`, a field of a TypedDict) by its internal
|
|
134
|
+
* blob id, so this is the only place those bytes can be reattached.
|
|
135
|
+
*/
|
|
136
|
+
async function resolveNestedBlobRefs(value, blobs, used, resolve) {
|
|
137
|
+
if (Array.isArray(value)) {
|
|
138
|
+
let changed = false;
|
|
139
|
+
const items = await Promise.all(value.map(async (item) => {
|
|
140
|
+
const next = await resolveNestedBlobRefs(item, blobs, used, resolve);
|
|
141
|
+
if (next !== item)
|
|
142
|
+
changed = true;
|
|
143
|
+
return next;
|
|
144
|
+
}));
|
|
145
|
+
return changed ? items : value;
|
|
146
|
+
}
|
|
147
|
+
if (typeof value !== "object" || value === null)
|
|
148
|
+
return value;
|
|
149
|
+
if (value instanceof Uint8Array || value instanceof ArrayBuffer)
|
|
150
|
+
return value;
|
|
151
|
+
const record = value;
|
|
152
|
+
const uri = record["uri"];
|
|
153
|
+
if (isString(uri) && uri.startsWith(BLOB_URI_PREFIX)) {
|
|
154
|
+
const key = uri.slice(BLOB_URI_PREFIX.length);
|
|
155
|
+
const bytes = blobs.get(key);
|
|
156
|
+
if (bytes) {
|
|
157
|
+
used.add(key);
|
|
158
|
+
return resolve(record, bytes);
|
|
159
|
+
}
|
|
160
|
+
return value;
|
|
161
|
+
}
|
|
162
|
+
let copy = null;
|
|
163
|
+
for (const key of Object.keys(record)) {
|
|
164
|
+
const item = record[key];
|
|
165
|
+
const next = await resolveNestedBlobRefs(item, blobs, used, resolve);
|
|
166
|
+
if (next !== item) {
|
|
167
|
+
copy ??= { ...record };
|
|
168
|
+
Object.defineProperty(copy, key, {
|
|
169
|
+
value: next,
|
|
170
|
+
enumerable: true,
|
|
171
|
+
writable: true,
|
|
172
|
+
configurable: true
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
return copy ?? value;
|
|
177
|
+
}
|
|
114
178
|
export class PythonNodeExecutor {
|
|
115
179
|
bridge;
|
|
116
180
|
nodeType;
|
|
@@ -181,6 +245,66 @@ export class PythonNodeExecutor {
|
|
|
181
245
|
});
|
|
182
246
|
};
|
|
183
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* Build the `update` frame sink: forwards a node's log and binary updates
|
|
250
|
+
* to the context message stream, addressed to this graph node. The worker
|
|
251
|
+
* also defines `preview_update`, but the TS message protocol has no such
|
|
252
|
+
* type and no Python node package posts one, so it is dropped here.
|
|
253
|
+
*/
|
|
254
|
+
updateHandler(context) {
|
|
255
|
+
const nodeId = this.nodeId;
|
|
256
|
+
if (!context || !nodeId)
|
|
257
|
+
return undefined;
|
|
258
|
+
return (update) => {
|
|
259
|
+
const type = update["type"];
|
|
260
|
+
if (type === "log_update") {
|
|
261
|
+
const severity = update["severity"];
|
|
262
|
+
context.postMessage({
|
|
263
|
+
type: "log_update",
|
|
264
|
+
node_id: nodeId,
|
|
265
|
+
node_name: isString(update["node_name"])
|
|
266
|
+
? update["node_name"]
|
|
267
|
+
: this.nodeType,
|
|
268
|
+
content: isString(update["content"]) ? update["content"] : "",
|
|
269
|
+
severity: severity === "warning" || severity === "error" ? severity : "info",
|
|
270
|
+
workflow_id: context.workflowId
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
else if (type === "binary_update") {
|
|
274
|
+
const binary = update["binary"];
|
|
275
|
+
if (!(binary instanceof Uint8Array))
|
|
276
|
+
return;
|
|
277
|
+
context.postMessage({
|
|
278
|
+
type: "binary_update",
|
|
279
|
+
node_id: nodeId,
|
|
280
|
+
output_name: isString(update["output_name"])
|
|
281
|
+
? update["output_name"]
|
|
282
|
+
: "output",
|
|
283
|
+
// A view over the same bytes when they sit in a plain ArrayBuffer,
|
|
284
|
+
// which is what the msgpack decoder produces.
|
|
285
|
+
binary: binary.buffer instanceof ArrayBuffer
|
|
286
|
+
? new Uint8Array(binary.buffer, binary.byteOffset, binary.byteLength)
|
|
287
|
+
: new Uint8Array(binary)
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
else {
|
|
291
|
+
log.debug("Dropping unsupported Python worker update", {
|
|
292
|
+
nodeType: this.nodeType,
|
|
293
|
+
updateType: type
|
|
294
|
+
});
|
|
295
|
+
}
|
|
296
|
+
};
|
|
297
|
+
}
|
|
298
|
+
/** Per-call bridge options: run cancellation and the update sink. */
|
|
299
|
+
executeOptions(context) {
|
|
300
|
+
const options = {};
|
|
301
|
+
if (context?.signal)
|
|
302
|
+
options.signal = context.signal;
|
|
303
|
+
const onUpdate = this.updateHandler(context);
|
|
304
|
+
if (onUpdate)
|
|
305
|
+
options.onUpdate = onUpdate;
|
|
306
|
+
return options;
|
|
307
|
+
}
|
|
184
308
|
async prepareExecution(inputs, context) {
|
|
185
309
|
// NodeActor merges node.properties + edge inputs before calling process(),
|
|
186
310
|
// so `inputs` already contains all fields. Filter out internal keys.
|
|
@@ -232,7 +356,11 @@ export class PythonNodeExecutor {
|
|
|
232
356
|
}
|
|
233
357
|
const secrets = {};
|
|
234
358
|
if (context) {
|
|
235
|
-
|
|
359
|
+
const keys = new Set([
|
|
360
|
+
...this.requiredSettings,
|
|
361
|
+
...implicitSecrets(this.nodeType)
|
|
362
|
+
]);
|
|
363
|
+
for (const key of keys) {
|
|
236
364
|
const value = await context.getSecret(key);
|
|
237
365
|
if (value)
|
|
238
366
|
secrets[key] = value;
|
|
@@ -247,7 +375,18 @@ export class PythonNodeExecutor {
|
|
|
247
375
|
// Downstream only does own-key ops (Object.keys, spread, msgpack/JSON), so a
|
|
248
376
|
// null-prototype object behaves identically for legitimate names.
|
|
249
377
|
const outputs = Object.assign(Object.create(null), result.outputs);
|
|
378
|
+
// A blob is paired with an output slot by name. A blob whose key names
|
|
379
|
+
// no slot belongs to a ref nested inside an output (its uri is
|
|
380
|
+
// `blob://<key>`); it is reattached there below, never emitted as an
|
|
381
|
+
// output of its own.
|
|
382
|
+
const nestedBlobs = new Map();
|
|
250
383
|
for (const [name, blobData] of Object.entries(result.blobs)) {
|
|
384
|
+
if (name !== "output" &&
|
|
385
|
+
!Object.hasOwn(result.outputs, name) &&
|
|
386
|
+
!Object.hasOwn(this.outputTypes, name)) {
|
|
387
|
+
nestedBlobs.set(name, blobData);
|
|
388
|
+
continue;
|
|
389
|
+
}
|
|
251
390
|
// Guard the outputTypes lookup with Object.hasOwn so an external name like
|
|
252
391
|
// "constructor" can't resolve to an inherited Object.prototype member.
|
|
253
392
|
const mediaType = Object.hasOwn(this.outputTypes, name)
|
|
@@ -288,12 +427,55 @@ export class PythonNodeExecutor {
|
|
|
288
427
|
outputs[name] = blobData;
|
|
289
428
|
}
|
|
290
429
|
}
|
|
430
|
+
if (nestedBlobs.size > 0) {
|
|
431
|
+
await this.attachNestedBlobs(outputs, nestedBlobs, context);
|
|
432
|
+
}
|
|
291
433
|
return outputs;
|
|
292
434
|
}
|
|
435
|
+
/** Reattach blobs keyed by internal id to the nested refs that name them. */
|
|
436
|
+
async attachNestedBlobs(outputs, blobs, context) {
|
|
437
|
+
const used = new Set();
|
|
438
|
+
const resolve = async (ref, bytes) => {
|
|
439
|
+
const mediaType = isString(ref["type"])
|
|
440
|
+
? normalizeMediaOutputType(ref["type"])
|
|
441
|
+
: null;
|
|
442
|
+
if (!context?.storage) {
|
|
443
|
+
return { ...ref, data: bytes };
|
|
444
|
+
}
|
|
445
|
+
const format = refFormat(ref);
|
|
446
|
+
const ext = format
|
|
447
|
+
? `.${format}`
|
|
448
|
+
: mediaType
|
|
449
|
+
? (EXTENSION_MAP[mediaType] ?? "")
|
|
450
|
+
: "";
|
|
451
|
+
const contentType = (format ? FORMAT_MIME_MAP[format] : undefined) ??
|
|
452
|
+
(mediaType ? MIME_MAP[mediaType] : undefined) ??
|
|
453
|
+
"application/octet-stream";
|
|
454
|
+
const uri = await context.storage.store(`python-bridge/${randomUUID()}${ext}`, bytes, contentType);
|
|
455
|
+
const stored = { ...ref, uri };
|
|
456
|
+
if (isBinaryPayload(stored["data"]))
|
|
457
|
+
delete stored["data"];
|
|
458
|
+
return stored;
|
|
459
|
+
};
|
|
460
|
+
for (const name of Object.keys(outputs)) {
|
|
461
|
+
const value = outputs[name];
|
|
462
|
+
const next = await resolveNestedBlobRefs(value, blobs, used, resolve);
|
|
463
|
+
if (next !== value)
|
|
464
|
+
outputs[name] = next;
|
|
465
|
+
}
|
|
466
|
+
for (const key of blobs.keys()) {
|
|
467
|
+
if (!used.has(key)) {
|
|
468
|
+
log.warn("Dropping Python worker blob that matches no output", {
|
|
469
|
+
nodeType: this.nodeType,
|
|
470
|
+
blob: key
|
|
471
|
+
});
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
}
|
|
293
475
|
async process(inputs, context) {
|
|
294
476
|
const { fields, blobs, secrets } = await this.prepareExecution(inputs, context);
|
|
295
477
|
log.info("Python node executor calling bridge", { nodeType: this.nodeType });
|
|
296
|
-
const result = await this.bridge.execute(this.nodeType, fields, secrets, blobs, this.progressHandler(context), this.identity(context));
|
|
478
|
+
const result = await this.bridge.execute(this.nodeType, fields, secrets, blobs, this.progressHandler(context), this.identity(context), this.executeOptions(context));
|
|
297
479
|
return this.materializeOutputs(result, context);
|
|
298
480
|
}
|
|
299
481
|
async *genProcess(inputs, context) {
|
|
@@ -302,7 +484,7 @@ export class PythonNodeExecutor {
|
|
|
302
484
|
return;
|
|
303
485
|
}
|
|
304
486
|
const { fields, blobs, secrets } = await this.prepareExecution(inputs, context);
|
|
305
|
-
for await (const partial of this.bridge.executeStream(this.nodeType, fields, secrets, blobs, this.progressHandler(context), this.identity(context))) {
|
|
487
|
+
for await (const partial of this.bridge.executeStream(this.nodeType, fields, secrets, blobs, this.progressHandler(context), this.identity(context), this.executeOptions(context))) {
|
|
306
488
|
yield await this.materializeOutputs(partial, context);
|
|
307
489
|
}
|
|
308
490
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python-node-executor.js","sourceRoot":"","sources":["../src/python-node-executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"python-node-executor.js","sourceRoot":"","sources":["../src/python-node-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,12 @@ export declare class PythonStdioBridge extends PythonBridgeBase {
|
|
|
24
24
|
constructor(options?: PythonBridgeOptions);
|
|
25
25
|
protected _assertCanConnect(): void;
|
|
26
26
|
protected _openTransport(): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* Environment from the host's `workerEnv` hook (settings the worker reads
|
|
29
|
+
* at start, such as NODETOOL_TORCH_DEVICE). A failing hook is logged and
|
|
30
|
+
* ignored: the worker then starts with the inherited environment only.
|
|
31
|
+
*/
|
|
32
|
+
private _resolveSettingsEnv;
|
|
27
33
|
private _spawnCandidate;
|
|
28
34
|
/** Extract complete length-prefixed frames from a stdout chunk. */
|
|
29
35
|
private _drainFrames;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python-stdio-bridge.d.ts","sourceRoot":"","sources":["../src/python-stdio-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA0CH,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EACV,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EACnB,CAAC;AAmBF,qBAAa,iBAAkB,SAAQ,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAA6B;IAC7C,4DAA4D;IAC5D,OAAO,CAAC,aAAa,CAElB;IACH,2DAA2D;IAC3D,OAAO,CAAC,aAAa,CAAgB;IAErC,YAAY,OAAO,GAAE,mBAAwB,EAE5C;IAID,UAAmB,iBAAiB,IAAI,IAAI,CAM3C;IAID,UAAyB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"python-stdio-bridge.d.ts","sourceRoot":"","sources":["../src/python-stdio-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA0CH,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAQ3D,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EACV,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EACnB,CAAC;AAmBF,qBAAa,iBAAkB,SAAQ,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAA6B;IAC7C,4DAA4D;IAC5D,OAAO,CAAC,aAAa,CAElB;IACH,2DAA2D;IAC3D,OAAO,CAAC,aAAa,CAAgB;IAErC,YAAY,OAAO,GAAE,mBAAwB,EAE5C;IAID,UAAmB,iBAAiB,IAAI,IAAI,CAM3C;IAID,UAAyB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAsBvD;IAED;;;;OAIG;YACW,mBAAmB;YAcnB,eAAe;IAyK7B,mEAAmE;IACnE,OAAO,CAAC,YAAY;IAgCpB,OAAO,CAAC,aAAa;IAQrB,UAAmB,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAsB3D;IAIQ,KAAK,IAAI,IAAI,CAYrB;IAED,qEAAqE;IACrE,SAAS,IAAI,OAAO,CAKnB;IAED;;;;OAIG;IACM,WAAW,IAAI,OAAO,CAE9B;IAED,oBAAoB,CAAC,KAAK,SAAK,GAAG,MAAM,EAAE,CAEzC;IAEQ,sBAAsB,CAAC,KAAK,SAAK,GAAG,MAAM,GAAG,IAAI,CAOzD;IAED,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,0BAA0B;IAwBlC,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,sBAAsB;CAkC/B"}
|
|
@@ -59,9 +59,10 @@ export class PythonStdioBridge extends PythonBridgeBase {
|
|
|
59
59
|
async _openTransport() {
|
|
60
60
|
const candidates = this._getPythonLaunchCandidates();
|
|
61
61
|
let lastError = null;
|
|
62
|
+
const settingsEnv = await this._resolveSettingsEnv();
|
|
62
63
|
for (const candidate of candidates) {
|
|
63
64
|
try {
|
|
64
|
-
await this._spawnCandidate(candidate);
|
|
65
|
+
await this._spawnCandidate(candidate, settingsEnv);
|
|
65
66
|
return;
|
|
66
67
|
}
|
|
67
68
|
catch (error) {
|
|
@@ -73,7 +74,26 @@ export class PythonStdioBridge extends PythonBridgeBase {
|
|
|
73
74
|
? "No Python interpreter found — Python nodes will not be available"
|
|
74
75
|
: "Failed to start Python worker (stdio)"));
|
|
75
76
|
}
|
|
76
|
-
|
|
77
|
+
/**
|
|
78
|
+
* Environment from the host's `workerEnv` hook (settings the worker reads
|
|
79
|
+
* at start, such as NODETOOL_TORCH_DEVICE). A failing hook is logged and
|
|
80
|
+
* ignored: the worker then starts with the inherited environment only.
|
|
81
|
+
*/
|
|
82
|
+
async _resolveSettingsEnv() {
|
|
83
|
+
if (!this._options.workerEnv) {
|
|
84
|
+
return {};
|
|
85
|
+
}
|
|
86
|
+
try {
|
|
87
|
+
return await this._options.workerEnv();
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
log.warn("Could not resolve worker environment from settings", {
|
|
91
|
+
error: error instanceof Error ? error.message : String(error)
|
|
92
|
+
});
|
|
93
|
+
return {};
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async _spawnCandidate(candidate, settingsEnv = {}) {
|
|
77
97
|
const args = [
|
|
78
98
|
...(candidate.argsPrefix ?? []),
|
|
79
99
|
"-m",
|
|
@@ -95,6 +115,9 @@ export class PythonStdioBridge extends PythonBridgeBase {
|
|
|
95
115
|
// of the `notOnNode("node:child_process.spawn")` this file goes out
|
|
96
116
|
// of its way to raise.
|
|
97
117
|
...safeProcessEnv(),
|
|
118
|
+
// Values saved in Settings win over the inherited environment, the
|
|
119
|
+
// order provider settings resolve in (`getSecret`).
|
|
120
|
+
...settingsEnv,
|
|
98
121
|
TQDM_DISABLE: "1",
|
|
99
122
|
HF_HUB_DISABLE_PROGRESS_BARS: "1",
|
|
100
123
|
TRANSFORMERS_VERBOSITY: "error"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"python-stdio-bridge.js","sourceRoot":"","sources":["../src/python-stdio-bridge.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"python-stdio-bridge.js","sourceRoot":"","sources":["../src/python-stdio-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,5 @@
|
|
|
1
|
-
import { type Span
|
|
2
|
-
export
|
|
3
|
-
readonly userId: string;
|
|
4
|
-
readonly runId: string;
|
|
5
|
-
readonly traceId: string;
|
|
6
|
-
readonly origin: "ui" | "agent" | "cli" | "debug" | "public";
|
|
7
|
-
readonly secretValues: ReadonlySet<string>;
|
|
8
|
-
readonly policy: {
|
|
9
|
-
contentSuppressed: boolean;
|
|
10
|
-
};
|
|
11
|
-
readonly parentSpanContext?: SpanContext;
|
|
12
|
-
}
|
|
13
|
-
export declare function bindSpanRunTraceScope(span: Span, scope: RunTraceScope): void;
|
|
14
|
-
export declare function getSpanRunTraceScope(span: Span): RunTraceScope | undefined;
|
|
15
|
-
/** Execute child work under a trusted durable run without inheriting another request's trace. */
|
|
16
|
-
export declare function withRunTrace<T>(scope: RunTraceScope, fn: () => T): T;
|
|
17
|
-
/** The owner and policy shared by every span beneath the current run. */
|
|
18
|
-
export declare function getRunTraceScope(): RunTraceScope | undefined;
|
|
19
|
-
/** Add credentials resolved outside ProcessingContext to the shared run redaction set. */
|
|
20
|
-
export declare function recordRunTraceSecret(value: string | null | undefined): void;
|
|
21
|
-
/** Producers report content caps before the original value leaves their scope. */
|
|
22
|
-
export declare function markTraceContentTruncated(): void;
|
|
23
|
-
/** Exclude third-party content from this run and all subsequent inseparable work. */
|
|
24
|
-
export declare function suppressRunTraceContent(): void;
|
|
1
|
+
import { type Span } from "@opentelemetry/api";
|
|
2
|
+
export * from "./run-trace-scope.js";
|
|
25
3
|
/** Add a run event to an explicit span or the active span. */
|
|
26
4
|
export declare function recordTraceEvent(name: string, attributes: Record<string, unknown>, span?: Span): void;
|
|
27
|
-
/** Run-store IO and diagnostics must not recursively record themselves. */
|
|
28
|
-
export declare function withoutRunTrace<T>(fn: () => T): T;
|
|
29
|
-
export declare function isRunTraceSuppressed(): boolean;
|
|
30
5
|
//# sourceMappingURL=run-trace-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-trace-context.d.ts","sourceRoot":"","sources":["../src/run-trace-context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"run-trace-context.d.ts","sourceRoot":"","sources":["../src/run-trace-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/D,cAAc,sBAAsB,CAAC;AAErC,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAiBrG"}
|
|
@@ -1,57 +1,15 @@
|
|
|
1
|
-
import { context,
|
|
1
|
+
import { context, trace } from "@opentelemetry/api";
|
|
2
2
|
import { isTraceContentKey } from "@nodetool-ai/protocol";
|
|
3
|
-
import {
|
|
3
|
+
import { getRunTraceScope, getSpanRunTraceScope, isRunTraceSuppressed } from "./run-trace-scope.js";
|
|
4
4
|
import { sanitizeTraceContentText, stringifyTraceContent } from "./run-trace-serialization.js";
|
|
5
|
-
|
|
6
|
-
const suppressed = new AsyncLocalStorage();
|
|
7
|
-
const spanScopes = new WeakMap();
|
|
8
|
-
export function bindSpanRunTraceScope(span, scope) { spanScopes.set(span, scope); }
|
|
9
|
-
export function getSpanRunTraceScope(span) { return spanScopes.get(span); }
|
|
10
|
-
/** Execute child work under a trusted durable run without inheriting another request's trace. */
|
|
11
|
-
export function withRunTrace(scope, fn) {
|
|
12
|
-
if (!/^[0-9a-f]{32}$/.test(scope.traceId)) {
|
|
13
|
-
throw new Error("Invalid run trace id");
|
|
14
|
-
}
|
|
15
|
-
const active = context.active();
|
|
16
|
-
const activeSpan = trace.getSpanContext(active);
|
|
17
|
-
const parent = activeSpan?.traceId === scope.traceId
|
|
18
|
-
? active
|
|
19
|
-
: scope.parentSpanContext?.traceId === scope.traceId
|
|
20
|
-
? trace.setSpanContext(ROOT_CONTEXT, scope.parentSpanContext)
|
|
21
|
-
: ROOT_CONTEXT;
|
|
22
|
-
return runScope.run(scope, () => context.with(parent, fn));
|
|
23
|
-
}
|
|
24
|
-
/** The owner and policy shared by every span beneath the current run. */
|
|
25
|
-
export function getRunTraceScope() {
|
|
26
|
-
return suppressed.getStore() ? undefined : runScope.getStore();
|
|
27
|
-
}
|
|
28
|
-
/** Add credentials resolved outside ProcessingContext to the shared run redaction set. */
|
|
29
|
-
export function recordRunTraceSecret(value) {
|
|
30
|
-
const secrets = getRunTraceScope()?.secretValues;
|
|
31
|
-
if (value && secrets instanceof Set) {
|
|
32
|
-
secrets.add(value);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
/** Producers report content caps before the original value leaves their scope. */
|
|
36
|
-
export function markTraceContentTruncated() {
|
|
37
|
-
if (getRunTraceScope()) {
|
|
38
|
-
trace.getActiveSpan()?.setAttribute("nodetool.trace.truncated", true);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
/** Exclude third-party content from this run and all subsequent inseparable work. */
|
|
42
|
-
export function suppressRunTraceContent() {
|
|
43
|
-
const scope = getRunTraceScope();
|
|
44
|
-
if (scope) {
|
|
45
|
-
scope.policy.contentSuppressed = true;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
5
|
+
export * from "./run-trace-scope.js";
|
|
48
6
|
/** Add a run event to an explicit span or the active span. */
|
|
49
7
|
export function recordTraceEvent(name, attributes, span) {
|
|
50
8
|
if (isRunTraceSuppressed()) {
|
|
51
9
|
return;
|
|
52
10
|
}
|
|
53
11
|
const target = span ?? trace.getSpan(context.active());
|
|
54
|
-
const scope = getRunTraceScope() ?? (target ?
|
|
12
|
+
const scope = getRunTraceScope() ?? (target ? getSpanRunTraceScope(target) : undefined);
|
|
55
13
|
if (!target || !scope) {
|
|
56
14
|
return;
|
|
57
15
|
}
|
|
@@ -72,9 +30,4 @@ export function recordTraceEvent(name, attributes, span) {
|
|
|
72
30
|
}
|
|
73
31
|
target.addEvent(name, safe);
|
|
74
32
|
}
|
|
75
|
-
/** Run-store IO and diagnostics must not recursively record themselves. */
|
|
76
|
-
export function withoutRunTrace(fn) {
|
|
77
|
-
return suppressed.run(true, () => context.with(ROOT_CONTEXT, fn));
|
|
78
|
-
}
|
|
79
|
-
export function isRunTraceSuppressed() { return suppressed.getStore() === true; }
|
|
80
33
|
//# sourceMappingURL=run-trace-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-trace-context.js","sourceRoot":"","sources":["../src/run-trace-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"run-trace-context.js","sourceRoot":"","sources":["../src/run-trace-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAa,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACpG,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,cAAc,sBAAsB,CAAC;AAErC,8DAA8D;AAC9D,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,UAAmC,EAAE,IAAW;IAC7F,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACxF,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IAClC,MAAM,IAAI,GAAyD,EAAE,CAAC;IACtE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAC1G,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,GAAG,CAAC,GAAG,wBAAwB,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;YAChG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACpB,CAAC;aAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-trace-processor.d.ts","sourceRoot":"","sources":["../src/run-trace-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,OAAO,EAAwB,MAAM,oBAAoB,CAAC;AACzG,OAAO,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAErG,OAAO,EAAqF,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5L,OAAO,EAAoG,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG9J,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,GAAG,eAAe,CAAC;AACvE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AACD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACrC;AACD,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC9D,KAAK,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,qBAAqB,GAAG,WAAW,CAAC;CAC5E;AAqBD,4EAA4E;AAC5E,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAqB;
|
|
1
|
+
{"version":3,"file":"run-trace-processor.d.ts","sourceRoot":"","sources":["../src/run-trace-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { context, trace } from "@opentelemetry/api";
|
|
2
2
|
import { resourceFromAttributes } from "@opentelemetry/resources";
|
|
3
3
|
import { isTraceContentKey, splitTraceRecord, TRACE_STRING_LIMIT, TRACE_CONTENT_BYTE_LIMIT } from "@nodetool-ai/protocol";
|
|
4
|
-
import { redactTraceText, setLogHook, safeProcessEnv } from "@nodetool-ai/config";
|
|
5
|
-
import { spanToRecord } from "./
|
|
4
|
+
import { createTraceTextRedactor, redactTraceText, setLogHook, safeProcessEnv } from "@nodetool-ai/config";
|
|
5
|
+
import { spanToRecord } from "./span-record.js";
|
|
6
6
|
import { bindSpanRunTraceScope, getRunTraceScope, isRunTraceSuppressed, recordTraceEvent, withoutRunTrace } from "./run-trace-context.js";
|
|
7
7
|
import { sanitizeTraceContentText, stringifyTraceContent } from "./run-trace-serialization.js";
|
|
8
8
|
let store = null;
|
|
@@ -48,13 +48,14 @@ function redactRecord(record, options) {
|
|
|
48
48
|
if (store) {
|
|
49
49
|
return store.sanitize(record, options);
|
|
50
50
|
}
|
|
51
|
+
const redact = createTraceTextRedactor(options.secretValues);
|
|
51
52
|
let bytes = 0;
|
|
52
53
|
const clean = (value, depth) => {
|
|
53
54
|
if (depth > 12 || bytes >= TRACE_CONTENT_BYTE_LIMIT) {
|
|
54
55
|
return "[truncated]";
|
|
55
56
|
}
|
|
56
57
|
if (typeof value === "string") {
|
|
57
|
-
const text =
|
|
58
|
+
const text = redact(value).slice(0, TRACE_STRING_LIMIT);
|
|
58
59
|
bytes += text.length * 2;
|
|
59
60
|
return text;
|
|
60
61
|
}
|
|
@@ -75,16 +76,16 @@ function redactRecord(record, options) {
|
|
|
75
76
|
};
|
|
76
77
|
const status = { ...record.status };
|
|
77
78
|
if (record.status.message) {
|
|
78
|
-
status.message =
|
|
79
|
+
status.message = redact(record.status.message).slice(0, TRACE_STRING_LIMIT);
|
|
79
80
|
}
|
|
80
81
|
const sanitized = {
|
|
81
82
|
...record,
|
|
82
|
-
name:
|
|
83
|
+
name: redact(record.name).slice(0, 200),
|
|
83
84
|
status,
|
|
84
85
|
attributes: cleanAttributes(record.attributes, clean),
|
|
85
86
|
resource: cleanAttributes(record.resource, clean),
|
|
86
87
|
events: record.events.map((event) => {
|
|
87
|
-
const sanitizedEvent = { ...event, name:
|
|
88
|
+
const sanitizedEvent = { ...event, name: redact(event.name).slice(0, 200) };
|
|
88
89
|
if (event.attributes) {
|
|
89
90
|
sanitizedEvent.attributes = cleanAttributes(event.attributes, clean);
|
|
90
91
|
}
|