diff --git a/packages/kbot/.vscode/launch.json b/packages/kbot/.vscode/launch.json index ffa00c01..84d72409 100644 --- a/packages/kbot/.vscode/launch.json +++ b/packages/kbot/.vscode/launch.json @@ -723,6 +723,24 @@ "!**/node_modules/**" ], "outputCapture": "std" + }, + { + "type": "node", + "request": "launch", + "name": "examples:iterator-factory", + "skipFiles": ["/**"], + "cwd": "${workspaceFolder}", + "runtimeExecutable": "npm", + "runtimeArgs": ["run", "examples:iterator-factory"], + "outFiles": ["${workspaceFolder}/**/*.js", "${workspaceFolder}/**/*.ts"], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "sourceMaps": true, + "resolveSourceMapLocations": [ + "${workspaceFolder}/**", + "!**/node_modules/**" + ], + "outputCapture": "std" } ] } \ No newline at end of file diff --git a/packages/kbot/dist-in/examples/core/iterator-factory-example.js b/packages/kbot/dist-in/examples/core/iterator-factory-example.js index efdffc23..780716de 100644 --- a/packages/kbot/dist-in/examples/core/iterator-factory-example.js +++ b/packages/kbot/dist-in/examples/core/iterator-factory-example.js @@ -3,35 +3,7 @@ import * as path from 'path'; import * as fs from 'fs'; import { E_OPENROUTER_MODEL } from '../../models/cache/openrouter-models.js'; import { E_Mode } from '../../zod_schema.js'; -import { createIterator, registerCacheModule } from '../../iterator.js'; -import { run } from '../../commands/run.js'; -// Clear the mock cache for fresh testing -const mockCacheModule = { - _cache: new Map(), - get_cached_object: async (key, namespace) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: Looking up ${cacheKey}`); - return mockCacheModule._cache.get(cacheKey) || null; - }, - set_cached_object: async (key, namespace, value) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: Storing in ${cacheKey}`); - mockCacheModule._cache.set(cacheKey, value); - // Show what's being stored for debugging - console.log(`Cache value stored: ${JSON.stringify(value, null, 2).substring(0, 100)}...`); - }, - rm_cached_object: async (key, namespace) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: REMOVING ${cacheKey}`); - // Check if it existed before removal - const existed = mockCacheModule._cache.has(cacheKey); - mockCacheModule._cache.delete(cacheKey); - // Show removal status - console.log(`Cache removal: ${existed ? 'REMOVED EXISTING CACHE VALUE' : 'NO CACHE VALUE FOUND'}`); - } -}; -// Register our mock cache module -registerCacheModule(mockCacheModule); +import { createIterator, createLLMTransformer } from '../../iterator.js'; const MODEL = E_OPENROUTER_MODEL.MODEL_OPENROUTER_QUASAR_ALPHA; const ROUTER = 'openrouter'; const LOG_LEVEL = 2; @@ -93,32 +65,6 @@ const fieldMappings = [ } } ]; -// Create LLM transformer factory -const createLLMTransformer = (options) => { - return async (input, jsonPath) => { - logger.info(`Transforming field at path: ${jsonPath}`); - logger.info(`Input: ${input}`); - logger.info(`Using prompt: ${options.prompt}`); - const kbotTask = { - ...options, - prompt: `${options.prompt}\n\nText to transform: "${input}"`, - }; - try { - const results = await run(kbotTask); - if (results && results.length > 0 && typeof results[0] === 'string') { - const result = results[0].trim(); - logger.info(`Result: ${result}`); - return result; - } - logger.warn(`No valid result received for ${jsonPath}, returning original`); - return input; - } - catch (error) { - console.error(`Error calling LLM API: ${error.message}`, error); - return input; - } - }; -}; // Error handler const errorCallback = (path, value, error) => { logger.error(`Error transforming ${path}: ${error.message}`); @@ -152,7 +98,7 @@ export async function factoryExample() { concurrentTasks: 1, errorCallback, filterCallback: async () => true, - transformerFactory: createLLMTransformer, + transformerFactory: (options) => createLLMTransformer(options, logger), logger: logger, cache: { enabled: true, @@ -177,7 +123,7 @@ export async function factoryExample() { concurrentTasks: 1, errorCallback, filterCallback: async () => true, - transformerFactory: createLLMTransformer, + transformerFactory: (options) => createLLMTransformer(options, logger), logger: logger, cache: { enabled: true, @@ -186,55 +132,6 @@ export async function factoryExample() { }); // Should use cached values await iterator2.transform(fieldMappings); - // Manually set the marketingName for demonstration purposes - data2.products.fruits[0].name = { - value: "apple", - marketingName: "Crimson Orchard Delight" - }; - data2.products.fruits[1].name = { - value: "banana", - marketingName: "Golden Delight Banana" - }; - // Now create a third instance with caching disabled to demonstrate cache cleanup - console.log("\n\n========================================"); - console.log("Third run - with caching disabled (should clean up cache):"); - console.log("========================================"); - /* - const data3 = JSON.parse(JSON.stringify(exampleData)); - - const iterator3 = createIterator( - data3, - globalOptionsMixin, - { - throttleDelay: 1000, - concurrentTasks: 1, - errorCallback, - filterCallback: async () => true, - transformerFactory: createLLMTransformer, - logger: logger, - cache: { - enabled: false, // Caching disabled - namespace: 'product-transformations' - } - } - ); - - // Should transform again and remove the cache - await iterator3.transform(fieldMappings); - - // Verify cache was removed by checking if it still exists - console.log("\nVerifying cache removal:"); - const cacheKey = { - key: JSON.stringify({ - jsonPath: '$..name', - targetPath: 'marketingName', - options: { ...globalOptionsMixin, prompt: 'Generate a more appealing marketing name for this product' } - }), - name: 'product-transformations' - }; - const cachedValue = await mockCacheModule.get_cached_object(cacheKey, 'product-transformations'); - console.log(`Cache still exists? ${cachedValue !== null ? 'Yes' : 'No'}`); - */ console.log("\nBefore/After Comparison Example:"); console.log(`Original description: ${exampleData.products.fruits[0].description}`); console.log(`Transformed description: ${data.products.fruits[0].description}`); @@ -250,22 +147,16 @@ export async function factoryExample() { throw error; } } -console.log("Module loading, checking if this is direct execution"); -console.log("process.argv[1]:", process.argv[1]); -console.log("import.meta.url:", import.meta.url); -const isDirectExecution = process.argv[1] && process.argv[1].includes('iterator-factory-example'); -console.log("Is direct execution:", isDirectExecution); -if (isDirectExecution) { +if (process.argv[1] && process.argv[1].includes('iterator-factory-example')) { const isDebug = process.argv.includes('--debug'); console.log('Starting iterator factory example...'); console.log(`Command arguments: ${process.argv.slice(2).join(', ')}`); console.log(`Debug mode: ${isDebug ? 'enabled' : 'disabled'}`); if (isDebug) { - // Set up debug logging console.log("Running in debug mode with verbose output"); } factoryExample().catch(error => { console.error("Unhandled error:", error); }); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"iterator-factory-example.js","sourceRoot":"","sources":["../../../src/examples/core/iterator-factory-example.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXRlcmF0b3ItZmFjdG9yeS1leGFtcGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2V4YW1wbGVzL2NvcmUvaXRlcmF0b3ItZmFjdG9yeS1leGFtcGxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLElBQUksS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFDN0IsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFekIsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDN0UsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRTdDLE9BQU8sRUFBZ0IsY0FBYyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFdkYsTUFBTSxLQUFLLEdBQUcsa0JBQWtCLENBQUMsNkJBQTZCLENBQUM7QUFDL0QsTUFBTSxNQUFNLEdBQUcsWUFBWSxDQUFDO0FBQzVCLE1BQU0sU0FBUyxHQUFHLENBQUMsQ0FBQztBQUVwQixNQUFNLE1BQU0sR0FBRztJQUNYLElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLE9BQU8sRUFBRSxDQUFDO0lBQzFELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLE9BQU8sRUFBRSxDQUFDO0lBQzFELEtBQUssRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxVQUFVLE9BQU8sRUFBRSxDQUFDO0lBQzlELEtBQUssRUFBRSxDQUFDLE9BQWUsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLE9BQU8sRUFBRSxDQUFDO0lBQzVELEtBQUssRUFBRSxDQUFDLE9B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 \ 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 03a4908e..29eb3673 100644 --- a/packages/kbot/dist-in/iterator.d.ts +++ b/packages/kbot/dist-in/iterator.d.ts @@ -1,35 +1,6 @@ import { IKBotTask } from '@polymech/ai-tools'; import { AsyncTransformer, ErrorCallback, FilterCallback } from './async-iterator.js'; -declare let cacheModule: { - get_cached_object: (key: any, namespace: string) => Promise; - set_cached_object: (key: any, namespace: string, value: any, options?: any) => Promise; - rm_cached_object: (key: any, namespace: string) => Promise; -} | null; -export declare function registerCacheModule(module: typeof cacheModule): void; -export interface CacheInterface { - get: (key: any) => Promise; - set: (key: any, value: any) => Promise; - delete?: (key: any) => Promise; -} -export declare class NoopCache implements CacheInterface { - get(_key: any): Promise; - set(_key: any, _value: any): Promise; - delete(_key: any): Promise; -} -export declare class DefaultCache implements CacheInterface { - private readonly logger?; - constructor(logger?: { - error: (message: string, error?: any) => void; - }); - get(key: any): Promise; - set(key: any, value: any): Promise; - delete(key: any): Promise; -} -export interface CacheOptions { - enabled: boolean; - implementation?: CacheInterface; - namespace?: string; -} +export declare const removeEmptyObjects: (obj: any) => any; export interface FieldMapping { jsonPath: string; targetPath?: string | null; @@ -41,8 +12,11 @@ export interface IteratorFactory { transform: (mappings: FieldMapping[]) => Promise; createTransformer: (options: IKBotTask) => AsyncTransformer; } -export declare function createCacheKey(obj: any): string; -export declare function removeEmptyValues(obj: any): any; +export declare function createLLMTransformer(options: IKBotTask, logger?: { + info: (message: string) => void; + warn: (message: string) => void; + error: (message: string, error?: any) => void; +}): AsyncTransformer; export declare function createIterator(obj: Record, optionsMixin: Partial, globalOptions?: { throttleDelay?: number; concurrentTasks?: number; @@ -51,7 +25,6 @@ export declare function createIterator(obj: Record, optionsMixin: P transformerFactory?: (options: IKBotTask) => AsyncTransformer; maxRetries?: number; retryDelay?: number; - cache?: CacheOptions; logger?: { error: (message: string, error?: any) => void; }; @@ -63,9 +36,7 @@ export declare function transformWithMappings(obj: Record, createTr filterCallback?: FilterCallback; maxRetries?: number; retryDelay?: number; - cache?: CacheOptions; logger?: { error: (message: string, error?: any) => void; }; }): Promise; -export {}; diff --git a/packages/kbot/dist-in/iterator.js b/packages/kbot/dist-in/iterator.js index d02633ba..2c216aad 100644 --- a/packages/kbot/dist-in/iterator.js +++ b/packages/kbot/dist-in/iterator.js @@ -1,335 +1,106 @@ import { defaultError, defaultFilters, testFilters, transformObjectWithOptions } from './async-iterator.js'; -import { JSONPath } from 'jsonpath-plus'; -// Add an optional import that can be provided by the user -let cacheModule = null; -// Function to register the cache module -export function registerCacheModule(module) { - cacheModule = module; -} -// Default no-op cache implementation -export class NoopCache { - async get(_key) { return null; } - async set(_key, _value) { return; } - async delete(_key) { return; } -} -// Default cache implementation based on kbot.ts pattern -export class DefaultCache { - logger; - constructor(logger) { - this.logger = logger; - } - async get(key) { - if (!cacheModule) - return null; - try { - const namespace = key.name || 'iterator'; - const cached = await cacheModule.get_cached_object(key, namespace); - return cached; - } - catch (e) { - if (this.logger) { - this.logger.error(`Failed to get cached object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } - else { - console.error(`Cache get error:`, e); - } - return null; - } - } - async set(key, value) { - if (!cacheModule) - return; - try { - const namespace = key.name || 'iterator'; - await cacheModule.set_cached_object(key, namespace, value, {}); - } - catch (e) { - if (this.logger) { - this.logger.error(`Failed to cache object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } - else { - console.error(`Cache set error:`, e); - } - } - } - async delete(key) { - if (!cacheModule) - return; - try { - const namespace = key.name || 'iterator'; - await cacheModule.rm_cached_object(key, namespace); - } - catch (e) { - if (this.logger) { - this.logger.error(`Failed to delete cached object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } - else { - console.error(`Cache delete error:`, e); - } - } - } -} -// Utility function to create a cache key from an object -export function createCacheKey(obj) { - try { - const cleanObj = JSON.parse(JSON.stringify(removeEmptyValues(obj))); - return JSON.stringify(cleanObj); - } - catch (e) { - console.error("Error creating cache key:", e); - // Fallback to simpler stringification if error occurs - return JSON.stringify({ hash: String(Date.now()) }); - } -} -// Utility to remove null, undefined, and empty objects from an object for cache key generation -export function removeEmptyValues(obj) { - if (obj === null || obj === undefined) { - return undefined; - } - if (typeof obj !== 'object') { +import { run } from './commands/run.js'; +import { get_cached_object, set_cached_object } from "@polymech/cache"; +export const removeEmptyObjects = (obj) => { + if (obj === null || obj === undefined) return obj; - } - if (Array.isArray(obj)) { - const filtered = obj.map(removeEmptyValues).filter(v => v !== undefined); - return filtered.length ? filtered : undefined; - } - const result = {}; - let hasValues = false; - for (const [key, value] of Object.entries(obj)) { - const cleaned = removeEmptyValues(value); - if (cleaned !== undefined) { - result[key] = cleaned; - hasValues = true; + for (const key in obj) { + const val = obj[key]; + if (val === null || val === undefined) + continue; + if (typeof val === 'object' || + (key == 'value' && typeof val === 'number' && val === 0 || key == 'base64')) { + obj[key] = removeEmptyObjects(obj[key]); + if (Object.keys(obj[key]).length === 0) { + delete obj[key]; + } } } - return hasValues ? result : undefined; + return obj; +}; +export function createLLMTransformer(options, logger) { + return async (input, jsonPath) => { + if (logger) { + logger.info(`Transforming field at path: ${jsonPath}`); + logger.info(`Input: ${input}`); + logger.info(`Using prompt: ${options.prompt}`); + } + const kbotTask = { + ...options, + prompt: `${options.prompt}\n\nText to transform: "${input}"`, + }; + // Create cache key for the LLM call + const cacheKeyObj = removeEmptyObjects({ + prompt: kbotTask.prompt, + model: kbotTask.model, + router: kbotTask.router, + mode: kbotTask.mode, + filters: [], + tools: [] + }); + try { + const cachedResponse = await get_cached_object({ ca_options: cacheKeyObj }, 'llm-responses'); + if (cachedResponse?.content) { + if (logger) + logger.info(`Using cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); + return cachedResponse.content; + } + const results = await run(kbotTask); + if (results && results.length > 0 && typeof results[0] === 'string') { + const result = results[0].trim(); + await set_cached_object({ ca_options: cacheKeyObj }, 'llm-responses', { content: result }, {}); + if (logger) + logger.info(`Cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); + if (logger) + logger.info(`Result: ${result}`); + return result; + } + if (logger) + logger.warn(`No valid result received for ${jsonPath}, returning original`); + return input; + } + catch (error) { + if (logger) { + logger.error(`Error calling LLM API: ${error.message}`, error); + } + else { + console.error(`Error calling LLM API: ${error.message}`, error); + } + return input; + } + }; } export function createIterator(obj, optionsMixin, globalOptions = {}) { - const { throttleDelay = 1000, concurrentTasks = 1, errorCallback = defaultError, filterCallback = testFilters(defaultFilters()), transformerFactory, maxRetries = 3, retryDelay = 2000, cache, logger } = globalOptions; + const { throttleDelay = 1000, concurrentTasks = 1, errorCallback = defaultError, filterCallback = testFilters(defaultFilters()), transformerFactory, maxRetries = 3, retryDelay = 2000, logger } = globalOptions; const defaultTransformerFactory = (options) => { // This is a placeholder transformer that just returns the input // In real usage, this would be replaced by the provided transformerFactory return async (input) => input; }; const createTransformer = transformerFactory || defaultTransformerFactory; - // Default cache settings - const defaultImplementation = logger ? new DefaultCache(logger) : new DefaultCache(); - const cacheImpl = cache?.implementation || defaultImplementation; - const cacheEnabled = cache?.enabled || false; - const cacheNamespace = cache?.namespace || 'iterator'; return { createTransformer, transform: async (mappings) => { for (const mapping of mappings) { - // Merge the mapping options with the global mixin const mergedOptions = { ...optionsMixin, ...mapping.options }; const { jsonPath, targetPath = null, maxRetries: mappingRetries, retryDelay: mappingRetryDelay } = mapping; const transformer = createTransformer(mergedOptions); - // Generate cache key for this transformation - if (cacheEnabled) { - const cacheKeyObj = { - jsonPath, - targetPath, - options: mergedOptions, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - }; - const cacheKey = { key: createCacheKey(cacheKeyObj), name: cacheNamespace }; - // Check if we have a cached result - try { - const cachedResult = await cacheImpl.get(cacheKey); - if (cachedResult) { - // Apply cached result directly - applyTransformResult(obj, jsonPath, targetPath, cachedResult); - continue; // Skip to next mapping - } - } - catch (e) { - errorCallback('cache', 'get', e); - } - // For paths with targetPath, we need special handling for the LLM results - if (targetPath) { - // Get all the values that need transformation - const paths = JSONPath({ path: jsonPath, json: obj, resultType: 'pointer' }); - const transformedData = {}; - for (const path of paths) { - // Extract the value to transform - const keys = path.slice(1).split('/'); - let current = obj; - for (const key of keys) { - if (key === '') - continue; - if (current === undefined || current === null) - break; - current = current[key]; - } - // Transform the value if it exists - if (current !== undefined) { - try { - // Perform the transformation using the LLM - const rawValue = typeof current === 'object' && current !== null && 'value' in current - ? current.value - : current; - const result = await transformer(String(rawValue), path); - // Store the result with the target path - transformedData[path] = { [targetPath]: result }; - } - catch (e) { - errorCallback(path, String(current), e); - } - } - } - // Store the result in the cache - if (Object.keys(transformedData).length > 0) { - try { - await cacheImpl.set(cacheKey, transformedData); - } - catch (e) { - errorCallback('cache', 'set', e); - } - // Apply the transformations - applyTransformResult(obj, jsonPath, targetPath, transformedData); - } - } - else { - // Regular case without targetPath - use normal approach - // Create a deep clone to transform - const objCopy = JSON.parse(JSON.stringify(obj)); - // Perform the transformation - await transformObjectWithOptions(objCopy, transformer, { - jsonPath, - targetPath, - throttleDelay, - concurrentTasks, - errorCallback, - filterCallback, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - }); - // Store the result in the cache - try { - // Extract the transformed parts to store in cache - const transformedData = extractTransformedData(objCopy, jsonPath, targetPath); - await cacheImpl.set(cacheKey, transformedData); - } - catch (e) { - errorCallback('cache', 'set', e); - } - // Apply the transformation to the original object - applyTransformResult(obj, jsonPath, targetPath, extractTransformedData(objCopy, jsonPath, targetPath)); - } - } - else { - // Caching is disabled, but check if there are old cached values that should be removed - try { - // Create the same cacheKeyObj as used when caching is enabled - const keyObj = { - jsonPath, - targetPath, - options: mergedOptions, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - }; - const cacheKey = { key: createCacheKey(keyObj), name: cacheNamespace }; - const cachedResult = await cacheImpl.get(cacheKey); - if (cachedResult && cacheImpl.delete) { - // If item exists in cache but caching is disabled, remove it - await cacheImpl.delete(cacheKey); - } - } - catch (e) { - // Silently ignore errors when cleaning cache - } - // No caching, just transform the object directly - await transformObjectWithOptions(obj, transformer, { - jsonPath, - targetPath, - throttleDelay, - concurrentTasks, - errorCallback, - filterCallback, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - }); - } + await transformObjectWithOptions(obj, transformer, { + jsonPath, + targetPath, + throttleDelay, + concurrentTasks, + errorCallback, + filterCallback, + maxRetries: mappingRetries || maxRetries, + retryDelay: mappingRetryDelay || retryDelay + }); } } }; } -// Extract transformed data based on the jsonPath and targetPath -function extractTransformedData(obj, jsonPath, targetPath) { - const paths = JSONPath({ path: jsonPath, json: obj, resultType: 'pointer' }); - const result = {}; - for (const p of paths) { - const keys = p.slice(1).split('/'); - let current = obj; - // Navigate to the value - for (const key of keys) { - if (key === '') - continue; - if (current === undefined || current === null) - break; - current = current[key]; - } - // Store the value in the result - if (current !== undefined) { - if (targetPath) { - // For target path transformations (like marketingName), - // store the actual transformed value instead of the original value - if (typeof current === 'object' && current !== null && targetPath in current) { - result[p] = { [targetPath]: current[targetPath] }; - } - else { - // This is the raw value from the LLM - use this as is - result[p] = { [targetPath]: current }; - } - } - else { - result[p] = current; - } - } - } - return result; -} -// Apply transformed data to the original object -function applyTransformResult(obj, jsonPath, targetPath, transformedData) { - for (const [path, value] of Object.entries(transformedData)) { - const keys = path.slice(1).split('/'); - let current = obj; - // Navigate to the parent object - for (let i = 0; i < keys.length - 1; i++) { - const key = keys[i]; - if (key === '') - continue; - if (current[key] === undefined) { - current[key] = {}; - } - current = current[key]; - } - // Apply the value - const lastKey = keys[keys.length - 1]; - if (lastKey !== '') { - if (targetPath) { - // Check if current[lastKey] is an object, if not convert it to an object - if (typeof current[lastKey] !== 'object' || current[lastKey] === null) { - // Save the original value - const originalValue = current[lastKey]; - // Convert to object - current[lastKey] = { value: originalValue }; - } - // Update the targetPath property with the value from the transformer, not the original value - if (typeof value === 'object' && value !== null && value[targetPath] !== undefined) { - current[lastKey][targetPath] = value[targetPath]; - } - } - else { - current[lastKey] = value; - } - } - } -} export async function transformWithMappings(obj, createTransformer, mappings, globalOptions = {}) { - const { throttleDelay = 1000, concurrentTasks = 1, errorCallback = defaultError, filterCallback = testFilters(defaultFilters()), maxRetries = 3, retryDelay = 2000, cache, logger } = globalOptions; + const { throttleDelay = 1000, concurrentTasks = 1, errorCallback = defaultError, filterCallback = testFilters(defaultFilters()), maxRetries = 3, retryDelay = 2000, logger } = globalOptions; const iterator = createIterator(obj, {}, { throttleDelay, concurrentTasks, @@ -338,9 +109,8 @@ export async function transformWithMappings(obj, createTransformer, mappings, gl transformerFactory: createTransformer, maxRetries, retryDelay, - cache, logger }); await iterator.transform(mappings); } -//# 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXRlcmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaXRlcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFtRCxZQUFZLEVBQUUsY0FBYyxFQUFFLFdBQVcsRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzVKLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUN2QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQW9CLE1BQU0saUJBQWlCLENBQUE7QUFFeEYsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxHQUFRLEVBQU8sRUFBRTtJQUNoRCxJQUFJLEdBQUcsS0FBSyxJQUFJLElBQUksR0FBRyxLQUFLLFNBQVM7UUFBRSxPQUFPLEdBQUcsQ0FBQztJQUNsRCxLQUFLLE1BQU0sR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQ3BCLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNwQixJQUFJLEdBQUcsS0FBSyxJQUFJLElBQUksR0FBRyxLQUFLLFNBQVM7WUFBRSxTQUFTO1FBQ2hELElBQUksT0FBTyxHQUFHLEtBQUssUUFBUTtZQUN2QixDQUFDLEdBQUcsSUFBSSxPQUFPLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEdBQUcsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLFFBQVEsQ0FBQyxFQUM3RSxDQUFDO1lBQ0MsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3hDLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ3JDLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3BCLENBQUM7UUFDTCxDQUFDO0lB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 \ No newline at end of file diff --git a/packages/kbot/package-lock.json b/packages/kbot/package-lock.json index 35433d58..ed8893ff 100644 --- a/packages/kbot/package-lock.json +++ b/packages/kbot/package-lock.json @@ -9,6 +9,7 @@ "version": "0.3.5", "dependencies": { "@polymech/ai-tools": "file:../ai-tools", + "@polymech/cache": "file:../cache", "@polymech/commons": "file:../commons", "@polymech/core": "file:../core", "@polymech/fs": "file:../fs", @@ -109,6 +110,26 @@ "puppeteer": "^24.2.1" } }, + "../cache": { + "name": "@polymech/cache", + "version": "0.4.8", + "license": "BSD-3-Clause", + "dependencies": { + "@polymech/commons": "file:../commons", + "@polymech/core": "file:../core", + "@polymech/fs": "file:../fs", + "@polymech/log": "file:../log", + "@types/node": "^22.10.2", + "cacache": "^19.0.1", + "md5": "^2.3.0", + "p-map": "^7.0.3", + "ssri": "^10.0.1", + "yargs": "^17.7.2" + }, + "engines": { + "node": ">= 14.0.0" + } + }, "../commons": { "name": "@polymech/commons", "version": "0.2.6", @@ -1359,6 +1380,10 @@ "resolved": "../ai-tools", "link": true }, + "node_modules/@polymech/cache": { + "resolved": "../cache", + "link": true + }, "node_modules/@polymech/commons": { "resolved": "../commons", "link": true diff --git a/packages/kbot/package.json b/packages/kbot/package.json index 04a1c8cc..cb34e117 100644 --- a/packages/kbot/package.json +++ b/packages/kbot/package.json @@ -41,6 +41,7 @@ }, "dependencies": { "@polymech/ai-tools": "file:../ai-tools", + "@polymech/cache": "file:../cache", "@polymech/commons": "file:../commons", "@polymech/core": "file:../core", "@polymech/fs": "file:../fs", diff --git a/packages/kbot/src/commands/run.ts b/packages/kbot/src/commands/run.ts index f8e934fc..8f029451 100644 --- a/packages/kbot/src/commands/run.ts +++ b/packages/kbot/src/commands/run.ts @@ -144,7 +144,7 @@ export const execute_request = async ( params: ChatCompletionToolRunnerParams ): Promise => { let ret: any = null - + try { switch (options.mode) { case E_Mode.COMPLETION: diff --git a/packages/kbot/src/examples/core/iterator-factory-example.ts b/packages/kbot/src/examples/core/iterator-factory-example.ts index a9c7706e..e80c619d 100644 --- a/packages/kbot/src/examples/core/iterator-factory-example.ts +++ b/packages/kbot/src/examples/core/iterator-factory-example.ts @@ -4,40 +4,8 @@ import * as fs from 'fs'; import type { IKBotTask } from '@polymech/ai-tools'; import { E_OPENROUTER_MODEL } from '../../models/cache/openrouter-models.js'; import { E_Mode } from '../../zod_schema.js'; -import { AsyncTransformer } from '../../async-iterator.js'; -import { FieldMapping, createIterator, DefaultCache, registerCacheModule } from '../../iterator.js'; -import { run } from '../../commands/run.js'; -// Clear the mock cache for fresh testing -const mockCacheModule = { - _cache: new Map(), - get_cached_object: async (key: any, namespace: string) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: Looking up ${cacheKey}`); - return mockCacheModule._cache.get(cacheKey) || null; - }, - set_cached_object: async (key: any, namespace: string, value: any) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: Storing in ${cacheKey}`); - mockCacheModule._cache.set(cacheKey, value); - // Show what's being stored for debugging - console.log(`Cache value stored: ${JSON.stringify(value, null, 2).substring(0, 100)}...`); - }, - rm_cached_object: async (key: any, namespace: string) => { - const cacheKey = JSON.stringify({ key, namespace }); - console.log(`Cache: REMOVING ${cacheKey}`); - - // Check if it existed before removal - const existed = mockCacheModule._cache.has(cacheKey); - mockCacheModule._cache.delete(cacheKey); - - // Show removal status - console.log(`Cache removal: ${existed ? 'REMOVED EXISTING CACHE VALUE' : 'NO CACHE VALUE FOUND'}`); - } -}; - -// Register our mock cache module -registerCacheModule(mockCacheModule); +import { FieldMapping, createIterator, createLLMTransformer } from '../../iterator.js'; const MODEL = E_OPENROUTER_MODEL.MODEL_OPENROUTER_QUASAR_ALPHA; const ROUTER = 'openrouter'; @@ -104,36 +72,6 @@ const fieldMappings: FieldMapping[] = [ } ]; -// Create LLM transformer factory -const createLLMTransformer = (options: IKBotTask): AsyncTransformer => { - return async (input: string, jsonPath: string): Promise => { - logger.info(`Transforming field at path: ${jsonPath}`); - logger.info(`Input: ${input}`); - logger.info(`Using prompt: ${options.prompt}`); - - const kbotTask: IKBotTask = { - ...options, - prompt: `${options.prompt}\n\nText to transform: "${input}"`, - }; - - try { - const results = await run(kbotTask); - - if (results && results.length > 0 && typeof results[0] === 'string') { - const result = results[0].trim(); - logger.info(`Result: ${result}`); - return result; - } - - logger.warn(`No valid result received for ${jsonPath}, returning original`); - return input; - } catch (error) { - console.error(`Error calling LLM API: ${error.message}`, error); - return input; - } - }; -}; - // Error handler const errorCallback = (path: string, value: string, error: any) => { logger.error(`Error transforming ${path}: ${error.message}`); @@ -175,7 +113,7 @@ export async function factoryExample() { concurrentTasks: 1, errorCallback, filterCallback: async () => true, - transformerFactory: createLLMTransformer, + transformerFactory: (options) => createLLMTransformer(options, logger), logger: logger, cache: { enabled: true, @@ -210,7 +148,7 @@ export async function factoryExample() { concurrentTasks: 1, errorCallback, filterCallback: async () => true, - transformerFactory: createLLMTransformer, + transformerFactory: (options) => createLLMTransformer(options, logger), logger: logger, cache: { enabled: true, @@ -222,58 +160,6 @@ export async function factoryExample() { // Should use cached values await iterator2.transform(fieldMappings); - // Manually set the marketingName for demonstration purposes - data2.products.fruits[0].name = { - value: "apple", - marketingName: "Crimson Orchard Delight" - }; - data2.products.fruits[1].name = { - value: "banana", - marketingName: "Golden Delight Banana" - }; - - // Now create a third instance with caching disabled to demonstrate cache cleanup - console.log("\n\n========================================"); - console.log("Third run - with caching disabled (should clean up cache):"); - console.log("========================================"); - - /* - const data3 = JSON.parse(JSON.stringify(exampleData)); - - const iterator3 = createIterator( - data3, - globalOptionsMixin, - { - throttleDelay: 1000, - concurrentTasks: 1, - errorCallback, - filterCallback: async () => true, - transformerFactory: createLLMTransformer, - logger: logger, - cache: { - enabled: false, // Caching disabled - namespace: 'product-transformations' - } - } - ); - - // Should transform again and remove the cache - await iterator3.transform(fieldMappings); - - // Verify cache was removed by checking if it still exists - console.log("\nVerifying cache removal:"); - const cacheKey = { - key: JSON.stringify({ - jsonPath: '$..name', - targetPath: 'marketingName', - options: { ...globalOptionsMixin, prompt: 'Generate a more appealing marketing name for this product' } - }), - name: 'product-transformations' - }; - const cachedValue = await mockCacheModule.get_cached_object(cacheKey, 'product-transformations'); - console.log(`Cache still exists? ${cachedValue !== null ? 'Yes' : 'No'}`); - */ - console.log("\nBefore/After Comparison Example:"); console.log(`Original description: ${exampleData.products.fruits[0].description}`); console.log(`Transformed description: ${data.products.fruits[0].description}`); @@ -291,21 +177,13 @@ export async function factoryExample() { } } -console.log("Module loading, checking if this is direct execution"); -console.log("process.argv[1]:", process.argv[1]); -console.log("import.meta.url:", import.meta.url); - -const isDirectExecution = process.argv[1] && process.argv[1].includes('iterator-factory-example'); -console.log("Is direct execution:", isDirectExecution); - -if (isDirectExecution) { +if (process.argv[1] && process.argv[1].includes('iterator-factory-example')) { const isDebug = process.argv.includes('--debug'); console.log('Starting iterator factory example...'); console.log(`Command arguments: ${process.argv.slice(2).join(', ')}`); console.log(`Debug mode: ${isDebug ? 'enabled' : 'disabled'}`); if (isDebug) { - // Set up debug logging console.log("Running in debug mode with verbose output"); } diff --git a/packages/kbot/src/iterator.ts b/packages/kbot/src/iterator.ts index f9e3baa6..56b700a9 100644 --- a/packages/kbot/src/iterator.ts +++ b/packages/kbot/src/iterator.ts @@ -1,89 +1,23 @@ import { IKBotTask } from '@polymech/ai-tools' import { AsyncTransformer, ErrorCallback, FilterCallback, defaultError, defaultFilters, testFilters, transformObjectWithOptions } from './async-iterator.js' -import { JSONPath } from 'jsonpath-plus' -import { deepClone } from '@polymech/core/objects' -// Add an optional import that can be provided by the user -let cacheModule: { - get_cached_object: (key: any, namespace: string) => Promise; - set_cached_object: (key: any, namespace: string, value: any, options?: any) => Promise; - rm_cached_object: (key: any, namespace: string) => Promise; -} | null = null; +import { run } from './commands/run.js' +import { get_cached_object, set_cached_object, rm_cached_object } from "@polymech/cache" -// Function to register the cache module -export function registerCacheModule(module: typeof cacheModule) { - cacheModule = module; -} - -// Cache interface - users can implement to connect different cache systems -export interface CacheInterface { - get: (key: any) => Promise; - set: (key: any, value: any) => Promise; - delete?: (key: any) => Promise; -} - -// Default no-op cache implementation -export class NoopCache implements CacheInterface { - async get(_key: any) { return null; } - async set(_key: any, _value: any) { return; } - async delete(_key: any) { return; } -} - -// Default cache implementation based on kbot.ts pattern -export class DefaultCache implements CacheInterface { - constructor(private readonly logger?: { error: (message: string, error?: any) => void }) {} - - async get(key: any): Promise { - if (!cacheModule) return null; - - try { - const namespace = key.name || 'iterator'; - const cached = await cacheModule.get_cached_object(key, namespace); - return cached; - } catch (e) { - if (this.logger) { - this.logger.error(`Failed to get cached object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } else { - console.error(`Cache get error:`, e); - } - return null; - } - } - - async set(key: any, value: any): Promise { - if (!cacheModule) return; - - try { - const namespace = key.name || 'iterator'; - await cacheModule.set_cached_object(key, namespace, value, {}); - } catch (e) { - if (this.logger) { - this.logger.error(`Failed to cache object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } else { - console.error(`Cache set error:`, e); +export const removeEmptyObjects = (obj: any): any => { + if (obj === null || obj === undefined) return obj; + for (const key in obj) { + const val = obj[key] + if (val === null || val === undefined) continue; + if (typeof val === 'object' || + (key == 'value' && typeof val === 'number' && val === 0 || key == 'base64') + ) { + obj[key] = removeEmptyObjects(obj[key]); + if (Object.keys(obj[key]).length === 0) { + delete obj[key]; } } } - - async delete(key: any): Promise { - if (!cacheModule) return; - - try { - const namespace = key.name || 'iterator'; - await cacheModule.rm_cached_object(key, namespace); - } catch (e) { - if (this.logger) { - this.logger.error(`Failed to delete cached object for key: ${JSON.stringify(key).substring(0, 50)}`, e); - } else { - console.error(`Cache delete error:`, e); - } - } - } -} - -export interface CacheOptions { - enabled: boolean; - implementation?: CacheInterface; - namespace?: string; + return obj } export interface FieldMapping { @@ -99,45 +33,64 @@ export interface IteratorFactory { createTransformer: (options: IKBotTask) => AsyncTransformer } -// Utility function to create a cache key from an object -export function createCacheKey(obj: any): string { - try { - const cleanObj = JSON.parse(JSON.stringify(removeEmptyValues(obj))); - return JSON.stringify(cleanObj); - } catch (e) { - console.error("Error creating cache key:", e); - // Fallback to simpler stringification if error occurs - return JSON.stringify({ hash: String(Date.now()) }); +export function createLLMTransformer( + options: IKBotTask, + logger?: { + info: (message: string) => void; + warn: (message: string) => void; + error: (message: string, error?: any) => void; } -} - -// Utility to remove null, undefined, and empty objects from an object for cache key generation -export function removeEmptyValues(obj: any): any { - if (obj === null || obj === undefined) { - return undefined; - } - - if (typeof obj !== 'object') { - return obj; - } - - if (Array.isArray(obj)) { - const filtered = obj.map(removeEmptyValues).filter(v => v !== undefined); - return filtered.length ? filtered : undefined; - } - - const result: Record = {}; - let hasValues = false; - - for (const [key, value] of Object.entries(obj)) { - const cleaned = removeEmptyValues(value); - if (cleaned !== undefined) { - result[key] = cleaned; - hasValues = true; +): AsyncTransformer { + return async (input: string, jsonPath: string): Promise => { + if (logger) { + logger.info(`Transforming field at path: ${jsonPath}`); + logger.info(`Input: ${input}`); + logger.info(`Using prompt: ${options.prompt}`); } - } - - return hasValues ? result : undefined; + + const kbotTask: IKBotTask = { + ...options, + prompt: `${options.prompt}\n\nText to transform: "${input}"`, + }; + + // Create cache key for the LLM call + const cacheKeyObj = removeEmptyObjects({ + prompt: kbotTask.prompt, + model: kbotTask.model, + router: kbotTask.router, + mode: kbotTask.mode, + filters: [], + tools: [] + }); + + try { + + const cachedResponse = await get_cached_object({ ca_options: cacheKeyObj }, 'llm-responses') as { content: string }; + if (cachedResponse?.content) { + if (logger) logger.info(`Using cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); + return cachedResponse.content; + } + const results = await run(kbotTask) + if (results && results.length > 0 && typeof results[0] === 'string') { + const result = results[0].trim(); + await set_cached_object({ ca_options: cacheKeyObj }, 'llm-responses', { content: result }, {}); + if (logger) logger.info(`Cached LLM response for prompt: ${kbotTask.prompt.substring(0, 100)}...`); + + if (logger) logger.info(`Result: ${result}`); + return result; + } + + if (logger) logger.warn(`No valid result received for ${jsonPath}, returning original`); + return input; + } catch (error) { + if (logger) { + logger.error(`Error calling LLM API: ${error.message}`, error); + } else { + console.error(`Error calling LLM API: ${error.message}`, error); + } + return input; + } + }; } export function createIterator( @@ -151,7 +104,6 @@ export function createIterator( transformerFactory?: (options: IKBotTask) => AsyncTransformer maxRetries?: number retryDelay?: number - cache?: CacheOptions logger?: { error: (message: string, error?: any) => void } } = {} ): IteratorFactory { @@ -163,7 +115,6 @@ export function createIterator( transformerFactory, maxRetries = 3, retryDelay = 2000, - cache, logger } = globalOptions; @@ -172,244 +123,35 @@ export function createIterator( // In real usage, this would be replaced by the provided transformerFactory return async (input: string): Promise => input; }; - - const createTransformer = transformerFactory || defaultTransformerFactory; - // Default cache settings - const defaultImplementation = logger ? new DefaultCache(logger) : new DefaultCache(); - const cacheImpl = cache?.implementation || defaultImplementation; - const cacheEnabled = cache?.enabled || false; - const cacheNamespace = cache?.namespace || 'iterator'; + const createTransformer = transformerFactory || defaultTransformerFactory; return { createTransformer, transform: async (mappings: FieldMapping[]): Promise => { for (const mapping of mappings) { - // Merge the mapping options with the global mixin const mergedOptions = { ...optionsMixin, ...mapping.options } as IKBotTask; const { jsonPath, targetPath = null, maxRetries: mappingRetries, retryDelay: mappingRetryDelay } = mapping; const transformer = createTransformer(mergedOptions); - - // Generate cache key for this transformation - if (cacheEnabled) { - const cacheKeyObj = { + await transformObjectWithOptions( + obj, + transformer, + { jsonPath, targetPath, - options: mergedOptions, + throttleDelay, + concurrentTasks, + errorCallback, + filterCallback, maxRetries: mappingRetries || maxRetries, retryDelay: mappingRetryDelay || retryDelay - }; - - const cacheKey = { key: createCacheKey(cacheKeyObj), name: cacheNamespace }; - - // Check if we have a cached result - try { - const cachedResult = await cacheImpl.get(cacheKey); - if (cachedResult) { - // Apply cached result directly - applyTransformResult(obj, jsonPath, targetPath, cachedResult); - continue; // Skip to next mapping - } - } catch (e) { - errorCallback('cache', 'get', e); } - - // For paths with targetPath, we need special handling for the LLM results - if (targetPath) { - // Get all the values that need transformation - const paths = JSONPath({ path: jsonPath, json: obj, resultType: 'pointer' }); - const transformedData: Record = {}; - - for (const path of paths) { - // Extract the value to transform - const keys = path.slice(1).split('/'); - let current = obj; - - for (const key of keys) { - if (key === '') continue; - if (current === undefined || current === null) break; - current = current[key]; - } - - // Transform the value if it exists - if (current !== undefined) { - try { - // Perform the transformation using the LLM - const rawValue = typeof current === 'object' && current !== null && 'value' in current - ? current.value - : current; - - const result = await transformer(String(rawValue), path); - - // Store the result with the target path - transformedData[path] = { [targetPath]: result }; - } catch (e) { - errorCallback(path, String(current), e); - } - } - } - - // Store the result in the cache - if (Object.keys(transformedData).length > 0) { - try { - await cacheImpl.set(cacheKey, transformedData); - } catch (e) { - errorCallback('cache', 'set', e); - } - - // Apply the transformations - applyTransformResult(obj, jsonPath, targetPath, transformedData); - } - } else { - // Regular case without targetPath - use normal approach - // Create a deep clone to transform - const objCopy = JSON.parse(JSON.stringify(obj)); - - // Perform the transformation - await transformObjectWithOptions( - objCopy, - transformer, - { - jsonPath, - targetPath, - throttleDelay, - concurrentTasks, - errorCallback, - filterCallback, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - } - ); - - // Store the result in the cache - try { - // Extract the transformed parts to store in cache - const transformedData = extractTransformedData(objCopy, jsonPath, targetPath); - await cacheImpl.set(cacheKey, transformedData); - } catch (e) { - errorCallback('cache', 'set', e); - } - - // Apply the transformation to the original object - applyTransformResult(obj, jsonPath, targetPath, extractTransformedData(objCopy, jsonPath, targetPath)); - } - } else { - // Caching is disabled, but check if there are old cached values that should be removed - try { - // Create the same cacheKeyObj as used when caching is enabled - const keyObj = { - jsonPath, - targetPath, - options: mergedOptions, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - }; - const cacheKey = { key: createCacheKey(keyObj), name: cacheNamespace }; - const cachedResult = await cacheImpl.get(cacheKey); - if (cachedResult && cacheImpl.delete) { - // If item exists in cache but caching is disabled, remove it - await cacheImpl.delete(cacheKey); - } - } catch (e) { - // Silently ignore errors when cleaning cache - } - - // No caching, just transform the object directly - await transformObjectWithOptions( - obj, - transformer, - { - jsonPath, - targetPath, - throttleDelay, - concurrentTasks, - errorCallback, - filterCallback, - maxRetries: mappingRetries || maxRetries, - retryDelay: mappingRetryDelay || retryDelay - } - ); - } + ); } } }; } -// Extract transformed data based on the jsonPath and targetPath -function extractTransformedData(obj: Record, jsonPath: string, targetPath: string | null): any { - const paths = JSONPath({ path: jsonPath, json: obj, resultType: 'pointer' }); - const result: Record = {}; - - for (const p of paths) { - const keys = p.slice(1).split('/'); - let current = obj; - - // Navigate to the value - for (const key of keys) { - if (key === '') continue; - if (current === undefined || current === null) break; - current = current[key]; - } - - // Store the value in the result - if (current !== undefined) { - if (targetPath) { - // For target path transformations (like marketingName), - // store the actual transformed value instead of the original value - if (typeof current === 'object' && current !== null && targetPath in current) { - result[p] = { [targetPath]: current[targetPath] }; - } else { - // This is the raw value from the LLM - use this as is - result[p] = { [targetPath]: current }; - } - } else { - result[p] = current; - } - } - } - - return result; -} - -// Apply transformed data to the original object -function applyTransformResult(obj: Record, jsonPath: string, targetPath: string | null, transformedData: Record): void { - for (const [path, value] of Object.entries(transformedData)) { - const keys = path.slice(1).split('/'); - let current = obj; - - // Navigate to the parent object - for (let i = 0; i < keys.length - 1; i++) { - const key = keys[i]; - if (key === '') continue; - if (current[key] === undefined) { - current[key] = {}; - } - current = current[key]; - } - - // Apply the value - const lastKey = keys[keys.length - 1]; - if (lastKey !== '') { - if (targetPath) { - // Check if current[lastKey] is an object, if not convert it to an object - if (typeof current[lastKey] !== 'object' || current[lastKey] === null) { - // Save the original value - const originalValue = current[lastKey]; - // Convert to object - current[lastKey] = { value: originalValue }; - } - - // Update the targetPath property with the value from the transformer, not the original value - if (typeof value === 'object' && value !== null && value[targetPath] !== undefined) { - current[lastKey][targetPath] = value[targetPath]; - } - } else { - current[lastKey] = value; - } - } - } -} - export async function transformWithMappings( obj: Record, createTransformer: (options: IKBotTask) => AsyncTransformer, @@ -421,7 +163,6 @@ export async function transformWithMappings( filterCallback?: FilterCallback maxRetries?: number retryDelay?: number - cache?: CacheOptions logger?: { error: (message: string, error?: any) => void } } = {} ): Promise { @@ -432,13 +173,12 @@ export async function transformWithMappings( filterCallback = testFilters(defaultFilters()), maxRetries = 3, retryDelay = 2000, - cache, logger } = globalOptions; const iterator = createIterator( - obj, - {}, + obj, + {}, { throttleDelay, concurrentTasks, @@ -447,10 +187,9 @@ export async function transformWithMappings( transformerFactory: createTransformer, maxRetries, retryDelay, - cache, logger } ); - + await iterator.transform(mappings); } \ No newline at end of file diff --git a/packages/kbot/tests/test-data/core/iterator-factory-data.json b/packages/kbot/tests/test-data/core/iterator-factory-data.json index 20224f1d..7a1f9f61 100644 --- a/packages/kbot/tests/test-data/core/iterator-factory-data.json +++ b/packages/kbot/tests/test-data/core/iterator-factory-data.json @@ -3,29 +3,25 @@ "fruits": [ { "id": "f1", - "name": { - "value": "apple", - "marketingName": "Crimson Orchard Delight" - }, - "description": "A deliciously sweet, juicy fruit with a satisfying crunch, bursting with refreshing flavor that delights your senses and offers a perfect balance of crisp texture and natural sweetness.", + "name": "apple", + "description": "A deliciously juicy fruit bursting with natural sweetness, offering a satisfying crunch with every bite—a perfect refreshing snack packed with vitamins and vibrant flavor.", "details": { "color": "red", "origin": "Worldwide", - "nutrition": "Rich in fiber and vitamin C, which supports digestive health, promotes healthy gut bacteria, and boosts immune function. Vitamin C also aids collagen production for skin health and enhances iron absorption." - } + "nutrition": "Rich in fiber and vitamin C, which supports a healthy digestive system, aids in maintaining stable blood sugar levels, strengthens the immune system, and promotes collagen production for healthier skin and faster wound healing." + }, + "marketingName": "Crimson Orchard Essence" }, { "id": "f2", - "name": { - "value": "banana", - "marketingName": "Golden Tropic Delight" - }, - "description": "A vibrant, sun-kissed yellow tropical fruit with a sweet, juicy flesh and an enticing aroma, bursting with refreshing flavor reminiscent of sunshine and warm island breezes.", + "name": "banana", + "description": "A vibrant, sun-kissed tropical fruit with a bright yellow hue, boasting a sweet, juicy flavor that bursts with refreshing tropical essence in every delicious bite.", "details": { "color": "yellow", "origin": "Southeast Asia", - "nutrition": "High in potassium, which helps maintain healthy blood pressure levels, supports proper muscle function, and promotes optimal nerve signaling, contributing to overall cardiovascular health and helping reduce the risk of stroke." - } + "nutrition": "High in potassium, which supports healthy nerve and muscle function, helps maintain normal blood pressure, and reduces the risk of stroke by balancing sodium levels in the body for overall cardiovascular health." + }, + "marketingName": "Golden Sun Banana" } ] }