cactus-react-native 0.1.3 → 0.1.4

package/lib/module/tools.js

@@ -0,0 +1,73 @@
+"use strict";
+
+export class Tools {
+  tools = new Map();
+  add(func, description, parameters) {
+    this.tools.set(func.name, {
+      func,
+      description,
+      parameters,
+      required: Object.entries(parameters).filter(([_, param]) => param.required).map(([key, _]) => key)
+    });
+    return func;
+  }
+  getSchemas() {
+    return Array.from(this.tools.entries()).map(([name, {
+      description,
+      parameters,
+      required
+    }]) => ({
+      type: "function",
+      function: {
+        name,
+        description,
+        parameters: {
+          type: "object",
+          properties: parameters,
+          required
+        }
+      }
+    }));
+  }
+  async execute(name, args) {
+    const tool = this.tools.get(name);
+    if (!tool) throw new Error(`Tool ${name} not found`);
+    return await tool.func(...Object.values(args));
+  }
+}
+export async function parseAndExecuteTool(result, tools) {
+  if (!result.tool_calls || result.tool_calls.length === 0) {
+    // console.log('No tool calls found');
+    return {
+      toolCalled: false
+    };
+  }
+  try {
+    const toolCall = result.tool_calls[0];
+    if (!toolCall) {
+      // console.log('No tool call found');
+      return {
+        toolCalled: false
+      };
+    }
+    const toolName = toolCall.function.name;
+    const toolInput = JSON.parse(toolCall.function.arguments);
+
+    // console.log('Calling tool:', toolName, toolInput);
+    const toolOutput = await tools.execute(toolName, toolInput);
+    // console.log('Tool called result:', toolOutput);
+
+    return {
+      toolCalled: true,
+      toolName,
+      toolInput,
+      toolOutput
+    };
+  } catch (error) {
+    // console.error('Error parsing tool call:', error);
+    return {
+      toolCalled: false
+    };
+  }
+}
+//# sourceMappingURL=tools.js.map

package/lib/module/tools.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Tools","tools","Map","add","func","description","parameters","set","name","required","Object","entries","filter","_","param","map","key","getSchemas","Array","from","type","function","properties","execute","args","tool","get","Error","values","parseAndExecuteTool","result","tool_calls","length","toolCalled","toolCall","toolName","toolInput","JSON","parse","arguments","toolOutput","error"],"sourceRoot":"../../src","sources":["tools.ts"],"mappings":";;AAeA,OAAO,MAAMA,KAAK,CAAC;EACTC,KAAK,GAAG,IAAIC,GAAG,CAAe,CAAC;EAEvCC,GAAGA,CACCC,IAAc,EACdC,WAAmB,EACnBC,UAAsC,EACtC;IACA,IAAI,CAACL,KAAK,CAACM,GAAG,CAACH,IAAI,CAACI,IAAI,EAAE;MACxBJ,IAAI;MACJC,WAAW;MACXC,UAAU;MACVG,QAAQ,EAAEC,MAAM,CAACC,OAAO,CAACL,UAAU,CAAC,CACjCM,MAAM,CAAC,CAAC,CAACC,CAAC,EAAEC,KAAK,CAAC,KAAKA,KAAK,CAACL,QAAQ,CAAC,CACtCM,GAAG,CAAC,CAAC,CAACC,GAAG,EAAEH,CAAC,CAAC,KAAKG,GAAG;IAC1B,CAAC,CAAC;IACF,OAAOZ,IAAI;EACb;EAEFa,UAAUA,CAAA,EAAG;IACT,OAAOC,KAAK,CAACC,IAAI,CAAC,IAAI,CAAClB,KAAK,CAACU,OAAO,CAAC,CAAC,CAAC,CAACI,GAAG,CAAC,CAAC,CAACP,IAAI,EAAE;MAAEH,WAAW;MAAEC,UAAU;MAAEG;IAAS,CAAC,CAAC,MAAM;MAC9FW,IAAI,EAAE,UAAU;MAChBC,QAAQ,EAAE;QACRb,IAAI;QACJH,WAAW;QACXC,UAAU,EAAE;UACVc,IAAI,EAAE,QAAQ;UACdE,UAAU,EAAEhB,UAAU;UACtBG;QACF;MACF;IACF,CAAC,CAAC,CAAC;EACL;EAEF,MAAMc,OAAOA,CAACf,IAAY,EAAEgB,IAAS,EAAE;IACnC,MAAMC,IAAI,GAAG,IAAI,CAACxB,KAAK,CAACyB,GAAG,CAAClB,IAAI,CAAC;IACjC,IAAI,CAACiB,IAAI,EAAE,MAAM,IAAIE,KAAK,CAAC,QAAQnB,IAAI,YAAY,CAAC;IACpD,OAAO,MAAMiB,IAAI,CAACrB,IAAI,CAAC,GAAGM,MAAM,CAACkB,MAAM,CAACJ,IAAI,CAAC,CAAC;EAClD;AACF;AAEA,OAAO,eAAeK,mBAAmBA,CAACC,MAA8B,EAAE7B,KAAY,EAAwF;EAC5K,IAAI,CAAC6B,MAAM,CAACC,UAAU,IAAID,MAAM,CAACC,UAAU,CAACC,MAAM,KAAK,CAAC,EAAE;IACtD;IACA,OAAO;MAACC,UAAU,EAAE;IAAK,CAAC;EAC9B;EAEA,IAAI;IACA,MAAMC,QAAQ,GAAGJ,MAAM,CAACC,UAAU,CAAC,CAAC,CAAC;IACrC,IAAI,CAACG,QAAQ,EAAE;MACb;MACA,OAAO;QAACD,UAAU,EAAE;MAAK,CAAC;IAC5B;IACA,MAAME,QAAQ,GAAGD,QAAQ,CAACb,QAAQ,CAACb,IAAI;IACvC,MAAM4B,SAAS,GAAGC,IAAI,CAACC,KAAK,CAACJ,QAAQ,CAACb,QAAQ,CAACkB,SAAS,CAAC;;IAEzD;IACA,MAAMC,UAAU,GAAG,MAAMvC,KAAK,CAACsB,OAAO,CAACY,QAAQ,EAAEC,SAAS,CAAC;IAC3D;;IAEA,OAAO;MACHH,UAAU,EAAE,IAAI;MAChBE,QAAQ;MACRC,SAAS;MACTI;IACJ,CAAC;EACL,CAAC,CAAC,OAAOC,KAAK,EAAE;IACZ;IACA,OAAO;MAACR,UAAU,EAAE;IAAK,CAAC;EAC9B;AACF","ignoreList":[]}

package/lib/module/tts.js

@@ -0,0 +1,27 @@
+"use strict";
+
+import { initVocoder, getFormattedAudioCompletion, decodeAudioTokens, releaseVocoder } from './index';
+export class CactusTTS {
+  constructor(context) {
+    this.context = context;
+  }
+  static async init(context, vocoderModelPath) {
+    await initVocoder(context.id, vocoderModelPath);
+    return new CactusTTS(context);
+  }
+  async generate(textToSpeak, speakerJsonStr) {
+    const {
+      formatted_prompt
+    } = await getFormattedAudioCompletion(this.context.id, speakerJsonStr, textToSpeak);
+    // This part is simplified. In a real scenario, the tokens from 
+    // the main model would be generated and passed to decodeAudioTokens.
+    // For now, we are assuming a direct path which may not be fully functional
+    // without the main model's token output for TTS.
+    const tokens = (await this.context.tokenize(formatted_prompt)).tokens;
+    return decodeAudioTokens(this.context.id, tokens);
+  }
+  async release() {
+    return releaseVocoder(this.context.id);
+  }
+}
+//# sourceMappingURL=tts.js.map

package/lib/module/tts.js.map

@@ -1 +1 @@
-{"version":3,"names":["initVocoder","getFormattedAudioCompletion","decodeAudioTokens","releaseVocoder","CactusTTS","constructor","context","init","vocoderModelPath","id","generate","textToSpeak","speakerJsonStr","formatted_prompt","tokens","tokenize","release"],"sourceRoot":"../../src","sources":["tts.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,2BAA2B,EAC3BC,iBAAiB,EACjBC,cAAc,QACT,SAAS;AAGhB,OAAO,MAAMC,SAAS,CAAC;EAGbC,WAAWA,CAACC,OAAqB,EAAE;IACzC,IAAI,CAACA,OAAO,GAAGA,OAAO;EACxB;EAEA,aAAaC,IAAIA,CACfD,OAAqB,EACrBE,gBAAwB,EACJ;IACpB,MAAMR,WAAW,CAACM,OAAO,CAACG,EAAE,EAAED,gBAAgB,CAAC;IAC/C,OAAO,IAAIJ,SAAS,CAACE,OAAO,CAAC;EAC/B;EAEA,MAAMI,QAAQA,CACZC,WAAmB,EACnBC,cAAsB,EACY;IAClC,MAAM;MAAEC;IAAiB,CAAC,GAAG,MAAMZ,2BAA2B,CAC5D,IAAI,CAACK,OAAO,CAACG,EAAE,EACfG,cAAc,EACdD,WACF,CAAC;IACD,MAAMG,MAAM,GAAG,CAAC,MAAM,IAAI,CAACR,OAAO,CAACS,QAAQ,CAACF,gBAAgB,CAAC,EAAEC,MAAM;IACrE,OAAOZ,iBAAiB,CAAC,IAAI,CAACI,OAAO,CAACG,EAAE,EAAEK,MAAM,CAAC;EACnD;EAEA,MAAME,OAAOA,CAAA,EAAkB;IAC7B,OAAOb,cAAc,CAAC,IAAI,CAACG,OAAO,CAACG,EAAE,CAAC;EACxC;AACF","ignoreList":[]}
+{"version":3,"names":["initVocoder","getFormattedAudioCompletion","decodeAudioTokens","releaseVocoder","CactusTTS","constructor","context","init","vocoderModelPath","id","generate","textToSpeak","speakerJsonStr","formatted_prompt","tokens","tokenize","release"],"sourceRoot":"../../src","sources":["tts.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,2BAA2B,EAC3BC,iBAAiB,EACjBC,cAAc,QACT,SAAS;AAGhB,OAAO,MAAMC,SAAS,CAAC;EAGbC,WAAWA,CAACC,OAAqB,EAAE;IACzC,IAAI,CAACA,OAAO,GAAGA,OAAO;EACxB;EAEA,aAAaC,IAAIA,CACfD,OAAqB,EACrBE,gBAAwB,EACJ;IACpB,MAAMR,WAAW,CAACM,OAAO,CAACG,EAAE,EAAED,gBAAgB,CAAC;IAC/C,OAAO,IAAIJ,SAAS,CAACE,OAAO,CAAC;EAC/B;EAEA,MAAMI,QAAQA,CACZC,WAAmB,EACnBC,cAAsB,EACY;IAClC,MAAM;MAAEC;IAAiB,CAAC,GAAG,MAAMZ,2BAA2B,CAC5D,IAAI,CAACK,OAAO,CAACG,EAAE,EACfG,cAAc,EACdD,WACF,CAAC;IACD;IACA;IACA;IACA;IACA,MAAMG,MAAM,GAAG,CAAC,MAAM,IAAI,CAACR,OAAO,CAACS,QAAQ,CAACF,gBAAgB,CAAC,EAAEC,MAAM;IACrE,OAAOZ,iBAAiB,CAAC,IAAI,CAACI,OAAO,CAACG,EAAE,EAAEK,MAAM,CAAC;EACnD;EAEA,MAAME,OAAOA,CAAA,EAAkB;IAC7B,OAAOb,cAAc,CAAC,IAAI,CAACG,OAAO,CAACG,EAAE,CAAC;EACxC;AACF","ignoreList":[]}

package/lib/module/vlm.js

@@ -0,0 +1,78 @@
+"use strict";
+
+import { initLlama, initMultimodal, multimodalCompletion } from './index';
+import { Telemetry } from './telemetry';
+export class CactusVLM {
+  constructor(context, initParams) {
+    this.context = context;
+    this.initParams = initParams;
+  }
+  static async init(params, onProgress) {
+    const configs = [params, {
+      ...params,
+      n_gpu_layers: 0
+    }];
+    for (const config of configs) {
+      try {
+        const context = await initLlama(config, onProgress);
+        // Explicitly disable GPU for the multimodal projector for stability.
+        await initMultimodal(context.id, params.mmproj, false);
+        return {
+          vlm: new CactusVLM(context, params),
+          error: null
+        };
+      } catch (e) {
+        Telemetry.error(e, config);
+        if (configs.indexOf(config) === configs.length - 1) {
+          return {
+            vlm: null,
+            error: e
+          };
+        }
+      }
+    }
+    return {
+      vlm: null,
+      error: new Error('Failed to initialize CactusVLM')
+    };
+  }
+  async completion(messages, params = {}, callback) {
+    const startTime = Date.now();
+    let firstTokenTime = null;
+    const wrappedCallback = callback ? data => {
+      if (firstTokenTime === null) firstTokenTime = Date.now();
+      callback(data);
+    } : undefined;
+    let result;
+    if (params.images && params.images.length > 0) {
+      const formattedPrompt = await this.context.getFormattedChat(messages);
+      const prompt = typeof formattedPrompt === 'string' ? formattedPrompt : formattedPrompt.prompt;
+      result = await multimodalCompletion(this.context.id, prompt, params.images, {
+        ...params,
+        prompt,
+        emit_partial_completion: !!callback
+      });
+    } else {
+      result = await this.context.completion({
+        messages,
+        ...params
+      }, wrappedCallback);
+    }
+    Telemetry.track({
+      event: 'completion',
+      tok_per_sec: result.timings?.predicted_per_second,
+      toks_generated: result.timings?.predicted_n,
+      ttft: firstTokenTime ? firstTokenTime - startTime : null,
+      num_images: params.images?.length
+    }, this.initParams);
+    return result;
+  }
+  async rewind() {
+    // @ts-ignore
+    return this.context?.rewind();
+  }
+  async release() {
+    return this.context.release();
+  }
+}
+//# sourceMappingURL=vlm.js.map

package/lib/module/vlm.js.map

@@ -1 +1 @@
-{"version":3,"names":["initLlama","initMultimodal","multimodalCompletion","CactusVLM","constructor","context","init","params","onProgress","id","mmproj","completion","messages","images","n_predict","temperature","top_p","top_k","min_p","penalty_repeat","penalty_freq","penalty_present","mirostat","mirostat_tau","mirostat_eta","seed","stop","ignore_eos","chat_template","jinja","tools","parallel_tool_calls","tool_choice","response_format","n_probs","grammar","grammar_lazy","grammar_triggers","json_schema","callback","length","formattedPrompt","getFormattedChat","prompt","emit_partial_completion","rewind","release"],"sourceRoot":"../../src","sources":["vlm.ts"],"mappings":";;AAAA,SACEA,SAAS,EACTC,cAAc,EACdC,oBAAoB,QAEf,SAAS;AAahB,OAAO,MAAMC,SAAS,CAAC;EAGbC,WAAWA,CAACC,OAAqB,EAAE;IACzC,IAAI,CAACA,OAAO,GAAGA,OAAO;EACxB;EAEA,aAAaC,IAAIA,CACfC,MAAwB,EACxBC,UAAuC,EACnB;IACpB,MAAMH,OAAO,GAAG,MAAML,SAAS,CAACO,MAAM,EAAEC,UAAU,CAAC;;IAEnD;IACA,MAAMP,cAAc,CAACI,OAAO,CAACI,EAAE,EAAEF,MAAM,CAACG,MAAM,EAAE,KAAK,CAAC;IAEtD,OAAO,IAAIP,SAAS,CAACE,OAAO,CAAC;EAC/B;EAEA,MAAMM,UAAUA,CACdC,QAAsC,EACtC;IACEC,MAAM;IACNC,SAAS;IACTC,WAAW;IACXC,KAAK;IACLC,KAAK;IACLC,KAAK;IACLC,cAAc;IACdC,YAAY;IACZC,eAAe;IACfC,QAAQ;IACRC,YAAY;IACZC,YAAY;IACZC,IAAI;IACJC,IAAI;IACJC,UAAU;IACVC,aAAa;IACbC,KAAK;IACLC,KAAK;IACLC,mBAAmB;IACnBC,WAAW;IACXC,eAAe;IACfC,OAAO;IACPC,OAAO;IACPC,YAAY;IACZC,gBAAgB;IAChBC;EA4BF,CAAC,GAAG,CAAC,CAAC,EACNC,QAAoC,EACH;IACjC,IAAI1B,MAAM,IAAIA,MAAM,CAAC2B,MAAM,GAAG,CAAC,EAAE;MAC/B,MAAMC,eAAe,GAAG,MAAM,IAAI,CAACpC,OAAO,CAACqC,gBAAgB,CAAC9B,QAAQ,CAAC;MACrE,MAAM+B,MAAM,GACV,OAAOF,eAAe,KAAK,QAAQ,GAC/BA,eAAe,GACfA,eAAe,CAACE,MAAM;MAC5B,OAAOzC,oBAAoB,CACzB,IAAI,CAACG,OAAO,CAACI,EAAE,EACfkC,MAAM,EACN9B,MAAM,EACN;QACE8B,MAAM;QACN7B,SAAS;QACTC,WAAW;QACXC,KAAK;QACLC,KAAK;QACLC,KAAK;QACLC,cAAc;QACdC,YAAY;QACZC,eAAe;QACfC,QAAQ;QACRC,YAAY;QACZC,YAAY;QACZC,IAAI;QACJC,IAAI;QACJC,UAAU;QACVC,aAAa;QACbC,KAAK;QACLC,KAAK;QACLC,mBAAmB;QACnBC,WAAW;QACXC,eAAe;QACfC,OAAO;QACPC,OAAO;QACPC,YAAY;QACZC,gBAAgB;QAChBC,WAAW;QACXM,uBAAuB,EAAE,CAAC,CAACL;MAC7B,CACF,CAAC;IACH;IACA,OAAO,IAAI,CAAClC,OAAO,CAACM,UAAU,CAAC;MAC7BC,QAAQ;MACRE,SAAS;MACTC,WAAW;MACXC,KAAK;MACLC,KAAK;MACLC,KAAK;MACLC,cAAc;MACdC,YAAY;MACZC,eAAe;MACfC,QAAQ;MACRC,YAAY;MACZC,YAAY;MACZC,IAAI;MACJC,IAAI;MACJC,UAAU;MACVC,aAAa;MACbC,KAAK;MACLC,KAAK;MACLC,mBAAmB;MACnBC,WAAW;MACXC,eAAe;MACfC,OAAO;MACPC,OAAO;MACPC,YAAY;MACZC,gBAAgB;MAChBC;IACF,CAAC,EAAEC,QAAQ,CAAC;EACd;EAEA,MAAMM,MAAMA,CAAA,EAAkB;IAC5B;IACA,OAAO,IAAI,CAACxC,OAAO,EAAEwC,MAAM,CAAC,CAAC;EAC/B;EAEA,MAAMC,OAAOA,CAAA,EAAkB;IAC7B,OAAO,IAAI,CAACzC,OAAO,CAACyC,OAAO,CAAC,CAAC;EAC/B;AACF","ignoreList":[]}
+{"version":3,"names":["initLlama","initMultimodal","multimodalCompletion","Telemetry","CactusVLM","constructor","context","initParams","init","params","onProgress","configs","n_gpu_layers","config","id","mmproj","vlm","error","e","indexOf","length","Error","completion","messages","callback","startTime","Date","now","firstTokenTime","wrappedCallback","data","undefined","result","images","formattedPrompt","getFormattedChat","prompt","emit_partial_completion","track","event","tok_per_sec","timings","predicted_per_second","toks_generated","predicted_n","ttft","num_images","rewind","release"],"sourceRoot":"../../src","sources":["vlm.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/index.d.ts.map

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

package/lib/typescript/lm.d.ts

@@ -1,41 +1,17 @@
-import type { ContextParams, CactusOAICompatibleMessage, NativeCompletionResult, EmbeddingParams, NativeEmbeddingResult, TokenData, CompletionResponseFormat } from './index';
+import type { ContextParams, CompletionParams, CactusOAICompatibleMessage, NativeCompletionResult, EmbeddingParams, NativeEmbeddingResult } from './index';
+interface CactusLMReturn {
+    lm: CactusLM | null;
+    error: Error | null;
+}
 export declare class CactusLM {
     private context;
+    private initParams;
     private constructor();
-    static init(params: ContextParams, onProgress?: (progress: number) => void): Promise<CactusLM>;
-    completion(messages: CactusOAICompatibleMessage[], { n_predict, temperature, top_p, top_k, min_p, penalty_repeat, penalty_freq, penalty_present, mirostat, mirostat_tau, mirostat_eta, seed, stop, ignore_eos, chat_template, jinja, tools, parallel_tool_calls, tool_choice, response_format, n_probs, grammar, grammar_lazy, grammar_triggers, json_schema, }?: {
-        n_predict?: number;
-        temperature?: number;
-        top_p?: number;
-        top_k?: number;
-        min_p?: number;
-        penalty_repeat?: number;
-        penalty_freq?: number;
-        penalty_present?: number;
-        mirostat?: number;
-        mirostat_tau?: number;
-        mirostat_eta?: number;
-        seed?: number;
-        stop?: string[];
-        ignore_eos?: boolean;
-        chat_template?: string;
-        jinja?: boolean;
-        tools?: object;
-        parallel_tool_calls?: object;
-        tool_choice?: string;
-        response_format?: CompletionResponseFormat;
-        n_probs?: number;
-        grammar?: string;
-        grammar_lazy?: boolean;
-        grammar_triggers?: Array<{
-            type: number;
-            value: string;
-            token: number;
-        }>;
-        json_schema?: string;
-    }, callback?: (data: TokenData) => void): Promise<NativeCompletionResult>;
+    static init(params: ContextParams, onProgress?: (progress: number) => void): Promise<CactusLMReturn>;
+    completion(messages: CactusOAICompatibleMessage[], params?: CompletionParams, callback?: (data: any) => void): Promise<NativeCompletionResult>;
     embedding(text: string, params?: EmbeddingParams): Promise<NativeEmbeddingResult>;
     rewind(): Promise<void>;
     release(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=lm.d.ts.map

package/lib/typescript/lm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lm.d.ts","sourceRoot":"","sources":["../../src/lm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,0BAA0B,EAC1B,sBAAsB,EACtB,eAAe,EACf,qBAAqB,EACrB,SAAS,EACT,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO;WAIM,IAAI,CACf,MAAM,EAAE,aAAa,EACrB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GACtC,OAAO,CAAC,QAAQ,CAAC;IAKd,UAAU,CACd,QAAQ,EAAE,0BAA0B,EAAE,EACtC,EACE,SAAS,EACT,WAAW,EACX,KAAK,EACL,KAAK,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,aAAa,EACb,KAAK,EACL,KAAK,EACL,mBAAmB,EACnB,WAAW,EACX,eAAe,EACf,OAAO,EACP,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,WAAW,GACZ,GAAE;QACD,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;QACf,UAAU,CAAC,EAAE,OAAO,CAAA;QACpB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,wBAAwB,CAAA;QAC1C,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,YAAY,CAAC,EAAE,OAAO,CAAA;QACtB,gBAAgB,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QACxE,WAAW,CAAC,EAAE,MAAM,CAAA;KAChB,EACN,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,GACnC,OAAO,CAAC,sBAAsB,CAAC;IA+B5B,SAAS,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,qBAAqB,CAAC;IAI3B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
+{"version":3,"file":"lm.d.ts","sourceRoot":"","sources":["../../src/lm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,0BAA0B,EAC1B,sBAAsB,EACtB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAGhB,UAAU,cAAc;IACtB,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAA;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;CACpB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,UAAU,CAAe;IAEjC,OAAO;WAKM,IAAI,CACf,MAAM,EAAE,aAAa,EACrB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GACtC,OAAO,CAAC,cAAc,CAAC;IAoBpB,UAAU,CACd,QAAQ,EAAE,0BAA0B,EAAE,EACtC,MAAM,GAAE,gBAAqB,EAC7B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,GAC7B,OAAO,CAAC,sBAAsB,CAAC;IAqB5B,SAAS,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,qBAAqB,CAAC;IAI3B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/lib/typescript/telemetry.d.ts

@@ -0,0 +1,21 @@
+import type { ContextParams } from './index';
+interface TelemetryConfig {
+    supabaseUrl: string;
+    supabaseKey: string;
+    table?: string;
+}
+export declare class Telemetry {
+    private static instance;
+    private config;
+    private constructor();
+    private static getFilename;
+    static autoInit(): void;
+    static init(config: TelemetryConfig): void;
+    static track(payload: Record<string, any>, options: ContextParams): void;
+    static error(error: Error, options: ContextParams): void;
+    private trackInternal;
+    private errorInternal;
+    private sendRecord;
+}
+export {};
+//# sourceMappingURL=telemetry.d.ts.map

package/lib/typescript/telemetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAiB7C,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA0B;IACjD,OAAO,CAAC,MAAM,CAA4B;IAE1C,OAAO;IAOP,OAAO,CAAC,MAAM,CAAC,WAAW;IAQ1B,MAAM,CAAC,QAAQ,IAAI,IAAI;IASvB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAM1C,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAOxE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAOxD,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,aAAa;YAsBP,UAAU;CAYzB"}

package/lib/typescript/tools.d.ts

@@ -1,4 +1,3 @@
-import type { CactusOAICompatibleMessage } from "./chat";
 import type { NativeCompletionResult } from "./NativeCactus";
 interface Parameter {
     type: string;
@@ -26,13 +25,11 @@ export declare class Tools {
     }[];
     execute(name: string, args: any): Promise<any>;
 }
-export declare function injectToolsIntoMessages(messages: CactusOAICompatibleMessage[], tools: Tools): CactusOAICompatibleMessage[];
 export declare function parseAndExecuteTool(result: NativeCompletionResult, tools: Tools): Promise<{
     toolCalled: boolean;
     toolName?: string;
     toolInput?: any;
     toolOutput?: any;
 }>;
-export declare function updateMessagesWithToolCall(messages: CactusOAICompatibleMessage[], toolName: string, toolInput: any, toolOutput: any): CactusOAICompatibleMessage[];
 export {};
 //# sourceMappingURL=tools.d.ts.map

package/lib/typescript/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AASD,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAA2B;IAExC,GAAG,CACC,IAAI,EAAE,QAAQ,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;IAa1C,UAAU;;;;;;;;;;;;;;IAeJ,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;CAKtC;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,0BAA0B,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,0BAA0B,EAAE,CA8B1H;AAED,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAC,CAAC,CAsB5K;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,0BAA0B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,0BAA0B,EAAE,CAalK"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AASD,qBAAa,KAAK;IAChB,OAAO,CAAC,KAAK,CAA2B;IAExC,GAAG,CACC,IAAI,EAAE,QAAQ,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;IAa1C,UAAU;;;;;;;;;;;;;;IAeJ,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;CAKtC;AAED,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,GAAG,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAC,CAAC,CA6B5K"}

package/lib/typescript/tts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../../src/tts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAEtD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO;WAIM,IAAI,CACf,OAAO,EAAE,YAAY,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,CAAC;IAKf,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,uBAAuB,CAAC;IAU7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
+{"version":3,"file":"tts.d.ts","sourceRoot":"","sources":["../../src/tts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAKb,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAEtD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO;WAIM,IAAI,CACf,OAAO,EAAE,YAAY,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,CAAC;IAKf,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,uBAAuB,CAAC;IAc7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/lib/typescript/vlm.d.ts

@@ -1,44 +1,22 @@
-import type { ContextParams, CactusOAICompatibleMessage, NativeCompletionResult, TokenData, CompletionResponseFormat } from './index';
+import type { ContextParams, CompletionParams, CactusOAICompatibleMessage, NativeCompletionResult } from './index';
+interface CactusVLMReturn {
+    vlm: CactusVLM | null;
+    error: Error | null;
+}
 export type VLMContextParams = ContextParams & {
     mmproj: string;
 };
+export type VLMCompletionParams = Omit<CompletionParams, 'prompt'> & {
+    images?: string[];
+};
 export declare class CactusVLM {
     private context;
+    private initParams;
     private constructor();
-    static init(params: VLMContextParams, onProgress?: (progress: number) => void): Promise<CactusVLM>;
-    completion(messages: CactusOAICompatibleMessage[], { images, n_predict, temperature, top_p, top_k, min_p, penalty_repeat, penalty_freq, penalty_present, mirostat, mirostat_tau, mirostat_eta, seed, stop, ignore_eos, chat_template, jinja, tools, parallel_tool_calls, tool_choice, response_format, n_probs, grammar, grammar_lazy, grammar_triggers, json_schema, }?: {
-        images?: string[];
-        n_predict?: number;
-        temperature?: number;
-        top_p?: number;
-        top_k?: number;
-        min_p?: number;
-        penalty_repeat?: number;
-        penalty_freq?: number;
-        penalty_present?: number;
-        mirostat?: number;
-        mirostat_tau?: number;
-        mirostat_eta?: number;
-        seed?: number;
-        stop?: string[];
-        ignore_eos?: boolean;
-        chat_template?: string;
-        jinja?: boolean;
-        tools?: object;
-        parallel_tool_calls?: object;
-        tool_choice?: string;
-        response_format?: CompletionResponseFormat;
-        n_probs?: number;
-        grammar?: string;
-        grammar_lazy?: boolean;
-        grammar_triggers?: Array<{
-            type: number;
-            value: string;
-            token: number;
-        }>;
-        json_schema?: string;
-    }, callback?: (data: TokenData) => void): Promise<NativeCompletionResult>;
+    static init(params: VLMContextParams, onProgress?: (progress: number) => void): Promise<CactusVLMReturn>;
+    completion(messages: CactusOAICompatibleMessage[], params?: VLMCompletionParams, callback?: (data: any) => void): Promise<NativeCompletionResult>;
     rewind(): Promise<void>;
     release(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=vlm.d.ts.map

package/lib/typescript/vlm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vlm.d.ts","sourceRoot":"","sources":["../../src/vlm.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,aAAa,EACb,0BAA0B,EAC1B,sBAAsB,EACtB,SAAS,EACT,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO;WAIM,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GACtC,OAAO,CAAC,SAAS,CAAC;IASf,UAAU,CACd,QAAQ,EAAE,0BAA0B,EAAE,EACtC,EACE,MAAM,EACN,SAAS,EACT,WAAW,EACX,KAAK,EACL,KAAK,EACL,KAAK,EACL,cAAc,EACd,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,aAAa,EACb,KAAK,EACL,KAAK,EACL,mBAAmB,EACnB,WAAW,EACX,eAAe,EACf,OAAO,EACP,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,WAAW,GACZ,GAAE;QACD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;QACf,UAAU,CAAC,EAAE,OAAO,CAAA;QACpB,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,wBAAwB,CAAA;QAC1C,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,YAAY,CAAC,EAAE,OAAO,CAAA;QACtB,gBAAgB,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;QACxE,WAAW,CAAC,EAAE,MAAM,CAAA;KAChB,EACN,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,GACnC,OAAO,CAAC,sBAAsB,CAAC;IAwE5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
+{"version":3,"file":"vlm.d.ts","sourceRoot":"","sources":["../../src/vlm.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,0BAA0B,EAC1B,sBAAsB,EACvB,MAAM,SAAS,CAAA;AAGhB,UAAU,eAAe;IACvB,GAAG,EAAE,SAAS,GAAG,IAAI,CAAA;IACrB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;CACpB;AAED,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,GAAG;IACnE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO;WAKM,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GACtC,OAAO,CAAC,eAAe,CAAC;IAuBrB,UAAU,CACd,QAAQ,EAAE,0BAA0B,EAAE,EACtC,MAAM,GAAE,mBAAwB,EAChC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,GAC7B,OAAO,CAAC,sBAAsB,CAAC;IAqC5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cactus-react-native",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Run AI models locally on mobile devices",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.ts

@@ -26,7 +26,7 @@ import type {
 import { SchemaGrammarConverter, convertJsonSchemaToGrammar } from './grammar'
 import type { CactusMessagePart, CactusOAICompatibleMessage } from './chat'
 import { formatChat } from './chat'
-import { Tools, injectToolsIntoMessages, parseAndExecuteTool, updateMessagesWithToolCall } from './tools'
+import { Tools, parseAndExecuteTool } from './tools'
 export type {
   NativeContextParams,
   NativeLlamaContext,
@@ -231,49 +231,72 @@ export class LlamaContext {
       tool_choice: params?.tool_choice,
     })
   }
-
+  
   async completionWithTools(
-      params: CompletionParams & {tools: Tools},
-      callback?: (data: TokenData) => void,
-      recursionCount: number = 0,
-      recursionLimit: number = 3
-  ): Promise<NativeCompletionResult> {
-      if (!params.messages) { // tool calling only works with messages
-          return this.completion(params, callback);
-      }
-      if (!params.tools) { // no tools => default completion
-          return this.completion(params, callback);
-      }
-      if (recursionCount >= recursionLimit) {
-          return this.completion(params, callback);
-      }
-
-      let messages = [...params?.messages || []]; // avoid mutating the original
-
-      if (recursionCount === 0) {
-          messages = injectToolsIntoMessages(messages, params.tools);
-      }
+    params: CompletionParams & {tools: Tools},
+    callback?: (data: TokenData) => void,
+    recursionCount: number = 0,
+    recursionLimit: number = 3
+): Promise<NativeCompletionResult> {
+    if (!params.messages) { // tool calling only works with messages
+        return this.completion(params, callback);
+    }
+    if (!params.tools) { // no tools => default completion
+        return this.completion(params, callback);
+    }
+    if (recursionCount >= recursionLimit) {
+        // console.log(`Recursion limit reached (${recursionCount}/${recursionLimit}), returning default completion`)
+        return this.completion({
+            ...params,
+            jinja: true, 
+            tools: params.tools.getSchemas()
+        }, callback);
+    }
 
-      const result = await this.completion({...params, messages}, callback);
-      
-      const {toolCalled, toolName, toolInput, toolOutput} = 
-          await parseAndExecuteTool(result, params.tools);
-
-      if (toolCalled && toolName && toolInput) {
-          const newMessages = updateMessagesWithToolCall(
-              messages, toolName, toolInput, toolOutput
-          );
-          
-          return await this.completionWithTools(
-              {...params, messages: newMessages}, 
-              callback, 
-              recursionCount + 1, 
-              recursionLimit
-          );
-      }
+    const messages = [...params.messages]; // avoid mutating the original messages
+
+    // console.log('Calling completion...')
+    const result = await this.completion({
+        ...params, 
+        messages: messages,
+        jinja: true, 
+        tools: params.tools.getSchemas()
+    }, callback);
+    // console.log('Completion result:', result);
+    
+    const {toolCalled, toolName, toolInput, toolOutput} = 
+        await parseAndExecuteTool(result, params.tools);
+
+    if (toolCalled && toolName && toolInput) {
+        const assistantMessage = {
+            role: 'assistant',
+            content: result.content,
+            tool_calls: result.tool_calls
+        } as CactusOAICompatibleMessage;
+
+        messages.push(assistantMessage);
+        
+        const toolCallId = result.tool_calls?.[0]?.id;
+        const toolMessage = {
+            role: 'tool',
+            content: JSON.stringify(toolOutput),
+            tool_call_id: toolCallId
+        } as CactusOAICompatibleMessage;
+        
+        messages.push(toolMessage);
+        
+        // console.log('Messages being sent to next completion:', JSON.stringify(messages, null, 2));
+        
+        return await this.completionWithTools(
+            {...params, messages: messages}, 
+            callback, 
+            recursionCount + 1, 
+            recursionLimit
+        );
+    }
 
-      return result;
-}
+    return result;
+  }
 
   async completion(
     params: CompletionParams,