@mastra/core 0.6.3 → 0.6.4-alpha.1
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/agent/index.cjs +2 -2
- package/dist/agent/index.d.cts +1 -1
- package/dist/agent/index.d.ts +1 -1
- package/dist/agent/index.js +1 -1
- package/dist/{base-CbMRVSw8.d.ts → base-CMQiCwHG.d.ts} +5 -4
- package/dist/{base-DsOQiX2q.d.cts → base-DbCjWM67.d.cts} +5 -4
- package/dist/{chunk-5ROCYEY7.cjs → chunk-2DKUBXLZ.cjs} +2 -2
- package/dist/{chunk-YW6NIHPF.cjs → chunk-33QB276D.cjs} +4 -3
- package/dist/{chunk-OC5LOLNS.js → chunk-34GSMLRD.js} +1 -1
- package/dist/{chunk-64NEAPI4.js → chunk-3OXCRLRW.js} +28 -1
- package/dist/{chunk-WSMI66XC.cjs → chunk-4OM3F6KZ.cjs} +28 -0
- package/dist/{chunk-F6KZ3CUF.js → chunk-B7OACOMS.js} +1 -1
- package/dist/{chunk-DW4X6TXX.js → chunk-PRNJCD6I.js} +20 -5
- package/dist/{chunk-75XZXEUM.cjs → chunk-YLLXAKL2.cjs} +29 -14
- package/dist/{chunk-ZG5FKEL2.cjs → chunk-YTP2MMIM.cjs} +2 -2
- package/dist/{chunk-S7PRIZBF.js → chunk-ZG35KSBA.js} +3 -2
- package/dist/eval/index.d.cts +1 -1
- package/dist/eval/index.d.ts +1 -1
- package/dist/index.cjs +42 -38
- package/dist/index.d.cts +3 -3
- package/dist/index.d.ts +3 -3
- package/dist/index.js +7 -7
- package/dist/integration/index.d.cts +1 -1
- package/dist/integration/index.d.ts +1 -1
- package/dist/llm/index.d.cts +1 -1
- package/dist/llm/index.d.ts +1 -1
- package/dist/mastra/index.cjs +2 -2
- package/dist/mastra/index.d.cts +1 -1
- package/dist/mastra/index.d.ts +1 -1
- package/dist/mastra/index.js +1 -1
- package/dist/memory/index.cjs +2 -2
- package/dist/memory/index.d.cts +1 -1
- package/dist/memory/index.d.ts +1 -1
- package/dist/memory/index.js +1 -1
- package/dist/network/index.cjs +2 -2
- package/dist/network/index.d.cts +1 -1
- package/dist/network/index.d.ts +1 -1
- package/dist/network/index.js +1 -1
- package/dist/relevance/index.cjs +4 -4
- package/dist/relevance/index.d.cts +1 -1
- package/dist/relevance/index.d.ts +1 -1
- package/dist/relevance/index.js +1 -1
- package/dist/storage/index.d.cts +1 -1
- package/dist/storage/index.d.ts +1 -1
- package/dist/storage/libsql/index.d.cts +1 -1
- package/dist/storage/libsql/index.d.ts +1 -1
- package/dist/telemetry/index.d.cts +1 -1
- package/dist/telemetry/index.d.ts +1 -1
- package/dist/tools/index.d.cts +1 -1
- package/dist/tools/index.d.ts +1 -1
- package/dist/utils.cjs +15 -11
- package/dist/utils.d.cts +3 -2
- package/dist/utils.d.ts +3 -2
- package/dist/utils.js +1 -1
- package/dist/voice/index.d.cts +1 -1
- package/dist/voice/index.d.ts +1 -1
- package/dist/workflows/index.cjs +17 -17
- package/dist/workflows/index.d.cts +2 -2
- package/dist/workflows/index.d.ts +2 -2
- package/dist/workflows/index.js +1 -1
- package/package.json +1 -1
- package/dist/{chunk-LHUFN2BG.cjs → chunk-YXJQFZOW.cjs} +1 -1
- package/dist/{chunk-U6V76AAB.js → chunk-ZBKJDQPM.js} +1 -1
package/dist/agent/index.cjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkYLLXAKL2_cjs = require('../chunk-YLLXAKL2.cjs');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
Object.defineProperty(exports, "Agent", {
|
|
8
8
|
enumerable: true,
|
|
9
|
-
get: function () { return
|
|
9
|
+
get: function () { return chunkYLLXAKL2_cjs.Agent; }
|
|
10
10
|
});
|
package/dist/agent/index.d.cts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { Message as AiMessageType } from 'ai';
|
|
2
2
|
import 'json-schema';
|
|
3
3
|
import 'zod';
|
|
4
|
-
export { A as Agent, m as AgentConfig, aH as AgentGenerateOptions, aI as AgentStreamOptions, az as MastraLanguageModel, a as ToolsInput, aG as ToolsetsInput } from '../base-
|
|
4
|
+
export { A as Agent, m as AgentConfig, aH as AgentGenerateOptions, aI as AgentStreamOptions, az as MastraLanguageModel, a as ToolsInput, aG as ToolsetsInput } from '../base-DbCjWM67.cjs';
|
|
5
5
|
import '../base-ObPJ-w8K.cjs';
|
|
6
6
|
import '../types-CwTG2XyQ.cjs';
|
|
7
7
|
import 'sift';
|
package/dist/agent/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { Message as AiMessageType } from 'ai';
|
|
2
2
|
import 'json-schema';
|
|
3
3
|
import 'zod';
|
|
4
|
-
export { A as Agent, m as AgentConfig, aH as AgentGenerateOptions, aI as AgentStreamOptions, az as MastraLanguageModel, a as ToolsInput, aG as ToolsetsInput } from '../base-
|
|
4
|
+
export { A as Agent, m as AgentConfig, aH as AgentGenerateOptions, aI as AgentStreamOptions, az as MastraLanguageModel, a as ToolsInput, aG as ToolsetsInput } from '../base-CMQiCwHG.js';
|
|
5
5
|
import '../base-Cmunaaxb.js';
|
|
6
6
|
import '../types-CwTG2XyQ.js';
|
|
7
7
|
import 'sift';
|
package/dist/agent/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { Agent } from '../chunk-
|
|
1
|
+
export { Agent } from '../chunk-PRNJCD6I.js';
|
|
@@ -1587,6 +1587,7 @@ declare class MastraLLMBase extends MastraBase {
|
|
|
1587
1587
|
getModel(): ai.LanguageModelV1;
|
|
1588
1588
|
convertToMessages(messages: string | string[] | CoreMessage$1[]): CoreMessage$1[];
|
|
1589
1589
|
__registerPrimitives(p: MastraPrimitives): void;
|
|
1590
|
+
__registerMastra(p: Mastra): void;
|
|
1590
1591
|
__text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
|
|
1591
1592
|
__textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
|
|
1592
1593
|
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options?: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
|
|
@@ -1681,22 +1682,22 @@ declare class Agent<TTools extends ToolsInput = ToolsInput, TMetrics extends Rec
|
|
|
1681
1682
|
outputText: string;
|
|
1682
1683
|
}) => Promise<void>;
|
|
1683
1684
|
};
|
|
1684
|
-
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & {
|
|
1685
|
+
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentGenerateOptions<Z> & {
|
|
1685
1686
|
output?: never;
|
|
1686
1687
|
experimental_output?: never;
|
|
1687
1688
|
}): Promise<GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1688
|
-
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & ({
|
|
1689
|
+
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentGenerateOptions<Z> & ({
|
|
1689
1690
|
output: Z;
|
|
1690
1691
|
experimental_output?: never;
|
|
1691
1692
|
} | {
|
|
1692
1693
|
experimental_output: Z;
|
|
1693
1694
|
output?: never;
|
|
1694
1695
|
})): Promise<GenerateObjectResult<Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1695
|
-
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & {
|
|
1696
|
+
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentStreamOptions<Z> & {
|
|
1696
1697
|
output?: never;
|
|
1697
1698
|
experimental_output?: never;
|
|
1698
1699
|
}): Promise<StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1699
|
-
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & ({
|
|
1700
|
+
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentStreamOptions<Z> & ({
|
|
1700
1701
|
output: Z;
|
|
1701
1702
|
experimental_output?: never;
|
|
1702
1703
|
} | {
|
|
@@ -1587,6 +1587,7 @@ declare class MastraLLMBase extends MastraBase {
|
|
|
1587
1587
|
getModel(): ai.LanguageModelV1;
|
|
1588
1588
|
convertToMessages(messages: string | string[] | CoreMessage$1[]): CoreMessage$1[];
|
|
1589
1589
|
__registerPrimitives(p: MastraPrimitives): void;
|
|
1590
|
+
__registerMastra(p: Mastra): void;
|
|
1590
1591
|
__text<Z extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextOptions<Z>): Promise<GenerateTextResult<any, any>>;
|
|
1591
1592
|
__textObject<T extends ZodSchema | JSONSchema7 | undefined>(input: LLMTextObjectOptions<T>): Promise<GenerateObjectResult<T>>;
|
|
1592
1593
|
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], options?: LLMStreamOptions<Z>): Promise<GenerateReturn<Z>>;
|
|
@@ -1681,22 +1682,22 @@ declare class Agent<TTools extends ToolsInput = ToolsInput, TMetrics extends Rec
|
|
|
1681
1682
|
outputText: string;
|
|
1682
1683
|
}) => Promise<void>;
|
|
1683
1684
|
};
|
|
1684
|
-
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & {
|
|
1685
|
+
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentGenerateOptions<Z> & {
|
|
1685
1686
|
output?: never;
|
|
1686
1687
|
experimental_output?: never;
|
|
1687
1688
|
}): Promise<GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1688
|
-
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & ({
|
|
1689
|
+
generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentGenerateOptions<Z> & ({
|
|
1689
1690
|
output: Z;
|
|
1690
1691
|
experimental_output?: never;
|
|
1691
1692
|
} | {
|
|
1692
1693
|
experimental_output: Z;
|
|
1693
1694
|
output?: never;
|
|
1694
1695
|
})): Promise<GenerateObjectResult<Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1695
|
-
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & {
|
|
1696
|
+
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentStreamOptions<Z> & {
|
|
1696
1697
|
output?: never;
|
|
1697
1698
|
experimental_output?: never;
|
|
1698
1699
|
}): Promise<StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
|
|
1699
|
-
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & ({
|
|
1700
|
+
stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[] | Message[], args?: AgentStreamOptions<Z> & ({
|
|
1700
1701
|
output: Z;
|
|
1701
1702
|
experimental_output?: never;
|
|
1702
1703
|
} | {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var chunkU7ONOIBO_cjs = require('./chunk-U7ONOIBO.cjs');
|
|
4
4
|
var chunkONDCHP6G_cjs = require('./chunk-ONDCHP6G.cjs');
|
|
5
|
-
var
|
|
5
|
+
var chunk4OM3F6KZ_cjs = require('./chunk-4OM3F6KZ.cjs');
|
|
6
6
|
var chunkPL7PVTGF_cjs = require('./chunk-PL7PVTGF.cjs');
|
|
7
7
|
var fs = require('fs');
|
|
8
8
|
var path = require('path');
|
|
@@ -195,7 +195,7 @@ var MastraMemory = class extends chunkPL7PVTGF_cjs.MastraBase {
|
|
|
195
195
|
return { indexName };
|
|
196
196
|
}
|
|
197
197
|
getMergedThreadConfig(config) {
|
|
198
|
-
return
|
|
198
|
+
return chunk4OM3F6KZ_cjs.deepMerge(this.threadConfig, config || {});
|
|
199
199
|
}
|
|
200
200
|
estimateTokens(text) {
|
|
201
201
|
return Math.ceil(text.split(" ").length * 1.3);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunk4OM3F6KZ_cjs = require('./chunk-4OM3F6KZ.cjs');
|
|
4
4
|
var chunkPL7PVTGF_cjs = require('./chunk-PL7PVTGF.cjs');
|
|
5
5
|
var api = require('@opentelemetry/api');
|
|
6
6
|
var EventEmitter = require('events');
|
|
@@ -394,7 +394,7 @@ var Machine = class extends EventEmitter__default.default {
|
|
|
394
394
|
const logger = this.logger;
|
|
395
395
|
let mastraProxy = void 0;
|
|
396
396
|
if (this.#mastra) {
|
|
397
|
-
mastraProxy =
|
|
397
|
+
mastraProxy = chunk4OM3F6KZ_cjs.createMastraProxy({ mastra: this.#mastra, logger });
|
|
398
398
|
}
|
|
399
399
|
let result = void 0;
|
|
400
400
|
try {
|
|
@@ -2002,7 +2002,8 @@ var Workflow = class extends chunkPL7PVTGF_cjs.MastraBase {
|
|
|
2002
2002
|
if (activeRun) {
|
|
2003
2003
|
return activeRun.resume({ stepId, context: resumeContext });
|
|
2004
2004
|
}
|
|
2005
|
-
|
|
2005
|
+
const run = this.createRun({ runId });
|
|
2006
|
+
return run.resume({ stepId, context: resumeContext });
|
|
2006
2007
|
}
|
|
2007
2008
|
watch(onTransition) {
|
|
2008
2009
|
this.logger.warn(`Please use 'watch' on the 'createRun' call instead, watch is deprecated`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { LibSQLVector } from './chunk-SMBKF6K5.js';
|
|
2
2
|
import { DefaultProxyStorage } from './chunk-7VTZI3YN.js';
|
|
3
|
-
import { deepMerge } from './chunk-
|
|
3
|
+
import { deepMerge } from './chunk-3OXCRLRW.js';
|
|
4
4
|
import { MastraBase } from './chunk-VN4M67DA.js';
|
|
5
5
|
import { existsSync } from 'fs';
|
|
6
6
|
import { join } from 'path';
|
|
@@ -328,5 +328,32 @@ function createMastraProxy({ mastra, logger }) {
|
|
|
328
328
|
}
|
|
329
329
|
});
|
|
330
330
|
}
|
|
331
|
+
function checkEvalStorageFields(traceObject, logger) {
|
|
332
|
+
const missingFields = [];
|
|
333
|
+
if (!traceObject.input) missingFields.push("input");
|
|
334
|
+
if (!traceObject.output) missingFields.push("output");
|
|
335
|
+
if (!traceObject.agentName) missingFields.push("agent_name");
|
|
336
|
+
if (!traceObject.metricName) missingFields.push("metric_name");
|
|
337
|
+
if (!traceObject.instructions) missingFields.push("instructions");
|
|
338
|
+
if (!traceObject.globalRunId) missingFields.push("global_run_id");
|
|
339
|
+
if (!traceObject.runId) missingFields.push("run_id");
|
|
340
|
+
if (missingFields.length > 0) {
|
|
341
|
+
if (logger) {
|
|
342
|
+
logger.warn("Skipping evaluation storage due to missing required fields", {
|
|
343
|
+
missingFields,
|
|
344
|
+
runId: traceObject.runId,
|
|
345
|
+
agentName: traceObject.agentName
|
|
346
|
+
});
|
|
347
|
+
} else {
|
|
348
|
+
console.warn("Skipping evaluation storage due to missing required fields", {
|
|
349
|
+
missingFields,
|
|
350
|
+
runId: traceObject.runId,
|
|
351
|
+
agentName: traceObject.agentName
|
|
352
|
+
});
|
|
353
|
+
}
|
|
354
|
+
return false;
|
|
355
|
+
}
|
|
356
|
+
return true;
|
|
357
|
+
}
|
|
331
358
|
|
|
332
|
-
export { createMastraProxy, deepMerge, delay, ensureToolProperties, isVercelTool, jsonSchemaPropertiesToTSTypes, jsonSchemaToModel, makeCoreTool, maskStreamTags, resolveSerializedZodOutput };
|
|
359
|
+
export { checkEvalStorageFields, createMastraProxy, deepMerge, delay, ensureToolProperties, isVercelTool, jsonSchemaPropertiesToTSTypes, jsonSchemaToModel, makeCoreTool, maskStreamTags, resolveSerializedZodOutput };
|
|
@@ -334,7 +334,35 @@ function createMastraProxy({ mastra, logger }) {
|
|
|
334
334
|
}
|
|
335
335
|
});
|
|
336
336
|
}
|
|
337
|
+
function checkEvalStorageFields(traceObject, logger) {
|
|
338
|
+
const missingFields = [];
|
|
339
|
+
if (!traceObject.input) missingFields.push("input");
|
|
340
|
+
if (!traceObject.output) missingFields.push("output");
|
|
341
|
+
if (!traceObject.agentName) missingFields.push("agent_name");
|
|
342
|
+
if (!traceObject.metricName) missingFields.push("metric_name");
|
|
343
|
+
if (!traceObject.instructions) missingFields.push("instructions");
|
|
344
|
+
if (!traceObject.globalRunId) missingFields.push("global_run_id");
|
|
345
|
+
if (!traceObject.runId) missingFields.push("run_id");
|
|
346
|
+
if (missingFields.length > 0) {
|
|
347
|
+
if (logger) {
|
|
348
|
+
logger.warn("Skipping evaluation storage due to missing required fields", {
|
|
349
|
+
missingFields,
|
|
350
|
+
runId: traceObject.runId,
|
|
351
|
+
agentName: traceObject.agentName
|
|
352
|
+
});
|
|
353
|
+
} else {
|
|
354
|
+
console.warn("Skipping evaluation storage due to missing required fields", {
|
|
355
|
+
missingFields,
|
|
356
|
+
runId: traceObject.runId,
|
|
357
|
+
agentName: traceObject.agentName
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
return false;
|
|
361
|
+
}
|
|
362
|
+
return true;
|
|
363
|
+
}
|
|
337
364
|
|
|
365
|
+
exports.checkEvalStorageFields = checkEvalStorageFields;
|
|
338
366
|
exports.createMastraProxy = createMastraProxy;
|
|
339
367
|
exports.deepMerge = deepMerge;
|
|
340
368
|
exports.delay = delay;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InstrumentClass } from './chunk-W5HVJX45.js';
|
|
2
|
-
import { ensureToolProperties, createMastraProxy, makeCoreTool, delay } from './chunk-
|
|
2
|
+
import { ensureToolProperties, createMastraProxy, makeCoreTool, delay } from './chunk-3OXCRLRW.js';
|
|
3
3
|
import { MastraBase } from './chunk-VN4M67DA.js';
|
|
4
4
|
import { RegisteredLogger } from './chunk-L7CR75HA.js';
|
|
5
5
|
import { executeHook } from './chunk-BB4KXGBU.js';
|
|
@@ -56,6 +56,8 @@ var MastraLLMBase = class extends MastraBase {
|
|
|
56
56
|
if (p.logger) {
|
|
57
57
|
this.__setLogger(p.logger);
|
|
58
58
|
}
|
|
59
|
+
}
|
|
60
|
+
__registerMastra(p) {
|
|
59
61
|
this.#mastra = p;
|
|
60
62
|
}
|
|
61
63
|
async __text(input) {
|
|
@@ -111,8 +113,8 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
111
113
|
this.#model = model;
|
|
112
114
|
if (mastra) {
|
|
113
115
|
this.#mastra = mastra;
|
|
114
|
-
if (mastra.
|
|
115
|
-
this.__setLogger(mastra.
|
|
116
|
+
if (mastra.getLogger()) {
|
|
117
|
+
this.__setLogger(mastra.getLogger());
|
|
116
118
|
}
|
|
117
119
|
}
|
|
118
120
|
}
|
|
@@ -123,6 +125,8 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
123
125
|
if (p.logger) {
|
|
124
126
|
this.__setLogger(p.logger);
|
|
125
127
|
}
|
|
128
|
+
}
|
|
129
|
+
__registerMastra(p) {
|
|
126
130
|
this.#mastra = p;
|
|
127
131
|
}
|
|
128
132
|
getProvider() {
|
|
@@ -142,6 +146,14 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
142
146
|
memory
|
|
143
147
|
} = {}) {
|
|
144
148
|
this.logger.debug("Starting tool conversion for LLM");
|
|
149
|
+
let mastraProxy = void 0;
|
|
150
|
+
const logger = this.logger;
|
|
151
|
+
if (this.#mastra) {
|
|
152
|
+
mastraProxy = createMastraProxy({
|
|
153
|
+
mastra: this.#mastra,
|
|
154
|
+
logger
|
|
155
|
+
});
|
|
156
|
+
}
|
|
145
157
|
const converted = Object.entries(tools || {}).reduce((memo, value) => {
|
|
146
158
|
const k = value[0];
|
|
147
159
|
const tool = value[1];
|
|
@@ -153,7 +165,7 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
153
165
|
resourceId,
|
|
154
166
|
logger: this.logger,
|
|
155
167
|
memory,
|
|
156
|
-
mastra:
|
|
168
|
+
mastra: mastraProxy
|
|
157
169
|
};
|
|
158
170
|
memo[k] = makeCoreTool(tool, options);
|
|
159
171
|
}
|
|
@@ -627,7 +639,8 @@ var Agent = class extends (_a = MastraBase) {
|
|
|
627
639
|
throw new Error(`LanguageModel is required to create an Agent. Please provide the 'model'.`);
|
|
628
640
|
}
|
|
629
641
|
this.llm = new MastraLLM({
|
|
630
|
-
model: config.model
|
|
642
|
+
model: config.model,
|
|
643
|
+
mastra: config.mastra
|
|
631
644
|
});
|
|
632
645
|
this.tools = {};
|
|
633
646
|
this.metrics = {};
|
|
@@ -636,6 +649,7 @@ var Agent = class extends (_a = MastraBase) {
|
|
|
636
649
|
this.tools = ensureToolProperties(config.tools);
|
|
637
650
|
}
|
|
638
651
|
if (config.mastra) {
|
|
652
|
+
this.__registerMastra(config.mastra);
|
|
639
653
|
this.__registerPrimitives({
|
|
640
654
|
telemetry: config.mastra.getTelemetry(),
|
|
641
655
|
logger: config.mastra.getLogger()
|
|
@@ -688,6 +702,7 @@ var Agent = class extends (_a = MastraBase) {
|
|
|
688
702
|
}
|
|
689
703
|
__registerMastra(mastra) {
|
|
690
704
|
this.#mastra = mastra;
|
|
705
|
+
this.llm.__registerMastra(mastra);
|
|
691
706
|
}
|
|
692
707
|
/**
|
|
693
708
|
* Set the concrete tools for the agent
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var chunkXB2TJ7LX_cjs = require('./chunk-XB2TJ7LX.cjs');
|
|
4
|
-
var
|
|
4
|
+
var chunk4OM3F6KZ_cjs = require('./chunk-4OM3F6KZ.cjs');
|
|
5
5
|
var chunkPL7PVTGF_cjs = require('./chunk-PL7PVTGF.cjs');
|
|
6
6
|
var chunkNPOKIPWC_cjs = require('./chunk-NPOKIPWC.cjs');
|
|
7
7
|
var chunkST5RMVLG_cjs = require('./chunk-ST5RMVLG.cjs');
|
|
@@ -58,6 +58,8 @@ var MastraLLMBase = class extends chunkPL7PVTGF_cjs.MastraBase {
|
|
|
58
58
|
if (p.logger) {
|
|
59
59
|
this.__setLogger(p.logger);
|
|
60
60
|
}
|
|
61
|
+
}
|
|
62
|
+
__registerMastra(p) {
|
|
61
63
|
this.#mastra = p;
|
|
62
64
|
}
|
|
63
65
|
async __text(input) {
|
|
@@ -113,8 +115,8 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
113
115
|
this.#model = model;
|
|
114
116
|
if (mastra) {
|
|
115
117
|
this.#mastra = mastra;
|
|
116
|
-
if (mastra.
|
|
117
|
-
this.__setLogger(mastra.
|
|
118
|
+
if (mastra.getLogger()) {
|
|
119
|
+
this.__setLogger(mastra.getLogger());
|
|
118
120
|
}
|
|
119
121
|
}
|
|
120
122
|
}
|
|
@@ -125,6 +127,8 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
125
127
|
if (p.logger) {
|
|
126
128
|
this.__setLogger(p.logger);
|
|
127
129
|
}
|
|
130
|
+
}
|
|
131
|
+
__registerMastra(p) {
|
|
128
132
|
this.#mastra = p;
|
|
129
133
|
}
|
|
130
134
|
getProvider() {
|
|
@@ -144,6 +148,14 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
144
148
|
memory
|
|
145
149
|
} = {}) {
|
|
146
150
|
this.logger.debug("Starting tool conversion for LLM");
|
|
151
|
+
let mastraProxy = void 0;
|
|
152
|
+
const logger = this.logger;
|
|
153
|
+
if (this.#mastra) {
|
|
154
|
+
mastraProxy = chunk4OM3F6KZ_cjs.createMastraProxy({
|
|
155
|
+
mastra: this.#mastra,
|
|
156
|
+
logger
|
|
157
|
+
});
|
|
158
|
+
}
|
|
147
159
|
const converted = Object.entries(tools || {}).reduce((memo, value) => {
|
|
148
160
|
const k = value[0];
|
|
149
161
|
const tool = value[1];
|
|
@@ -155,9 +167,9 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
155
167
|
resourceId,
|
|
156
168
|
logger: this.logger,
|
|
157
169
|
memory,
|
|
158
|
-
mastra:
|
|
170
|
+
mastra: mastraProxy
|
|
159
171
|
};
|
|
160
|
-
memo[k] =
|
|
172
|
+
memo[k] = chunk4OM3F6KZ_cjs.makeCoreTool(tool, options);
|
|
161
173
|
}
|
|
162
174
|
return memo;
|
|
163
175
|
}, {});
|
|
@@ -218,7 +230,7 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
218
230
|
this.logger.warn("Rate limit approaching, waiting 10 seconds", {
|
|
219
231
|
runId
|
|
220
232
|
});
|
|
221
|
-
await
|
|
233
|
+
await chunk4OM3F6KZ_cjs.delay(10 * 1e3);
|
|
222
234
|
}
|
|
223
235
|
},
|
|
224
236
|
...rest
|
|
@@ -298,7 +310,7 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
298
310
|
this.logger.warn("Rate limit approaching, waiting 10 seconds", {
|
|
299
311
|
runId
|
|
300
312
|
});
|
|
301
|
-
await
|
|
313
|
+
await chunk4OM3F6KZ_cjs.delay(10 * 1e3);
|
|
302
314
|
}
|
|
303
315
|
},
|
|
304
316
|
...rest
|
|
@@ -380,7 +392,7 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
380
392
|
this.logger.warn("Rate limit approaching, waiting 10 seconds", {
|
|
381
393
|
runId
|
|
382
394
|
});
|
|
383
|
-
await
|
|
395
|
+
await chunk4OM3F6KZ_cjs.delay(10 * 1e3);
|
|
384
396
|
}
|
|
385
397
|
},
|
|
386
398
|
onFinish: async props => {
|
|
@@ -479,7 +491,7 @@ var MastraLLM = class extends MastraLLMBase {
|
|
|
479
491
|
this.logger.warn("Rate limit approaching, waiting 10 seconds", {
|
|
480
492
|
runId
|
|
481
493
|
});
|
|
482
|
-
await
|
|
494
|
+
await chunk4OM3F6KZ_cjs.delay(10 * 1e3);
|
|
483
495
|
}
|
|
484
496
|
},
|
|
485
497
|
onFinish: async props => {
|
|
@@ -629,15 +641,17 @@ exports.Agent = class Agent extends (_a = chunkPL7PVTGF_cjs.MastraBase) {
|
|
|
629
641
|
throw new Error(`LanguageModel is required to create an Agent. Please provide the 'model'.`);
|
|
630
642
|
}
|
|
631
643
|
this.llm = new MastraLLM({
|
|
632
|
-
model: config.model
|
|
644
|
+
model: config.model,
|
|
645
|
+
mastra: config.mastra
|
|
633
646
|
});
|
|
634
647
|
this.tools = {};
|
|
635
648
|
this.metrics = {};
|
|
636
649
|
this.evals = {};
|
|
637
650
|
if (config.tools) {
|
|
638
|
-
this.tools =
|
|
651
|
+
this.tools = chunk4OM3F6KZ_cjs.ensureToolProperties(config.tools);
|
|
639
652
|
}
|
|
640
653
|
if (config.mastra) {
|
|
654
|
+
this.__registerMastra(config.mastra);
|
|
641
655
|
this.__registerPrimitives({
|
|
642
656
|
telemetry: config.mastra.getTelemetry(),
|
|
643
657
|
logger: config.mastra.getLogger()
|
|
@@ -690,6 +704,7 @@ exports.Agent = class Agent extends (_a = chunkPL7PVTGF_cjs.MastraBase) {
|
|
|
690
704
|
}
|
|
691
705
|
__registerMastra(mastra) {
|
|
692
706
|
this.#mastra = mastra;
|
|
707
|
+
this.llm.__registerMastra(mastra);
|
|
693
708
|
}
|
|
694
709
|
/**
|
|
695
710
|
* Set the concrete tools for the agent
|
|
@@ -953,7 +968,7 @@ exports.Agent = class Agent extends (_a = chunkPL7PVTGF_cjs.MastraBase) {
|
|
|
953
968
|
let mastraProxy = void 0;
|
|
954
969
|
const logger = this.logger;
|
|
955
970
|
if (this.#mastra) {
|
|
956
|
-
mastraProxy =
|
|
971
|
+
mastraProxy = chunk4OM3F6KZ_cjs.createMastraProxy({
|
|
957
972
|
mastra: this.#mastra,
|
|
958
973
|
logger
|
|
959
974
|
});
|
|
@@ -972,7 +987,7 @@ exports.Agent = class Agent extends (_a = chunkPL7PVTGF_cjs.MastraBase) {
|
|
|
972
987
|
memory,
|
|
973
988
|
agentName: this.name
|
|
974
989
|
};
|
|
975
|
-
memo[k] =
|
|
990
|
+
memo[k] = chunk4OM3F6KZ_cjs.makeCoreTool(tool, options);
|
|
976
991
|
}
|
|
977
992
|
return memo;
|
|
978
993
|
}, {});
|
|
@@ -1031,7 +1046,7 @@ exports.Agent = class Agent extends (_a = chunkPL7PVTGF_cjs.MastraBase) {
|
|
|
1031
1046
|
logger: this.logger,
|
|
1032
1047
|
agentName: this.name
|
|
1033
1048
|
};
|
|
1034
|
-
toolsFromToolsetsConverted[toolName] =
|
|
1049
|
+
toolsFromToolsetsConverted[toolName] = chunk4OM3F6KZ_cjs.makeCoreTool(toolObj, options, "toolset");
|
|
1035
1050
|
});
|
|
1036
1051
|
});
|
|
1037
1052
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkYLLXAKL2_cjs = require('./chunk-YLLXAKL2.cjs');
|
|
4
4
|
var cohereAi = require('cohere-ai');
|
|
5
5
|
|
|
6
6
|
var CohereRelevanceScorer = class {
|
|
@@ -38,7 +38,7 @@ Relevance score (0-1):`;
|
|
|
38
38
|
var MastraAgentRelevanceScorer = class {
|
|
39
39
|
agent;
|
|
40
40
|
constructor(name, model) {
|
|
41
|
-
this.agent = new
|
|
41
|
+
this.agent = new chunkYLLXAKL2_cjs.Agent({
|
|
42
42
|
name: `Relevance Scorer ${name}`,
|
|
43
43
|
instructions: `You are a specialized agent for evaluating the relevance of text to queries.
|
|
44
44
|
Your task is to rate how well a text passage answers a given query.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createMastraProxy } from './chunk-
|
|
1
|
+
import { createMastraProxy } from './chunk-3OXCRLRW.js';
|
|
2
2
|
import { MastraBase } from './chunk-VN4M67DA.js';
|
|
3
3
|
import { context, trace } from '@opentelemetry/api';
|
|
4
4
|
import EventEmitter from 'node:events';
|
|
@@ -1995,7 +1995,8 @@ var Workflow = class extends MastraBase {
|
|
|
1995
1995
|
if (activeRun) {
|
|
1996
1996
|
return activeRun.resume({ stepId, context: resumeContext });
|
|
1997
1997
|
}
|
|
1998
|
-
|
|
1998
|
+
const run = this.createRun({ runId });
|
|
1999
|
+
return run.resume({ stepId, context: resumeContext });
|
|
1999
2000
|
}
|
|
2000
2001
|
watch(onTransition) {
|
|
2001
2002
|
this.logger.warn(`Please use 'watch' on the 'createRun' call instead, watch is deprecated`);
|
package/dist/eval/index.d.cts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { M as Metric, T as TestInfo, a as MetricResult } from '../types-CwTG2XyQ.cjs';
|
|
2
|
-
import { A as Agent } from '../base-
|
|
2
|
+
import { A as Agent } from '../base-DbCjWM67.cjs';
|
|
3
3
|
import 'ai';
|
|
4
4
|
import '../base-ObPJ-w8K.cjs';
|
|
5
5
|
import '@opentelemetry/api';
|
package/dist/eval/index.d.ts
CHANGED