npm - agent-swarm-kit - Versions diffs - 1.0.52 → 1.0.54 - Mend

agent-swarm-kit 1.0.52 → 1.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/build/index.cjs CHANGED Viewed

@@ -3746,69 +3746,64 @@ var ClientStorage = /** @class */ (function () {
                 }
             });
         }); });
-        this.take = function (search, total) { return __awaiter(_this, void 0, void 0, function () {
-            var indexed, searchEmbeddings, filtered;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take"), {
-                            search: search,
-                            total: total,
-                        });
-                        indexed = [];
-                        return [4 /*yield*/, this.params.createEmbedding(search)];
-                    case 1:
-                        searchEmbeddings = _a.sent();
-                        if (this.params.onCreate) {
-                            this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
-                        }
-                        return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(functoolsKit.execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
-                                var _a, targetEmbeddings, index, score;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0: return [4 /*yield*/, this._createEmbedding(item)];
-                                        case 1:
-                                            _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
-                                            return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
-                                        case 2:
-                                            score = _b.sent();
-                                            if (this.params.onCompare) {
-                                                this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
-                                            }
-                                            indexed.push({ data: item, score: score });
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); }, {
-                                delay: 10,
-                                maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
-                            })))];
-                    case 2:
-                        _a.sent();
-                        filtered = indexed
-                            .filter(function (_a) {
-                            var score = _a.score;
-                            return score > GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY;
-                        })
-                            .sort(function (_a, _b) {
-                            var a = _a.score;
-                            var b = _b.score;
-                            return b - a;
-                        });
-                        this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take filtered"), {
-                            filtered: filtered.map(function (_a) {
-                                var data = _a.data, score = _a.score;
-                                return ({ id: data.id, score: score });
-                            }),
-                        });
-                        return [2 /*return*/, filtered.map(function (_a) {
-                                var data = _a.data;
-                                return data;
-                            })];
-                }
+        this.take = function (search_1, total_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([search_1, total_1], __read(args_1), false), void 0, function (search, total, score) {
+                var indexed, searchEmbeddings, filtered;
+                var _this = this;
+                if (score === void 0) { score = GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY; }
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take"), {
+                                search: search,
+                                total: total,
+                            });
+                            indexed = new functoolsKit.SortedArray();
+                            return [4 /*yield*/, this.params.createEmbedding(search)];
+                        case 1:
+                            searchEmbeddings = _a.sent();
+                            if (this.params.onCreate) {
+                                this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
+                            }
+                            return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(functoolsKit.execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                                    var _a, targetEmbeddings, index, score;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0: return [4 /*yield*/, this._createEmbedding(item)];
+                                            case 1:
+                                                _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
+                                                return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
+                                            case 2:
+                                                score = _b.sent();
+                                                if (this.params.onCompare) {
+                                                    this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
+                                                }
+                                                indexed.push({ id: item.id }, score);
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); }, {
+                                    delay: 10,
+                                    maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
+                                })))];
+                        case 2:
+                            _a.sent();
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take indexed"), {
+                                indexed: indexed.getEntries(),
+                            });
+                            filtered = indexed.take(total, score);
+                            return [2 /*return*/, filtered.map(function (_a) {
+                                    var id = _a.id;
+                                    return _this._itemMap.get(id);
+                                })];
+                    }
+                });
             });
-        }); };
+        };
         this.upsert = function (item) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             return __generator(this, function (_c) {
@@ -3925,7 +3920,7 @@ var StorageConnectionService = /** @class */ (function () {
          * @param {number} total - The total number of items to retrieve.
          * @returns {Promise<IStorageData[]>} The list of storage data.
          */
-        this.take = function (search, total) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, score) { return __awaiter(_this, void 0, void 0, function () {
             var storage;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3934,12 +3929,13 @@ var StorageConnectionService = /** @class */ (function () {
                             context: this.contextService.context,
                             search: search,
                             total: total,
+                            score: score,
                         });
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, storage.take(search, total)];
+                        return [4 /*yield*/, storage.take(search, total, score)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4092,7 +4088,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {number} total - The total number of items to retrieve.
          * @returns {Promise<IStorageData[]>} The list of storage data.
          */
-        this.take = function (search, total, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, clientId, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4102,11 +4098,12 @@ var StoragePublicService = /** @class */ (function () {
                             total: total,
                             clientId: clientId,
                             storageName: storageName,
+                            score: score,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.storageConnectionService.take(search, total)];
+                                        case 0: return [4 /*yield*/, this.storageConnectionService.take(search, total, score)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -5768,7 +5765,7 @@ var StorageUtils = /** @class */ (function () {
          * @returns {Promise<T[]>} - A promise that resolves to an array of items.
          * @template T
          */
-        this.take = function (search, total, clientId, agentName, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, clientId, agentName, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5777,12 +5774,13 @@ var StorageUtils = /** @class */ (function () {
                             total: total,
                             clientId: clientId,
                             storageName: storageName,
+                            score: score,
                         });
                         swarm.storageValidationService.validate(storageName, "StorageStatic");
                         if (!swarm.agentValidationService.hasStorage(agentName, storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(storageName, " not registered in ").concat(agentName, " (take)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.take(search, total, clientId, storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.take(search, total, clientId, storageName, score)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });

package/build/index.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import { scoped } from 'di-scoped';
-import { ToolRegistry, trycatch, sleep, PubsubArrayAdapter, Subject, queued, not, randomString, memoize, createAwaiter, cancelable, CANCELED_PROMISE_SYMBOL, singleshot, execpool, schedule, ttl, Source } from 'functools-kit';
+import { ToolRegistry, trycatch, sleep, PubsubArrayAdapter, Subject, queued, not, randomString, memoize, createAwaiter, cancelable, CANCELED_PROMISE_SYMBOL, singleshot, execpool, SortedArray, schedule, ttl, Source } from 'functools-kit';
 import { createActivator } from 'di-kit';
 import { omit } from 'lodash-es';
 import xml2js from 'xml2js';
@@ -3744,69 +3744,64 @@ var ClientStorage = /** @class */ (function () {
                 }
             });
         }); });
-        this.take = function (search, total) { return __awaiter(_this, void 0, void 0, function () {
-            var indexed, searchEmbeddings, filtered;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take"), {
-                            search: search,
-                            total: total,
-                        });
-                        indexed = [];
-                        return [4 /*yield*/, this.params.createEmbedding(search)];
-                    case 1:
-                        searchEmbeddings = _a.sent();
-                        if (this.params.onCreate) {
-                            this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
-                        }
-                        return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
-                                var _a, targetEmbeddings, index, score;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0: return [4 /*yield*/, this._createEmbedding(item)];
-                                        case 1:
-                                            _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
-                                            return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
-                                        case 2:
-                                            score = _b.sent();
-                                            if (this.params.onCompare) {
-                                                this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
-                                            }
-                                            indexed.push({ data: item, score: score });
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); }, {
-                                delay: 10,
-                                maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
-                            })))];
-                    case 2:
-                        _a.sent();
-                        filtered = indexed
-                            .filter(function (_a) {
-                            var score = _a.score;
-                            return score > GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY;
-                        })
-                            .sort(function (_a, _b) {
-                            var a = _a.score;
-                            var b = _b.score;
-                            return b - a;
-                        });
-                        this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take filtered"), {
-                            filtered: filtered.map(function (_a) {
-                                var data = _a.data, score = _a.score;
-                                return ({ id: data.id, score: score });
-                            }),
-                        });
-                        return [2 /*return*/, filtered.map(function (_a) {
-                                var data = _a.data;
-                                return data;
-                            })];
-                }
+        this.take = function (search_1, total_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([search_1, total_1], __read(args_1), false), void 0, function (search, total, score) {
+                var indexed, searchEmbeddings, filtered;
+                var _this = this;
+                if (score === void 0) { score = GLOBAL_CONFIG.CC_STORAGE_SEARCH_SIMILARITY; }
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take"), {
+                                search: search,
+                                total: total,
+                            });
+                            indexed = new SortedArray();
+                            return [4 /*yield*/, this.params.createEmbedding(search)];
+                        case 1:
+                            searchEmbeddings = _a.sent();
+                            if (this.params.onCreate) {
+                                this.params.onCreate(search, searchEmbeddings, this.params.clientId, this.params.embedding);
+                            }
+                            return [4 /*yield*/, Promise.all(Array.from(this._itemMap.values()).map(execpool(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                                    var _a, targetEmbeddings, index, score;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0: return [4 /*yield*/, this._createEmbedding(item)];
+                                            case 1:
+                                                _a = __read.apply(void 0, [_b.sent(), 2]), targetEmbeddings = _a[0], index = _a[1];
+                                                return [4 /*yield*/, this.params.calculateSimilarity(searchEmbeddings, targetEmbeddings)];
+                                            case 2:
+                                                score = _b.sent();
+                                                if (this.params.onCompare) {
+                                                    this.params.onCompare(search, index, score, this.params.clientId, this.params.embedding);
+                                                }
+                                                indexed.push({ id: item.id }, score);
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); }, {
+                                    delay: 10,
+                                    maxExec: GLOBAL_CONFIG.CC_STORAGE_SEARCH_POOL,
+                                })))];
+                        case 2:
+                            _a.sent();
+                            this.params.logger.debug("ClientStorage storageName=".concat(this.params.storageName, " clientId=").concat(this.params.clientId, " take indexed"), {
+                                indexed: indexed.getEntries(),
+                            });
+                            filtered = indexed.take(total, score);
+                            return [2 /*return*/, filtered.map(function (_a) {
+                                    var id = _a.id;
+                                    return _this._itemMap.get(id);
+                                })];
+                    }
+                });
             });
-        }); };
+        };
         this.upsert = function (item) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             return __generator(this, function (_c) {
@@ -3923,7 +3918,7 @@ var StorageConnectionService = /** @class */ (function () {
          * @param {number} total - The total number of items to retrieve.
          * @returns {Promise<IStorageData[]>} The list of storage data.
          */
-        this.take = function (search, total) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, score) { return __awaiter(_this, void 0, void 0, function () {
             var storage;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -3932,12 +3927,13 @@ var StorageConnectionService = /** @class */ (function () {
                             context: this.contextService.context,
                             search: search,
                             total: total,
+                            score: score,
                         });
                         storage = this.getStorage(this.contextService.context.clientId, this.contextService.context.storageName);
                         return [4 /*yield*/, storage.waitForInit()];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, storage.take(search, total)];
+                        return [4 /*yield*/, storage.take(search, total, score)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4090,7 +4086,7 @@ var StoragePublicService = /** @class */ (function () {
          * @param {number} total - The total number of items to retrieve.
          * @returns {Promise<IStorageData[]>} The list of storage data.
          */
-        this.take = function (search, total, clientId, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, clientId, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -4100,11 +4096,12 @@ var StoragePublicService = /** @class */ (function () {
                             total: total,
                             clientId: clientId,
                             storageName: storageName,
+                            score: score,
                         });
                         return [4 /*yield*/, ContextService.runInContext(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.storageConnectionService.take(search, total)];
+                                        case 0: return [4 /*yield*/, this.storageConnectionService.take(search, total, score)];
                                         case 1: return [2 /*return*/, _a.sent()];
                                     }
                                 });
@@ -5766,7 +5763,7 @@ var StorageUtils = /** @class */ (function () {
          * @returns {Promise<T[]>} - A promise that resolves to an array of items.
          * @template T
          */
-        this.take = function (search, total, clientId, agentName, storageName) { return __awaiter(_this, void 0, void 0, function () {
+        this.take = function (search, total, clientId, agentName, storageName, score) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5775,12 +5772,13 @@ var StorageUtils = /** @class */ (function () {
                             total: total,
                             clientId: clientId,
                             storageName: storageName,
+                            score: score,
                         });
                         swarm.storageValidationService.validate(storageName, "StorageStatic");
                         if (!swarm.agentValidationService.hasStorage(agentName, storageName)) {
                             throw new Error("agent-swarm StorageUtils ".concat(storageName, " not registered in ").concat(agentName, " (take)"));
                         }
-                        return [4 /*yield*/, swarm.storagePublicService.take(search, total, clientId, storageName)];
+                        return [4 /*yield*/, swarm.storagePublicService.take(search, total, clientId, storageName, score)];
                     case 1: return [2 /*return*/, (_a.sent())];
                 }
             });

package/package.json CHANGED Viewed

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

package/types.d.ts CHANGED Viewed

@@ -510,7 +510,7 @@ interface IStorageData {
 }
 interface IStorageSchema<T extends IStorageData = IStorageData> {
     getData?: (clientId: string, storageName: StorageName) => Promise<T[]> | T[];
-    createIndex(item: T): Promise<string>;
+    createIndex(item: T): Promise<string> | string;
     embedding: EmbeddingName;
     storageName: StorageName;
     callbacks?: Partial<IStorageCallbacks<T>>;
@@ -526,7 +526,7 @@ interface IStorageParams<T extends IStorageData = IStorageData> extends IStorage
     logger: ILogger;
 }
 interface IStorage<T extends IStorageData = IStorageData> {
-    take(search: string, total: number): Promise<T[]>;
+    take(search: string, total: number, score?: number): Promise<T[]>;
     upsert(item: T): Promise<void>;
     remove(itemId: IStorageData["id"]): Promise<void>;
     get(itemId: IStorageData["id"]): Promise<T | null>;
@@ -1861,7 +1861,7 @@ declare class ClientStorage<T extends IStorageData = IStorageData> implements IS
     constructor(params: IStorageParams<T>);
     _createEmbedding: ((item: T) => Promise<readonly [Embeddings, string]>) & functools_kit.IClearableMemoize<string | number> & functools_kit.IControlMemoize<string | number, Promise<readonly [Embeddings, string]>>;
     waitForInit: (() => Promise<void>) & functools_kit.ISingleshotClearable;
-    take: (search: string, total: number) => Promise<T[]>;
+    take: (search: string, total: number, score?: number) => Promise<T[]>;
     upsert: (item: T) => Promise<void>;
     remove: (itemId: IStorageData["id"]) => Promise<void>;
     clear: () => Promise<void>;
@@ -1891,7 +1891,7 @@ declare class StorageConnectionService implements IStorage {
      * @param {number} total - The total number of items to retrieve.
      * @returns {Promise<IStorageData[]>} The list of storage data.
      */
-    take: (search: string, total: number) => Promise<IStorageData[]>;
+    take: (search: string, total: number, score?: number) => Promise<IStorageData[]>;
     /**
      * Upserts an item in the storage.
      * @param {IStorageData} item - The item to upsert.
@@ -1948,7 +1948,7 @@ declare class StoragePublicService implements TStorageConnectionService {
      * @param {number} total - The total number of items to retrieve.
      * @returns {Promise<IStorageData[]>} The list of storage data.
      */
-    take: (search: string, total: number, clientId: string, storageName: StorageName) => Promise<IStorageData[]>;
+    take: (search: string, total: number, clientId: string, storageName: StorageName, score?: number) => Promise<IStorageData[]>;
     /**
      * Upserts an item in the storage.
      * @param {IStorageData} item - The item to upsert.
@@ -2497,7 +2497,7 @@ declare class StorageUtils implements TStorage {
      * @returns {Promise<T[]>} - A promise that resolves to an array of items.
      * @template T
      */
-    take: <T extends IStorageData = IStorageData>(search: string, total: number, clientId: string, agentName: AgentName, storageName: StorageName) => Promise<T[]>;
+    take: <T extends IStorageData = IStorageData>(search: string, total: number, clientId: string, agentName: AgentName, storageName: StorageName, score?: number) => Promise<T[]>;
     /**
      * Upserts an item in the storage.
      * @param {T} item - The item to upsert.