diff --git a/packages/kbot/dist-in/iterator-cache.d.ts b/packages/kbot/dist-in/iterator-cache.d.ts new file mode 100644 index 00000000..165d77b2 --- /dev/null +++ b/packages/kbot/dist-in/iterator-cache.d.ts @@ -0,0 +1,16 @@ +export interface CacheProvider { + get(key: object, namespace: string): Promise; + set(key: object, namespace: string, value: any, options?: { + expiration?: number; + }): Promise; + delete(key: object, namespace: string): Promise; +} +export interface CacheConfig { + enabled?: boolean; + provider?: 'default' | 'redis'; + namespace?: string; + expiration?: number; + redisUrl?: string; +} +export declare const DEFAULT_CACHE_CONFIG: Required>; +export declare function createCacheProvider(config?: CacheConfig): CacheProvider; diff --git a/packages/kbot/dist-in/iterator-cache.js b/packages/kbot/dist-in/iterator-cache.js new file mode 100644 index 00000000..6fd4a60d --- /dev/null +++ b/packages/kbot/dist-in/iterator-cache.js @@ -0,0 +1,114 @@ +import { get_cached_object, set_cached_object, rm_cached_object } from "@polymech/cache"; +import { Redis } from 'ioredis'; +export const DEFAULT_CACHE_CONFIG = { + enabled: true, + provider: 'default', + namespace: 'default-cache', + expiration: 7 * 24 * 60 * 60 // 7 days in seconds +}; +// --- Default Cache Provider (using @polymech/cache) --- +class DefaultCacheProvider { + async get(key, namespace) { + try { + return await get_cached_object({ ca_options: key }, namespace); + } + catch (error) { + console.error(`DefaultCache: Error getting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + return null; + } + } + async set(key, namespace, value, options) { + try { + await set_cached_object({ ca_options: key }, namespace, value, options); + } + catch (error) { + console.error(`DefaultCache: Error setting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + } + } + async delete(key, namespace) { + try { + await rm_cached_object({ ca_options: key }, namespace); + } + catch (error) { + console.error(`DefaultCache: Error deleting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + } + } +} +// --- Redis Cache Provider --- +class RedisCacheProvider { + redis; + constructor(redisUrl) { + // Default to local instance if no URL is provided + this.redis = new Redis(redisUrl || 'redis://localhost:6379'); + this.redis.on('error', (err) => console.error('Redis Client Error', err)); + } + generateKey(key, namespace) { + // Simple serialization; consider a more robust hashing function for complex keys + return `${namespace}:${JSON.stringify(key)}`; + } + async get(key, namespace) { + const redisKey = this.generateKey(key, namespace); + try { + const data = await this.redis.get(redisKey); + return data ? JSON.parse(data) : null; + } + catch (error) { + console.error(`RedisCache: Error getting cache for key ${redisKey}:`, error); + return null; + } + } + async set(key, namespace, value, options) { + const redisKey = this.generateKey(key, namespace); + try { + const stringValue = JSON.stringify(value); + if (options?.expiration) { + await this.redis.set(redisKey, stringValue, 'EX', options.expiration); + } + else { + await this.redis.set(redisKey, stringValue); + } + } + catch (error) { + console.error(`RedisCache: Error setting cache for key ${redisKey}:`, error); + } + } + async delete(key, namespace) { + const redisKey = this.generateKey(key, namespace); + try { + await this.redis.del(redisKey); + } + catch (error) { + console.error(`RedisCache: Error deleting cache for key ${redisKey}:`, error); + } + } + async disconnect() { + await this.redis.quit(); + } +} +// --- Factory Function --- +let defaultCacheProviderInstance = null; +let redisCacheProviderInstance = null; +export function createCacheProvider(config) { + const mergedConfig = { ...DEFAULT_CACHE_CONFIG, ...config }; + if (!mergedConfig.enabled) { + // Return a dummy provider if caching is disabled + return { + get: async () => null, + set: async () => { }, + delete: async () => { }, + }; + } + if (mergedConfig.provider === 'redis') { + if (!redisCacheProviderInstance) { + // Pass redisUrl if provided in config + redisCacheProviderInstance = new RedisCacheProvider(config?.redisUrl); + } + return redisCacheProviderInstance; + } + // Default provider + if (!defaultCacheProviderInstance) { + defaultCacheProviderInstance = new DefaultCacheProvider(); + } + return defaultCacheProviderInstance; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXRlcmF0b3ItY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaXRlcmF0b3ItY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekYsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQWdCaEMsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQTRDO0lBQ3pFLE9BQU8sRUFBRSxJQUFJO0lBQ2IsUUFBUSxFQUFFLFNBQVM7SUFDbkIsU0FBUyxFQUFFLGVBQWU7SUFDMUIsVUFBVSxFQUFFLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxvQkFBb0I7Q0FDcEQsQ0FBQztBQUVGLHlEQUF5RDtBQUV6RCxNQUFNLG9CQUFvQjtJQUN0QixLQUFLLENBQUMsR0FBRyxDQUFDLEdBQVcsRUFBRSxTQUFpQjtRQUNwQyxJQUFJLENBQUM7WUFDRCxPQUFPLE1BQU0saUJBQWlCLENBQUMsRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbkUsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDYixPQUFPLENBQUMsS0FBSyxDQUFDLDZDQUE2QyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsU0FBUyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDcEgsT0FBTyxJQUFJLENBQUM7UUFDaEIsQ0FBQztJQUNMLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQVcsRUFBRSxTQUFpQixFQUFFLEtBQVUsRUFBRSxPQUFpQztRQUNuRixJQUFJLENBQUM7WUFDRCxNQUFNLGlCQUFpQixDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDNUUsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDYixPQUFPLENBQUMsS0FBSyxDQUFDLDZDQUE2QyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsU0FBUyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDeEgsQ0FBQztJQUNMLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQVcsRUFBRSxTQUFpQjtRQUN2QyxJQUFJLENBQUM7WUFDRCxNQUFNLGdCQUFnQixDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQzNELENBQUM7UUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1lBQ2IsT0FBTyxDQUFDLEtBQUssQ0FBQyw4Q0FBOEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLFNBQVMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3pILENBQUM7SUFDTCxDQUFDO0NBQ0o7QUFFRCwrQkFBK0I7QUFFL0IsTUFBTSxrQkFBa0I7SUFDWixLQUFLLENBQVE7SUFFckIsWUFBWSxRQUFpQjtRQUN6QixrREFBa0Q7UUFDbEQsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLEtBQUssQ0FBQyxRQUFRLElBQUksd0JBQXdCLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0JBQW9CLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRU8sV0FBVyxDQUFDLEdBQVcsRUFBRSxTQUFpQjtRQUM5QyxpRkFBaUY7UUFDakYsT0FBTyxHQUFHLFNBQVMsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7SUFDakQsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLFNBQWlCO1FBQ3BDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQztZQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDNUMsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUMxQyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNiLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkNBQTJDLFFBQVEsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQzdFLE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFXLEVBQUUsU0FBaUIsRUFBRSxLQUFVLEVBQUUsT0FBaUM7UUFDbkYsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDO1lBQ0QsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMxQyxJQUFJLE9BQU8sRUFBRSxVQUFVLEVBQUUsQ0FBQztnQkFDdEIsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDMUUsQ0FBQztpQkFBTSxDQUFDO2dCQUNKLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1lBQ2hELENBQUM7UUFDTCxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNiLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkNBQTJDLFFBQVEsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2pGLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFXLEVBQUUsU0FBaUI7UUFDdkMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDO1lBQ0QsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNiLE9BQU8sQ0FBQyxLQUFLLENBQUMsNENBQTRDLFFBQVEsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2xGLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVU7UUFDWixNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDNUIsQ0FBQztDQUNKO0FBRUQsMkJBQTJCO0FBRTNCLElBQUksNEJBQTRCLEdBQXlCLElBQUksQ0FBQztBQUM5RCxJQUFJLDBCQUEwQixHQUF5QixJQUFJLENBQUM7QUFFNUQsTUFBTSxVQUFVLG1CQUFtQixDQUFDLE1BQW9CO0lBQ3BELE1BQU0sWUFBWSxHQUFHLEVBQUUsR0FBRyxvQkFBb0IsRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDO0lBRTVELElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDeEIsaURBQWlEO1FBQ2pELE9BQU87WUFDSCxHQUFHLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQyxJQUFJO1lBQ3JCLEdBQUcsRUFBRSxLQUFLLElBQUksRUFBRSxHQUFFLENBQUM7WUFDbkIsTUFBTSxFQUFFLEtBQUssSUFBSSxFQUFFLEdBQUUsQ0FBQztTQUN6QixDQUFDO0lBQ04sQ0FBQztJQUVELElBQUksWUFBWSxDQUFDLFFBQVEsS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUNwQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsQ0FBQztZQUM3QixzQ0FBc0M7WUFDdkMsMEJBQTBCLEdBQUcsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDMUUsQ0FBQztRQUNELE9BQU8sMEJBQTBCLENBQUM7SUFDdEMsQ0FBQztJQUVELG1CQUFtQjtJQUNuQixJQUFJLENBQUMsNEJBQTRCLEVBQUUsQ0FBQztRQUNoQyw0QkFBNEIsR0FBRyxJQUFJLG9CQUFvQixFQUFFLENBQUM7SUFDOUQsQ0FBQztJQUNELE9BQU8sNEJBQTRCLENBQUM7QUFDeEMsQ0FBQyJ9 \ No newline at end of file diff --git a/packages/kbot/dist-in/iterator.d.ts b/packages/kbot/dist-in/iterator.d.ts index 99e3b2aa..7439e03d 100644 --- a/packages/kbot/dist-in/iterator.d.ts +++ b/packages/kbot/dist-in/iterator.d.ts @@ -1,5 +1,6 @@ import { IKBotTask } from '@polymech/ai-tools'; import { AsyncTransformer, ErrorCallback, FilterCallback, OnTransformCallback, OnTransformedCallback, INetworkOptions } from './async-iterator.js'; +import { CacheConfig } from './iterator-cache.js'; /** * Notes for LLM modifications * @@ -22,11 +23,6 @@ export interface IteratorFactory { transform: (mappings: FieldMapping[]) => Promise; createTransformer: (options: IKBotTask) => AsyncTransformer; } -export interface CacheConfig { - enabled?: boolean; - namespace?: string; - expiration?: number; -} export interface IOptions { network?: INetworkOptions; errorCallback?: ErrorCallback; @@ -38,6 +34,7 @@ export interface IOptions { onTransformed?: OnTransformedCallback; } export { INetworkOptions }; +export { CacheConfig }; export declare function createLLMTransformer(options: IKBotTask, logger?: ILogger, cacheConfig?: CacheConfig): AsyncTransformer; export declare function createIterator(obj: Record, optionsMixin: Partial, globalOptions?: IOptions): IteratorFactory; export declare function transformWithMappings(obj: Record, createTransformer: (options: IKBotTask) => AsyncTransformer, mappings: FieldMapping[], globalOptions?: IOptions): Promise; diff --git a/packages/kbot/dist-in/iterator.js b/packages/kbot/dist-in/iterator.js index 2971064c..b0999ceb 100644 --- a/packages/kbot/dist-in/iterator.js +++ b/packages/kbot/dist-in/iterator.js @@ -1,6 +1,6 @@ import { defaultError, defaultFilters, testFilters, transformObjectWithOptions, DEFAULT_NETWORK_OPTIONS } from './async-iterator.js'; import { run } from './commands/run.js'; -import { get_cached_object, set_cached_object } from "@polymech/cache"; +import { createCacheProvider, DEFAULT_CACHE_CONFIG } from './iterator-cache.js'; const dummyLogger = { info: () => { }, warn: () => { }, @@ -23,13 +23,9 @@ export const removeEmptyObjects = (obj) => { } return obj; }; -const DEFAULT_CACHE_CONFIG = { - enabled: true, - namespace: 'llm-responses', - expiration: 7 * 24 * 60 * 60 // 7 days in seconds -}; export function createLLMTransformer(options, logger = dummyLogger, cacheConfig) { - const config = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const mergedCacheConfig = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const cacheProvider = createCacheProvider(mergedCacheConfig); return async (input, jsonPath) => { logger.info(`Transforming field at path: ${jsonPath}`); logger.info(`Input: ${input}`); @@ -47,8 +43,8 @@ export function createLLMTransformer(options, logger = dummyLogger, cacheConfig) tools: [] }); try { - if (config.enabled) { - const cachedResponse = await get_cached_object({ ca_options: cacheKeyObj }, config.namespace); + if (mergedCacheConfig.enabled) { + const cachedResponse = await cacheProvider.get(cacheKeyObj, 'llm-responses'); if (cachedResponse?.content) { logger.info(`Using cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); return cachedResponse.content; @@ -57,8 +53,8 @@ export function createLLMTransformer(options, logger = dummyLogger, cacheConfig) const results = await run(kbotTask); if (results && results.length > 0 && typeof results[0] === 'string') { const result = results[0].trim(); - if (config.enabled) { - await set_cached_object({ ca_options: cacheKeyObj }, config.namespace, { content: result }, { expiration: config.expiration }); + if (mergedCacheConfig.enabled) { + await cacheProvider.set(cacheKeyObj, 'llm-responses', { content: result }, { expiration: mergedCacheConfig.expiration }); logger.info(`Cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); } logger.info(`Result: ${result}`); @@ -79,7 +75,9 @@ export function createIterator(obj, optionsMixin, globalOptions = {}) { ...DEFAULT_NETWORK_OPTIONS, ...network }; - const config = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const mergedCacheConfig = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const cacheProvider = createCacheProvider(mergedCacheConfig); + const objCacheNamespace = 'transformed-objects'; const defaultTransformerFactory = (options) => { return async (input) => input; }; @@ -116,27 +114,22 @@ export function createIterator(obj, optionsMixin, globalOptions = {}) { transform: async (mappings) => { // *** Object Cache Check (Start) *** let objectCacheKey; - if (config.enabled) { - objectCacheKey = createObjectCacheKey(obj, mappings); // Key based on initial state - const cachedObject = await get_cached_object({ ca_options: objectCacheKey }, 'transformed-objects'); + if (mergedCacheConfig.enabled) { + objectCacheKey = createObjectCacheKey(obj, mappings); + const cachedObject = await cacheProvider.get(objectCacheKey, objCacheNamespace); if (cachedObject?.content) { logger.info('Using cached transformed object'); - // Clear the original object before merging cache to avoid partial states Object.keys(obj).forEach(key => delete obj[key]); deepMerge(obj, cachedObject.content); return; } } // *** Object Cache Check (End) *** - // If no cache hit or caching disabled, perform the transformations directly on 'obj' - // REMOVED: const transformedObj = JSON.parse(JSON.stringify(obj)); for (const mapping of mappings) { const mergedOptions = { ...optionsMixin, ...mapping.options }; const { jsonPath, targetPath = null } = mapping; const transformer = createTransformer(mergedOptions); - // Call transformObjectWithOptions directly on the original 'obj' - await transformObjectWithOptions(obj, // <<< Operate directly on obj - transformer, { + await transformObjectWithOptions(obj, transformer, { jsonPath, targetPath, network: networkOptions, @@ -148,19 +141,15 @@ export function createIterator(obj, optionsMixin, globalOptions = {}) { }); } // *** Object Cache Setting (Start) *** - // Cache the final state of the modified 'obj' - if (config.enabled && objectCacheKey) { // Ensure key was generated - await set_cached_object({ ca_options: objectCacheKey }, 'transformed-objects', { content: obj }, // <<< Cache the final obj - { expiration: config.expiration }); + if (mergedCacheConfig.enabled && objectCacheKey) { + await cacheProvider.set(objectCacheKey, objCacheNamespace, { content: obj }, { expiration: mergedCacheConfig.expiration }); logger.info('Cached transformed object'); } // *** Object Cache Setting (End) *** - // REMOVED: deepMerge(obj, transformedObj); } }; } export async function transformWithMappings(obj, createTransformer, mappings, globalOptions = {}) { - // Pass the provided createTransformer as the transformerFactory in options const optionsWithTransformer = { ...globalOptions, transformerFactory: createTransformer @@ -183,4 +172,4 @@ export async function transform(obj, mappings, optionsMixin = {}, options = {}) await iterator.transform(mappings); return obj; } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"iterator.js","sourceRoot":"","sources":["../src/iterator.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"iterator.js","sourceRoot":"","sources":["../src/iterator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist-in/prompt.js b/packages/kbot/dist-in/prompt.js index 9622b6ce..1fec1568 100644 --- a/packages/kbot/dist-in/prompt.js +++ b/packages/kbot/dist-in/prompt.js @@ -17,12 +17,15 @@ export const preferences = async (opts) => { let preferencesPath = path.resolve(path.join(process.cwd(), PREFERENCES_FILE_NAME)); if (!exists(preferencesPath)) { // Fall back to specified preferences path if local file doesn't exist - preferencesPath = path.resolve(resolve(opts.preferences, false, env_vars())); + // Only resolve if opts.preferences is actually defined + preferencesPath = opts.preferences ? path.resolve(resolve(opts.preferences, false, env_vars())) : ''; } - const preferences = read(preferencesPath, 'string'); + // Only read if preferencesPath is valid and exists + const preferencesContent = preferencesPath && exists(preferencesPath) ? read(preferencesPath, 'string') : ''; return { role: "user", - content: `USER Preferences : ${preferences}` || '' + // Only include content if preferences were actually loaded + content: preferencesContent ? `USER Preferences : ${preferencesContent}` : '' }; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvbXB0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Byb21wdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxJQUFJLElBQUksTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzNDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFBO0FBRWpDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUMvQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDekMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFdEQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssRUFBRSxJQUFlLEVBQW1ELEVBQUU7SUFDN0YsTUFBTSxLQUFLLEdBQUcsTUFBTSxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDdEMsT0FBTztRQUNILElBQUksRUFBRSxNQUFNO1FBQ1osT0FBTyxFQUFFLEtBQUssSUFBSSxFQUFFO0tBQ3ZCLENBQUE7QUFDTCxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxFQUFFLElBQWUsRUFBbUQsRUFBRTtJQUNsRyw4QkFBOEI7SUFDOUIsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUE7SUFDbkYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1FBQzNCLHNFQUFzRTtRQUN0RSxlQUFlLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ2hGLENBQUM7SUFDRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLFFBQVEsQ0FBVyxDQUFBO0lBQzdELE9BQU87UUFDSCxJQUFJLEVBQUUsTUFBTTtRQUNaLE9BQU8sRUFBRSxzQkFBc0IsV0FBVyxFQUFFLElBQUksRUFBRTtLQUNyRCxDQUFBO0FBQ0wsQ0FBQyxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvbXB0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Byb21wdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxJQUFJLElBQUksTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDcEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzNDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFBO0FBRWpDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUMvQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDekMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFdEQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssRUFBRSxJQUFlLEVBQW1ELEVBQUU7SUFDN0YsTUFBTSxLQUFLLEdBQUcsTUFBTSxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDdEMsT0FBTztRQUNILElBQUksRUFBRSxNQUFNO1FBQ1osT0FBTyxFQUFFLEtBQUssSUFBSSxFQUFFO0tBQ3ZCLENBQUE7QUFDTCxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxFQUFFLElBQWUsRUFBbUQsRUFBRTtJQUNsRyw4QkFBOEI7SUFDOUIsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUE7SUFDbkYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1FBQzNCLHNFQUFzRTtRQUN0RSx1REFBdUQ7UUFDdkQsZUFBZSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ3hHLENBQUM7SUFDRCxtREFBbUQ7SUFDbkQsTUFBTSxrQkFBa0IsR0FBRyxlQUFlLElBQUksTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLFFBQVEsQ0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDdEgsT0FBTztRQUNILElBQUksRUFBRSxNQUFNO1FBQ1osMkRBQTJEO1FBQzNELE9BQU8sRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsc0JBQXNCLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7S0FDaEYsQ0FBQTtBQUNMLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/packages/kbot/logs/params.json b/packages/kbot/logs/params.json index 995d91d0..0d22092a 100644 --- a/packages/kbot/logs/params.json +++ b/packages/kbot/logs/params.json @@ -1,13 +1,13 @@ { - "model": "mistralai/mistral-tiny", + "model": "openai/chatgpt-4o-latest", "messages": [ { "role": "user", - "content": "Generate a random number" + "content": "Analyze this product review and extract key information\n\nText to transform: \"Great selection of fruits with good prices and quality. Some items were out of stock.\"" }, { "role": "user", - "content": "USER Preferences : undefined" + "content": "" } ], "tools": [] diff --git a/packages/kbot/package-lock.json b/packages/kbot/package-lock.json index d1fdfdad..0828ee33 100644 --- a/packages/kbot/package-lock.json +++ b/packages/kbot/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "@polymech/kbot-d", "version": "0.3.5", + "license": "MIT", "dependencies": { "@polymech/ai-tools": "file:../ai-tools", "@polymech/cache": "file:../cache", @@ -22,6 +23,7 @@ "emojilib": "4.0.1", "env-var": "7.5.0", "glob": "11.0.1", + "ioredis": "^5.4.1", "json-schema-to-zod": "2.6.0", "jsonpath-plus": "10.3.0", "marked": "14.1.4", @@ -1085,6 +1087,12 @@ } } }, + "node_modules/@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==", + "license": "MIT" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -3128,6 +3136,15 @@ "node": ">=6" } }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -3287,6 +3304,15 @@ "node": ">=0.4.0" } }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -4435,6 +4461,30 @@ "node": ">=10.13.0" } }, + "node_modules/ioredis": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.0.tgz", + "integrity": "sha512-tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==", + "license": "MIT", + "dependencies": { + "@ioredis/commands": "^1.1.1", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ioredis" + } + }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", @@ -4817,6 +4867,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "license": "MIT" + }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -6347,6 +6409,27 @@ "node": ">= 10.13.0" } }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "license": "MIT", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/remark-parse": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz", @@ -6766,6 +6849,12 @@ "dev": true, "license": "MIT" }, + "node_modules/standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", + "license": "MIT" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", diff --git a/packages/kbot/package.json b/packages/kbot/package.json index 7e2a01bb..4d5c866b 100644 --- a/packages/kbot/package.json +++ b/packages/kbot/package.json @@ -63,6 +63,7 @@ "emojilib": "4.0.1", "env-var": "7.5.0", "glob": "11.0.1", + "ioredis": "^5.4.1", "json-schema-to-zod": "2.6.0", "jsonpath-plus": "10.3.0", "marked": "14.1.4", diff --git a/packages/kbot/src/iterator-cache.ts b/packages/kbot/src/iterator-cache.ts new file mode 100644 index 00000000..16e39189 --- /dev/null +++ b/packages/kbot/src/iterator-cache.ts @@ -0,0 +1,139 @@ +import { get_cached_object, set_cached_object, rm_cached_object } from "@polymech/cache"; +import { Redis } from 'ioredis'; + +export interface CacheProvider { + get(key: object, namespace: string): Promise; + set(key: object, namespace: string, value: any, options?: { expiration?: number }): Promise; + delete(key: object, namespace: string): Promise; +} + +export interface CacheConfig { + enabled?: boolean; + provider?: 'default' | 'redis'; + namespace?: string; + expiration?: number; // in seconds + redisUrl?: string; // e.g., 'redis://localhost:6379' +} + +export const DEFAULT_CACHE_CONFIG: Required> = { + enabled: true, + provider: 'default', + namespace: 'default-cache', + expiration: 7 * 24 * 60 * 60 // 7 days in seconds +}; + +// --- Default Cache Provider (using @polymech/cache) --- + +class DefaultCacheProvider implements CacheProvider { + async get(key: object, namespace: string): Promise { + try { + return await get_cached_object({ ca_options: key }, namespace); + } catch (error) { + console.error(`DefaultCache: Error getting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + return null; + } + } + + async set(key: object, namespace: string, value: any, options?: { expiration?: number }): Promise { + try { + await set_cached_object({ ca_options: key }, namespace, value, options); + } catch (error) { + console.error(`DefaultCache: Error setting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + } + } + + async delete(key: object, namespace: string): Promise { + try { + await rm_cached_object({ ca_options: key }, namespace); + } catch (error) { + console.error(`DefaultCache: Error deleting cache for key ${JSON.stringify(key)} in namespace ${namespace}:`, error); + } + } +} + +// --- Redis Cache Provider --- + +class RedisCacheProvider implements CacheProvider { + private redis: Redis; + + constructor(redisUrl?: string) { + // Default to local instance if no URL is provided + this.redis = new Redis(redisUrl || 'redis://localhost:6379'); + this.redis.on('error', (err) => console.error('Redis Client Error', err)); + } + + private generateKey(key: object, namespace: string): string { + // Simple serialization; consider a more robust hashing function for complex keys + return `${namespace}:${JSON.stringify(key)}`; + } + + async get(key: object, namespace: string): Promise { + const redisKey = this.generateKey(key, namespace); + try { + const data = await this.redis.get(redisKey); + return data ? JSON.parse(data) : null; + } catch (error) { + console.error(`RedisCache: Error getting cache for key ${redisKey}:`, error); + return null; + } + } + + async set(key: object, namespace: string, value: any, options?: { expiration?: number }): Promise { + const redisKey = this.generateKey(key, namespace); + try { + const stringValue = JSON.stringify(value); + if (options?.expiration) { + await this.redis.set(redisKey, stringValue, 'EX', options.expiration); + } else { + await this.redis.set(redisKey, stringValue); + } + } catch (error) { + console.error(`RedisCache: Error setting cache for key ${redisKey}:`, error); + } + } + + async delete(key: object, namespace: string): Promise { + const redisKey = this.generateKey(key, namespace); + try { + await this.redis.del(redisKey); + } catch (error) { + console.error(`RedisCache: Error deleting cache for key ${redisKey}:`, error); + } + } + + async disconnect(): Promise { + await this.redis.quit(); + } +} + +// --- Factory Function --- + +let defaultCacheProviderInstance: CacheProvider | null = null; +let redisCacheProviderInstance: CacheProvider | null = null; + +export function createCacheProvider(config?: CacheConfig): CacheProvider { + const mergedConfig = { ...DEFAULT_CACHE_CONFIG, ...config }; + + if (!mergedConfig.enabled) { + // Return a dummy provider if caching is disabled + return { + get: async () => null, + set: async () => {}, + delete: async () => {}, + }; + } + + if (mergedConfig.provider === 'redis') { + if (!redisCacheProviderInstance) { + // Pass redisUrl if provided in config + redisCacheProviderInstance = new RedisCacheProvider(config?.redisUrl); + } + return redisCacheProviderInstance; + } + + // Default provider + if (!defaultCacheProviderInstance) { + defaultCacheProviderInstance = new DefaultCacheProvider(); + } + return defaultCacheProviderInstance; +} \ No newline at end of file diff --git a/packages/kbot/src/iterator.ts b/packages/kbot/src/iterator.ts index a534d0df..dd08dc16 100644 --- a/packages/kbot/src/iterator.ts +++ b/packages/kbot/src/iterator.ts @@ -13,8 +13,8 @@ import { DEFAULT_NETWORK_OPTIONS } from './async-iterator.js' import { run } from './commands/run.js' -import { get_cached_object, set_cached_object, rm_cached_object } from "@polymech/cache" import { deepClone } from "@polymech/core/objects" +import { CacheConfig, createCacheProvider, CacheProvider, DEFAULT_CACHE_CONFIG } from './iterator-cache.js' /** * Notes for LLM modifications @@ -64,12 +64,6 @@ export interface IteratorFactory { createTransformer: (options: IKBotTask) => AsyncTransformer } -export interface CacheConfig { - enabled?: boolean; - namespace?: string; - expiration?: number; // in seconds -} - export interface IOptions { network?: INetworkOptions; errorCallback?: ErrorCallback; @@ -81,21 +75,18 @@ export interface IOptions { onTransformed?: OnTransformedCallback; } -const DEFAULT_CACHE_CONFIG: Required = { - enabled: true, - namespace: 'llm-responses', - expiration: 7 * 24 * 60 * 60 // 7 days in seconds -}; - // Re-export INetworkOptions for other modules to use export { INetworkOptions }; +// Re-export CacheConfig as well +export { CacheConfig }; export function createLLMTransformer( options: IKBotTask, logger: ILogger = dummyLogger, cacheConfig?: CacheConfig ): AsyncTransformer { - const config: Required = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const mergedCacheConfig = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const cacheProvider = createCacheProvider(mergedCacheConfig); return async (input: string, jsonPath: string): Promise => { logger.info(`Transforming field at path: ${jsonPath}`); @@ -117,8 +108,8 @@ export function createLLMTransformer( }); try { - if (config.enabled) { - const cachedResponse = await get_cached_object({ ca_options: cacheKeyObj }, config.namespace) as { content: string }; + if (mergedCacheConfig.enabled) { + const cachedResponse = await cacheProvider.get(cacheKeyObj, 'llm-responses') as { content: string }; if (cachedResponse?.content) { logger.info(`Using cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); return cachedResponse.content; @@ -129,12 +120,12 @@ export function createLLMTransformer( if (results && results.length > 0 && typeof results[0] === 'string') { const result = results[0].trim(); - if (config.enabled) { - await set_cached_object( - { ca_options: cacheKeyObj }, - config.namespace, + if (mergedCacheConfig.enabled) { + await cacheProvider.set( + cacheKeyObj, + 'llm-responses', { content: result }, - { expiration: config.expiration } + { expiration: mergedCacheConfig.expiration } ); logger.info(`Cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); } @@ -173,7 +164,9 @@ export function createIterator( ...network }; - const config: Required = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const mergedCacheConfig = { ...DEFAULT_CACHE_CONFIG, ...cacheConfig }; + const cacheProvider = createCacheProvider(mergedCacheConfig); + const objCacheNamespace = 'transformed-objects'; const defaultTransformerFactory = (options: IKBotTask): AsyncTransformer => { return async (input: string): Promise => input; @@ -213,16 +206,15 @@ export function createIterator( transform: async (mappings: FieldMapping[]): Promise => { // *** Object Cache Check (Start) *** let objectCacheKey: any; - if (config.enabled) { - objectCacheKey = createObjectCacheKey(obj, mappings); // Key based on initial state - const cachedObject = await get_cached_object( - { ca_options: objectCacheKey }, - 'transformed-objects' + if (mergedCacheConfig.enabled) { + objectCacheKey = createObjectCacheKey(obj, mappings); + const cachedObject = await cacheProvider.get( + objectCacheKey, + objCacheNamespace ) as { content: Record }; if (cachedObject?.content) { logger.info('Using cached transformed object'); - // Clear the original object before merging cache to avoid partial states Object.keys(obj).forEach(key => delete obj[key]); deepMerge(obj, cachedObject.content); return; @@ -230,16 +222,13 @@ export function createIterator( } // *** Object Cache Check (End) *** - // If no cache hit or caching disabled, perform the transformations directly on 'obj' - // REMOVED: const transformedObj = JSON.parse(JSON.stringify(obj)); for (const mapping of mappings) { const mergedOptions = { ...optionsMixin, ...mapping.options } as IKBotTask; const { jsonPath, targetPath = null } = mapping; const transformer = createTransformer(mergedOptions); - // Call transformObjectWithOptions directly on the original 'obj' await transformObjectWithOptions( - obj, // <<< Operate directly on obj + obj, transformer, { jsonPath, @@ -255,19 +244,16 @@ export function createIterator( } // *** Object Cache Setting (Start) *** - // Cache the final state of the modified 'obj' - if (config.enabled && objectCacheKey) { // Ensure key was generated - await set_cached_object( - { ca_options: objectCacheKey }, - 'transformed-objects', - { content: obj }, // <<< Cache the final obj - { expiration: config.expiration } + if (mergedCacheConfig.enabled && objectCacheKey) { + await cacheProvider.set( + objectCacheKey, + objCacheNamespace, + { content: obj }, + { expiration: mergedCacheConfig.expiration } ); logger.info('Cached transformed object'); } // *** Object Cache Setting (End) *** - - // REMOVED: deepMerge(obj, transformedObj); } }; } @@ -278,7 +264,6 @@ export async function transformWithMappings( mappings: FieldMapping[], globalOptions: IOptions = {} ): Promise { - // Pass the provided createTransformer as the transformerFactory in options const optionsWithTransformer: IOptions = { ...globalOptions, transformerFactory: createTransformer diff --git a/packages/kbot/src/prompt.ts b/packages/kbot/src/prompt.ts index 8fbab641..40d1bb5f 100644 --- a/packages/kbot/src/prompt.ts +++ b/packages/kbot/src/prompt.ts @@ -24,11 +24,14 @@ export const preferences = async (opts: IKBotTask): Promise