@mastra/core 0.1.27-alpha.75 → 0.1.27-alpha.76

package/dist/core.esm.js

@@ -557,7 +557,11 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
       this.log(LogLevel.DEBUG, "Initializing Azure model " + (model.name || 'gpt-35-turbo-instruct'));
       var azure = createAzure({
         resourceName: process.env.AZURE_RESOURCE_NAME || '',
-        apiKey: (model == null ? void 0 : model.apiKey) || process.env.AZURE_API_KEY || ''
+        apiKey: (model == null ? void 0 : model.apiKey) || process.env.AZURE_API_KEY || '',
+        apiVersion: model == null ? void 0 : model.apiVersion,
+        baseURL: model == null ? void 0 : model.baseURL,
+        headers: model == null ? void 0 : model.headers,
+        fetch: model == null ? void 0 : model.fetch
       });
       modelDef = azure(model.name || 'gpt-35-turbo-instruct');
     } else if (model.type === 'amazon') {
@@ -824,14 +828,7 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
               tools: Object.keys(tools || convertedTools || {})
             });
             if ('name' in model) {
-              modelToPass = {
-                type: this.getModelType(),
-                name: model.name,
-                toolChoice: model.toolChoice,
-                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
-                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
-                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
-              };
+              modelToPass = this.__getNamedModel();
             } else {
               modelToPass = model;
             }
@@ -901,6 +898,21 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
     }
     return __text;
   }();
+  _proto.__getNamedModel = function __getNamedModel() {
+    var model = _classPrivateFieldLooseBase(this, _model)[_model];
+    if (!('name' in model)) {
+      throw new Error('Model name is required');
+    }
+    return {
+      type: this.getModelType(),
+      name: model.name,
+      toolChoice: model.toolChoice,
+      apiKey: model == null ? void 0 : model.apiKey,
+      baseURL: model == null ? void 0 : model.baseURL,
+      headers: model == null ? void 0 : model.headers,
+      fetch: model == null ? void 0 : model.fetch
+    };
+  };
   _proto.__textObject = /*#__PURE__*/function () {
     var _textObject = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref9) {
       var _this4 = this;
@@ -914,14 +926,7 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
               runId: runId
             });
             if ('name' in model) {
-              modelToPass = {
-                type: this.getModelType(),
-                name: model.name,
-                toolChoice: model.toolChoice,
-                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
-                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
-                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
-              };
+              modelToPass = this.__getNamedModel();
             } else {
               modelToPass = model;
             }
@@ -1017,14 +1022,7 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
               runId: runId
             });
             if ('name' in model) {
-              modelToPass = {
-                type: this.getModelType(),
-                name: model.name,
-                toolChoice: model.toolChoice,
-                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
-                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
-                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
-              };
+              modelToPass = this.__getNamedModel();
             } else {
               modelToPass = model;
             }
@@ -1132,14 +1130,7 @@ var LLM = (_model = /*#__PURE__*/_classPrivateFieldLooseKey("model"), /*#__PURE_
               runId: runId
             });
             if ('name' in model) {
-              modelToPass = {
-                type: this.getModelType(),
-                name: model.name,
-                toolChoice: model.toolChoice,
-                apiKey: model.provider !== 'LM_STUDIO' ? model == null ? void 0 : model.apiKey : undefined,
-                baseURL: model.provider === 'LM_STUDIO' ? model.baseURL : undefined,
-                fetch: model.provider === 'BASETEN' ? model.fetch : undefined
-              };
+              modelToPass = this.__getNamedModel();
             } else {
               modelToPass = model;
             }
@@ -4009,13 +4000,13 @@ var MastraMemory = /*#__PURE__*/function (_MastraBase) {
 
 // Cohere implementation
 var CohereRelevanceScorer = /*#__PURE__*/function () {
-  function CohereRelevanceScorer(apiKey, model) {
+  function CohereRelevanceScorer(model, apiKey) {
     this.client = void 0;
     this.model = void 0;
     this.client = new CohereClient({
-      token: apiKey
+      token: apiKey || process.env.COHERE_API_KEY || ''
     });
-    this.model = model || 'rerank-v3.5';
+    this.model = model;
   }
   var _proto = CohereRelevanceScorer.prototype;
   _proto.getRelevanceScore = /*#__PURE__*/function () {
@@ -4055,12 +4046,15 @@ function createSimilarityPrompt(query, text) {
 
 // Mastra Agent implementation
 var MastraAgentRelevanceScorer = /*#__PURE__*/function () {
-  function MastraAgentRelevanceScorer(provider, name) {
+  function MastraAgentRelevanceScorer(provider, name, model) {
     this.agent = void 0;
-    var modelConfig = {
-      provider: provider,
+    var modelConfig = _extends({
+      provider: provider
+    }, model ? {
+      model: model
+    } : {
       name: name
-    };
+    });
     this.agent = new Agent({
       name: "Relevance Scorer " + provider + " " + name,
       instructions: "You are a specialized agent for evaluating the relevance of text to queries.\nYour task is to rate how well a text passage answers a given query.\nOutput only a number between 0 and 1, where:\n1.0 = Perfectly relevant, directly answers the query\n0.0 = Completely irrelevant\nConsider:\n- Direct relevance to the question\n- Completeness of information\n- Quality and specificity\nAlways return just the number, no explanation.",