Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/components/nodes/agentflow/Agent/Agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ class Agent_Agentflow implements INode {
if (!model) {
throw new Error('Model is required')
}
const modelName = modelConfig?.model ?? modelConfig?.modelName

// Extract tools
const tools = nodeData.inputs?.agentTools as ITool[]
Expand Down Expand Up @@ -1178,7 +1179,7 @@ class Agent_Agentflow implements INode {

// End analytics tracking - pass usage metadata for token calculation
if (analyticHandlers && llmIds) {
await analyticHandlers.onLLMEnd(llmIds, finalResponse, response.usage_metadata)
await analyticHandlers.onLLMEnd(llmIds, output, { model: modelName, provider: model })
}

// Send additional streaming events if needed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ class ConditionAgent_Agentflow implements INode {
if (!model) {
throw new Error('Model is required')
}
const modelName = modelConfig?.model ?? modelConfig?.modelName

// Setup analytics tracing options and attach to options object for easy access
const callbacks = await additionalCallbacks(nodeData, {
...options,
Expand Down Expand Up @@ -387,13 +389,20 @@ class ConditionAgent_Agentflow implements INode {
const endTime = Date.now()
const timeDelta = endTime - startTime

// End analytics tracking - pass usage metadata for token calculation
// End analytics tracking (pass structured output with usage metadata)
if (analyticHandlers && llmIds) {
await analyticHandlers.onLLMEnd(
llmIds,
typeof response.content === 'string' ? response.content : JSON.stringify(response.content),
response.usage_metadata
)
const analyticsOutput: any = {
content: typeof response.content === 'string' ? response.content : JSON.stringify(response.content)
}
// Include usage metadata if available
if (response.usage_metadata) {
analyticsOutput.usageMetadata = response.usage_metadata
}
// Include response metadata (contains model name) if available
if (response.response_metadata) {
analyticsOutput.responseMetadata = response.response_metadata
}
await analyticHandlers.onLLMEnd(llmIds, analyticsOutput, { model: modelName, provider: model })
}

let calledOutputName: string
Expand Down
3 changes: 2 additions & 1 deletion packages/components/nodes/agentflow/LLM/LLM.ts
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ class LLM_Agentflow implements INode {
if (!model) {
throw new Error('Model is required')
}
const modelName = modelConfig?.model ?? modelConfig?.modelName

// Extract memory and configuration options
const enableMemory = nodeData.inputs?.llmEnableMemory as boolean
Expand Down Expand Up @@ -521,7 +522,7 @@ class LLM_Agentflow implements INode {

// End analytics tracking - pass usage metadata for token calculation
if (analyticHandlers && llmIds) {
await analyticHandlers.onLLMEnd(llmIds, finalResponse, response.usage_metadata)
await analyticHandlers.onLLMEnd(llmIds, output, { model: modelName, provider: model })
}

// Send additional streaming events if needed
Expand Down
17 changes: 5 additions & 12 deletions packages/components/nodes/documentloaders/AAIDomains/AAIDomains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,12 +286,7 @@ class AAIDomains_DocumentLoaders implements INode {
return docs
}

async loadStream(
nodeData: INodeData,
_: string,
__: ICommonObject,
onBatch: (docs: IDocument[]) => Promise<void>
): Promise<void> {
async loadStream(nodeData: INodeData, _: string, __: ICommonObject, onBatch: (docs: IDocument[]) => Promise<void>): Promise<void> {
const textSplitter = nodeData.inputs?.textSplitter as TextSplitter
const limit = nodeData.inputs?.limit ? Number(nodeData.inputs.limit) : undefined
const searchTerm = nodeData.inputs?.searchTerm as string
Expand Down Expand Up @@ -476,7 +471,9 @@ class AAIDomainsLoader extends BaseDocumentLoader {
const requestedHeavy = heavyFields.filter((f) => requestedFields.has(f))
if (requestedHeavy.length > 0) {
console.warn(
`[AAIDomains] Warning: Fetching heavy JSONB fields: ${requestedHeavy.join(', ')}. This may impact performance.`
`[AAIDomains] Warning: Fetching heavy JSONB fields: ${requestedHeavy.join(
', '
)}. This may impact performance.`
)
}
} else {
Expand All @@ -500,11 +497,7 @@ class AAIDomainsLoader extends BaseDocumentLoader {
`
}

let query = supabase
.from('domains')
.select(selectFields)
.order('id', { ascending: true })
.limit(currentPageSize)
let query = supabase.from('domains').select(selectFields).order('id', { ascending: true }).limit(currentPageSize)

if (lastId) {
query = query.gt('id', lastId)
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/Interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ export enum FollowUpPromptProvider {
}

export type FollowUpPromptProviderConfig = {
[key in FollowUpPromptProvider]: {
[_key in FollowUpPromptProvider]: {
credentialId: string
modelName: string
baseUrl: string
Expand Down
Loading
Loading