@mastra/core 0.1.27-alpha.66 → 0.1.27-alpha.68

package/dist/agent/index.d.ts

@@ -1,4 +1,4 @@
-import { CoreAssistantMessage, CoreMessage, CoreToolMessage, CoreUserMessage, UserContent } from 'ai';
+import { CoreAssistantMessage, CoreMessage, CoreToolMessage, CoreUserMessage } from 'ai';
 import { JSONSchema7 } from 'json-schema';
 import { ZodSchema } from 'zod';
 import 'dotenv/config';
@@ -68,7 +68,7 @@ export declare class Agent<TTools extends Record<string, ToolAction<any, any, an
         threadId?: string;
         context?: CoreMessage[];
         runId?: string;
-        messages: UserContent[];
+        messages: CoreMessage[];
     }): {
         before: () => Promise<{
             messageObjects: CoreMessage[];

package/dist/agent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/agent/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,WAAW,EACX,eAAe,EACf,eAAe,EAIhB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAK,SAAS,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,eAAe,CAAC;AAEvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAIrF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,qBAIa,KAAK,CAChB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAC9G,SAAQ,UAAU;;IACX,IAAI,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAE5B,KAAK,EAAE,MAAM,CAAC;gBAEF,MAAM,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,WAAW,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,gBAAgB,CAAC;KAC3B;IAuBD,oBAAoB,CAAC,CAAC,EAAE,gBAAgB;IAYxC;;;OAGG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM;IAKlB,4BAA4B,CAAC,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,eAAe,CAAA;KAAE;IAwB5E,wBAAwB,CAAC,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC;IAK/C,QAAQ,CAAC,WAAW,EAAE,eAAe,GAAG,SAAS;IAcjD,UAAU,CAAC,EACf,QAAQ,EACR,UAAU,EACV,YAAY,GACb,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB;;;;IAwHK,YAAY,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAyE1F,wBAAwB,CACtB,QAAQ,EAAE,KAAK,CAAC,eAAe,GAAG,oBAAoB,CAAC,GACtD,KAAK,CAAC,eAAe,GAAG,oBAAoB,CAAC;IAmChD,YAAY,CAAC,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,GACN,EAAE;QACD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;IAuFtB,UAAU,CAAC,EACf,UAAU,EACV,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,WAAW,EAAE,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;KACpB;;;;IAeD,WAAW,CAAC,EACV,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,UAAU,EACV,KAAK,EACL,QAAQ,GACT,EAAE;QACD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,WAAW,EAAE,CAAC;KACzB;;;;sBAkDyE,MAAM;;sCAExC;YAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE;;IA8BnF,QAAQ,CAAC,CAAC,SAAS,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,EACtE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,WAAW,EAAE,EAC3C,EACE,OAAO,EACP,QAAQ,EAAE,YAAY,EACtB,UAAU,EACV,QAAY,EACZ,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,MAAe,GAChB,GAAE;QACD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC;KACpB,GACL,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAsEvB,MAAM,CAAC,CAAC,SAAS,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,EACpE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,WAAW,EAAE,EAC3C,EACE,OAAO,EACP,QAAQ,EAAE,YAAY,EACtB,UAAU,EACV,QAAY,EACZ,QAAQ,EACR,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,MAAe,GAChB,GAAE;QACD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACpD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC;KACpB,GACL,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAoF5B"}

package/dist/core.cjs.development.js

@@ -26,12 +26,12 @@ var resources = require('@opentelemetry/resources');
 var sdkNode = require('@opentelemetry/sdk-node');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
+var dotenv = require('dotenv');
 var voyageAiProvider = require('voyage-ai-provider');
 var cohereAi = require('cohere-ai');
 var radash = require('radash');
 var sift = require('sift');
 var xstate = require('xstate');
-var dotenv = require('dotenv');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -1332,7 +1332,8 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
       COHERE: 'cohere',
       AZURE: 'azure',
       AMAZON: 'amazon',
-      ANTHROPIC_VERTEX: 'anthropic-vertex'
+      ANTHROPIC_VERTEX: 'anthropic-vertex',
+      DEEPSEEK: 'deepseek'
     };
     var type = (_providerToType$model = providerToType[model.provider]) != null ? _providerToType$model : model.provider;
     this.log(LogLevel.DEBUG, "Model type resolved to " + type + " for provider " + model.provider);
@@ -1481,6 +1482,14 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
         apiKey: (_process$env$ANTHROPI = process.env.ANTHROPIC_API_KEY) != null ? _process$env$ANTHROPI : ''
       });
       modelDef = anthropicVertex(model.name || 'claude-3-5-sonnet@20240620');
+    } else if (model.type === 'deepseek') {
+      this.log(LogLevel.DEBUG, "Initializing Deepseek model " + (model.name || 'deepseek-chat'));
+      modelDef = this.createOpenAICompatibleModel({
+        baseURL: 'https://api.deepseek.com/v1/',
+        apiKey: (model == null ? void 0 : model.apiKey) || process.env.DEEPSEEK_API_KEY || '',
+        defaultModelName: 'deepseek-chat',
+        modelName: model.name
+      });
     } else {
       var _error2 = "Invalid model type: " + model.type;
       this.logger.error(_error2);
@@ -2940,7 +2949,7 @@ exports.Agent = (_mastra$1 = /*#__PURE__*/_classPrivateFieldLooseKey("mastra"),
       before: function () {
         var _before = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
           var _classPrivateFieldLoo6, _classPrivateFieldLoo7, _classPrivateFieldLoo8, _classPrivateFieldLoo9;
-          var systemMessage, userMessages, coreMessages, convertedTools, threadIdToUse, preExecuteResult, messageObjects;
+          var systemMessage, coreMessages, threadIdToUse, preExecuteResult, convertedTools, messageObjects;
           return _regeneratorRuntime().wrap(function _callee8$(_context9) {
             while (1) switch (_context9.prev = _context9.next) {
               case 0:
@@ -2951,36 +2960,30 @@ exports.Agent = (_mastra$1 = /*#__PURE__*/_classPrivateFieldLooseKey("mastra"),
                   role: 'system',
                   content: _this4.instructions + ". Today's date is " + new Date().toISOString()
                 };
-                userMessages = messages.map(function (content) {
-                  return {
-                    role: 'user',
-                    content: content
-                  };
-                });
-                coreMessages = userMessages;
+                coreMessages = messages;
                 threadIdToUse = threadId;
                 if (!((_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(_this4, _mastra$1)[_mastra$1]) != null && _classPrivateFieldLoo6.memory && resourceid)) {
-                  _context9.next = 13;
+                  _context9.next = 12;
                   break;
                 }
-                _context9.next = 8;
+                _context9.next = 7;
                 return _this4.preExecute({
                   resourceid: resourceid,
                   runId: runId,
                   threadId: threadIdToUse,
-                  messages: userMessages
+                  messages: messages
                 });
-              case 8:
+              case 7:
                 preExecuteResult = _context9.sent;
                 coreMessages = preExecuteResult.coreMessages;
                 threadIdToUse = preExecuteResult.threadIdToUse;
-                _context9.next = 14;
+                _context9.next = 13;
                 break;
-              case 13:
+              case 12:
                 _this4.log(LogLevel.DEBUG, "No memory or resourceid, skipping save to memory for agent " + _this4.name, {
                   runId: _this4.name
                 });
-              case 14:
+              case 13:
                 if (toolsets && Object.keys(toolsets || {}).length > 0 || (_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(_this4, _mastra$1)[_mastra$1]) != null && _classPrivateFieldLoo7.memory && resourceid || (_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(_this4, _mastra$1)[_mastra$1]) != null && _classPrivateFieldLoo8.engine || (_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(_this4, _mastra$1)[_mastra$1]) != null && _classPrivateFieldLoo9.syncs) {
                   convertedTools = _this4.convertTools({
                     toolsets: toolsets,
@@ -2998,7 +3001,7 @@ exports.Agent = (_mastra$1 = /*#__PURE__*/_classPrivateFieldLooseKey("mastra"),
                   convertedTools: convertedTools,
                   threadId: threadIdToUse
                 });
-              case 17:
+              case 16:
               case "end":
                 return _context9.stop();
             }
@@ -3071,15 +3074,21 @@ exports.Agent = (_mastra$1 = /*#__PURE__*/_classPrivateFieldLooseKey("mastra"),
           case 0:
             _ref9 = _temp === void 0 ? {} : _temp, context = _ref9.context, threadIdInFn = _ref9.threadId, resourceid = _ref9.resourceid, _ref9$maxSteps = _ref9.maxSteps, maxSteps = _ref9$maxSteps === void 0 ? 5 : _ref9$maxSteps, onStepFinish = _ref9.onStepFinish, runId = _ref9.runId, toolsets = _ref9.toolsets, _ref9$output = _ref9.output, output = _ref9$output === void 0 ? 'text' : _ref9$output;
             messagesToUse = [];
-            if (Array.isArray(messages)) {
-              messagesToUse = messages.map(function (content) {
-                if (typeof content === 'string') {
-                  return content;
+            if (typeof messages === "string") {
+              messagesToUse = [{
+                role: 'user',
+                content: messages
+              }];
+            } else {
+              messagesToUse = messages.map(function (message) {
+                if (typeof message === "string") {
+                  return {
+                    role: 'user',
+                    content: message
+                  };
                 }
-                return content.content;
+                return message;
               });
-            } else {
-              messagesToUse = [messages];
             }
             _this$__primitive = this.__primitive({
               messages: messagesToUse,
@@ -3164,15 +3173,21 @@ exports.Agent = (_mastra$1 = /*#__PURE__*/_classPrivateFieldLooseKey("mastra"),
           case 0:
             _ref10 = _temp2 === void 0 ? {} : _temp2, context = _ref10.context, threadIdInFn = _ref10.threadId, resourceid = _ref10.resourceid, _ref10$maxSteps = _ref10.maxSteps, maxSteps = _ref10$maxSteps === void 0 ? 5 : _ref10$maxSteps, _onFinish = _ref10.onFinish, onStepFinish = _ref10.onStepFinish, runId = _ref10.runId, toolsets = _ref10.toolsets, _ref10$output = _ref10.output, output = _ref10$output === void 0 ? 'text' : _ref10$output;
             messagesToUse = [];
-            if (Array.isArray(messages)) {
-              messagesToUse = messages.map(function (content) {
-                if (typeof content === 'string') {
-                  return content;
+            if (typeof messages === "string") {
+              messagesToUse = [{
+                role: 'user',
+                content: messages
+              }];
+            } else {
+              messagesToUse = messages.map(function (message) {
+                if (typeof message === "string") {
+                  return {
+                    role: 'user',
+                    content: message
+                  };
                 }
-                return content.content;
+                return message;
               });
-            } else {
-              messagesToUse = [messages];
             }
             _this$__primitive2 = this.__primitive({
               messages: messagesToUse,
@@ -3307,6 +3322,75 @@ exports.Agent = /*#__PURE__*/tslib.__decorate([/*#__PURE__*/InstrumentClass({
   excludeMethods: ['__setTools', '__setLogger', '__setTelemetry', 'log']
 }), /*#__PURE__*/tslib.__metadata("design:paramtypes", [Object])], exports.Agent);
 
+var MastraDeployer = /*#__PURE__*/function () {
+  function MastraDeployer(_ref) {
+    var scope = _ref.scope,
+      env = _ref.env,
+      projectName = _ref.projectName;
+    this.scope = void 0;
+    this.projectName = void 0;
+    this.env = void 0;
+    this.scope = scope;
+    this.env = env;
+    this.projectName = projectName;
+  }
+  var _proto = MastraDeployer.prototype;
+  _proto.loadEnvVars = function loadEnvVars() {
+    var _this = this;
+    this.getEnvFiles().forEach(function (file) {
+      var content = fs.readFileSync(file, 'utf-8');
+      var config = dotenv.parse(content);
+      _this.env = _extends({}, _this.env, config);
+    });
+  };
+  _proto.getEnvFiles = function getEnvFiles() {
+    var envFiles = ['.env', '.env.production'].map(function (file) {
+      return path.join(process.cwd(), file);
+    }).filter(function (file) {
+      return fs.existsSync(file);
+    });
+    return envFiles;
+  };
+  _proto.parseEnvFile = function parseEnvFile(filePath) {
+    var content = fs.readFileSync(filePath, 'utf-8');
+    return content.split('\n').map(function (line) {
+      return line.trim();
+    }).filter(function (line) {
+      return line && !line.startsWith('#');
+    }).filter(function (line) {
+      return line.includes('=');
+    }); // Only include valid KEY=value pairs
+  };
+  _proto.writeFiles = function writeFiles(_ref2) {
+    var dir = _ref2.dir;
+    console.log('Writing files to', dir);
+  };
+  _proto.writeIndex = function writeIndex(_ref3) {
+    var dir = _ref3.dir;
+    console.log('Writing index to', dir);
+  };
+  _proto.deploy = /*#__PURE__*/function () {
+    var _deploy = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref4) {
+      var dir, siteId;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            dir = _ref4.dir, siteId = _ref4.siteId;
+            console.log("Deploy command " + this.scope + "..." + (siteId || '') + " to " + dir + " " + (this.projectName || 'mastra-starter'));
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function deploy(_x) {
+      return _deploy.apply(this, arguments);
+    }
+    return deploy;
+  }();
+  return MastraDeployer;
+}();
+
 function embed(_x, _x2) {
   return _embed.apply(this, arguments);
 }
@@ -6813,75 +6897,6 @@ function executeHook(hook, data) {
   });
 }
 
-var MastraDeployer = /*#__PURE__*/function () {
-  function MastraDeployer(_ref) {
-    var scope = _ref.scope,
-      env = _ref.env,
-      projectName = _ref.projectName;
-    this.scope = void 0;
-    this.projectName = void 0;
-    this.env = void 0;
-    this.scope = scope;
-    this.env = env;
-    this.projectName = projectName;
-  }
-  var _proto = MastraDeployer.prototype;
-  _proto.loadEnvVars = function loadEnvVars() {
-    var _this = this;
-    this.getEnvFiles().forEach(function (file) {
-      var content = fs.readFileSync(file, 'utf-8');
-      var config = dotenv.parse(content);
-      _this.env = _extends({}, _this.env, config);
-    });
-  };
-  _proto.getEnvFiles = function getEnvFiles() {
-    var envFiles = ['.env', '.env.production'].map(function (file) {
-      return path.join(process.cwd(), file);
-    }).filter(function (file) {
-      return fs.existsSync(file);
-    });
-    return envFiles;
-  };
-  _proto.parseEnvFile = function parseEnvFile(filePath) {
-    var content = fs.readFileSync(filePath, 'utf-8');
-    return content.split('\n').map(function (line) {
-      return line.trim();
-    }).filter(function (line) {
-      return line && !line.startsWith('#');
-    }).filter(function (line) {
-      return line.includes('=');
-    }); // Only include valid KEY=value pairs
-  };
-  _proto.writeFiles = function writeFiles(_ref2) {
-    var dir = _ref2.dir;
-    console.log('Writing files to', dir);
-  };
-  _proto.writeIndex = function writeIndex(_ref3) {
-    var dir = _ref3.dir;
-    console.log('Writing index to', dir);
-  };
-  _proto.deploy = /*#__PURE__*/function () {
-    var _deploy = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref4) {
-      var dir, siteId;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            dir = _ref4.dir, siteId = _ref4.siteId;
-            console.log("Deploy command " + this.scope + "..." + (siteId || '') + " to " + dir + " " + (this.projectName || 'mastra-starter'));
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, this);
-    }));
-    function deploy(_x) {
-      return _deploy.apply(this, arguments);
-    }
-    return deploy;
-  }();
-  return MastraDeployer;
-}();
-
 exports.BaseLogger = BaseLogger;
 exports.CohereRelevanceScorer = CohereRelevanceScorer;
 exports.ConsoleLogger = ConsoleLogger;