diff --git a/packages/kbot/.vscode/launch.json b/packages/kbot/.vscode/launch.json index 84d72409..b805a8a3 100644 --- a/packages/kbot/.vscode/launch.json +++ b/packages/kbot/.vscode/launch.json @@ -741,6 +741,29 @@ "!**/node_modules/**" ], "outputCapture": "std" + }, + { + "type": "node", + "request": "launch", + "name": "each:image", + "skipFiles": [ + "/**" + ], + "program": "${workspaceFolder}/dist-in/main.js", + "args": [ + "--router2=openai", + "--model=meta-llama/llama-3.2-90b-vision-instruct", + "--prompt=./tests/pdf/prompt_manual.md", + "--each=./tests/pdf/780/*.jpg", // Note: Glob pattern passed directly + "--mode=completion", + "--preferences=none", + "--dst=./tests/pdf/sako_manual.md", + "--filters=code", + "--append=concat" + ], + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "outputCapture": "std" } ] } \ No newline at end of file diff --git a/packages/kbot/dist-in/commands/run.d.ts b/packages/kbot/dist-in/commands/run.d.ts index b7001aa6..5d59a5f8 100644 --- a/packages/kbot/dist-in/commands/run.d.ts +++ b/packages/kbot/dist-in/commands/run.d.ts @@ -1,6 +1,7 @@ import { ChatCompletionToolRunnerParams } from 'openai/lib/ChatCompletionRunner'; import { ChatCompletionMessageParam } from 'openai/resources/index.mjs'; import { IKBotTask } from '@polymech/ai-tools'; +export declare const default_sort: (files: string[]) => string[]; type ProcessRunResult = string | boolean | Record | null; /** * Complete options by setting up defaults, validating inputs, and initializing required components diff --git a/packages/kbot/dist-in/commands/run.js b/packages/kbot/dist-in/commands/run.js index 06198847..461c17c8 100644 --- a/packages/kbot/dist-in/commands/run.js +++ b/packages/kbot/dist-in/commands/run.js @@ -22,6 +22,23 @@ import { runTools } from './run-tools.js'; import { runAssistant } from './run-assistant.js'; import { all } from '../models/index.js'; import { getLogger } from '../index.js'; +export const default_sort = (files) => { + const getSortableParts = (filename) => { + const baseName = path.parse(filename).name; + const match = baseName.match(/^(\d+)_?(.*)$/); // Match leading numbers + const numPart = match ? parseInt(match[1], 10) : NaN; + const textPart = match ? match[2] : baseName; // Extract text part + return { numPart, textPart }; + }; + return files.sort((a, b) => { + const { numPart: aNum, textPart: aText } = getSortableParts(a); + const { numPart: bNum, textPart: bText } = getSortableParts(b); + if (!isNaN(aNum) && !isNaN(bNum)) { + return aNum - bNum || aText.localeCompare(bText, undefined, { numeric: true, sensitivity: 'base' }); + } + return aText.localeCompare(bText, undefined, { numeric: true, sensitivity: 'base' }); + }); +}; /** * Complete options by setting up defaults, validating inputs, and initializing required components * @@ -240,8 +257,10 @@ export const run = async (opts) => { items = read(opts.each, 'json') || []; } else if (hasMagic(opts.each)) { - const info = pathInfoEx(forward_slash(path.resolve(resolve(opts.each)))); - items = info.FILES; + const info = pathInfoEx(forward_slash(path.resolve(resolve(opts.each))), false, { + absolute: true, + }); + items = default_sort(info.FILES); } else if (isFile(opts.each) && exists(opts.each)) { items = [opts.each]; @@ -281,4 +300,4 @@ export const run = async (opts) => { } return ret; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist-in/utils/merge.d.ts b/packages/kbot/dist-in/utils/merge.d.ts new file mode 100644 index 00000000..9785b4ee --- /dev/null +++ b/packages/kbot/dist-in/utils/merge.d.ts @@ -0,0 +1,28 @@ +/** + * Appends new content to existing content. + * + * @param existingContent - The original content string. + * @param newContent - The content string to append. + * @returns The combined string with new content appended. + */ +export declare function concat(existingContent: string, newContent: string): string; +/** + * Merges new content into existing content. + * For now, this simply concatenates with a newline separator. + * TODO: Implement more sophisticated merging logic if needed (e.g., JSON merge). + * + * @param existingContent - The original content string. + * @param newContent - The content string to merge/append. + * @returns The combined string. + */ +export declare function merge(existingContent: string, newContent: string): string; +/** + * Writes content to a destination file, handling append/merge logic if the file exists. + * + * @param dstPath - The absolute path to the destination file. + * @param content - The content to write. + * @param appendMode - Optional mode ('concat' or 'merge') to handle existing files. + * @param logger - Optional logger instance conforming to SimpleLogger. + * @returns The final content written to the file or the original content if read fails. + */ +export declare function writeOrAppend(dstPath: string, content: string, appendMode?: 'concat' | 'merge'): string; diff --git a/packages/kbot/dist-in/utils/merge.js b/packages/kbot/dist-in/utils/merge.js new file mode 100644 index 00000000..c5a1ce00 --- /dev/null +++ b/packages/kbot/dist-in/utils/merge.js @@ -0,0 +1,54 @@ +import { sync as exists } from '@polymech/fs/exists'; +import { sync as read } from '@polymech/fs/read'; +import { sync as write } from '@polymech/fs/write'; +/** + * Appends new content to existing content. + * + * @param existingContent - The original content string. + * @param newContent - The content string to append. + * @returns The combined string with new content appended. + */ +export function concat(existingContent, newContent) { + return existingContent + '\n\n' + newContent + '\n'; +} +/** + * Merges new content into existing content. + * For now, this simply concatenates with a newline separator. + * TODO: Implement more sophisticated merging logic if needed (e.g., JSON merge). + * + * @param existingContent - The original content string. + * @param newContent - The content string to merge/append. + * @returns The combined string. + */ +export function merge(existingContent, newContent) { + // Placeholder: Simple concatenation + // Potential future implementation: Detect JSON/YAML and perform structured merge + return existingContent + '\n' + newContent; +} +/** + * Writes content to a destination file, handling append/merge logic if the file exists. + * + * @param dstPath - The absolute path to the destination file. + * @param content - The content to write. + * @param appendMode - Optional mode ('concat' or 'merge') to handle existing files. + * @param logger - Optional logger instance conforming to SimpleLogger. + * @returns The final content written to the file or the original content if read fails. + */ +export function writeOrAppend(dstPath, content, appendMode) { + let finalContent = content; + if (exists(dstPath) && appendMode) { + const existingContentBuffer = read(dstPath); // Read returns Buffer | undefined + if (existingContentBuffer) { // Check if read was successful + const existingContent = existingContentBuffer.toString(); + if (appendMode === 'concat') { + finalContent = concat(existingContent, content); + } + else if (appendMode === 'merge') { + finalContent = merge(existingContent, content); // Using placeholder merge for now + } + } + } + write(dstPath, finalContent); + return finalContent; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVyZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvbWVyZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksSUFBSSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxJQUFJLElBQUksS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFbEQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLE1BQU0sQ0FBQyxlQUF1QixFQUFFLFVBQWtCO0lBQ2hFLE9BQU8sZUFBZSxHQUFHLE1BQU0sR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFBO0FBQ3JELENBQUM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxLQUFLLENBQUMsZUFBdUIsRUFBRSxVQUFrQjtJQUMvRCxvQ0FBb0M7SUFDcEMsaUZBQWlGO0lBQ2pGLE9BQU8sZUFBZSxHQUFHLElBQUksR0FBRyxVQUFVLENBQUM7QUFDN0MsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FDM0IsT0FBZSxFQUNmLE9BQWUsRUFDZixVQUErQjtJQUUvQixJQUFJLFlBQVksR0FBRyxPQUFPLENBQUM7SUFDM0IsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksVUFBVSxFQUFFLENBQUM7UUFDbEMsTUFBTSxxQkFBcUIsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxrQ0FBa0M7UUFDL0UsSUFBSSxxQkFBcUIsRUFBRSxDQUFDLENBQUMsK0JBQStCO1lBQzFELE1BQU0sZUFBZSxHQUFHLHFCQUFxQixDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ3pELElBQUksVUFBVSxLQUFLLFFBQVEsRUFBRSxDQUFDO2dCQUM1QixZQUFZLEdBQUcsTUFBTSxDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUNsRCxDQUFDO2lCQUFNLElBQUksVUFBVSxLQUFLLE9BQU8sRUFBRSxDQUFDO2dCQUNsQyxZQUFZLEdBQUcsS0FBSyxDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLDBDQUEwQztZQUM1RixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFDRCxLQUFLLENBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQyxDQUFBO0lBQzVCLE9BQU8sWUFBWSxDQUFBO0FBQ3JCLENBQUMifQ== \ No newline at end of file diff --git a/packages/kbot/src/commands/run.ts b/packages/kbot/src/commands/run.ts index 2bceb96e..bbba40a8 100644 --- a/packages/kbot/src/commands/run.ts +++ b/packages/kbot/src/commands/run.ts @@ -28,6 +28,24 @@ import { runAssistant } from './run-assistant.js' import { all } from '../models/index.js' import { getLogger } from '../index.js' +export const default_sort = (files: string[]): string[] => { + const getSortableParts = (filename: string) => { + const baseName = path.parse(filename).name; + const match = baseName.match(/^(\d+)_?(.*)$/); // Match leading numbers + const numPart = match ? parseInt(match[1], 10) : NaN; + const textPart = match ? match[2] : baseName; // Extract text part + + return { numPart, textPart }; + } + return files.sort((a, b) => { + const { numPart: aNum, textPart: aText } = getSortableParts(a) + const { numPart: bNum, textPart: bText } = getSortableParts(b) + if (!isNaN(aNum) && !isNaN(bNum)) { + return aNum - bNum || aText.localeCompare(bText, undefined, { numeric: true, sensitivity: 'base' }) + } + return aText.localeCompare(bText, undefined, { numeric: true, sensitivity: 'base' }) + }) +} type ProcessRunResult = string | boolean | Record | null; @@ -293,8 +311,10 @@ export const run = async (opts: IKBotTask): Promise => { } else if (exists(opts.each) && isFile(opts.each) && path.parse(opts.each).ext === '.json') { items = read(opts.each, 'json') as [] || [] } else if (hasMagic(opts.each)) { - const info = pathInfoEx(forward_slash(path.resolve(resolve(opts.each)))) - items = info.FILES + const info = pathInfoEx(forward_slash(path.resolve(resolve(opts.each))),false,{ + absolute: true, + }) + items = default_sort(info.FILES) } else if (isFile(opts.each) && exists(opts.each)) { items = [opts.each] } else if (isString(opts.each)) { diff --git a/packages/kbot/src/utils/merge.ts b/packages/kbot/src/utils/merge.ts new file mode 100644 index 00000000..de159bd5 --- /dev/null +++ b/packages/kbot/src/utils/merge.ts @@ -0,0 +1,59 @@ +import { sync as exists } from '@polymech/fs/exists' +import { sync as read } from '@polymech/fs/read' +import { sync as write } from '@polymech/fs/write' + +/** + * Appends new content to existing content. + * + * @param existingContent - The original content string. + * @param newContent - The content string to append. + * @returns The combined string with new content appended. + */ +export function concat(existingContent: string, newContent: string): string { + return existingContent + '\n\n' + newContent + '\n' +} + +/** + * Merges new content into existing content. + * For now, this simply concatenates with a newline separator. + * TODO: Implement more sophisticated merging logic if needed (e.g., JSON merge). + * + * @param existingContent - The original content string. + * @param newContent - The content string to merge/append. + * @returns The combined string. + */ +export function merge(existingContent: string, newContent: string): string { + // Placeholder: Simple concatenation + // Potential future implementation: Detect JSON/YAML and perform structured merge + return existingContent + '\n' + newContent; +} + +/** + * Writes content to a destination file, handling append/merge logic if the file exists. + * + * @param dstPath - The absolute path to the destination file. + * @param content - The content to write. + * @param appendMode - Optional mode ('concat' or 'merge') to handle existing files. + * @param logger - Optional logger instance conforming to SimpleLogger. + * @returns The final content written to the file or the original content if read fails. + */ +export function writeOrAppend( + dstPath: string, + content: string, + appendMode?: 'concat' | 'merge' +): string { + let finalContent = content; + if (exists(dstPath) && appendMode) { + const existingContentBuffer = read(dstPath); // Read returns Buffer | undefined + if (existingContentBuffer) { // Check if read was successful + const existingContent = existingContentBuffer.toString(); + if (appendMode === 'concat') { + finalContent = concat(existingContent, content); + } else if (appendMode === 'merge') { + finalContent = merge(existingContent, content); // Using placeholder merge for now + } + } + } + write(dstPath, finalContent) + return finalContent +} \ No newline at end of file diff --git a/packages/kbot/tests/pdf/780/manual.pdf b/packages/kbot/tests/pdf/780/manual.pdf new file mode 100644 index 00000000..d5094ecc Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual.pdf differ diff --git a/packages/kbot/tests/pdf/780/manual_19.jpg b/packages/kbot/tests/pdf/780/manual_19.jpg new file mode 100644 index 00000000..fddfafd6 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_19.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_20.jpg b/packages/kbot/tests/pdf/780/manual_20.jpg new file mode 100644 index 00000000..6fa9c6bb Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_20.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_21.jpg b/packages/kbot/tests/pdf/780/manual_21.jpg new file mode 100644 index 00000000..4f225c5b Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_21.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_22.jpg b/packages/kbot/tests/pdf/780/manual_22.jpg new file mode 100644 index 00000000..17213888 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_22.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_23.jpg b/packages/kbot/tests/pdf/780/manual_23.jpg new file mode 100644 index 00000000..e1ff8571 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_23.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_24.jpg b/packages/kbot/tests/pdf/780/manual_24.jpg new file mode 100644 index 00000000..546c3272 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_24.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_25.jpg b/packages/kbot/tests/pdf/780/manual_25.jpg new file mode 100644 index 00000000..6381b0d4 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_25.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_26.jpg b/packages/kbot/tests/pdf/780/manual_26.jpg new file mode 100644 index 00000000..071a85d8 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_26.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_27.jpg b/packages/kbot/tests/pdf/780/manual_27.jpg new file mode 100644 index 00000000..08bbfb68 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_27.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_28.jpg b/packages/kbot/tests/pdf/780/manual_28.jpg new file mode 100644 index 00000000..025ce964 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_28.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_29.jpg b/packages/kbot/tests/pdf/780/manual_29.jpg new file mode 100644 index 00000000..8f0af367 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_29.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_30.jpg b/packages/kbot/tests/pdf/780/manual_30.jpg new file mode 100644 index 00000000..f6547bcc Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_30.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_31.jpg b/packages/kbot/tests/pdf/780/manual_31.jpg new file mode 100644 index 00000000..377fe04b Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_31.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_32.jpg b/packages/kbot/tests/pdf/780/manual_32.jpg new file mode 100644 index 00000000..d7902eb7 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_32.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_33.jpg b/packages/kbot/tests/pdf/780/manual_33.jpg new file mode 100644 index 00000000..e121a197 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_33.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_34.jpg b/packages/kbot/tests/pdf/780/manual_34.jpg new file mode 100644 index 00000000..9fc36aa6 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_34.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_35.jpg b/packages/kbot/tests/pdf/780/manual_35.jpg new file mode 100644 index 00000000..b349b0ba Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_35.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_36.jpg b/packages/kbot/tests/pdf/780/manual_36.jpg new file mode 100644 index 00000000..2b21124a Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_36.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_37.jpg b/packages/kbot/tests/pdf/780/manual_37.jpg new file mode 100644 index 00000000..d935c0b7 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_37.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_38.jpg b/packages/kbot/tests/pdf/780/manual_38.jpg new file mode 100644 index 00000000..f2663a37 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_38.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_39.jpg b/packages/kbot/tests/pdf/780/manual_39.jpg new file mode 100644 index 00000000..4a506b27 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_39.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_40.jpg b/packages/kbot/tests/pdf/780/manual_40.jpg new file mode 100644 index 00000000..6dea2a77 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_40.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_41.jpg b/packages/kbot/tests/pdf/780/manual_41.jpg new file mode 100644 index 00000000..fb6579ae Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_41.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_42.jpg b/packages/kbot/tests/pdf/780/manual_42.jpg new file mode 100644 index 00000000..63f2b391 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_42.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_43.jpg b/packages/kbot/tests/pdf/780/manual_43.jpg new file mode 100644 index 00000000..0da4273f Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_43.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_44.jpg b/packages/kbot/tests/pdf/780/manual_44.jpg new file mode 100644 index 00000000..3dca5f64 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_44.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_45.jpg b/packages/kbot/tests/pdf/780/manual_45.jpg new file mode 100644 index 00000000..e9824e3a Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_45.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_46.jpg b/packages/kbot/tests/pdf/780/manual_46.jpg new file mode 100644 index 00000000..3cc3da4c Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_46.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_47.jpg b/packages/kbot/tests/pdf/780/manual_47.jpg new file mode 100644 index 00000000..61eef058 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_47.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_48.jpg b/packages/kbot/tests/pdf/780/manual_48.jpg new file mode 100644 index 00000000..952d398c Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_48.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_49.jpg b/packages/kbot/tests/pdf/780/manual_49.jpg new file mode 100644 index 00000000..e02b5823 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_49.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_50.jpg b/packages/kbot/tests/pdf/780/manual_50.jpg new file mode 100644 index 00000000..fd65d178 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_50.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_51.jpg b/packages/kbot/tests/pdf/780/manual_51.jpg new file mode 100644 index 00000000..f5d833c7 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_51.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_52.jpg b/packages/kbot/tests/pdf/780/manual_52.jpg new file mode 100644 index 00000000..091417d0 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_52.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_53.jpg b/packages/kbot/tests/pdf/780/manual_53.jpg new file mode 100644 index 00000000..65548a45 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_53.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_54.jpg b/packages/kbot/tests/pdf/780/manual_54.jpg new file mode 100644 index 00000000..01f8e0fe Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_54.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_55.jpg b/packages/kbot/tests/pdf/780/manual_55.jpg new file mode 100644 index 00000000..56af6c99 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_55.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_56.jpg b/packages/kbot/tests/pdf/780/manual_56.jpg new file mode 100644 index 00000000..f5ae9c25 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_56.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_57.jpg b/packages/kbot/tests/pdf/780/manual_57.jpg new file mode 100644 index 00000000..c91c08d7 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_57.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_58.jpg b/packages/kbot/tests/pdf/780/manual_58.jpg new file mode 100644 index 00000000..ce793063 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_58.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_59.jpg b/packages/kbot/tests/pdf/780/manual_59.jpg new file mode 100644 index 00000000..1ca21e8f Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_59.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_60.jpg b/packages/kbot/tests/pdf/780/manual_60.jpg new file mode 100644 index 00000000..4e80b847 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_60.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_61.jpg b/packages/kbot/tests/pdf/780/manual_61.jpg new file mode 100644 index 00000000..ceb80391 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_61.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_62.jpg b/packages/kbot/tests/pdf/780/manual_62.jpg new file mode 100644 index 00000000..dc02d85a Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_62.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_63.jpg b/packages/kbot/tests/pdf/780/manual_63.jpg new file mode 100644 index 00000000..bf95cf92 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_63.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_64.jpg b/packages/kbot/tests/pdf/780/manual_64.jpg new file mode 100644 index 00000000..f5b18a6b Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_64.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_65.jpg b/packages/kbot/tests/pdf/780/manual_65.jpg new file mode 100644 index 00000000..9af99acd Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_65.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_66.jpg b/packages/kbot/tests/pdf/780/manual_66.jpg new file mode 100644 index 00000000..b7b40234 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_66.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_67.jpg b/packages/kbot/tests/pdf/780/manual_67.jpg new file mode 100644 index 00000000..1685b1c0 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_67.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_68.jpg b/packages/kbot/tests/pdf/780/manual_68.jpg new file mode 100644 index 00000000..2b03124c Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_68.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_69.jpg b/packages/kbot/tests/pdf/780/manual_69.jpg new file mode 100644 index 00000000..4c7eda83 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_69.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_70.jpg b/packages/kbot/tests/pdf/780/manual_70.jpg new file mode 100644 index 00000000..5eaec794 Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_70.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_71.jpg b/packages/kbot/tests/pdf/780/manual_71.jpg new file mode 100644 index 00000000..fd07449f Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_71.jpg differ diff --git a/packages/kbot/tests/pdf/780/manual_72.jpg b/packages/kbot/tests/pdf/780/manual_72.jpg new file mode 100644 index 00000000..267f09bc Binary files /dev/null and b/packages/kbot/tests/pdf/780/manual_72.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-1.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-1.jpg new file mode 100644 index 00000000..6b60de11 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-1.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-10.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-10.jpg new file mode 100644 index 00000000..c5621070 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-10.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-11.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-11.jpg new file mode 100644 index 00000000..05e57305 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-11.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-12.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-12.jpg new file mode 100644 index 00000000..f93f7e6e Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-12.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-13.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-13.jpg new file mode 100644 index 00000000..6fb102ca Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-13.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-14.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-14.jpg new file mode 100644 index 00000000..45417849 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-14.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-15.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-15.jpg new file mode 100644 index 00000000..aca3f455 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-15.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-16.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-16.jpg new file mode 100644 index 00000000..2f4aff6c Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-16.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-17.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-17.jpg new file mode 100644 index 00000000..bcd07320 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-17.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-18.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-18.jpg new file mode 100644 index 00000000..ebf2a504 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-18.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-19.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-19.jpg new file mode 100644 index 00000000..b2bcaf50 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-19.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-2.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-2.jpg new file mode 100644 index 00000000..0e7cd435 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-2.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-20.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-20.jpg new file mode 100644 index 00000000..dacef5bd Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-20.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-21.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-21.jpg new file mode 100644 index 00000000..491a7834 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-21.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-22.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-22.jpg new file mode 100644 index 00000000..d247585c Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-22.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-23.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-23.jpg new file mode 100644 index 00000000..1345b09b Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-23.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-24.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-24.jpg new file mode 100644 index 00000000..51f68643 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-24.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-25.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-25.jpg new file mode 100644 index 00000000..133f2ae1 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-25.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-26.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-26.jpg new file mode 100644 index 00000000..3f9f7305 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-26.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-27.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-27.jpg new file mode 100644 index 00000000..5554424d Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-27.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-28.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-28.jpg new file mode 100644 index 00000000..6198655a Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-28.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-29.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-29.jpg new file mode 100644 index 00000000..368a87c9 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-29.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-3.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-3.jpg new file mode 100644 index 00000000..7e489d07 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-3.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-4.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-4.jpg new file mode 100644 index 00000000..7fa2538a Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-4.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-5.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-5.jpg new file mode 100644 index 00000000..a9b1b38a Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-5.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-6.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-6.jpg new file mode 100644 index 00000000..21b56e64 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-6.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-7.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-7.jpg new file mode 100644 index 00000000..20c3cc2b Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-7.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-8.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-8.jpg new file mode 100644 index 00000000..40cb14b0 Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-8.jpg differ diff --git a/packages/kbot/tests/pdf/RS485-780/RS485-780-9.jpg b/packages/kbot/tests/pdf/RS485-780/RS485-780-9.jpg new file mode 100644 index 00000000..e712d62b Binary files /dev/null and b/packages/kbot/tests/pdf/RS485-780/RS485-780-9.jpg differ diff --git a/packages/kbot/tests/pdf/extract.sh b/packages/kbot/tests/pdf/extract.sh new file mode 100644 index 00000000..77b3f612 --- /dev/null +++ b/packages/kbot/tests/pdf/extract.sh @@ -0,0 +1,6 @@ +kbot-d --router2=openai --model=google/gemini-2.5-pro-preview-03-25 \ + --prompt=./tests/pdf/prompt.md \ + --each=./tests/pdf/RS485-780/RS485-780-*.jpg \ + --mode=completion --preferences=none \ + --dst=./tests/pdf/sako.md \ + --filters=code --append=concat diff --git a/packages/kbot/tests/pdf/extract_manual.sh b/packages/kbot/tests/pdf/extract_manual.sh new file mode 100644 index 00000000..665669f1 --- /dev/null +++ b/packages/kbot/tests/pdf/extract_manual.sh @@ -0,0 +1,6 @@ +kbot-d --router2=openai --model=meta-llama/llama-3.2-90b-vision-instruct \ + --prompt=./tests/pdf/prompt_manual.md \ + --each=./tests/pdf/780/*.jpg \ + --mode=completion --preferences=none \ + --dst=./tests/pdf/sako_manual.md \ + --filters=code --append=concat diff --git a/packages/kbot/tests/pdf/prompt.md b/packages/kbot/tests/pdf/prompt.md new file mode 100644 index 00000000..1c4a1131 --- /dev/null +++ b/packages/kbot/tests/pdf/prompt.md @@ -0,0 +1,14 @@ + +Extract all Modbus read & write registers, as Markdown table. If none can be identified, abort and return message "No registers found" !! + + +## Columns +- type (read/write holding register/coil) as function code +- description +- address in Hex +- address in decimal +- if provided, parameter group + +- Dont comment or explain, just return Markdown +- insert new lines before and after headers +- insert a descriptive chapter name, header level 3 with the page number diff --git a/packages/kbot/tests/pdf/prompt_manual.md b/packages/kbot/tests/pdf/prompt_manual.md new file mode 100644 index 00000000..754dff1f --- /dev/null +++ b/packages/kbot/tests/pdf/prompt_manual.md @@ -0,0 +1,28 @@ + +Extract all parameters, as Markdown tables, return "Skipping Number Page : Nothing found" if nothing has been found, otherwise use this layout and structure (only valid Markdown!!) + + +## Parameters + +### Columns + +- parameter +- description +- if provided, parameter group +- range +- default +- Dont comment or explain, just return Markdown +- insert new lines before and after headers +- insert a descriptive chapter name, header level 3 with the page number + +## Error Codes + +### Columns + +- code +- description +- if provided, parameter group +- Dont comment or explain, just return Markdown +- insert new lines before and after headers +- insert a descriptive chapter name, header level 3 with the page number + diff --git a/packages/kbot/tests/pdf/sako.md b/packages/kbot/tests/pdf/sako.md new file mode 100644 index 00000000..cde2bd53 --- /dev/null +++ b/packages/kbot/tests/pdf/sako.md @@ -0,0 +1,15 @@ +No registers found + + +### Modbus Registers + +| type | description | address (Hex) | address (dec) | parameter group | +| :--------------------- | :------------------------- | :------------ | :------------ | :-------------- | +| write holding register | P0-16 functional parameters | F010H | 61456 | P0 | +| write holding register | AC-08 functional parameters | AC08H | 44040 | AC | + + +No registers found + + +No registers found diff --git a/packages/kbot/tests/pdf/sako_manual.md b/packages/kbot/tests/pdf/sako_manual.md new file mode 100644 index 00000000..e69de29b