@memberjunction/ai-mistral 0.9.12 → 0.9.14

package/dist/config.d.ts

@@ -0,0 +1 @@
+export declare const mistralAPIKey: string;

package/dist/config.js

@@ -0,0 +1,10 @@
+"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

@@ -0,0 +1 @@
+{"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/mistral.d.ts

@@ -1,119 +1,20 @@
-import { BaseLLM, ChatMessage, ChatParams, ChatResult, ClassifyParams, ClassifyResult, SummarizeParams, SummarizeResult } from '@memberjunction/ai';
+import { BaseLLM, ChatParams, ChatResult, ClassifyParams, ClassifyResult, EmbedParams, EmbedResult, SummarizeParams, SummarizeResult } from '@memberjunction/ai';
+import { EmbeddingResponse, ListModelsResponse, MistralClient } from './mistralClient';
 export declare class MistralLLM extends BaseLLM {
-    private apiBaseURL;
-    private enableSafePrompt;
+    static _client: MistralClient;
     constructor(apiKey: string);
-    ChatCompletion(params: ChatParams): Promise<ChatResult>;
+    get client(): MistralClient;
+    ChatCompletion(params: MistralChatParams): Promise<ChatResult>;
     SummarizeText(params: SummarizeParams): Promise<SummarizeResult>;
     ClassifyText(params: ClassifyParams): Promise<ClassifyResult>;
-    /**
-     * Helper function to ask a simple question and return the response
-     * @param prompt
-     */
-    Ask(prompt: string): Promise<void>;
+    createEmbedding(model: string, text: string): Promise<EmbeddingResponse>;
+    EmbedText(params: EmbedParams): Promise<EmbedResult>;
     /**
      * Returns a list of available models
      * @returns {Promise<AvailableModelInfo>}
      */
-    ListModels(): Promise<ListModelsResponse>;
-    ChatSingle(message: string, role?: string, model?: string, temperature?: number, maxTokens?: number, topP?: number, randomSeed?: number, safePrompt?: boolean): Promise<ChatCompletionResponse>;
-    Chat(messages: ChatMessage[], model?: string, temperature?: number, maxTokens?: number, topP?: number, randomSeed?: number, safePrompt?: boolean): Promise<ChatCompletionResponse>;
-    private MakeChatCompletionRequest;
-    private createAxiosRequestConfig;
-    private callApi;
-    createChatMessages(prompts: string[], role?: string): ChatMessage[];
-}
-export declare const MistralRoles: {
-    User: string;
-    System: string;
-};
-export declare const MistralModels: {
-    Tiny: string;
-    Small: string;
-    Medium: string;
-};
-export interface ModelPermission {
-    id: string;
-    object: 'model_permission';
-    created: number;
-    allow_create_engine: boolean;
-    allow_sampling: boolean;
-    allow_logprobs: boolean;
-    allow_search_indices: boolean;
-    allow_view: boolean;
-    allow_fine_tuning: boolean;
-    organization: string;
-    group: string | null;
-    is_blocking: boolean;
-}
-export interface Model {
-    id: string;
-    object: 'model';
-    created: number;
-    owned_by: string;
-    root: string | null;
-    parent: string | null;
-    permission: ModelPermission[];
-}
-export interface ListModelsResponse {
-    object: 'list';
-    data: Model[];
-}
-export interface TokenUsage {
-    prompt_tokens: number;
-    completion_tokens: number;
-    total_tokens: number;
-}
-export type ChatCompletetionRequest = {
-    model: string;
-    messages: ChatMessage[];
-    temperature: number;
-    max_tokens: number;
-    top_p: number;
-    random_seed: number;
-    stream: boolean;
-    safe_prompt: boolean;
-};
-export interface ChatCompletionResponseChoice {
-    index: number;
-    message: {
-        role: string;
-        content: string;
-    };
-    finish_reason: string;
-}
-export interface ChatCompletionResponseChunkChoice {
-    index: number;
-    delta: {
-        role?: string;
-        content?: string;
-    };
-    finish_reason: string;
-}
-export interface ChatCompletionResponse {
-    id: string;
-    object: 'chat.completion';
-    created: number;
-    model: string;
-    choices: ChatCompletionResponseChoice[];
-    usage: TokenUsage;
-}
-export interface ChatCompletionResponseChunk {
-    id: string;
-    object: 'chat.completion.chunk';
-    created: number;
-    model: string;
-    choices: ChatCompletionResponseChunkChoice[];
-}
-export interface Embedding {
-    id: string;
-    object: 'embedding';
-    embedding: number[];
+    listModels(): Promise<ListModelsResponse>;
 }
-export interface EmbeddingResponse {
-    id: string;
-    object: 'list';
-    data: Embedding[];
+export declare class MistralChatParams extends ChatParams {
     model: string;
-    usage: TokenUsage;
 }

package/dist/models/mistral.js

@@ -5,39 +5,55 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var MistralLLM_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MistralModels = exports.MistralRoles = exports.MistralLLM = void 0;
-const axios_1 = __importDefault(require("axios"));
+exports.MistralChatParams = exports.MistralLLM = void 0;
 const ai_1 = require("@memberjunction/ai");
 const global_1 = require("@memberjunction/global");
-let MistralLLM = class MistralLLM extends ai_1.BaseLLM {
+const mistralClient_1 = require("./mistralClient");
+let MistralLLM = MistralLLM_1 = class MistralLLM extends ai_1.BaseLLM {
     constructor(apiKey) {
         super(apiKey);
-        // need to do this another way, we don't want classes to rely on .env files directly
-        // this.apiBaseURL = process.env.MISTRAL_API_BASE_URL || "";
-        this.enableSafePrompt = process.env.MISTRAL_ENABLE_SAFE_PROMPT === "true";
+        if (!MistralLLM_1._client) {
+            MistralLLM_1._client = new mistralClient_1.MistralClient({ apiKey });
+        }
     }
+    get client() { return MistralLLM_1._client; }
     async ChatCompletion(params) {
-        const config = {
-            method: "post",
-            baseURL: this.apiBaseURL,
-            url: "/chat/completions",
-            headers: {
-                Authorization: `Bearer ${this.apiKey}`
-            },
+        const startTime = new Date();
+        const chatResponse = await this.client.chat({
+            model: params.model,
+            messages: params.messages
+        });
+        const endTime = new Date();
+        let choices = chatResponse.choices.map((choice) => {
+            const res = {
+                message: {
+                    role: 'assistant',
+                    content: choice.message.content
+                },
+                finish_reason: choice.finish_reason,
+                index: choice.index
+            };
+            return res;
+        });
+        return {
+            success: true,
+            statusText: "OK",
+            startTime: startTime,
+            endTime: endTime,
+            timeElapsed: endTime.getTime() - startTime.getTime(),
             data: {
-                model: params.model,
-                messages: params.messages,
-                safe_prompt: this.enableSafePrompt
-            }
+                choices: choices,
+                usage: {
+                    totalTokens: chatResponse.usage.total_tokens,
+                    promptTokens: chatResponse.usage.prompt_tokens,
+                    completionTokens: chatResponse.usage.completion_tokens
+                }
+            },
+            errorMessage: "",
+            exception: null,
         };
-        let result = await this.callApi(config);
-        console.log(result);
-        console.log(result.choices);
-        return result;
     }
     async SummarizeText(params) {
         throw new Error("Method not implemented.");
@@ -45,101 +61,33 @@ let MistralLLM = class MistralLLM extends ai_1.BaseLLM {
     async ClassifyText(params) {
         throw new Error("Method not implemented.");
     }
-    /**
-     * Helper function to ask a simple question and return the response
-     * @param prompt
-     */
-    async Ask(prompt) {
-        let response = await this.ChatSingle(prompt, undefined, exports.MistralModels.Tiny);
-        console.log(response);
-        response.choices.forEach((choice) => {
-            console.log(choice.message.content);
-        });
-    }
-    /**
-     * Returns a list of available models
-     * @returns {Promise<AvailableModelInfo>}
-     */
-    async ListModels() {
-        const request = this.createAxiosRequestConfig('get', 'models');
-        let response = await this.callApi(request);
+    async createEmbedding(model, text) {
+        const response = await this.client.embeddings(model, text);
         return response;
     }
-    async ChatSingle(message, role = exports.MistralRoles.User, model = exports.MistralModels.Medium, temperature = null, maxTokens = null, topP = null, randomSeed = null, safePrompt = this.enableSafePrompt) {
-        const chatMessage = [
-            {
-                role: role,
-                content: message
-            }
-        ];
-        return await this.Chat(chatMessage, model, temperature, maxTokens, topP, randomSeed, safePrompt);
-    }
-    async Chat(messages, model = exports.MistralModels.Medium, temperature = null, maxTokens = null, topP = null, randomSeed = null, safePrompt = this.enableSafePrompt) {
-        const request = this.MakeChatCompletionRequest(model, messages, temperature, maxTokens, topP, randomSeed, false, safePrompt);
-        const axiosRequest = this.createAxiosRequestConfig('post', "chat/completions", request);
-        return await this.callApi(axiosRequest);
-    }
-    MakeChatCompletionRequest(model, messages, temperature = null, maxTokens = null, topP = null, randomSeed = null, stream = null, safePrompt = null) {
-        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: safePrompt ?? undefined,
-        };
-    }
-    ;
-    createAxiosRequestConfig(method, path, options = null) {
+    async EmbedText(params) {
+        const response = await this.client.embeddings(params.model, params.text);
         return {
-            method: method,
-            baseURL: this.apiBaseURL,
-            url: `/${path}`,
-            headers: {
-                Accept: options?.stream ? 'text/event-stream' : 'application/json',
-                ContentType: 'application/json',
-                Authorization: `Bearer ${this.apiKey}`
-            },
-            data: method !== 'get' ? options : null,
-            timeout: 120 * 1000
+            object: 'object',
+            model: params.model || "mistral-embed", //hard coded for now as theres only one available embedding model
+            ModelUsage: new ai_1.ModelUsage(response.usage.prompt_tokens, response.usage.completion_tokens),
+            data: response.data[0].embedding
         };
     }
-    async callApi(data) {
-        try {
-            const response = await (0, axios_1.default)(data);
-            return response.data;
-        }
-        catch (error) {
-            console.log(error);
-            console.error("An error occured when making request to", data.baseURL + data.url, ":\n", error.data?.message);
-            return null;
-        }
-    }
-    ;
-    createChatMessages(prompts, role = 'user') {
-        let messages = [];
-        prompts.forEach((prompt) => {
-            messages.push({
-                role: role,
-                content: prompt
-            });
-        });
-        return messages;
+    /**
+     * 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([
+exports.MistralLLM = MistralLLM = MistralLLM_1 = __decorate([
     (0, global_1.RegisterClass)(ai_1.BaseLLM, "MistralLLM")
 ], MistralLLM);
-exports.MistralRoles = {
-    User: 'user',
-    System: 'system'
-};
-exports.MistralModels = {
-    Tiny: "mistral-tiny",
-    Small: "mistral-small",
-    Medium: "mistral-medium"
-};
+class MistralChatParams extends ai_1.ChatParams {
+}
+exports.MistralChatParams = MistralChatParams;
 //# sourceMappingURL=mistral.js.map

package/dist/models/mistral.js.map

@@ -1 +1 @@
-{"version":3,"file":"mistral.js","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAiE;AACjE,2CAAqK;AACrK,mDAAuD;AAGhD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,YAAO;IAInC,YAAY,MAAc;QACtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,oFAAoF;QACpF,4DAA4D;QAC5D,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,MAAM,CAAC;IAC9E,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAkB;QAC1C,MAAM,MAAM,GAAuB;YAC/B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,GAAG,EAAE,mBAAmB;YACxB,OAAO,EAAE;gBACL,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE;gBACF,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW,EAAE,IAAI,CAAC,gBAAgB;aACrC;SACJ,CAAC;QACF,IAAI,MAAM,GAAQ,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;IAClB,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,GAAG,CAAC,MAAc;QAC3B,IAAI,QAAQ,GAA2B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,qBAAa,CAAC,IAAI,CAAC,CAAC;QACpG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAoC,EAAE,EAAE;YAC9D,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,UAAU;QACnB,MAAM,OAAO,GAAuB,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnF,IAAI,QAAQ,GAAuB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/D,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,UAAU,CACnB,OAAe,EACf,OAAe,oBAAY,CAAC,IAAI,EAChC,QAAgB,qBAAa,CAAC,MAAM,EACpC,cAAsB,IAAI,EAC1B,YAAoB,IAAI,EACxB,OAAe,IAAI,EACnB,aAAqB,IAAI,EACzB,aAAsB,IAAI,CAAC,gBAAgB;QAEvC,MAAM,WAAW,GAAkB;YAC/B;gBACI,IAAI,EAAmB,IAAI;gBAC3B,OAAO,EAAE,OAAO;aACnB;SACJ,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACzG,CAAC;IAEM,KAAK,CAAC,IAAI,CACb,QAAuB,EACvB,QAAgB,qBAAa,CAAC,MAAM,EACpC,cAAsB,IAAI,EAC1B,YAAoB,IAAI,EACxB,OAAe,IAAI,EACnB,aAAqB,IAAI,EACzB,aAAsB,IAAI,CAAC,gBAAgB;QAG3C,MAAM,OAAO,GAA4B,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtJ,MAAM,YAAY,GAAuB,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAC5G,OAAO,MAAM,IAAI,CAAC,OAAO,CAAyB,YAAY,CAAC,CAAC;IACpE,CAAC;IAEO,yBAAyB,CAC7B,KAAa,EACb,QAAuB,EACvB,cAAsB,IAAI,EAC1B,YAAoB,IAAI,EACxB,OAAe,IAAI,EACnB,aAAqB,IAAI,EACzB,SAAkB,IAAI,EACtB,aAAsB,IAAI;QAE1B,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;YAClB,WAAW,EAAE,WAAW,IAAI,SAAS;YACrC,UAAU,EAAE,SAAS,IAAI,SAAS;YAClC,KAAK,EAAE,IAAI,IAAI,SAAS;YACxB,WAAW,EAAE,UAAU,IAAI,SAAS;YACpC,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,WAAW,EAAE,UAAU,IAAI,SAAS;SACrC,CAAC;IACN,CAAC;IAAA,CAAC;IAEM,wBAAwB,CAAC,MAAc,EAAE,IAAY,EAAE,UAAmC,IAAI;QAClG,OAAO;YACH,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,OAAO,EAAE;gBACL,MAAM,EAAE,OAAO,EAAE,MAAM,CAAA,CAAC,CAAC,mBAAmB,CAAA,CAAC,CAAC,kBAAkB;gBAChE,WAAW,EAAE,kBAAkB;gBAC/B,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;aACzC;YACD,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;YACvC,OAAO,EAAE,GAAG,GAAG,IAAI;SACtB,CAAA;IACL,CAAC;IAEO,KAAK,CAAC,OAAO,CAAI,IAAwB;QAC7C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAkB,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;YAClD,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9G,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAAA,CAAC;IAEK,kBAAkB,CAAC,OAAiB,EAAE,OAAe,MAAM;QAC9D,IAAI,QAAQ,GAAkB,EAAE,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;YAC/B,QAAQ,CAAC,IAAI,CAAC;gBACV,IAAI,EAAmB,IAAI;gBAC3B,OAAO,EAAE,MAAM;aAClB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ,CAAA;AA1JY,gCAAU;qBAAV,UAAU;IADtB,IAAA,sBAAa,EAAC,YAAO,EAAE,YAAY,CAAC;GACxB,UAAU,CA0JtB;AAEY,QAAA,YAAY,GAAG;IACxB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;CACnB,CAAA;AAEY,QAAA,aAAa,GAAG;IACzB,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,gBAAgB;CAC3B,CAAA"}
+{"version":3,"file":"mistral.js","sourceRoot":"","sources":["../../src/models/mistral.ts"],"names":[],"mappings":"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"}

package/dist/models/mistralClient.d.ts

@@ -0,0 +1,181 @@
+import { ChatMessage } from '@memberjunction/ai';
+/**
+ * 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>;
+}
+export interface ModelPermission {
+    id: string;
+    object: 'model_permission';
+    created: number;
+    allow_create_engine: boolean;
+    allow_sampling: boolean;
+    allow_logprobs: boolean;
+    allow_search_indices: boolean;
+    allow_view: boolean;
+    allow_fine_tuning: boolean;
+    organization: string;
+    group: string | null;
+    is_blocking: boolean;
+}
+export interface Model {
+    id: string;
+    object: 'model';
+    created: number;
+    owned_by: string;
+    root: string | null;
+    parent: string | null;
+    permission: ModelPermission[];
+}
+export interface ListModelsResponse {
+    object: 'list';
+    data: Model[];
+}
+export interface TokenUsage {
+    prompt_tokens: number;
+    completion_tokens: number;
+    total_tokens: number;
+}
+export type ChatCompletetionRequest = {
+    model: string;
+    messages: ChatMessage[];
+    temperature?: number;
+    max_tokens?: number;
+    top_p?: number;
+    random_seed?: number;
+    stream?: boolean;
+    safe_prompt?: boolean;
+};
+export interface ChatCompletionResponseChoice {
+    index: number;
+    message: {
+        role: string;
+        content: string;
+    };
+    finish_reason: string;
+}
+export interface ChatCompletionResponseChunkChoice {
+    index: number;
+    delta: {
+        role?: string;
+        content?: string;
+    };
+    finish_reason: string;
+}
+export interface ChatCompletionResponse {
+    id: string;
+    object: 'chat.completion';
+    created: number;
+    model: string;
+    choices: ChatCompletionResponseChoice[];
+    usage: TokenUsage;
+}
+export interface ChatCompletionResponseChunk {
+    id: string;
+    object: 'chat.completion.chunk';
+    created: number;
+    model: string;
+    choices: ChatCompletionResponseChunkChoice[];
+}
+export interface Embedding {
+    id: string;
+    object: 'embedding';
+    embedding: number[];
+}
+export interface EmbeddingResponse {
+    id: string;
+    object: 'list';
+    data: Embedding[];
+    model: string;
+    usage: TokenUsage;
+}

package/dist/models/mistralClient.js

@@ -0,0 +1,155 @@
+"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 || process.env.MISTRAL_API_KEY;
+        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) {
+        const request = {
+            model: model,
+            input: input,
+        };
+        const response = await this.request('post', 'v1/embeddings', request);
+        return response;
+    }
+}
+exports.MistralClient = MistralClient;
+//# sourceMappingURL=mistralClient.js.map

package/dist/models/mistralClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mistralClient.js","sourceRoot":"","sources":["../../src/models/mistralClient.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ai-mistral",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "description": "MemberJunction Wrapper for Mistral AI's AI Models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,11 +16,10 @@
   "license": "ISC",
   "devDependencies": {
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.3.3",
-    "openai": "^3.2.1"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@memberjunction/ai": "^0.9.156",
-    "@memberjunction/global": "^0.9.148"
+    "@memberjunction/ai": "^0.9.159",
+    "@memberjunction/global": "^0.9.152"
   }
 }