From 393591e28e765ef08a00f1e1ae39e801c6af5f3e Mon Sep 17 00:00:00 2001 From: babayaga Date: Tue, 1 Apr 2025 14:35:30 +0200 Subject: [PATCH] kbot:structured output - spieglein spieglein :) --- packages/kbot/.vscode/launch.json | 77 +++++++++++------ .../kbot/dist-in/commands/run-completion.js | 3 +- packages/kbot/dist-in/zod_schema.js | 31 +++++-- packages/kbot/dist-in/zod_types.d.ts | 4 +- packages/kbot/package-lock.json | 10 +++ packages/kbot/package.json | 1 + packages/kbot/schema.json | 4 +- packages/kbot/schema_ui.json | 5 +- packages/kbot/src/commands/run-completion.ts | 3 +- packages/kbot/src/zod_schema.ts | 31 +++++-- packages/kbot/src/zod_types.ts | 4 +- .../response-format/africa-countries.json | 84 +++++++++++++++++++ .../tests/response-format/africa-countries.md | 66 +++++++++++++++ .../kbot/tests/response-format/countries.json | 31 +++++++ 14 files changed, 306 insertions(+), 48 deletions(-) create mode 100644 packages/kbot/tests/response-format/africa-countries.json create mode 100644 packages/kbot/tests/response-format/africa-countries.md create mode 100644 packages/kbot/tests/response-format/countries.json diff --git a/packages/kbot/.vscode/launch.json b/packages/kbot/.vscode/launch.json index a4cffa27..cc096254 100644 --- a/packages/kbot/.vscode/launch.json +++ b/packages/kbot/.vscode/launch.json @@ -9,7 +9,7 @@ "request": "launch", "name": "create", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -32,7 +32,7 @@ "request": "launch", "name": "modify", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -54,7 +54,7 @@ "request": "launch", "name": "git", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -77,7 +77,7 @@ "request": "launch", "name": "templates:solidworks", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -100,7 +100,7 @@ "request": "launch", "name": "prompt:docker", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -125,7 +125,7 @@ "request": "launch", "name": "iterator", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -154,7 +154,7 @@ "request": "launch", "name": "search:google", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -177,7 +177,7 @@ "request": "launch", "name": "search:serpapi", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -199,7 +199,7 @@ "request": "launch", "name": "interact", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -224,7 +224,7 @@ "request": "launch", "name": "web", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -247,7 +247,7 @@ "request": "launch", "name": "deepseek", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -269,7 +269,7 @@ "request": "launch", "name": "tools:email", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -291,7 +291,7 @@ "request": "launch", "name": "tools:terminal:astro", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -313,7 +313,7 @@ "request": "launch", "name": "types", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -333,7 +333,7 @@ "request": "launch", "name": "tools:search", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -357,7 +357,7 @@ "request": "launch", "name": "assistant:code", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -383,7 +383,7 @@ "request": "launch", "name": "assistant:pdf", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -409,7 +409,7 @@ "request": "launch", "name": "assistant:md", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -431,12 +431,39 @@ "outputCapture": "std", "console": "integratedTerminal" }, + { + "type": "node", + "request": "launch", + "name": "response-format", + "skipFiles": [], + "program": "${workspaceFolder}\\dist-in\\main.js", + "outFiles": [ + "${workspaceFolder}/**/*.js" + ], + "cwd": "${workspaceFolder}", + "args": [ + "'return a list of african countries'", + "--disable='npm,terminal,interact,git,search'", + "--router2=openai", + "--format=./tests/response-format/countries.json", + "--model=openai/gpt-4o", + "--mode=completion", + "--filters=JSONParse", + "--dst=./tests/response-format/africa-countries.json", + ], + "resolveSourceMapLocations": [ + "${workspaceFolder}/**", + "!**/node_modules/**" + ], + "outputCapture": "std", + "console": "integratedTerminal" + }, { "type": "node", "request": "launch", "name": "each:glob", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -462,7 +489,7 @@ "request": "launch", "name": "each:array", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -494,7 +521,7 @@ "request": "launch", "name": "salamand", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -527,7 +554,7 @@ "request": "launch", "name": "tools:test", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -556,7 +583,7 @@ "request": "launch", "name": "images:jpg-svg", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -582,7 +609,7 @@ "request": "launch", "name": "images:jpg-svg-overlay", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], @@ -609,7 +636,7 @@ "request": "launch", "name": "hono", "skipFiles": [], - "program": "${workspaceFolder}\\main.js", + "program": "${workspaceFolder}\\dist-in\\main.js", "outFiles": [ "${workspaceFolder}/**/*.js" ], diff --git a/packages/kbot/dist-in/commands/run-completion.js b/packages/kbot/dist-in/commands/run-completion.js index 3f3ed3f1..7f285bda 100644 --- a/packages/kbot/dist-in/commands/run-completion.js +++ b/packages/kbot/dist-in/commands/run-completion.js @@ -38,9 +38,10 @@ export const runCompletion = async (client, params, options) => { const completion = await client.chat.completions.create({ model: options.model, messages: params.messages, + response_format: options.format, }); let result = completion.choices[0].message.content; result = await onCompletion(result, options); return result; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLWNvbXBsZXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvcnVuLWNvbXBsZXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDaEQsT0FBTyxLQUFLLElBQUksTUFBTSxXQUFXLENBQUE7QUFDakMsT0FBTyxFQUFFLElBQUksSUFBSSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFJM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUNwQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDakQsT0FBTyxFQUFFLFlBQVksRUFBVSxNQUFNLGVBQWUsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFHM0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLEtBQUssRUFBRSxTQUFjLEVBQUUsRUFBRSxPQUFrQixFQUFFLEVBQUU7SUFDekUsTUFBTSxHQUFHLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLE9BQW1CLElBQUksRUFBRSxDQUFDLENBQUE7SUFDaEUsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQy9CLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFO1lBQ3ZELEdBQUcsSUFBSTtZQUNQLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJO1lBQ3JDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTtTQUN2QixDQUFDLENBQUMsQ0FBQTtRQUNILEtBQUssQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFDdEIsTUFBTSxDQUFDLEtBQUssQ0FBQyw4QkFBOEIsT0FBTyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQ3hFLENBQUM7U0FBTSxDQUFDO1FBQ04sTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7WUFDeEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsQ0FBQTtRQUNILE1BQU0sT0FBTyxHQUFXLE1BQU0sQ0FBQyxNQUFNLENBQVcsQ0FBQztRQUNqRCxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUMvQixDQUFDO0lBQ0QsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3JCLGtCQUFrQjtJQUNsQixPQUFPLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQUUsTUFBYyxFQUFFLE1BQVcsRUFBRSxPQUFrQixFQUFFLEVBQUU7SUFDckYsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDaEIsTUFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO1FBQzFDLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUNELE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDO1FBQ3RELEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSztRQUNwQixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVE7S0FDMUIsQ0FBQyxDQUFBO0lBQ0YsSUFBSSxNQUFNLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBQ2xELE1BQU0sR0FBRyxNQUFNLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDNUMsT0FBTyxNQUFNLENBQUE7QUFDZixDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLWNvbXBsZXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZHMvcnVuLWNvbXBsZXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDaEQsT0FBTyxLQUFLLElBQUksTUFBTSxXQUFXLENBQUE7QUFDakMsT0FBTyxFQUFFLElBQUksSUFBSSxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFJM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUNwQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDakQsT0FBTyxFQUFFLFlBQVksRUFBVSxNQUFNLGVBQWUsQ0FBQTtBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFHM0MsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLEtBQUssRUFBRSxTQUFjLEVBQUUsRUFBRSxPQUFrQixFQUFFLEVBQUU7SUFDekUsTUFBTSxHQUFHLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLE9BQW1CLElBQUksRUFBRSxDQUFDLENBQUE7SUFDaEUsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQy9CLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFO1lBQ3ZELEdBQUcsSUFBSTtZQUNQLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJO1lBQ3JDLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTTtTQUN2QixDQUFDLENBQUMsQ0FBQTtRQUNILEtBQUssQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFDdEIsTUFBTSxDQUFDLEtBQUssQ0FBQyw4QkFBOEIsT0FBTyxNQUFNLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQ3hFLENBQUM7U0FBTSxDQUFDO1FBQ04sTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7WUFDeEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsQ0FBQTtRQUNILE1BQU0sT0FBTyxHQUFXLE1BQU0sQ0FBQyxNQUFNLENBQVcsQ0FBQztRQUNqRCxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUMvQixDQUFDO0lBQ0QsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3JCLGtCQUFrQjtJQUNsQixPQUFPLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxLQUFLLEVBQUUsTUFBYyxFQUFFLE1BQVcsRUFBRSxPQUFrQixFQUFFLEVBQUU7SUFDckYsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDaEIsTUFBTSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO1FBQzFDLE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUNELE1BQU0sVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDO1FBQ3RELEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSztRQUNwQixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVE7UUFDekIsZUFBZSxFQUFFLE9BQU8sQ0FBQyxNQUFhO0tBQ3ZDLENBQUMsQ0FBQTtJQUNGLElBQUksTUFBTSxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQTtJQUNsRCxNQUFNLEdBQUcsTUFBTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVDLE9BQU8sTUFBTSxDQUFBO0FBQ2YsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/packages/kbot/dist-in/zod_schema.js b/packages/kbot/dist-in/zod_schema.js index e0a1806c..77544a05 100644 --- a/packages/kbot/dist-in/zod_schema.js +++ b/packages/kbot/dist-in/zod_schema.js @@ -3,13 +3,16 @@ import * as path from 'node:path'; import chalk from 'chalk'; import env from 'env-var'; import { generate_interfaces, ZodMetaMap, resolve, write } from '@polymech/commons'; +import { sync as exists } from '@polymech/fs/exists'; import { sync as writeFS } from '@polymech/fs/write'; +import { sync as readFS } from '@polymech/fs/read'; import { isArray, isFunction, isString } from '@polymech/core/primitives'; import { zodResponseFormat } from "openai/helpers/zod"; import { API_PREFIX, LOGGING_DIRECTORY, PREFERENCES_FILE_NAME } from './constants.js'; export const get_var = (key = '') => env.get(key).asString() || env.get(key.replace(/-/g, '_')).asString() || env.get(key.replace(/_/g, '-')).asString(); export const HOME = (sub = '') => path.join(process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'] || '', sub); export const PREFERENCES_DEFAULT = (key = 'KBOT_PREFERENCES') => get_var(key) || path.join(HOME(`.${API_PREFIX}`), PREFERENCES_FILE_NAME); +import { jsonSchemaToZod } from "json-schema-to-zod"; import { Filters } from './filters.js'; import { models_dist } from './models/index.js'; import { defaultTemplate } from './tools.js'; @@ -155,11 +158,29 @@ export const OptionsSchema = (opts) => { .optional() .default(false) .describe('Dry run - only write out parameters without making API calls')) - .add('format', z.any() + .add('format', z.string().optional().transform((val) => { + try { + let schema; + // Check if the string is a file path + if (exists(val) && val.endsWith('.json')) { + const content = readFS(val); + schema = JSON.parse(content.toString()); + } + else { + schema = JSON.parse(val); + } + const zodSchemaStr = jsonSchemaToZod(schema); + // Evaluate the string to get the actual Zod schema + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } + catch (e) { + console.error(`Error parsing format: ${e}`); + return null; + } + }) .optional() - .default(null) - .describe('Zod schema for structured outputs') - .transform((val) => val ? zodResponseFormat(val, "format") : null)); + .describe('Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.')); return schemaMap.root() .passthrough() .describe('IKBotOptions'); @@ -173,4 +194,4 @@ export const schemas = () => { write([OptionsSchema()], 'schema.json', 'kbot', {}); writeFS('schema_ui.json', schemaMap.getUISchema()); }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zod_schema.js","sourceRoot":"","sources":["../src/zod_schema.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"zod_schema.js","sourceRoot":"","sources":["../src/zod_schema.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/kbot/dist-in/zod_types.d.ts b/packages/kbot/dist-in/zod_types.d.ts index 6fc0d2a4..db6b0d21 100644 --- a/packages/kbot/dist-in/zod_types.d.ts +++ b/packages/kbot/dist-in/zod_types.d.ts @@ -427,6 +427,6 @@ export interface IKBotOptions { filters?: (string | ("JSON" | "JSONUnescape" | "JSONPretty" | "AlphaSort" | "code" | "JSONParse" | "trim")[] | string[] | ((...args_0: unknown[]) => unknown)[]); /** Dry run - only write out parameters without making API calls */ dry?: (boolean | string); - /** Zod schema for structured outputs */ - format?: any; + /** Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file. */ + format?: (string | undefined) | undefined; } diff --git a/packages/kbot/package-lock.json b/packages/kbot/package-lock.json index 6a394076..569962b6 100644 --- a/packages/kbot/package-lock.json +++ b/packages/kbot/package-lock.json @@ -20,6 +20,7 @@ "emojilib": "4.0.1", "env-var": "7.5.0", "glob": "11.0.1", + "json-schema-to-zod": "2.6.0", "marked": "14.1.4", "marked-terminal": "7.2.1", "mime-types": "2.1.35", @@ -4342,6 +4343,15 @@ "dev": true, "license": "MIT" }, + "node_modules/json-schema-to-zod": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/json-schema-to-zod/-/json-schema-to-zod-2.6.0.tgz", + "integrity": "sha512-6sFZqOzHZeON8g2ZW5HJ114Hb/FffNCjWh8dgulJaKFkUqKCEWZAzF4+g07SQpfBZF7HXemwedtdLypZzmnVpQ==", + "license": "ISC", + "bin": { + "json-schema-to-zod": "dist/cjs/cli.js" + } + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", diff --git a/packages/kbot/package.json b/packages/kbot/package.json index eea2c0f6..b2efc6c1 100644 --- a/packages/kbot/package.json +++ b/packages/kbot/package.json @@ -39,6 +39,7 @@ "emojilib": "4.0.1", "env-var": "7.5.0", "glob": "11.0.1", + "json-schema-to-zod": "2.6.0", "marked": "14.1.4", "marked-terminal": "7.2.1", "mime-types": "2.1.35", diff --git a/packages/kbot/schema.json b/packages/kbot/schema.json index 4273401e..c2befbe4 100644 --- a/packages/kbot/schema.json +++ b/packages/kbot/schema.json @@ -188,8 +188,8 @@ "description": "Dry run - only write out parameters without making API calls" }, "format": { - "default": null, - "description": "Zod schema for structured outputs" + "type": "string", + "description": "Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file." } }, "additionalProperties": true, diff --git a/packages/kbot/schema_ui.json b/packages/kbot/schema_ui.json index 9a1ba94c..2d4c4d88 100644 --- a/packages/kbot/schema_ui.json +++ b/packages/kbot/schema_ui.json @@ -127,8 +127,7 @@ "ui:placeholder": false }, "format": { - "ui:description": "Zod schema for structured outputs", - "ui:title": "Format", - "ui:placeholder": null + "ui:description": "Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.", + "ui:title": "Format" } } \ No newline at end of file diff --git a/packages/kbot/src/commands/run-completion.ts b/packages/kbot/src/commands/run-completion.ts index 166c0c69..51ca7f71 100644 --- a/packages/kbot/src/commands/run-completion.ts +++ b/packages/kbot/src/commands/run-completion.ts @@ -11,7 +11,7 @@ import { logger } from '../index.js' import { dumpAsScript } from '../utils/script.js' import { applyFilters, Filter } from '../filters.js' import { variables } from '../variables.js' - +import { ResponseFormatJSONSchema } from 'openai/resources/shared.js' export const onCompletion = async (result: any = "", options: IKBotTask) => { result = applyFilters(result, options.filters as Filter[] || []) @@ -44,6 +44,7 @@ export const runCompletion = async (client: OpenAI, params: any, options: IKBotT const completion = await client.chat.completions.create({ model: options.model, messages: params.messages, + response_format: options.format as any, }) let result = completion.choices[0].message.content result = await onCompletion(result, options) diff --git a/packages/kbot/src/zod_schema.ts b/packages/kbot/src/zod_schema.ts index 238fd6fb..da3af02d 100644 --- a/packages/kbot/src/zod_schema.ts +++ b/packages/kbot/src/zod_schema.ts @@ -5,6 +5,7 @@ import env from 'env-var' import { generate_interfaces, ZodMetaMap, resolve, write } from '@polymech/commons' import { sync as exists } from '@polymech/fs/exists' import { sync as writeFS } from '@polymech/fs/write' +import { sync as readFS } from '@polymech/fs/read' import { isArray, isFunction, isString } from '@polymech/core/primitives' import { zodResponseFormat } from "openai/helpers/zod" @@ -13,7 +14,7 @@ import { API_PREFIX, LOGGING_DIRECTORY, PREFERENCES_FILE_NAME } from './constant export const get_var = (key: string = '') => env.get(key).asString() || env.get(key.replace(/-/g, '_')).asString() || env.get(key.replace(/_/g, '-')).asString() export const HOME = (sub = '') => path.join(process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'] || '', sub) export const PREFERENCES_DEFAULT = (key: string = 'KBOT_PREFERENCES') => get_var(key) || path.join(HOME(`.${API_PREFIX}`), PREFERENCES_FILE_NAME) - +import { jsonSchemaToZod } from "json-schema-to-zod" import { Filters } from './filters.js' import { models_dist } from './models/index.js' import { defaultTemplate } from './tools.js' @@ -227,11 +228,11 @@ export const OptionsSchema = (opts?: any): any => { It unwraps by default any code or data in Markdown. Choices:\n\t${Object.keys(Filters)}\n`) .transform((val) => { - if(isArray(val) && val.length && isFunction(val[0])){ + if (isArray(val) && val.length && isFunction(val[0])) { return val } let filters = isString(val) ? val.split(',') : val - filters = filters.map((f: any) => Filters[f]).filter(Boolean) + filters = filters.map((f: any) => Filters[f]).filter(Boolean) return filters }) ) @@ -247,11 +248,27 @@ export const OptionsSchema = (opts?: any): any => { ) .add( 'format', - z.any() + z.string().optional().transform((val) => { + try { + let schema; + // Check if the string is a file path + if (exists(val) && val.endsWith('.json')) { + const content = readFS(val); + schema = JSON.parse(content.toString()); + } else { + schema = JSON.parse(val); + } + const zodSchemaStr = jsonSchemaToZod(schema); + // Evaluate the string to get the actual Zod schema + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } catch (e) { + console.error(`Error parsing format: ${e}`) + return null; + } + }) .optional() - .default(null) - .describe('Zod schema for structured outputs') - .transform((val) => val ? zodResponseFormat(val, "format") : null) + .describe('Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.') ); return schemaMap.root() .passthrough() diff --git a/packages/kbot/src/zod_types.ts b/packages/kbot/src/zod_types.ts index 323954c5..c5d922a1 100644 --- a/packages/kbot/src/zod_types.ts +++ b/packages/kbot/src/zod_types.ts @@ -427,6 +427,6 @@ export interface IKBotOptions { filters?: (string | ("JSON" | "JSONUnescape" | "JSONPretty" | "AlphaSort" | "code" | "JSONParse" | "trim")[] | string[] | ((...args_0: unknown[]) => unknown)[]); /** Dry run - only write out parameters without making API calls */ dry?: (boolean | string); - /** Zod schema for structured outputs */ - format?: any; + /** Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file. */ + format?: (string | undefined) | undefined; } \ No newline at end of file diff --git a/packages/kbot/tests/response-format/africa-countries.json b/packages/kbot/tests/response-format/africa-countries.json new file mode 100644 index 00000000..9f44a968 --- /dev/null +++ b/packages/kbot/tests/response-format/africa-countries.json @@ -0,0 +1,84 @@ +{ + "cities": [ + { + "name": "Lagos", + "country": "Nigeria", + "population": 14779000 + }, + { + "name": "Cairo", + "country": "Egypt", + "population": 20484965 + }, + { + "name": "Kinshasa", + "country": "Democratic Republic of the Congo", + "population": 15075000 + }, + { + "name": "Johannesburg", + "country": "South Africa", + "population": 9574417 + }, + { + "name": "Nairobi", + "country": "Kenya", + "population": 5545000 + }, + { + "name": "Luanda", + "country": "Angola", + "population": 8200000 + }, + { + "name": "Addis Ababa", + "country": "Ethiopia", + "population": 4942826 + }, + { + "name": "Khartoum", + "country": "Sudan", + "population": 6400000 + }, + { + "name": "Dar es Salaam", + "country": "Tanzania", + "population": 6936403 + }, + { + "name": "Accra", + "country": "Ghana", + "population": 4540000 + }, + { + "name": "Algiers", + "country": "Algeria", + "population": 3415811 + }, + { + "name": "Casablanca", + "country": "Morocco", + "population": 3500000 + }, + { + "name": "Abidjan", + "country": "Ivory Coast", + "population": 5040000 + }, + { + "name": "Dakar", + "country": "Senegal", + "population": 3483664 + }, + { + "name": "Tunis", + "country": "Tunisia", + "population": 2750330 + }, + { + "name": "Douala", + "country": "Cameroon", + "population": 4050687 + } + ] +} \ No newline at end of file diff --git a/packages/kbot/tests/response-format/africa-countries.md b/packages/kbot/tests/response-format/africa-countries.md new file mode 100644 index 00000000..6a7387ef --- /dev/null +++ b/packages/kbot/tests/response-format/africa-countries.md @@ -0,0 +1,66 @@ +# African Countries List + +Here is a comprehensive list of African countries in alphabetical order: + +1. Algeria +2. Angola +3. Benin +4. Botswana +5. Burkina Faso +6. Burundi +7. Cameroon +8. Cape Verde +9. Central African Republic +10. Chad +11. Comoros +12. Congo +13. Democratic Republic of the Congo +14. Djibouti +15. Egypt +16. Equatorial Guinea +17. Eritrea +18. Ethiopia +19. Gabon +20. Gambia +21. Ghana +22. Guinea +23. Guinea-Bissau +24. Ivory Coast +25. Kenya +26. Lesotho +27. Liberia +28. Libya +29. Madagascar +30. Malawi +31. Mali +32. Mauritania +33. Mauritius +34. Morocco +35. Mozambique +36. Namibia +37. Niger +38. Nigeria +39. Rwanda +40. Sao Tome and Principe +41. Senegal +42. Seychelles +43. Sierra Leone +44. Somalia +45. South Africa +46. South Sudan +47. Sudan +48. Swaziland (Eswatini) +49. Tanzania +50. Togo +51. Tunisia +52. Uganda +53. Zambia +54. Zimbabwe + +Source: [United Nations - Member States](https://www.un.org/en/about-us/member-states) + +--- +Prompt: 'return a list of african countries' + +Kind regards, +Guenter \ No newline at end of file diff --git a/packages/kbot/tests/response-format/countries.json b/packages/kbot/tests/response-format/countries.json new file mode 100644 index 00000000..062caf87 --- /dev/null +++ b/packages/kbot/tests/response-format/countries.json @@ -0,0 +1,31 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://example.com/cities.schema.json", + "title": "Cities Wrapper", + "description": "An object containing a list of cities (without coordinates).", + "type": "object", + "properties": { + "cities": { + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "City name." + }, + "country": { + "type": "string", + "description": "Country where the city is located." + }, + "population": { + "type": "integer", + "description": "Total population of the city." + } + }, + "required": ["name", "country"] + } + } + }, + "required": ["cities"] +}