@librechat/agents 3.7.7 → 3.7.9
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/cjs/agents/AgentContext.cjs +26 -5
- package/dist/cjs/agents/AgentContext.cjs.map +1 -1
- package/dist/cjs/common/constants.cjs +12 -0
- package/dist/cjs/common/constants.cjs.map +1 -1
- package/dist/cjs/graphs/Graph.cjs +56 -11
- package/dist/cjs/graphs/Graph.cjs.map +1 -1
- package/dist/cjs/graphs/MultiAgentGraph.cjs +1 -1
- package/dist/cjs/hooks/HookRegistry.cjs.map +1 -1
- package/dist/cjs/hooks/executeHooks.cjs +8 -0
- package/dist/cjs/hooks/executeHooks.cjs.map +1 -1
- package/dist/cjs/hooks/index.cjs +2 -0
- package/dist/cjs/hooks/index.cjs.map +1 -1
- package/dist/cjs/hooks/types.cjs +1 -0
- package/dist/cjs/hooks/types.cjs.map +1 -1
- package/dist/cjs/langfuse.cjs +43 -3
- package/dist/cjs/langfuse.cjs.map +1 -1
- package/dist/cjs/langfuseTraceShaping.cjs +75 -0
- package/dist/cjs/langfuseTraceShaping.cjs.map +1 -1
- package/dist/cjs/llm/bedrock/toolCache.cjs +1 -1
- package/dist/cjs/llm/fake.cjs +9 -5
- package/dist/cjs/llm/fake.cjs.map +1 -1
- package/dist/cjs/llm/invoke.cjs +3 -7
- package/dist/cjs/llm/invoke.cjs.map +1 -1
- package/dist/cjs/llm/openrouter/toolCache.cjs +1 -1
- package/dist/cjs/llm/prepareProviderRequest.cjs +2 -2
- package/dist/cjs/llm/providers.cjs +1 -1
- package/dist/cjs/llm/request.cjs +6 -0
- package/dist/cjs/llm/request.cjs.map +1 -1
- package/dist/cjs/llm/truncation.cjs +1 -0
- package/dist/cjs/main.cjs +22 -13
- package/dist/cjs/messages/format.cjs +375 -3
- package/dist/cjs/messages/format.cjs.map +1 -1
- package/dist/cjs/messages/index.cjs +1 -1
- package/dist/cjs/messages/prune.cjs +1 -1
- package/dist/cjs/run.cjs +217 -52
- package/dist/cjs/run.cjs.map +1 -1
- package/dist/cjs/session/AgentSession.cjs +1 -1
- package/dist/cjs/session/JsonlSessionStore.cjs +1 -1
- package/dist/cjs/stream.cjs +1 -1
- package/dist/cjs/summarization/index.cjs +1 -0
- package/dist/cjs/summarization/index.cjs.map +1 -1
- package/dist/cjs/summarization/node.cjs +58 -85
- package/dist/cjs/summarization/node.cjs.map +1 -1
- package/dist/cjs/summarization/semanticIndex.cjs +366 -0
- package/dist/cjs/summarization/semanticIndex.cjs.map +1 -0
- package/dist/cjs/summarization/shared.cjs +83 -0
- package/dist/cjs/summarization/shared.cjs.map +1 -0
- package/dist/cjs/tools/ToolNode.cjs +5 -5
- package/dist/cjs/tools/local/CompileCheckTool.cjs +1 -1
- package/dist/cjs/tools/local/LocalCodingTools.cjs +1 -1
- package/dist/cjs/tools/local/LocalExecutionEngine.cjs +1 -1
- package/dist/cjs/tools/runStepResume.cjs +1 -1
- package/dist/cjs/tools/runStepResume.cjs.map +1 -1
- package/dist/cjs/tools/subagent/SubagentExecutor.cjs +8 -12
- package/dist/cjs/tools/subagent/SubagentExecutor.cjs.map +1 -1
- package/dist/cjs/tools/subagent/childGraphConfig.cjs +2 -1
- package/dist/cjs/tools/subagent/childGraphConfig.cjs.map +1 -1
- package/dist/cjs/utils/index.cjs +1 -1
- package/dist/cjs/utils/tokens.cjs +8 -1
- package/dist/cjs/utils/tokens.cjs.map +1 -1
- package/dist/esm/agents/AgentContext.mjs +26 -5
- package/dist/esm/agents/AgentContext.mjs.map +1 -1
- package/dist/esm/common/constants.mjs +11 -1
- package/dist/esm/common/constants.mjs.map +1 -1
- package/dist/esm/graphs/Graph.mjs +56 -11
- package/dist/esm/graphs/Graph.mjs.map +1 -1
- package/dist/esm/graphs/MultiAgentGraph.mjs +1 -1
- package/dist/esm/hooks/HookRegistry.mjs.map +1 -1
- package/dist/esm/hooks/executeHooks.mjs +8 -1
- package/dist/esm/hooks/executeHooks.mjs.map +1 -1
- package/dist/esm/hooks/index.mjs +2 -1
- package/dist/esm/hooks/index.mjs.map +1 -1
- package/dist/esm/hooks/types.mjs +1 -0
- package/dist/esm/hooks/types.mjs.map +1 -1
- package/dist/esm/langfuse.mjs +43 -3
- package/dist/esm/langfuse.mjs.map +1 -1
- package/dist/esm/langfuseTraceShaping.mjs +75 -0
- package/dist/esm/langfuseTraceShaping.mjs.map +1 -1
- package/dist/esm/llm/bedrock/toolCache.mjs +1 -1
- package/dist/esm/llm/fake.mjs +9 -5
- package/dist/esm/llm/fake.mjs.map +1 -1
- package/dist/esm/llm/invoke.mjs +3 -7
- package/dist/esm/llm/invoke.mjs.map +1 -1
- package/dist/esm/llm/openrouter/toolCache.mjs +1 -1
- package/dist/esm/llm/prepareProviderRequest.mjs +2 -2
- package/dist/esm/llm/providers.mjs +1 -1
- package/dist/esm/llm/request.mjs +6 -1
- package/dist/esm/llm/request.mjs.map +1 -1
- package/dist/esm/llm/truncation.mjs +1 -1
- package/dist/esm/main.mjs +15 -14
- package/dist/esm/messages/format.mjs +375 -3
- package/dist/esm/messages/format.mjs.map +1 -1
- package/dist/esm/messages/index.mjs +1 -1
- package/dist/esm/messages/prune.mjs +1 -1
- package/dist/esm/run.mjs +217 -52
- package/dist/esm/run.mjs.map +1 -1
- package/dist/esm/session/AgentSession.mjs +1 -1
- package/dist/esm/session/JsonlSessionStore.mjs +1 -1
- package/dist/esm/stream.mjs +1 -1
- package/dist/esm/summarization/index.mjs +1 -0
- package/dist/esm/summarization/index.mjs.map +1 -1
- package/dist/esm/summarization/node.mjs +57 -84
- package/dist/esm/summarization/node.mjs.map +1 -1
- package/dist/esm/summarization/semanticIndex.mjs +363 -0
- package/dist/esm/summarization/semanticIndex.mjs.map +1 -0
- package/dist/esm/summarization/shared.mjs +79 -0
- package/dist/esm/summarization/shared.mjs.map +1 -0
- package/dist/esm/tools/ToolNode.mjs +5 -5
- package/dist/esm/tools/local/CompileCheckTool.mjs +1 -1
- package/dist/esm/tools/local/LocalCodingTools.mjs +1 -1
- package/dist/esm/tools/local/LocalExecutionEngine.mjs +1 -1
- package/dist/esm/tools/runStepResume.mjs +1 -1
- package/dist/esm/tools/runStepResume.mjs.map +1 -1
- package/dist/esm/tools/subagent/SubagentExecutor.mjs +8 -12
- package/dist/esm/tools/subagent/SubagentExecutor.mjs.map +1 -1
- package/dist/esm/tools/subagent/childGraphConfig.mjs +2 -1
- package/dist/esm/tools/subagent/childGraphConfig.mjs.map +1 -1
- package/dist/esm/utils/index.mjs +1 -1
- package/dist/esm/utils/tokens.mjs +8 -2
- package/dist/esm/utils/tokens.mjs.map +1 -1
- package/dist/types/agents/AgentContext.d.ts +27 -1
- package/dist/types/common/constants.d.ts +17 -0
- package/dist/types/graphs/Graph.d.ts +24 -0
- package/dist/types/hooks/executeHooks.d.ts +5 -2
- package/dist/types/hooks/index.d.ts +7 -2
- package/dist/types/hooks/types.d.ts +45 -7
- package/dist/types/langfuse.d.ts +3 -1
- package/dist/types/llm/fake.d.ts +12 -2
- package/dist/types/llm/request.d.ts +10 -0
- package/dist/types/messages/format.d.ts +17 -2
- package/dist/types/run.d.ts +19 -6
- package/dist/types/summarization/index.d.ts +6 -0
- package/dist/types/summarization/node.d.ts +0 -4
- package/dist/types/summarization/semanticIndex.d.ts +21 -0
- package/dist/types/summarization/shared.d.ts +25 -0
- package/dist/types/types/graph.d.ts +9 -1
- package/dist/types/types/run.d.ts +8 -0
- package/dist/types/types/stream.d.ts +6 -0
- package/dist/types/types/summarize.d.ts +44 -0
- package/dist/types/utils/tokens.d.ts +9 -0
- package/package.json +2 -1
- package/src/agents/AgentContext.ts +63 -6
- package/src/common/constants.ts +19 -0
- package/src/graphs/Graph.ts +86 -8
- package/src/hooks/HookRegistry.ts +3 -1
- package/src/hooks/executeHooks.ts +20 -2
- package/src/hooks/index.ts +12 -1
- package/src/hooks/types.ts +47 -4
- package/src/langfuse.ts +70 -0
- package/src/langfuseTraceShaping.ts +94 -0
- package/src/llm/fake.ts +35 -4
- package/src/llm/invoke.ts +13 -29
- package/src/llm/request.ts +24 -0
- package/src/messages/format.ts +839 -5
- package/src/run.ts +393 -187
- package/src/summarization/index.ts +11 -0
- package/src/summarization/node.ts +202 -158
- package/src/summarization/semanticIndex.ts +662 -0
- package/src/summarization/shared.ts +130 -0
- package/src/tools/runStepResume.ts +9 -0
- package/src/tools/subagent/SubagentExecutor.ts +4 -27
- package/src/tools/subagent/childGraphConfig.ts +3 -0
- package/src/types/graph.ts +9 -0
- package/src/types/run.ts +8 -0
- package/src/types/stream.ts +6 -0
- package/src/types/summarize.ts +57 -0
- package/src/utils/tokens.ts +31 -8
package/dist/esm/langfuse.mjs
CHANGED
|
@@ -2,8 +2,8 @@ import { isPresent, parseBooleanEnv } from "./utils/misc.mjs";
|
|
|
2
2
|
import { hasLangfuseConfigCredentials, hasLangfuseEnvConfig, hasLangfuseEnvCredentials, resolveToolOutputTracingConfig } from "./langfuseConfig.mjs";
|
|
3
3
|
import { resolveLangfuseConfigForSpan, resolveLangfuseScopeAgentId, resolveLangfuseScopeRunId, resolveTraceIdSeedForSpan, withLangfuseRuntimeScope } from "./langfuseRuntimeScope.mjs";
|
|
4
4
|
import { getLangfuseManagedSpanDestination, registerLangfuseManagedSpan, resolveLangfuseDestinationKey } from "./langfuseSpanRegistry.mjs";
|
|
5
|
-
import { isGraphInterrupt, isParentCommand } from "@langchain/langgraph";
|
|
6
5
|
import { AIMessage, AIMessageChunk } from "@langchain/core/messages";
|
|
6
|
+
import { isGraphInterrupt, isParentCommand } from "@langchain/langgraph";
|
|
7
7
|
import { getLangfuseTracerProvider, propagateAttributes } from "@langfuse/tracing";
|
|
8
8
|
import { context, trace } from "@opentelemetry/api";
|
|
9
9
|
import { CallbackHandler } from "@langfuse/langchain";
|
|
@@ -100,11 +100,14 @@ var ScopedLangfuseCallbackHandler = class extends CallbackHandler {
|
|
|
100
100
|
agentId;
|
|
101
101
|
parentSpanContext;
|
|
102
102
|
runId;
|
|
103
|
+
deferredRootRunId;
|
|
103
104
|
identity;
|
|
104
105
|
toolOutputTracing;
|
|
105
106
|
trackedRunIds = /* @__PURE__ */ new Set();
|
|
107
|
+
deferredRootStarted = false;
|
|
108
|
+
deferredRootOutcome;
|
|
106
109
|
constructor(params) {
|
|
107
|
-
const { langfuse, traceIdSeed, traceAnchor, agentId, parentSpanContext, inheritTraceIdentity, runId, toolOutputTracing, traceName, ...handlerParams } = params ?? {};
|
|
110
|
+
const { langfuse, traceIdSeed, traceAnchor, agentId, parentSpanContext, inheritTraceIdentity, runId, deferRootRunId, toolOutputTracing, traceName, ...handlerParams } = params ?? {};
|
|
108
111
|
super({
|
|
109
112
|
...handlerParams,
|
|
110
113
|
...inheritTraceIdentity === true ? {
|
|
@@ -119,6 +122,8 @@ var ScopedLangfuseCallbackHandler = class extends CallbackHandler {
|
|
|
119
122
|
this.agentId = agentId;
|
|
120
123
|
this.parentSpanContext = parentSpanContext;
|
|
121
124
|
this.runId = runId;
|
|
125
|
+
this.deferredRootRunId = deferRootRunId;
|
|
126
|
+
if (deferRootRunId != null) this.awaitHandlers = true;
|
|
122
127
|
this.toolOutputTracing = toolOutputTracing;
|
|
123
128
|
this.identity = {
|
|
124
129
|
userId: inheritTraceIdentity === true ? void 0 : handlerParams.userId,
|
|
@@ -195,14 +200,47 @@ var ScopedLangfuseCallbackHandler = class extends CallbackHandler {
|
|
|
195
200
|
}, scoped) : scoped());
|
|
196
201
|
}
|
|
197
202
|
handleChainStart(...args) {
|
|
203
|
+
const [, , runId, parentRunId] = args;
|
|
204
|
+
if (runId === this.deferredRootRunId && parentRunId == null && this.deferredRootStarted) return Promise.resolve();
|
|
205
|
+
if (runId === this.deferredRootRunId && parentRunId == null) this.deferredRootStarted = true;
|
|
198
206
|
return this.withRuntimeContext(() => super.handleChainStart(...args), this.startsDetachedRun(args[2], args[3]), args[5]);
|
|
199
207
|
}
|
|
200
208
|
handleChainError(...args) {
|
|
201
209
|
const [error, runId, parentRunId] = args;
|
|
210
|
+
if (runId === this.deferredRootRunId && parentRunId == null) {
|
|
211
|
+
this.deferredRootOutcome = {
|
|
212
|
+
type: "error",
|
|
213
|
+
error: error instanceof Error ? error : new Error(String(error))
|
|
214
|
+
};
|
|
215
|
+
return Promise.resolve();
|
|
216
|
+
}
|
|
202
217
|
if (error != null && parentRunId != null && isGraphInterrupt(error)) return super.handleChainEnd(GRAPH_INTERRUPT_CONTROL_FLOW, runId, parentRunId);
|
|
203
218
|
if (error != null && parentRunId != null && isParentCommand(error)) return super.handleChainEnd({ controlFlow: "ParentCommand" }, runId, parentRunId);
|
|
204
219
|
return super.handleChainError(...args);
|
|
205
220
|
}
|
|
221
|
+
handleChainEnd(...args) {
|
|
222
|
+
const [output, runId, parentRunId] = args;
|
|
223
|
+
if (runId === this.deferredRootRunId && parentRunId == null) {
|
|
224
|
+
this.deferredRootOutcome = {
|
|
225
|
+
type: "end",
|
|
226
|
+
output
|
|
227
|
+
};
|
|
228
|
+
return Promise.resolve();
|
|
229
|
+
}
|
|
230
|
+
return super.handleChainEnd(...args);
|
|
231
|
+
}
|
|
232
|
+
async finishDeferredRoot() {
|
|
233
|
+
const runId = this.deferredRootRunId;
|
|
234
|
+
const outcome = this.deferredRootOutcome;
|
|
235
|
+
if (!this.deferredRootStarted || runId == null || outcome == null) return;
|
|
236
|
+
this.deferredRootStarted = false;
|
|
237
|
+
this.deferredRootOutcome = void 0;
|
|
238
|
+
if (outcome.type === "error") {
|
|
239
|
+
await super.handleChainError(outcome.error, runId, outcome.parentRunId);
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
await super.handleChainEnd(outcome.output, runId, outcome.parentRunId);
|
|
243
|
+
}
|
|
206
244
|
handleAgentAction(...args) {
|
|
207
245
|
return this.withRuntimeContext(() => super.handleAgentAction(...args), this.startsDetachedRun(args[1], args[2]));
|
|
208
246
|
}
|
|
@@ -283,7 +321,7 @@ function shouldCreateLangfuseHandler(langfuse) {
|
|
|
283
321
|
if (langfuse?.enabled === false) return false;
|
|
284
322
|
return hasLangfuseEnvConfig() || hasLangfuseConfigCredentials(langfuse) || hasLangfuseConfigBaseUrl(langfuse) && hasLangfuseEnvCredentials();
|
|
285
323
|
}
|
|
286
|
-
function createLangfuseHandler({ langfuse, userId, sessionId, traceMetadata, tags, traceIdSeed, traceAnchor, agentId, parentSpanContext, inheritTraceIdentity, runId, toolOutputTracing, traceName }) {
|
|
324
|
+
function createLangfuseHandler({ langfuse, userId, sessionId, traceMetadata, tags, traceIdSeed, traceAnchor, agentId, parentSpanContext, inheritTraceIdentity, runId, deferRootRunId, toolOutputTracing, traceName }) {
|
|
287
325
|
if (!shouldCreateLangfuseHandler(langfuse)) return;
|
|
288
326
|
return new ScopedLangfuseCallbackHandler({
|
|
289
327
|
userId,
|
|
@@ -297,6 +335,7 @@ function createLangfuseHandler({ langfuse, userId, sessionId, traceMetadata, tag
|
|
|
297
335
|
parentSpanContext,
|
|
298
336
|
inheritTraceIdentity,
|
|
299
337
|
runId,
|
|
338
|
+
deferRootRunId,
|
|
300
339
|
toolOutputTracing,
|
|
301
340
|
traceName
|
|
302
341
|
});
|
|
@@ -318,6 +357,7 @@ function isLangfuseCallbackHandler(value) {
|
|
|
318
357
|
return value instanceof CallbackHandler;
|
|
319
358
|
}
|
|
320
359
|
async function disposeLangfuseHandler(value) {
|
|
360
|
+
if (value instanceof ScopedLangfuseCallbackHandler) await value.finishDeferredRoot();
|
|
321
361
|
if (value == null || parseBooleanEnv(process.env[LANGFUSE_FORCE_FLUSH_ON_DISPOSE]) !== true) return;
|
|
322
362
|
await getLangfuseTracerProvider().forceFlush?.();
|
|
323
363
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langfuse.mjs","names":["otelTrace","otelContext"],"sources":["../../src/langfuse.ts"],"mappings":";;;;;;;;;;;AAiDA,MAAM,4BAA4B;AAClC,MAAM,kCAAkC;AACxC,MAAM,+BAA+B,EAAE,aAAa,iBAAiB;AACrE,MAAM,8BAA8B,KAAK,UACvC,4BACF;
|
|
1
|
+
{"version":3,"file":"langfuse.mjs","names":["otelTrace","otelContext"],"sources":["../../src/langfuse.ts"],"mappings":"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"}
|
|
@@ -27,6 +27,10 @@ const DEPRECATED_TRACE_INPUT_ATTRIBUTE = "langfuse.trace.input";
|
|
|
27
27
|
const DEPRECATED_TRACE_OUTPUT_ATTRIBUTE = "langfuse.trace.output";
|
|
28
28
|
const OBSERVATION_METADATA_LANGGRAPH_NODE = `${LangfuseOtelSpanAttributes.OBSERVATION_METADATA}.langgraph_node`;
|
|
29
29
|
const OBSERVATION_METADATA_OPERATION = `${LangfuseOtelSpanAttributes.OBSERVATION_METADATA}.${LANGFUSE_OPERATION_METADATA_KEY}`;
|
|
30
|
+
const OBSERVATION_METADATA_COMPACTION_SEMANTIC_INDEX_ENTRIES = `${LangfuseOtelSpanAttributes.OBSERVATION_METADATA}.compaction_semantic_index_entries`;
|
|
31
|
+
const COMPACTION_SEMANTIC_INDEX_OPEN = "<compaction-semantic-index>";
|
|
32
|
+
const COMPACTION_SEMANTIC_INDEX_CLOSE = "</compaction-semantic-index>";
|
|
33
|
+
const REDACTED_COMPACTION_SEMANTIC_INDEX = "<compaction-semantic-index redacted=\"true\" />\n\n";
|
|
30
34
|
function isRecord(value) {
|
|
31
35
|
return value != null && typeof value === "object" && !Array.isArray(value);
|
|
32
36
|
}
|
|
@@ -40,6 +44,76 @@ function parseAttributeValue(value) {
|
|
|
40
44
|
return value;
|
|
41
45
|
}
|
|
42
46
|
}
|
|
47
|
+
function redactCompactionSemanticIndexText(value) {
|
|
48
|
+
if (!value.startsWith(COMPACTION_SEMANTIC_INDEX_OPEN)) return {
|
|
49
|
+
value,
|
|
50
|
+
redacted: false
|
|
51
|
+
};
|
|
52
|
+
const start = 0;
|
|
53
|
+
const close = value.indexOf(COMPACTION_SEMANTIC_INDEX_CLOSE, start);
|
|
54
|
+
if (close < 0) return {
|
|
55
|
+
value,
|
|
56
|
+
redacted: false
|
|
57
|
+
};
|
|
58
|
+
let end = close + 28;
|
|
59
|
+
while (end < value.length && /\s/.test(value[end])) end++;
|
|
60
|
+
return {
|
|
61
|
+
value: value.slice(0, start) + REDACTED_COMPACTION_SEMANTIC_INDEX + value.slice(end),
|
|
62
|
+
redacted: true
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function redactCompactionSemanticIndexValue(value) {
|
|
66
|
+
if (typeof value === "string") return redactCompactionSemanticIndexText(value);
|
|
67
|
+
if (Array.isArray(value)) {
|
|
68
|
+
for (let index = value.length - 1; index >= 0; index--) {
|
|
69
|
+
const nested = redactCompactionSemanticIndexValue(value[index]);
|
|
70
|
+
if (nested.redacted) {
|
|
71
|
+
const result = [...value];
|
|
72
|
+
result[index] = nested.value;
|
|
73
|
+
return {
|
|
74
|
+
value: result,
|
|
75
|
+
redacted: true
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
value,
|
|
81
|
+
redacted: false
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
if (!isRecord(value)) return {
|
|
85
|
+
value,
|
|
86
|
+
redacted: false
|
|
87
|
+
};
|
|
88
|
+
const entries = Object.entries(value);
|
|
89
|
+
for (let index = entries.length - 1; index >= 0; index--) {
|
|
90
|
+
const [key, nestedValue] = entries[index];
|
|
91
|
+
const nested = redactCompactionSemanticIndexValue(nestedValue);
|
|
92
|
+
if (nested.redacted) return {
|
|
93
|
+
value: {
|
|
94
|
+
...value,
|
|
95
|
+
[key]: nested.value
|
|
96
|
+
},
|
|
97
|
+
redacted: true
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
return {
|
|
101
|
+
value,
|
|
102
|
+
redacted: false
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
function redactCompactionSemanticIndexInput(span) {
|
|
106
|
+
const entryCount = span.attributes[OBSERVATION_METADATA_COMPACTION_SEMANTIC_INDEX_ENTRIES];
|
|
107
|
+
const numericEntryCount = Number(entryCount);
|
|
108
|
+
if (!Number.isFinite(numericEntryCount) || numericEntryCount <= 0) return;
|
|
109
|
+
const inputKey = LangfuseOtelSpanAttributes.OBSERVATION_INPUT;
|
|
110
|
+
const input = span.attributes[inputKey];
|
|
111
|
+
if (input == null) return;
|
|
112
|
+
const parsed = parseAttributeValue(input);
|
|
113
|
+
const redaction = redactCompactionSemanticIndexValue(parsed);
|
|
114
|
+
if (!redaction.redacted) return;
|
|
115
|
+
span.attributes[inputKey] = typeof redaction.value === "string" && parsed === input ? redaction.value : JSON.stringify(redaction.value);
|
|
116
|
+
}
|
|
43
117
|
function getMessageArray(value) {
|
|
44
118
|
if (Array.isArray(value)) {
|
|
45
119
|
const records = value.filter(isRecord);
|
|
@@ -271,6 +345,7 @@ function shapeLangfuseSpan(span) {
|
|
|
271
345
|
const mutable = span;
|
|
272
346
|
delete mutable.attributes[DEPRECATED_TRACE_INPUT_ATTRIBUTE];
|
|
273
347
|
delete mutable.attributes[DEPRECATED_TRACE_OUTPUT_ATTRIBUTE];
|
|
348
|
+
redactCompactionSemanticIndexInput(mutable);
|
|
274
349
|
const isGraphObservation = isGraphSpan(mutable);
|
|
275
350
|
if (mutable.name.startsWith(LANGGRAPH_AGENT_NODE_PREFIX)) shapeAgentNodeSpan(mutable);
|
|
276
351
|
else if (mutable.name.startsWith(LANGGRAPH_TOOL_NODE_PREFIX)) shapeToolNodeSpan(mutable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langfuseTraceShaping.mjs","names":[],"sources":["../../src/langfuseTraceShaping.ts"],"mappings":";;;;;;AAcA,MAAM,uBAAuB;AAC7B,MAAM,qBAAqB;AAC3B,MAAM,wBAAwB;AAC9B,MAAM,yBAAyB;AAC/B,MAAM,8BAA8B;AACpC,MAAM,6BAA6B;AACnC,MAAM,uBAAuB;AAC7B,MAAM,0BAA0B;AAChC,MAAM,uBAAuB;AAC7B,MAAM,wBAAwB;AAC9B,MAAM,yBAAyB;AAC/B,MAAM,wBAAwB;AAC9B,MAAM,kBAAkB;AACxB,MAAM,kBAAkB;AACxB,MAAM,2BAA2B;AACjC,MAAM,4BAA4B;AAClC,MAAM,2BAA2B;AACjC,MAAM,mCAAmC;AACzC,MAAM,kCAAkC;AACxC,MAAM,mCAAmC;AACzC,MAAM,oCAAoC;AAC1C,MAAM,sCAAsC,GAAG,2BAA2B,qBAAqB;AAC/F,MAAM,iCAAiC,GAAG,2BAA2B,qBAAqB,GAAG;
|
|
1
|
+
{"version":3,"file":"langfuseTraceShaping.mjs","names":[],"sources":["../../src/langfuseTraceShaping.ts"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { requireInternalModule } from "../../lazyRequire.mjs";
|
|
2
1
|
import { buildBedrockCachePoint } from "../../messages/cache.mjs";
|
|
2
|
+
import { requireInternalModule } from "../../lazyRequire.mjs";
|
|
3
3
|
//#region src/llm/bedrock/toolCache.ts
|
|
4
4
|
const convertToOpenAITool = (...args) => requireInternalModule("llm/openai/index")._convertToOpenAITool(...args);
|
|
5
5
|
const BEDROCK_TOOL_CACHE_MARKER = "__lc_bedrock_cache_point_after";
|
package/dist/esm/llm/fake.mjs
CHANGED
|
@@ -6,10 +6,11 @@ var FakeChatModel = class extends FakeListChatModel {
|
|
|
6
6
|
splitStrategy;
|
|
7
7
|
toolCalls = [];
|
|
8
8
|
addedToolCalls = false;
|
|
9
|
+
finalChunkGenerationInfo;
|
|
9
10
|
constructor({ responses, sleep, emitCustomEvent, splitStrategy = {
|
|
10
11
|
type: "regex",
|
|
11
12
|
value: /(?<=\s+)|(?=\s+)/
|
|
12
|
-
}, toolCalls = [] }) {
|
|
13
|
+
}, toolCalls = [], finalChunkGenerationInfo }) {
|
|
13
14
|
super({
|
|
14
15
|
responses,
|
|
15
16
|
sleep,
|
|
@@ -17,6 +18,7 @@ var FakeChatModel = class extends FakeListChatModel {
|
|
|
17
18
|
});
|
|
18
19
|
this.splitStrategy = splitStrategy;
|
|
19
20
|
this.toolCalls = toolCalls;
|
|
21
|
+
this.finalChunkGenerationInfo = finalChunkGenerationInfo;
|
|
20
22
|
}
|
|
21
23
|
splitText(text) {
|
|
22
24
|
if (this.splitStrategy.type === "regex") return text.split(this.splitStrategy.value);
|
|
@@ -27,13 +29,14 @@ var FakeChatModel = class extends FakeListChatModel {
|
|
|
27
29
|
return chunks;
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
|
-
_createResponseChunk(text, tool_call_chunks) {
|
|
32
|
+
_createResponseChunk(text, tool_call_chunks, responseMetadata) {
|
|
31
33
|
return new ChatGenerationChunk({
|
|
32
34
|
text,
|
|
33
|
-
generationInfo: {},
|
|
35
|
+
generationInfo: responseMetadata ?? {},
|
|
34
36
|
message: new AIMessageChunk({
|
|
35
37
|
content: text,
|
|
36
38
|
tool_call_chunks,
|
|
39
|
+
response_metadata: responseMetadata,
|
|
37
40
|
additional_kwargs: tool_call_chunks ? { tool_calls: tool_call_chunks.map((toolCall) => ({
|
|
38
41
|
index: toolCall.index ?? 0,
|
|
39
42
|
id: toolCall.id ?? "",
|
|
@@ -51,10 +54,11 @@ var FakeChatModel = class extends FakeListChatModel {
|
|
|
51
54
|
this._incrementResponse();
|
|
52
55
|
if (this.emitCustomEvent) await runManager?.handleCustomEvent("some_test_event", { someval: true });
|
|
53
56
|
const chunks = this.splitText(response);
|
|
54
|
-
for
|
|
57
|
+
for (let i = 0; i < chunks.length; i++) {
|
|
58
|
+
const chunk = chunks[i];
|
|
55
59
|
await this._sleepIfRequested();
|
|
56
60
|
if (options.thrownErrorString != null && options.thrownErrorString) throw new Error(options.thrownErrorString);
|
|
57
|
-
yield super._createResponseChunk(chunk);
|
|
61
|
+
yield i === chunks.length - 1 && this.toolCalls.length === 0 && this.finalChunkGenerationInfo != null ? this._createResponseChunk(chunk, void 0, this.finalChunkGenerationInfo) : super._createResponseChunk(chunk);
|
|
58
62
|
runManager?.handleLLMNewToken(chunk);
|
|
59
63
|
}
|
|
60
64
|
await this._sleepIfRequested();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fake.mjs","names":[],"sources":["../../../src/llm/fake.ts"],"mappings":";;;;AAYA,IAAa,gBAAb,cAAmC,kBAAkB;CACnD;CACA,YAAgC,CAAC;CACjC,iBAAkC;
|
|
1
|
+
{"version":3,"file":"fake.mjs","names":[],"sources":["../../../src/llm/fake.ts"],"mappings":";;;;AAYA,IAAa,gBAAb,cAAmC,kBAAkB;CACnD;CACA,YAAgC,CAAC;CACjC,iBAAkC;CASlC;CAEA,YAAY,EACV,WACA,OACA,iBACA,gBAAgB;EAAE,MAAM;EAAS,OAAO;CAAmB,GAC3D,YAAY,CAAC,GACb,4BAQC;EACD,MAAM;GAAE;GAAW;GAAO;EAAgB,CAAC;EAC3C,KAAK,gBAAgB;EACrB,KAAK,YAAY;EACjB,KAAK,2BAA2B;CAClC;CAEA,UAAkB,MAAwB;EACxC,IAAI,KAAK,cAAc,SAAS,SAC9B,OAAO,KAAK,MAAM,KAAK,cAAc,KAAe;OAC/C;GACL,MAAM,YAAY,KAAK,cAAc;GACrC,MAAM,SAAmB,CAAC;GAC1B,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK,WACpC,OAAO,KAAK,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC;GAE1C,OAAO;EACT;CACF;CACA,qBACE,MACA,kBACA,kBACqB;EACrB,OAAO,IAAI,oBAAoB;GAC7B;GACA,gBAAgB,oBAAoB,CAAC;GACrC,SAAS,IAAI,eAAe;IAC1B,SAAS;IACT;IACA,mBAAmB;IACnB,mBAAmB,mBACf,EACA,YAAY,iBAAiB,KAAK,cAAc;KAC9C,OAAO,SAAS,SAAS;KACzB,IAAI,SAAS,MAAM;KACnB,MAAM;KACN,UAAU;MACR,MAAM,SAAS,QAAQ;MACvB,WAAW,SAAS,QAAQ;KAC9B;IACF,EAAE,EACJ,IACE,KAAA;GACN,CAAC;EACH,CAAC;CACH;CAEA,OAAO,sBACL,WACA,SACA,YACqC;EACrC,MAAM,WAAW,KAAK,iBAAiB;EACvC,KAAK,mBAAmB;EAExB,IAAI,KAAK,iBACP,MAAM,YAAY,kBAAkB,mBAAmB,EACrD,SAAS,KACX,CAAC;EAGH,MAAM,SAAS,KAAK,UAAU,QAAQ;EACtC,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;GACtC,MAAM,QAAQ,OAAO;GACrB,MAAM,KAAK,kBAAkB;GAE7B,IAAI,QAAQ,qBAAqB,QAAQ,QAAQ,mBAC/C,MAAM,IAAI,MAAM,QAAQ,iBAAiB;GAoB3C,MATE,MAAM,OAAO,SAAS,KAAK,KAAK,UAAU,WAAW,KAElC,KAAK,4BAA4B,OAChD,KAAK,qBACL,OACA,KAAA,GACA,KAAK,wBACP,IACE,MAAM,qBAAqB,KAAK;GAEtC,YAAiB,kBAAkB,KAAK;EAC1C;EAEA,MAAM,KAAK,kBAAkB;EAC7B,IAAI,KAAK,UAAU,SAAS,KAAK,CAAC,KAAK,gBAAgB;GACrD,KAAK,iBAAiB;GACtB,MAAM,iBAAiB,KAAK,UAAU,KAAK,aAAa;IACtD,OAAO;KACL,MAAM,SAAS;KACf,MAAM,KAAK,UAAU,SAAS,IAAI;KAClC,IAAI,SAAS;KACb,MAAM;IACR;GACF,CAAC;GAED,MADsB,KAAK,qBAAqB,IAAI,cAClC;GAClB,YAAiB,kBAAkB,EAAE;EACvC;CACF;AACF;AAEA,SAAgB,uBAAuB,EACrC,WACA,OACA,eACA,aAMgB;CAChB,OAAO,IAAI,cAAc;EACvB;EACA;EACA,iBAAiB;EACjB;EACA;CACF,CAAC;AACH"}
|
package/dist/esm/llm/invoke.mjs
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import "../common/enum.mjs";
|
|
2
2
|
import "../common/index.mjs";
|
|
3
3
|
import { appendCallbacks } from "../utils/callbacks.mjs";
|
|
4
|
-
import { modifyDeltaProperties } from "../messages/core.mjs";
|
|
5
4
|
import { getProviderFamily, providerUsesManualToolStream } from "./providerRegistry.mjs";
|
|
5
|
+
import { resolveClientOptionsModel } from "./request.mjs";
|
|
6
|
+
import { modifyDeltaProperties } from "../messages/core.mjs";
|
|
6
7
|
import { safeDispatchCustomEvent } from "../utils/events.mjs";
|
|
7
8
|
import { ProviderMessageProjectionInvariantError, inspectProviderMessageProjection, resolveProviderMessageProjectionInvariantMode } from "../messages/projectionInvariant.mjs";
|
|
8
9
|
import "../messages/index.mjs";
|
|
@@ -365,11 +366,6 @@ function getFallbackOverflowCandidates(error) {
|
|
|
365
366
|
if (typeof error !== "object" || error === null) return [];
|
|
366
367
|
return [...fallbackOverflowCandidates.get(error) ?? []];
|
|
367
368
|
}
|
|
368
|
-
function extractClientOptionsModel(clientOptions) {
|
|
369
|
-
const options = clientOptions;
|
|
370
|
-
if (typeof options?.model === "string" && options.model !== "") return options.model;
|
|
371
|
-
if (typeof options?.modelName === "string" && options.modelName !== "") return options.modelName;
|
|
372
|
-
}
|
|
373
369
|
async function tryFallbackProviders({ fallbacks, tools, messages, config, primaryError, context, onChunk, streamLimitState, overflowContext, prepareProviderRequest: prepareFallbackRequest, prepareProviderMessages }) {
|
|
374
370
|
const isOverflow = (error, contextOverride = overflowContext) => getContextOverflowInfo(error, contextOverride) != null;
|
|
375
371
|
let lastError = primaryError;
|
|
@@ -381,7 +377,7 @@ async function tryFallbackProviders({ fallbacks, tools, messages, config, primar
|
|
|
381
377
|
clientOptions: fb.clientOptions,
|
|
382
378
|
tools
|
|
383
379
|
});
|
|
384
|
-
const fbModelName =
|
|
380
|
+
const fbModelName = resolveClientOptionsModel(fb.clientOptions);
|
|
385
381
|
const fbConfig = fbModelName == null ? config : {
|
|
386
382
|
...config,
|
|
387
383
|
metadata: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke.mjs","names":[],"sources":["../../../src/llm/invoke.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"invoke.mjs","names":[],"sources":["../../../src/llm/invoke.ts"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { requireInternalModule } from "../../lazyRequire.mjs";
|
|
2
1
|
import { buildAnthropicCacheControl } from "../../messages/cache.mjs";
|
|
2
|
+
import { requireInternalModule } from "../../lazyRequire.mjs";
|
|
3
3
|
//#region src/llm/openrouter/toolCache.ts
|
|
4
4
|
const convertToOpenAITool = (tool) => requireInternalModule("llm/openai/index")._convertToOpenAITool(tool);
|
|
5
5
|
function getToolName(tool) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import "../common/enum.mjs";
|
|
2
2
|
import "../common/index.mjs";
|
|
3
|
+
import { getProviderFamily, providerRequiresStrictAlternation } from "./providerRegistry.mjs";
|
|
4
|
+
import { isAnthropicLike, isOpenAILike } from "../utils/llm.mjs";
|
|
3
5
|
import { stripAnthropicCacheControl, stripBedrockCacheControl } from "../messages/cache.mjs";
|
|
4
6
|
import { projectCacheControlledToolOutputsToText, projectComputerCallOutputsToText, projectOpenAIChatToolMessageContent, projectOpenAIResponsesToolMessageContent, projectOpenRouterToolMessageContent, projectSingleTextToolOutputsToText, projectStructuredToolOutputsToText, projectToolStreamContentForProvider } from "../messages/core.mjs";
|
|
5
|
-
import { getProviderFamily, providerRequiresStrictAlternation } from "./providerRegistry.mjs";
|
|
6
7
|
import { coalesceAdjacentUserTurns } from "../messages/alternation.mjs";
|
|
7
8
|
import { appendPredecessorHandoffCue, removePredecessorHandoffCue } from "../messages/handoffCue.mjs";
|
|
8
9
|
import "../messages/index.mjs";
|
|
9
|
-
import { isAnthropicLike, isOpenAILike } from "../utils/llm.mjs";
|
|
10
10
|
import { annotateMessagesForLLM } from "../tools/toolOutputReferences.mjs";
|
|
11
11
|
import "./providers.mjs";
|
|
12
12
|
//#region src/llm/prepareProviderRequest.ts
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import "../common/enum.mjs";
|
|
2
2
|
import "../common/index.mjs";
|
|
3
|
-
import { requireInternalModule } from "../lazyRequire.mjs";
|
|
4
3
|
import { getRegisteredChatModelClass, registerBuiltInProviderLoader } from "./providerRegistry.mjs";
|
|
4
|
+
import { requireInternalModule } from "../lazyRequire.mjs";
|
|
5
5
|
//#region src/llm/providers.ts
|
|
6
6
|
function initializeBuiltInProvider(provider, loadModel, traits) {
|
|
7
7
|
registerBuiltInProviderLoader({
|
package/dist/esm/llm/request.mjs
CHANGED
|
@@ -10,10 +10,15 @@ function isThinkingEnabled(provider, clientOptions) {
|
|
|
10
10
|
if ((provider === "openAI" || family === "openai") && (clientOptions.modelKwargs?.thinking)?.type === "enabled") return true;
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
|
+
function resolveClientOptionsModel(clientOptions) {
|
|
14
|
+
const options = clientOptions;
|
|
15
|
+
if (typeof options?.model === "string" && options.model !== "") return options.model;
|
|
16
|
+
if (typeof options?.modelName === "string" && options.modelName !== "") return options.modelName;
|
|
17
|
+
}
|
|
13
18
|
function getMaxOutputTokensKey(provider) {
|
|
14
19
|
return provider === "google" || provider === "vertexai" || getProviderFamily(provider) === "google" ? "maxOutputTokens" : "maxTokens";
|
|
15
20
|
}
|
|
16
21
|
//#endregion
|
|
17
|
-
export { getMaxOutputTokensKey, isThinkingEnabled };
|
|
22
|
+
export { getMaxOutputTokensKey, isThinkingEnabled, resolveClientOptionsModel };
|
|
18
23
|
|
|
19
24
|
//# sourceMappingURL=request.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.mjs","names":[],"sources":["../../../src/llm/request.ts"],"mappings":";;;;AASA,SAAgB,kBACd,UACA,eACS;CACT,IAAI,CAAC,eAAe,OAAO;CAC3B,MAAM,SAAS,kBAAkB,QAAQ;CAEzC,KACG,aAAA,eAAoC,WAAW,gBAC/C,cAA2C,YAAY,MAExD,OAAO;CAGT,KACG,aAAA,aAAkC,WAAW,cAC7C,cAA0C,+BACzC,eACG,MAEL,OAAO;CAGT,KACG,aAAA,YAAiC,WAAW,cAE1C,cAAwC,aACrC,SAAA,EACH,SAAS,WAEZ,OAAO;CAGT,OAAO;AACT;AAOA,SAAgB,sBACd,UACiC;CACjC,OAAO,aAAA,YACL,aAAA,cACA,kBAAkB,QAAQ,MAAM,WAC9B,oBACA;AACN"}
|
|
1
|
+
{"version":3,"file":"request.mjs","names":[],"sources":["../../../src/llm/request.ts"],"mappings":";;;;AASA,SAAgB,kBACd,UACA,eACS;CACT,IAAI,CAAC,eAAe,OAAO;CAC3B,MAAM,SAAS,kBAAkB,QAAQ;CAEzC,KACG,aAAA,eAAoC,WAAW,gBAC/C,cAA2C,YAAY,MAExD,OAAO;CAGT,KACG,aAAA,aAAkC,WAAW,cAC7C,cAA0C,+BACzC,eACG,MAEL,OAAO;CAGT,KACG,aAAA,YAAiC,WAAW,cAE1C,cAAwC,aACrC,SAAA,EACH,SAAS,WAEZ,OAAO;CAGT,OAAO;AACT;AAWA,SAAgB,0BACd,eACoB;CACpB,MAAM,UAAU;CAGhB,IAAI,OAAO,SAAS,UAAU,YAAY,QAAQ,UAAU,IAC1D,OAAO,QAAQ;CAEjB,IAAI,OAAO,SAAS,cAAc,YAAY,QAAQ,cAAc,IAClE,OAAO,QAAQ;AAGnB;AAOA,SAAgB,sBACd,UACiC;CACjC,OAAO,aAAA,YACL,aAAA,cACA,kBAAkB,QAAQ,MAAM,WAC9B,oBACA;AACN"}
|
|
@@ -70,6 +70,6 @@ function assertNotTruncatedToolCall(message, provider) {
|
|
|
70
70
|
throw new OutputTruncationError(stopReason, collectToolCallNames(message));
|
|
71
71
|
}
|
|
72
72
|
//#endregion
|
|
73
|
-
export { assertNotTruncatedToolCall };
|
|
73
|
+
export { assertNotTruncatedToolCall, getTruncationStopReason };
|
|
74
74
|
|
|
75
75
|
//# sourceMappingURL=truncation.mjs.map
|