agent-swarm-kit 1.0.155 → 1.0.157

package/build/index.cjs

@@ -15926,6 +15926,10 @@ var SchemaUtils = /** @class */ (function () {
  */
 var Schema = new SchemaUtils();
 
+/**
+ * @see https://github.com/ollama/ollama/blob/86a622cbdc69e9fd501764ff7565e977fc98f00a/server/model.go#L158
+ */
+var TOOL_PROTOCOL_PROMPT = functoolsKit.str.newline("For each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:", "<tool_call>", "{\"name\": <function-name>, \"arguments\": <args-json-object>}", "</tool_call>");
 var AdapterUtils = /** @class */ (function () {
     function AdapterUtils() {
         var _this = this;
@@ -15955,7 +15959,77 @@ var AdapterUtils = /** @class */ (function () {
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            LoggerAdapter.logClient(clientId, "AdapterUtils history", JSON.stringify(rawMessages));
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromOpenAI completion", JSON.stringify(rawMessages));
+                            messages = rawMessages.map(function (_a) {
+                                var role = _a.role, tool_call_id = _a.tool_call_id, tool_calls = _a.tool_calls, content = _a.content;
+                                return ({
+                                    role: role,
+                                    tool_call_id: tool_call_id,
+                                    content: content,
+                                    tool_calls: tool_calls === null || tool_calls === void 0 ? void 0 : tool_calls.map(function (_a) {
+                                        var f = _a.function, rest = __rest(_a, ["function"]);
+                                        return (__assign(__assign({}, rest), { function: {
+                                                name: f.name,
+                                                arguments: JSON.stringify(f.arguments),
+                                            } }));
+                                    }),
+                                });
+                            });
+                            return [4 /*yield*/, openai.chat.completions.create({
+                                    model: model,
+                                    messages: messages,
+                                    tools: tools,
+                                    temperature: 0,
+                                    seed: 0,
+                                    response_format: response_format,
+                                })];
+                        case 1:
+                            _c = __read.apply(void 0, [(_e.sent()).choices, 1]), _d = _c[0].message, content = _d.content, role = _d.role, tool_calls = _d.tool_calls;
+                            return [2 /*return*/, {
+                                    content: content,
+                                    mode: mode,
+                                    agentName: agentName,
+                                    role: role,
+                                    tool_calls: tool_calls === null || tool_calls === void 0 ? void 0 : tool_calls.map(function (_a) {
+                                        var f = _a.function, rest = __rest(_a, ["function"]);
+                                        return (__assign(__assign({}, rest), { function: {
+                                                name: f.name,
+                                                arguments: JSON.parse(f.arguments),
+                                            } }));
+                                    }),
+                                }];
+                    }
+                });
+            }); };
+        };
+        /**
+         * Creates a function to interact with LMStudio's chat completions.
+         *
+         * @param {any} openai - The LMStudio instance.
+         * @param {string} [model="saiga_yandexgpt_8b_gguf"] - The model to use for completions.
+         * @param {Object} [response_format] - The format of the response.
+         * @returns {Function} - A function that takes completion arguments and returns a response from LMStudio.
+         */
+        this.fromLMStudio = function (openai, model, response_format) {
+            if (model === void 0) { model = "saiga_yandexgpt_8b_gguf"; }
+            /**
+             * Handles the completion request to LMStudio.
+             *
+             * @param {ICompletionArgs} args - The arguments for the completion request.
+             * @param {string} args.agentName - The name of the agent.
+             * @param {Array} args.messages - The messages to send to LMStudio.
+             * @param {string} args.mode - The mode of the completion.
+             * @param {Array} args.tools - The tools to use for the completion.
+             * @param {string} args.clientId - The client ID.
+             * @returns {Promise<Object>} - The response from LMStudio.
+             */
+            return function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+                var messages, _c, _d, content, role, tool_calls;
+                var agentName = _b.agentName, rawMessages = _b.messages, mode = _b.mode, tools = _b.tools, clientId = _b.clientId;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromLMStudio completion", JSON.stringify(rawMessages));
                             messages = rawMessages.map(function (_a) {
                                 var role = _a.role, tool_call_id = _a.tool_call_id, tool_calls = _a.tool_calls, content = _a.content;
                                 return ({
@@ -15975,6 +16049,8 @@ var AdapterUtils = /** @class */ (function () {
                                     model: model,
                                     messages: messages,
                                     tools: tools,
+                                    temperature: 0,
+                                    seed: 0,
                                     response_format: response_format,
                                 })];
                         case 1:
@@ -15996,6 +16072,75 @@ var AdapterUtils = /** @class */ (function () {
                 });
             }); };
         };
+        /**
+         * Creates a function to interact with Ollama's chat completions.
+         *
+         * @param {any} ollama - The Ollama instance.
+         * @param {string} [model="nemotron-mini:4b"] - The model to use for completions.
+         * @param {string} [tool_call_protocol=TOOL_PROTOCOL_PROMPT] - The protocol for tool calls.
+         * @returns {Function} - A function that takes completion arguments and returns a response from Ollama.
+         */
+        this.fromOllama = function (ollama, model, tool_call_protocol) {
+            if (model === void 0) { model = "nemotron-mini:4b"; }
+            if (tool_call_protocol === void 0) { tool_call_protocol = TOOL_PROTOCOL_PROMPT; }
+            /**
+             * Handles the completion request to Ollama.
+             *
+             * @param {ICompletionArgs} args - The arguments for the completion request.
+             * @param {string} args.agentName - The name of the agent.
+             * @param {Array} args.messages - The messages to send to Ollama.
+             * @param {string} args.mode - The mode of the completion.
+             * @param {Array} args.tools - The tools to use for the completion.
+             * @param {string} args.clientId - The client ID.
+             * @returns {Promise<Object>} - The response from Ollama.
+             */
+            return function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+                var messages, response;
+                var _c;
+                var agentName = _b.agentName, rawMessages = _b.messages, mode = _b.mode, tools = _b.tools, clientId = _b.clientId;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromOllama completion", JSON.stringify(rawMessages));
+                            messages = __spreadArray([], __read(rawMessages), false);
+                            if (tool_call_protocol) {
+                                messages.unshift({
+                                    agentName: agentName,
+                                    mode: "tool",
+                                    role: "system",
+                                    content: tool_call_protocol,
+                                });
+                            }
+                            return [4 /*yield*/, ollama.chat({
+                                    model: model,
+                                    keep_alive: "24h",
+                                    options: {
+                                        temperature: 0,
+                                        seed: 0,
+                                    },
+                                    messages: messages.map(function (message) {
+                                        var _a;
+                                        return ({
+                                            content: message.content,
+                                            role: message.role,
+                                            tool_calls: (_a = message.tool_calls) === null || _a === void 0 ? void 0 : _a.map(function (call) { return ({
+                                                function: call.function,
+                                            }); }),
+                                        });
+                                    }),
+                                    tools: tools,
+                                })];
+                        case 1:
+                            response = _d.sent();
+                            return [2 /*return*/, __assign(__assign({}, response.message), { tool_calls: (_c = response.message.tool_calls) === null || _c === void 0 ? void 0 : _c.map(function (call) { return ({
+                                        function: call.function,
+                                        type: "function",
+                                        id: functoolsKit.randomString(),
+                                    }); }), mode: mode, agentName: agentName, role: response.message.role })];
+                    }
+                });
+            }); };
+        };
     }
     return AdapterUtils;
 }());

package/build/index.mjs

@@ -15924,6 +15924,10 @@ var SchemaUtils = /** @class */ (function () {
  */
 var Schema = new SchemaUtils();
 
+/**
+ * @see https://github.com/ollama/ollama/blob/86a622cbdc69e9fd501764ff7565e977fc98f00a/server/model.go#L158
+ */
+var TOOL_PROTOCOL_PROMPT = str.newline("For each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:", "<tool_call>", "{\"name\": <function-name>, \"arguments\": <args-json-object>}", "</tool_call>");
 var AdapterUtils = /** @class */ (function () {
     function AdapterUtils() {
         var _this = this;
@@ -15953,7 +15957,77 @@ var AdapterUtils = /** @class */ (function () {
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            LoggerAdapter.logClient(clientId, "AdapterUtils history", JSON.stringify(rawMessages));
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromOpenAI completion", JSON.stringify(rawMessages));
+                            messages = rawMessages.map(function (_a) {
+                                var role = _a.role, tool_call_id = _a.tool_call_id, tool_calls = _a.tool_calls, content = _a.content;
+                                return ({
+                                    role: role,
+                                    tool_call_id: tool_call_id,
+                                    content: content,
+                                    tool_calls: tool_calls === null || tool_calls === void 0 ? void 0 : tool_calls.map(function (_a) {
+                                        var f = _a.function, rest = __rest(_a, ["function"]);
+                                        return (__assign(__assign({}, rest), { function: {
+                                                name: f.name,
+                                                arguments: JSON.stringify(f.arguments),
+                                            } }));
+                                    }),
+                                });
+                            });
+                            return [4 /*yield*/, openai.chat.completions.create({
+                                    model: model,
+                                    messages: messages,
+                                    tools: tools,
+                                    temperature: 0,
+                                    seed: 0,
+                                    response_format: response_format,
+                                })];
+                        case 1:
+                            _c = __read.apply(void 0, [(_e.sent()).choices, 1]), _d = _c[0].message, content = _d.content, role = _d.role, tool_calls = _d.tool_calls;
+                            return [2 /*return*/, {
+                                    content: content,
+                                    mode: mode,
+                                    agentName: agentName,
+                                    role: role,
+                                    tool_calls: tool_calls === null || tool_calls === void 0 ? void 0 : tool_calls.map(function (_a) {
+                                        var f = _a.function, rest = __rest(_a, ["function"]);
+                                        return (__assign(__assign({}, rest), { function: {
+                                                name: f.name,
+                                                arguments: JSON.parse(f.arguments),
+                                            } }));
+                                    }),
+                                }];
+                    }
+                });
+            }); };
+        };
+        /**
+         * Creates a function to interact with LMStudio's chat completions.
+         *
+         * @param {any} openai - The LMStudio instance.
+         * @param {string} [model="saiga_yandexgpt_8b_gguf"] - The model to use for completions.
+         * @param {Object} [response_format] - The format of the response.
+         * @returns {Function} - A function that takes completion arguments and returns a response from LMStudio.
+         */
+        this.fromLMStudio = function (openai, model, response_format) {
+            if (model === void 0) { model = "saiga_yandexgpt_8b_gguf"; }
+            /**
+             * Handles the completion request to LMStudio.
+             *
+             * @param {ICompletionArgs} args - The arguments for the completion request.
+             * @param {string} args.agentName - The name of the agent.
+             * @param {Array} args.messages - The messages to send to LMStudio.
+             * @param {string} args.mode - The mode of the completion.
+             * @param {Array} args.tools - The tools to use for the completion.
+             * @param {string} args.clientId - The client ID.
+             * @returns {Promise<Object>} - The response from LMStudio.
+             */
+            return function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+                var messages, _c, _d, content, role, tool_calls;
+                var agentName = _b.agentName, rawMessages = _b.messages, mode = _b.mode, tools = _b.tools, clientId = _b.clientId;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromLMStudio completion", JSON.stringify(rawMessages));
                             messages = rawMessages.map(function (_a) {
                                 var role = _a.role, tool_call_id = _a.tool_call_id, tool_calls = _a.tool_calls, content = _a.content;
                                 return ({
@@ -15973,6 +16047,8 @@ var AdapterUtils = /** @class */ (function () {
                                     model: model,
                                     messages: messages,
                                     tools: tools,
+                                    temperature: 0,
+                                    seed: 0,
                                     response_format: response_format,
                                 })];
                         case 1:
@@ -15994,6 +16070,75 @@ var AdapterUtils = /** @class */ (function () {
                 });
             }); };
         };
+        /**
+         * Creates a function to interact with Ollama's chat completions.
+         *
+         * @param {any} ollama - The Ollama instance.
+         * @param {string} [model="nemotron-mini:4b"] - The model to use for completions.
+         * @param {string} [tool_call_protocol=TOOL_PROTOCOL_PROMPT] - The protocol for tool calls.
+         * @returns {Function} - A function that takes completion arguments and returns a response from Ollama.
+         */
+        this.fromOllama = function (ollama, model, tool_call_protocol) {
+            if (model === void 0) { model = "nemotron-mini:4b"; }
+            if (tool_call_protocol === void 0) { tool_call_protocol = TOOL_PROTOCOL_PROMPT; }
+            /**
+             * Handles the completion request to Ollama.
+             *
+             * @param {ICompletionArgs} args - The arguments for the completion request.
+             * @param {string} args.agentName - The name of the agent.
+             * @param {Array} args.messages - The messages to send to Ollama.
+             * @param {string} args.mode - The mode of the completion.
+             * @param {Array} args.tools - The tools to use for the completion.
+             * @param {string} args.clientId - The client ID.
+             * @returns {Promise<Object>} - The response from Ollama.
+             */
+            return function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+                var messages, response;
+                var _c;
+                var agentName = _b.agentName, rawMessages = _b.messages, mode = _b.mode, tools = _b.tools, clientId = _b.clientId;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            LoggerAdapter.logClient(clientId, "AdapterUtils fromOllama completion", JSON.stringify(rawMessages));
+                            messages = __spreadArray([], __read(rawMessages), false);
+                            if (tool_call_protocol) {
+                                messages.unshift({
+                                    agentName: agentName,
+                                    mode: "tool",
+                                    role: "system",
+                                    content: tool_call_protocol,
+                                });
+                            }
+                            return [4 /*yield*/, ollama.chat({
+                                    model: model,
+                                    keep_alive: "24h",
+                                    options: {
+                                        temperature: 0,
+                                        seed: 0,
+                                    },
+                                    messages: messages.map(function (message) {
+                                        var _a;
+                                        return ({
+                                            content: message.content,
+                                            role: message.role,
+                                            tool_calls: (_a = message.tool_calls) === null || _a === void 0 ? void 0 : _a.map(function (call) { return ({
+                                                function: call.function,
+                                            }); }),
+                                        });
+                                    }),
+                                    tools: tools,
+                                })];
+                        case 1:
+                            response = _d.sent();
+                            return [2 /*return*/, __assign(__assign({}, response.message), { tool_calls: (_c = response.message.tool_calls) === null || _c === void 0 ? void 0 : _c.map(function (call) { return ({
+                                        function: call.function,
+                                        type: "function",
+                                        id: randomString(),
+                                    }); }), mode: mode, agentName: agentName, role: response.message.role })];
+                    }
+                });
+            }); };
+        };
     }
     return AdapterUtils;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-swarm-kit",
-  "version": "1.0.155",
+  "version": "1.0.157",
   "description": "A TypeScript library for building orchestrated framework-agnostic multi-agent AI systems",
   "author": {
     "name": "Petr Tripolsky",

package/types.d.ts

@@ -1,7 +1,6 @@
 import * as di_scoped from 'di-scoped';
 import * as functools_kit from 'functools-kit';
 import { SortedArray, Subject } from 'functools-kit';
-import { ICompletionArgs as ICompletionArgs$1 } from 'src/interfaces/Completion.interface';
 
 /**
  * Interface representing the context.
@@ -5730,13 +5729,39 @@ declare class AdapterUtils {
      */
     fromOpenAI: (openai: any, model?: string, response_format?: {
         type: string;
-    }) => ({ agentName, messages: rawMessages, mode, tools, clientId, }: ICompletionArgs$1) => Promise<{
+    }) => ({ agentName, messages: rawMessages, mode, tools, clientId, }: ICompletionArgs) => Promise<{
         content: any;
         mode: ExecutionMode;
         agentName: string;
         role: any;
         tool_calls: any;
     }>;
+    /**
+     * Creates a function to interact with LMStudio's chat completions.
+     *
+     * @param {any} openai - The LMStudio instance.
+     * @param {string} [model="saiga_yandexgpt_8b_gguf"] - The model to use for completions.
+     * @param {Object} [response_format] - The format of the response.
+     * @returns {Function} - A function that takes completion arguments and returns a response from LMStudio.
+     */
+    fromLMStudio: (openai: any, model?: string, response_format?: {
+        type: string;
+    }) => ({ agentName, messages: rawMessages, mode, tools, clientId, }: ICompletionArgs) => Promise<{
+        content: any;
+        mode: ExecutionMode;
+        agentName: string;
+        role: any;
+        tool_calls: any;
+    }>;
+    /**
+     * Creates a function to interact with Ollama's chat completions.
+     *
+     * @param {any} ollama - The Ollama instance.
+     * @param {string} [model="nemotron-mini:4b"] - The model to use for completions.
+     * @param {string} [tool_call_protocol=TOOL_PROTOCOL_PROMPT] - The protocol for tool calls.
+     * @returns {Function} - A function that takes completion arguments and returns a response from Ollama.
+     */
+    fromOllama: (ollama: any, model?: string, tool_call_protocol?: string) => ({ agentName, messages: rawMessages, mode, tools, clientId, }: ICompletionArgs) => Promise<any>;
 }
 /**
  * An instance of AdapterUtils.