@memberjunction/ai-mistral 2.29.2 → 2.31.0

package/dist/models/mistral.d.ts

@@ -1,21 +1,12 @@
 import { BaseLLM, ChatParams, ChatResult, ClassifyParams, ClassifyResult, SummarizeParams, SummarizeResult } from '@memberjunction/ai';
-import { MistralClient } from './mistralClient';
-import { ListModelsResponse } from '../generic/mistral.types';
+import { Mistral } from "@mistralai/mistralai";
 export declare class MistralLLM extends BaseLLM {
     private _client;
     constructor(apiKey: string);
-    get client(): MistralClient;
-    ChatCompletion(params: MistralChatParams): Promise<ChatResult>;
+    get Client(): Mistral;
+    ChatCompletion(params: ChatParams): Promise<ChatResult>;
     SummarizeText(params: SummarizeParams): Promise<SummarizeResult>;
     ClassifyText(params: ClassifyParams): Promise<ClassifyResult>;
-    /**
-     * Returns a list of available models
-     * @returns {Promise<AvailableModelInfo>}
-     */
-    listModels(): Promise<ListModelsResponse>;
-}
-export declare class MistralChatParams extends ChatParams {
-    model: string;
 }
 export declare function LoadMistralLLM(): void;
 //# sourceMappingURL=mistral.d.ts.map

package/dist/models/mistral.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mistral.d.ts","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAoB,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEzJ,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAgC,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE5F,qBACa,UAAW,SAAQ,OAAO;IACnC,OAAO,CAAC,OAAO,CAAgB;gBACnB,MAAM,EAAE,MAAM;IAK1B,IAAW,MAAM,IAAI,aAAa,CAAuB;IAE5C,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IA0C9D,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAI1E;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAIzD;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAC7C,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,cAAc,SAE7B"}
+{"version":3,"file":"mistral.d.ts","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAoB,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEzJ,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAG/C,qBACa,UAAW,SAAQ,OAAO;IACnC,OAAO,CAAC,OAAO,CAAU;gBAEb,MAAM,EAAE,MAAM;IAO1B,IAAW,MAAM,IAAI,OAAO,CAAuB;IAEtC,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IA4DvD,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAIhE,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;CAG7E;AAED,wBAAgB,cAAc,SAE7B"}

package/dist/models/mistral.js

@@ -6,32 +6,47 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadMistralLLM = exports.MistralChatParams = exports.MistralLLM = void 0;
+exports.LoadMistralLLM = exports.MistralLLM = void 0;
 const ai_1 = require("@memberjunction/ai");
 const global_1 = require("@memberjunction/global");
-const mistralClient_1 = require("./mistralClient");
+const mistralai_1 = require("@mistralai/mistralai");
 let MistralLLM = class MistralLLM extends ai_1.BaseLLM {
     constructor(apiKey) {
         super(apiKey);
-        this._client = new mistralClient_1.MistralClient({ apiKey });
+        this._client = new mistralai_1.Mistral({
+            apiKey: apiKey
+        });
     }
-    get client() { return this._client; }
+    get Client() { return this._client; }
     async ChatCompletion(params) {
         const startTime = new Date();
-        const chatResponse = await this.client.chat({
+        let responseFormat = undefined;
+        if (params.responseFormat) {
+            if (params.responseFormat === 'JSON') {
+                responseFormat = { type: "json_object" };
+            }
+        }
+        const chatResponse = await this.Client.chat.complete({
             model: params.model,
             messages: params.messages,
-            max_tokens: params.maxOutputTokens,
-            response_format: params.responseFormat
+            maxTokens: params.maxOutputTokens,
+            responseFormat: responseFormat
         });
         const endTime = new Date();
         let choices = chatResponse.choices.map((choice) => {
+            let content = "";
+            if (choice.message.content && typeof choice.message.content === 'string') {
+                content = choice.message.content;
+            }
+            else if (choice.message.content && Array.isArray(choice.message.content)) {
+                content = choice.message.content.join(' ');
+            }
             const res = {
                 message: {
                     role: 'assistant',
-                    content: choice.message.content
+                    content: content
                 },
-                finish_reason: choice.finish_reason,
+                finish_reason: choice.finishReason,
                 index: choice.index
             };
             return res;
@@ -45,9 +60,9 @@ let MistralLLM = class MistralLLM extends ai_1.BaseLLM {
             data: {
                 choices: choices,
                 usage: {
-                    totalTokens: chatResponse.usage.total_tokens,
-                    promptTokens: chatResponse.usage.prompt_tokens,
-                    completionTokens: chatResponse.usage.completion_tokens
+                    totalTokens: chatResponse.usage.totalTokens,
+                    promptTokens: chatResponse.usage.promptTokens,
+                    completionTokens: chatResponse.usage.completionTokens
                 }
             },
             errorMessage: "",
@@ -60,22 +75,11 @@ let MistralLLM = class MistralLLM extends ai_1.BaseLLM {
     async ClassifyText(params) {
         throw new Error("Method not implemented.");
     }
-    /**
-     * Returns a list of available models
-     * @returns {Promise<AvailableModelInfo>}
-     */
-    async listModels() {
-        const listModelsResponse = await this.client.listModels();
-        return listModelsResponse;
-    }
 };
 exports.MistralLLM = MistralLLM;
 exports.MistralLLM = MistralLLM = __decorate([
     (0, global_1.RegisterClass)(ai_1.BaseLLM, "MistralLLM")
 ], MistralLLM);
-class MistralChatParams extends ai_1.ChatParams {
-}
-exports.MistralChatParams = MistralChatParams;
 function LoadMistralLLM() {
     // this does nothing but prevents the class from being removed by the tree shaker
 }

package/dist/models/mistral.js.map

@@ -1 +1 @@
-{"version":3,"file":"mistral.js","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyJ;AACzJ,mDAAuD;AACvD,mDAAgD;AAIzC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,YAAO;IAEnC,YAAY,MAAc;QACtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,IAAI,6BAAa,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAW,MAAM,KAAmB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC;IAElD,KAAK,CAAC,cAAc,CAAC,MAAyB;QACjD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,eAAe;YAClC,eAAe,EAAE,MAAM,CAAC,cAAc;SACzC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAE3B,IAAI,OAAO,GAAuB,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAoC,EAAE,EAAE;YAChG,MAAM,GAAG,GAAqB;gBAC1B,OAAO,EAAE;oBACL,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;iBAClC;gBACD,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,KAAK,EAAE,MAAM,CAAC,KAAK;aACtB,CAAC;YACF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE;YACpD,IAAI,EAAE;gBACF,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,YAAY;oBAC5C,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,aAAa;oBAC9C,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,iBAAiB;iBACzD;aACJ;YACD,YAAY,EAAE,EAAE;YAChB,SAAS,EAAE,IAAI;SAClB,CAAA;IAEL,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,MAAuB;QAC9C,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,MAAsB;QAC5C,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,UAAU;QACnB,MAAM,kBAAkB,GAAuB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC9E,OAAO,kBAAkB,CAAC;IAC9B,CAAC;CACJ,CAAA;AAnEY,gCAAU;qBAAV,UAAU;IADtB,IAAA,sBAAa,EAAC,YAAO,EAAE,YAAY,CAAC;GACxB,UAAU,CAmEtB;AAED,MAAa,iBAAkB,SAAQ,eAAU;CAEhD;AAFD,8CAEC;AAED,SAAgB,cAAc;IAC1B,iFAAiF;AACrF,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"mistral.js","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":"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"}

package/dist/models/mistralEmbedding.d.ts

@@ -1,9 +1,9 @@
 import { EmbedTextParams, EmbedTextsParams, Embeddings, EmbedTextResult, EmbedTextsResult } from "@memberjunction/ai";
-import { MistralClient } from './mistralClient';
+import { Mistral } from "@mistralai/mistralai";
 export declare class MistralEmbedding extends Embeddings {
     private _client;
     constructor(apiKey: string);
-    get Client(): MistralClient;
+    get Client(): Mistral;
     /**
      * Mistral AI embedding endpoint outputs vectors in 1024 dimensions
      */

package/dist/models/mistralEmbedding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mistralEmbedding.d.ts","sourceRoot":"","sources":["../../src/models/mistralEmbedding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,UAAU,EAAc,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAElI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,qBACa,gBAAiB,SAAQ,UAAU;IAC5C,OAAO,CAAC,OAAO,CAAgB;gBAEnB,MAAM,EAAE,MAAM;IAK1B,IAAW,MAAM,IAAI,aAAa,CAAyB;IAE3D;;OAEG;IACU,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAezE;;OAEG;IACU,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW/D,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC;CAKlD;AAED,wBAAgB,oBAAoB,SAEnC"}
+{"version":3,"file":"mistralEmbedding.d.ts","sourceRoot":"","sources":["../../src/models/mistralEmbedding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,UAAU,EAAc,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAElI,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAI/C,qBACa,gBAAiB,SAAQ,UAAU;IAC5C,OAAO,CAAC,OAAO,CAAU;gBAET,MAAM,EAAE,MAAM;IAO1B,IAAW,MAAM,IAAI,OAAO,CAAuB;IAEvD;;OAEG;IACU,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAoBzE;;OAEG;IACU,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiB/D,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC;CAIlD;AAED,wBAAgB,oBAAoB,SAEnC"}

package/dist/models/mistralEmbedding.js

@@ -9,19 +9,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadMistralEmbedding = exports.MistralEmbedding = void 0;
 const ai_1 = require("@memberjunction/ai");
 const global_1 = require("@memberjunction/global");
-const mistralClient_1 = require("./mistralClient");
+const mistralai_1 = require("@mistralai/mistralai");
 let MistralEmbedding = class MistralEmbedding extends ai_1.Embeddings {
     constructor(apiKey) {
         super(apiKey);
-        this._client = new mistralClient_1.MistralClient({ apiKey });
+        this._client = new mistralai_1.Mistral({
+            apiKey: apiKey
+        });
     }
     get Client() { return this._client; }
     /**
      * Mistral AI embedding endpoint outputs vectors in 1024 dimensions
      */
     async EmbedText(params) {
+        const request = {
+            inputs: params.text,
+            model: params.model || "mistral-embed",
+        };
         params.model = params.model || "mistral-embed";
-        const response = await this.Client.embeddings(params.model, [params.text]);
+        const response = await this.Client.embeddings.create(request);
         let vector = [];
         if (response.data.length > 0) {
             vector = response.data[0].embedding;
@@ -29,7 +35,7 @@ let MistralEmbedding = class MistralEmbedding extends ai_1.Embeddings {
         return {
             object: response.object,
             model: response.model,
-            ModelUsage: new ai_1.ModelUsage(response.usage.prompt_tokens, response.usage.completion_tokens),
+            ModelUsage: new ai_1.ModelUsage(response.usage.promptTokens, response.usage.completionTokens),
             vector: vector
         };
     }
@@ -37,18 +43,21 @@ let MistralEmbedding = class MistralEmbedding extends ai_1.Embeddings {
      * Mistral AI embedding endpoint outputs vectors in 1024 dimensions
      */
     async EmbedTexts(params) {
+        const request = {
+            inputs: params.texts,
+            model: params.model || "mistral-embed",
+        };
         params.model = params.model || "mistral-embed";
-        const response = await this.Client.embeddings(params.model, params.texts);
+        const response = await this.Client.embeddings.create(request);
         return {
             object: response.object,
             model: response.model,
-            ModelUsage: new ai_1.ModelUsage(response.usage.prompt_tokens, response.usage.completion_tokens),
+            ModelUsage: new ai_1.ModelUsage(response.usage.promptTokens, response.usage.completionTokens),
             vectors: response.data.map((data) => data.embedding)
         };
     }
     async GetEmbeddingModels() {
-        let allModels = await this.Client.listModels();
-        allModels.data = allModels.data.filter((model) => model.id.toLowerCase().includes('embed'));
+        let allModels = await this.Client.models.list();
         return allModels;
     }
 };

package/dist/models/mistralEmbedding.js.map

@@ -1 +1 @@
-{"version":3,"file":"mistralEmbedding.js","sourceRoot":"","sources":["../../src/models/mistralEmbedding.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAkI;AAClI,mDAAuD;AACvD,mDAAgD;AAKzC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,eAAU;IAG5C,YAAY,MAAc;QACtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,IAAI,6BAAa,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAW,MAAM,KAAoB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3D;;OAEG;IACI,KAAK,CAAC,SAAS,CAAC,MAAuB;QAC1C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC;QAC/C,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9F,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;YAC1B,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,OAAO;YACH,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,UAAU,EAAE,IAAI,eAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC1F,MAAM,EAAE,MAAM;SACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU,CAAC,MAAwB;QAC5C,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC;QAC/C,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7F,OAAO;YACH,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,UAAU,EAAE,IAAI,eAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC1F,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;SACvD,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC3B,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC/C,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA/CY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,sBAAa,EAAC,eAAU,EAAE,kBAAkB,CAAC;GACjC,gBAAgB,CA+C5B;AAED,SAAgB,oBAAoB;IAChC,iFAAiF;AACrF,CAAC;AAFD,oDAEC"}
+{"version":3,"file":"mistralEmbedding.js","sourceRoot":"","sources":["../../src/models/mistralEmbedding.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAkI;AAClI,mDAAuD;AACvD,oDAA+C;AAKxC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,eAAU;IAGxC,YAAY,MAAc;QACtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,IAAI,mBAAO,CAAC;YACvB,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IACP,CAAC;IAED,IAAW,MAAM,KAAa,OAAO,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC;IAEvD;;OAEG;IACI,KAAK,CAAC,SAAS,CAAC,MAAuB;QAC1C,MAAM,OAAO,GAAqB;YAC9B,MAAM,EAAE,MAAM,CAAC,IAAI;YACnB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,eAAe;SACzC,CAAC;QAEF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC;QAC/C,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjF,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;YAC1B,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxC,CAAC;QACD,OAAO;YACH,MAAM,EAAE,QAAQ,CAAC,MAA2B;YAC5C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,UAAU,EAAE,IAAI,eAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACxF,MAAM,EAAE,MAAM;SACjB,CAAC;IACN,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU,CAAC,MAAwB;QAE5C,MAAM,OAAO,GAAqB;YAC9B,MAAM,EAAE,MAAM,CAAC,KAAK;YACpB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,eAAe;SACzC,CAAC;QAEF,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC;QAC/C,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjF,OAAO;YACH,MAAM,EAAE,QAAQ,CAAC,MAA2B;YAC5C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,UAAU,EAAE,IAAI,eAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACxF,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;SACvD,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC3B,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA3DY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,sBAAa,EAAC,eAAU,EAAE,kBAAkB,CAAC;GACjC,gBAAgB,CA2D5B;AAED,SAAgB,oBAAoB;IAChC,iFAAiF;AACrF,CAAC;AAFD,oDAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ai-mistral",
-  "version": "2.29.2",
+  "version": "2.31.0",
   "description": "MemberJunction Wrapper for Mistral AI's AI Models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,9 +19,9 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@memberjunction/ai": "2.29.2",
-    "@memberjunction/global": "2.29.2",
-    "@mistralai/mistralai": "1.5.0",
-    "axios-retry": "^4.3.0"
+    "@memberjunction/ai": "2.31.0",
+    "@memberjunction/global": "2.31.0",
+    "@mistralai/mistralai": "^1.5.0",
+    "axios-retry": "4.3.0"
   }
 }

package/dist/config.d.ts

@@ -1,2 +0,0 @@
-export declare const mistralAPIKey: string;
-//# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,EAAE,MAAoC,CAAC"}

package/dist/config.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mistralAPIKey = void 0;
-const dotenv_1 = __importDefault(require("dotenv"));
-dotenv_1.default.config();
-exports.mistralAPIKey = process.env.MISTRAL_API_KEY;
-//# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEH,QAAA,aAAa,GAAW,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC"}

package/dist/models/mistralClient.d.ts

@@ -1,97 +0,0 @@
-import { ListModelsResponse, ChatCompletetionRequest, ChatCompletionResponse, EmbeddingResponse } from '../generic/mistral.types';
-/**
- * A simple and lightweight client for the Mistral API
- * @param {*} apiKey can be set as an environment variable MISTRAL_API_KEY,
- * or provided in this parameter
- * @param {*} endpoint defaults to https://api.mistral.ai
- */
-export declare class MistralClient {
-    private RETRY_STATUS_CODES;
-    private ENDPOINT;
-    endpoint: string;
-    apiKey: string;
-    textDecoder: TextDecoder;
-    constructor(config: {
-        apiKey?: string;
-        endpoint?: string;
-    });
-    /**
-     *
-     * @param {*} method
-     * @param {*} path
-     * @param {*} request
-     * @return {Promise<T>}
-     */
-    private request;
-    /**
-     * Creates a chat completion request
-     * @param {*} model
-     * @param {*} messages
-     * @param {*} temperature
-     * @param {*} maxTokens
-     * @param {*} topP
-     * @param {*} randomSeed
-     * @param {*} stream
-     * @param {*} safeMode
-     * @return {Promise<Object>}
-     */
-    _makeChatCompletionRequest: (model: any, messages: any, temperature: any, maxTokens: any, topP: any, randomSeed: any, stream: any, safeMode: any) => {
-        model: any;
-        messages: any;
-        temperature: any;
-        max_tokens: any;
-        top_p: any;
-        random_seed: any;
-        stream: any;
-        safe_prompt: any;
-    };
-    /**
-     * Returns a list of the available models
-     * @return {Promise<ListModelsResponse>}
-     */
-    listModels(): Promise<ListModelsResponse>;
-    /**
-     * A chat endpoint without streaming
-     * @param {*} model the name of the model to chat with, e.g. mistral-tiny
-     * @param {*} messages an array of messages to chat with, e.g.
-     * [{role: 'user', content: 'What is the best French cheese?'}]
-     * @param {*} temperature the temperature to use for sampling, e.g. 0.5
-     * @param {*} maxTokens the maximum number of tokens to generate, e.g. 100
-     * @param {*} topP the cumulative probability of tokens to generate, e.g. 0.9
-     * @param {*} randomSeed the random seed to use for sampling, e.g. 42
-     * @param {*} safeMode whether to use safe mode, e.g. true
-     * @return {Promise<Object>}
-     */
-    chat(params: ChatCompletetionRequest): Promise<ChatCompletionResponse>;
-    /**
-     * A chat endpoint that streams responses.
-     * @param {*} model the name of the model to chat with, e.g. mistral-tiny
-     * @param {*} messages an array of messages to chat with, e.g.
-     * [{role: 'user', content: 'What is the best French cheese?'}]
-     * @param {*} temperature the temperature to use for sampling, e.g. 0.5
-     * @param {*} maxTokens the maximum number of tokens to generate, e.g. 100
-     * @param {*} topP the cumulative probability of tokens to generate, e.g. 0.9
-     * @param {*} randomSeed the random seed to use for sampling, e.g. 42
-     * @param {*} safeMode whether to use safe mode, e.g. true
-     * @return {Promise<Object>}
-     */
-    chatStream: ({ model, messages, temperature, maxTokens, topP, randomSeed, safeMode }: {
-        model: any;
-        messages: any;
-        temperature: any;
-        maxTokens: any;
-        topP: any;
-        randomSeed: any;
-        safeMode: any;
-    }) => AsyncGenerator<any, void, unknown>;
-    /**
-     * An embedddings endpoint that returns embeddings for a single,
-     * or batch of inputs
-     * @param {*} model The embedding model to use, e.g. mistral-embed
-     * @param {*} input The input to embed,
-     * e.g. ['What is the best French cheese?']
-     * @return {Promise<Object>}
-     */
-    embeddings(model: string, input: string[]): Promise<EmbeddingResponse>;
-}
-//# sourceMappingURL=mistralClient.d.ts.map

package/dist/models/mistralClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mistralClient.d.ts","sourceRoot":"","sources":["../../src/models/mistralClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlI;;;;;GAKG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,QAAQ,CAA4B;IAE5C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;gBAEb,MAAM,EAAE;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAC;IAmB1D;;;;;;OAMG;YACW,OAAO;IAiBrB;;;;;;;;;;;OAWG;IACH,0BAA0B;;;;;;;;;MAoBxB;IAGF;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAKtD;;;;;;;;;;;OAWG;IACU,IAAI,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAQnF;;;;;;;;;;;OAWG;IACH,UAAU;;;;;;;;6CAqCR;IAEF;;;;;;;OAOG;IACU,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAepF"}

package/dist/models/mistralClient.js

@@ -1,160 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MistralClient = void 0;
-const axios_1 = __importDefault(require("axios"));
-const axios_retry_1 = __importDefault(require("axios-retry"));
-//This is a 1:1 copy of the mistralAI client library
-//but modified to work with MJ
-//see https://github.com/mistralai/client-js 
-/**
- * A simple and lightweight client for the Mistral API
- * @param {*} apiKey can be set as an environment variable MISTRAL_API_KEY,
- * or provided in this parameter
- * @param {*} endpoint defaults to https://api.mistral.ai
- */
-class MistralClient {
-    constructor(config) {
-        this.RETRY_STATUS_CODES = [429, 500, 502, 503, 504];
-        this.ENDPOINT = 'https://api.mistral.ai';
-        /**
-         * Creates a chat completion request
-         * @param {*} model
-         * @param {*} messages
-         * @param {*} temperature
-         * @param {*} maxTokens
-         * @param {*} topP
-         * @param {*} randomSeed
-         * @param {*} stream
-         * @param {*} safeMode
-         * @return {Promise<Object>}
-         */
-        this._makeChatCompletionRequest = function (model, messages, temperature, maxTokens, topP, randomSeed, stream, safeMode) {
-            return {
-                model: model,
-                messages: messages,
-                temperature: temperature ?? undefined,
-                max_tokens: maxTokens ?? undefined,
-                top_p: topP ?? undefined,
-                random_seed: randomSeed ?? undefined,
-                stream: stream ?? undefined,
-                safe_prompt: safeMode ?? undefined,
-            };
-        };
-        /**
-         * A chat endpoint that streams responses.
-         * @param {*} model the name of the model to chat with, e.g. mistral-tiny
-         * @param {*} messages an array of messages to chat with, e.g.
-         * [{role: 'user', content: 'What is the best French cheese?'}]
-         * @param {*} temperature the temperature to use for sampling, e.g. 0.5
-         * @param {*} maxTokens the maximum number of tokens to generate, e.g. 100
-         * @param {*} topP the cumulative probability of tokens to generate, e.g. 0.9
-         * @param {*} randomSeed the random seed to use for sampling, e.g. 42
-         * @param {*} safeMode whether to use safe mode, e.g. true
-         * @return {Promise<Object>}
-         */
-        this.chatStream = async function* ({ model, messages, temperature, maxTokens, topP, randomSeed, safeMode }) {
-            const request = this._makeChatCompletionRequest(model, messages, temperature, maxTokens, topP, randomSeed, true, safeMode);
-            const response = await this._request('post', 'v1/chat/completions', request);
-            for await (const chunk of response) {
-                const chunkString = this.textDecoder.decode(chunk);
-                // split the chunks by new line
-                const chunkLines = chunkString.split('\n');
-                // Iterate through the lines
-                for (const chunkLine of chunkLines) {
-                    // If the line starts with data: then it is a chunk
-                    if (chunkLine.startsWith('data:')) {
-                        const chunkData = chunkLine.substring(6).trim();
-                        if (chunkData !== '[DONE]') {
-                            yield JSON.parse(chunkData);
-                        }
-                    }
-                }
-            }
-        };
-        this.endpoint = config.endpoint || this.ENDPOINT;
-        this.apiKey = config.apiKey;
-        this.textDecoder = new TextDecoder();
-        (0, axios_retry_1.default)(axios_1.default, {
-            retries: 3,
-            retryCondition: (error) => {
-                return this.RETRY_STATUS_CODES.includes(error.response.status);
-            },
-            retryDelay: (retryCount, error) => {
-                console.debug(`retry attempt: ${retryCount}`, error);
-                return retryCount * 500;
-            },
-        });
-    }
-    /**
-     *
-     * @param {*} method
-     * @param {*} path
-     * @param {*} request
-     * @return {Promise<T>}
-     */
-    async request(method, path, request) {
-        const response = await (0, axios_1.default)({
-            method: method,
-            url: `${this.endpoint}/${path}`,
-            data: request || {},
-            headers: {
-                'Authorization': `Bearer ${this.apiKey}`,
-            },
-            responseType: request?.stream ? 'stream' : 'json',
-        }).catch((error) => {
-            console.error(error);
-            return error.response;
-        });
-        return response.data;
-    }
-    /**
-     * Returns a list of the available models
-     * @return {Promise<ListModelsResponse>}
-     */
-    async listModels() {
-        const response = await this.request('get', 'v1/models');
-        return response;
-    }
-    /**
-     * A chat endpoint without streaming
-     * @param {*} model the name of the model to chat with, e.g. mistral-tiny
-     * @param {*} messages an array of messages to chat with, e.g.
-     * [{role: 'user', content: 'What is the best French cheese?'}]
-     * @param {*} temperature the temperature to use for sampling, e.g. 0.5
-     * @param {*} maxTokens the maximum number of tokens to generate, e.g. 100
-     * @param {*} topP the cumulative probability of tokens to generate, e.g. 0.9
-     * @param {*} randomSeed the random seed to use for sampling, e.g. 42
-     * @param {*} safeMode whether to use safe mode, e.g. true
-     * @return {Promise<Object>}
-     */
-    async chat(params) {
-        const response = await this.request('post', 'v1/chat/completions', params);
-        return response;
-    }
-    /**
-     * An embedddings endpoint that returns embeddings for a single,
-     * or batch of inputs
-     * @param {*} model The embedding model to use, e.g. mistral-embed
-     * @param {*} input The input to embed,
-     * e.g. ['What is the best French cheese?']
-     * @return {Promise<Object>}
-     */
-    async embeddings(model, input) {
-        try {
-            const request = {
-                model: model,
-                input: input,
-            };
-            const response = await this.request('post', 'v1/embeddings', request);
-            return response;
-        }
-        catch (error) {
-            throw new Error(error);
-        }
-    }
-}
-exports.MistralClient = MistralClient;
-//# sourceMappingURL=mistralClient.js.map

package/dist/models/mistralClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mistralClient.js","sourceRoot":"","sources":["../../src/models/mistralClient.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,8DAAqC;AAGrC,oDAAoD;AACpD,8BAA8B;AAC9B,6CAA6C;AAE7C;;;;;GAKG;AACH,MAAa,aAAa;IAStB,YAAY,MAA4C;QAPhD,uBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC/C,aAAQ,GAAG,wBAAwB,CAAC;QAiD9C;;;;;;;;;;;WAWG;QACH,+BAA0B,GAAG,UAC3B,KAAK,EACL,QAAQ,EACR,WAAW,EACX,SAAS,EACT,IAAI,EACJ,UAAU,EACV,MAAM,EACN,QAAQ;YAER,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,WAAW,IAAI,SAAS;gBACrC,UAAU,EAAE,SAAS,IAAI,SAAS;gBAClC,KAAK,EAAE,IAAI,IAAI,SAAS;gBACxB,WAAW,EAAE,UAAU,IAAI,SAAS;gBACpC,MAAM,EAAE,MAAM,IAAI,SAAS;gBAC3B,WAAW,EAAE,QAAQ,IAAI,SAAS;aACnC,CAAC;QACJ,CAAC,CAAC;QAgCF;;;;;;;;;;;WAWG;QACH,eAAU,GAAG,KAAK,SAAS,CAAC,EAAE,EAC5B,KAAK,EACL,QAAQ,EACR,WAAW,EACX,SAAS,EACT,IAAI,EACJ,UAAU,EACV,QAAQ,EAAC;YACT,MAAM,OAAO,GAAG,IAAI,CAAC,0BAA0B,CAC7C,KAAK,EACL,QAAQ,EACR,WAAW,EACX,SAAS,EACT,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,QAAQ,CACT,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAClC,MAAM,EAAE,qBAAqB,EAAE,OAAO,CACvC,CAAC;YAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnD,+BAA+B;gBAC/B,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3C,4BAA4B;gBAC5B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,mDAAmD;oBACnD,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;wBAChD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;4BAC3B,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;wBAC9B,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QA3JI,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE5B,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QAErC,IAAA,qBAAU,EAAC,eAAK,EAAE;YAClB,OAAO,EAAE,CAAC;YACV,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnE,CAAC;YAED,UAAU,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,kBAAkB,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;gBACrD,OAAO,UAAU,GAAG,GAAG,CAAC;YAC5B,CAAC;SACA,CAAC,CAAC;IACP,CAAC;IAEH;;;;;;OAMG;IACK,KAAK,CAAC,OAAO,CAAI,MAAc,EAAE,IAAY,EAAE,OAAa;QAElE,MAAM,QAAQ,GAAG,MAAM,IAAA,eAAK,EAAC;YACzB,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;YAC/B,IAAI,EAAE,OAAO,IAAI,EAAE;YACnB,OAAO,EAAE;gBACP,eAAe,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;aACzC;YACD,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAClD,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAqCD;;;OAGG;IACI,KAAK,CAAC,UAAU;QACrB,MAAM,QAAQ,GAAuB,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC5E,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,IAAI,CAAC,MAA+B;QAC/C,MAAM,QAAQ,GAA2B,MAAM,IAAI,CAAC,OAAO,CACzD,MAAM,EAAE,qBAAqB,EAAE,MAAM,CACtC,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAqDD;;;;;;;OAOG;IACI,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,KAAe;QACpD,IAAG,CAAC;YACF,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK;aACb,CAAC;YACF,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,OAAO,CACpD,MAAM,EAAE,eAAe,EAAE,OAAO,CACjC,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAM,KAAK,EAAC,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AA9LD,sCA8LC"}