diff --git a/packages/kbot/dist-in/zod_schema.js b/packages/kbot/dist-in/zod_schema.js index 77544a05..828a51f2 100644 --- a/packages/kbot/dist-in/zod_schema.js +++ b/packages/kbot/dist-in/zod_schema.js @@ -158,29 +158,48 @@ export const OptionsSchema = (opts) => { .optional() .default(false) .describe('Dry run - only write out parameters without making API calls')) - .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()); + .add('format', z.union([ + z.string().transform((val) => { + try { + // Check if the string is a file path + if (exists(val) && val.endsWith('.json')) { + const content = readFS(val); + const schema = JSON.parse(content.toString()); + const zodSchemaStr = jsonSchemaToZod(schema); + // Evaluate the string to get the actual Zod schema + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } + else { + // Try parsing as JSON schema first + try { + const schema = JSON.parse(val); + const zodSchemaStr = jsonSchemaToZod(schema); + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } + catch { + // If not JSON, try evaluating as Zod schema directly + const zodSchema = eval(`(${val})`); + return zodResponseFormat(zodSchema, "format"); + } + } } - else { - schema = JSON.parse(val); + catch (e) { + console.error(`Error parsing format: ${e}`); + return null; + } + }), + z.any().transform((val) => { + // If it's already a Zod schema, use it directly + if (val && typeof val === 'object' && 'parse' in val) { + return zodResponseFormat(val, "format"); } - 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() - .describe('Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.')); + .describe('Format for structured outputs. Can be a Zod schema, a Zod schema string, a JSON schema string, or a path to a JSON file.')); return schemaMap.root() .passthrough() .describe('IKBotOptions'); @@ -194,4 +213,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":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,GAAG,MAAM,SAAS,CAAA;AACzB,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACnF,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAErF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;AAChK,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAA;AAC3H,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAc,kBAAkB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,qBAAqB,CAAC,CAAA;AACjJ,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAQ,CAAC,CAAA;AAE5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;AAGnI,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,UAAU,EAAE,YAAY;IACxB,KAAK,EAAE,OAAO;IACd,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;CACR,CAAA;AAGV,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC;IAC1B,KAAK,CAAC,UAAU;IAChB,KAAK,CAAC,KAAK;IACX,KAAK,CAAC,SAAS;IACf,KAAK,CAAC,MAAM;CACb,CAAC,CAAA;AACF,oFAAoF;AACpF;;;;;;EAME;AACF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC;IAC9B,MAAM;IACN,iCAAiC;IACjC,6BAA6B;IAC7B,gCAAgC;IAChC,0CAA0C;IAC1C,6BAA6B;CAC9B,CAAC,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAA;AAK3C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,IAAI,6BAA6B,EAAE,MAAM,wBAAwB,CAAA;AACpH,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,IAAI,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAExG,IAAI,SAAS,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAU,EAAO,EAAE;IAE/C,SAAS,GAAG,UAAU,CAAC,MAAM,EAAqB,CAAA;IAClD,SAAS,CAAC,GAAG,CACX,MAAM,EACN,CAAC,CAAC,MAAM,EAAE;SACP,GAAG,CAAC,CAAC,CAAC;SACN,OAAO,CAAC,GAAG,CAAC;SACZ,QAAQ,CAAC,kBAAkB,CAAC,EAC7B,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;SACzB,GAAG,CACF,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,CAAC,4DAA4D,CAAC;SACtE,QAAQ,EAAE;SACV,OAAO,CAAC,aAAa,CAAC,CAC1B;SACA,GAAG,CACF,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,0DAA0D,CAAC,CACxE;SACA,GAAG,CACF,KAAK,EACL,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,yIAAyI,CAAC,CACvJ;SACA,GAAG,CACF,MAAM,EACN,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,6OAA6O,CAAC,CAC3P;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAChB,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,2CAA2C,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAC1F;SACA,GAAG,CACF,cAAc,EACd,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAChB,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,mCAAmC,CAAC,CACjD;SACA,GAAG,CACF,OAAO,EACP,CAAC,CAAC,KAAK,CACL;QACE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC,CAAC,MAAM,EAAE;KACX,CAAC,CAAC,QAAQ,EAAE;SACZ,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;SAC9B,QAAQ,CAAC,4FAA4F,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;SACvI,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACjE;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAChB,QAAQ,EAAE;SACV,QAAQ,CAAC,gGAAgG,CAAC,CAC9G;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,yBAAyB,CAAC,CACvC;SACA,GAAG,CACF,OAAO,EACP,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,sDAAsD,WAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAC9F;SACA,GAAG,CACF,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE;SACP,OAAO,CAAC,YAAY,CAAC;SACrB,QAAQ,CAAC,+CAA+C,CAAC,CAC7D;SACA,GAAG,CACF,MAAM,EACN,KAAK;SACF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;SACpB,QAAQ,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;YAC9B,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;YACzB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;YAC7B,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;OAC/B,CAAC,CACH;SACA,GAAG,CACF,UAAU,EACV,CAAC,CAAC,MAAM,EAAE;SACP,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,CAAC,mCAAmC,CAAC,CACjD;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,gEAAgE,CAAC,CAC9E;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,oDAAoD,CAAC,CAClE;SACA,GAAG,CACF,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC,CAC3F;SACA,GAAG,CACF,MAAM,EACN,CAAC,CAAC,MAAM,EAAE;SACP,QAAQ,EAAE;SACV,QAAQ,CAAC,iBAAiB,CAAC,CAC/B;SACA,GAAG,CACF,aAAa,EACb,CAAC,CAAC,MAAM,EAAE;SACP,OAAO,CAAC,mBAAmB,EAAE,CAAC;SAC9B,QAAQ,CAAC,0GAA0G,CAAC,CACxH;SACA,GAAG,CACF,MAAM,EACN,CAAC,CAAC,MAAM,EAAE;SACP,OAAO,CAAC,iBAAiB,CAAC;SAC1B,QAAQ,CAAC,mBAAmB,CAAC,CACjC;SACA,GAAG,CACF,KAAK,EACL,CAAC,CAAC,MAAM,EAAE;SACP,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CAAC,0BAA0B,CAAC,CACxC;QACD,wCAAwC;QACxC,oFAAoF;SACnF,GAAG,CACF,WAAW,EACX,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;SAC7B,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC,CACf;SACA,GAAG,CACF,SAAS,EACT,CAAC,CAAC,KAAK,CAAC;QACN,CAAC,CAAC,MAAM,EAAE;QACV,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;QAClB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KACtB,CAAC;SACC,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC;;;uBAGK,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;SACvC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;QACjB,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QAClD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC7D,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CACL;SACA,GAAG,CACF,KAAK,EACL,CAAC,CAAC,KAAK,CAAC;QACN,CAAC,CAAC,OAAO,EAAE;QACX,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;KAC5D,CAAC;SACC,QAAQ,EAAE;SACV,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CAAC,8DAA8D,CAAC,CAC5E;SACA,GAAG,CACF,QAAQ,EACR,CAAC,CAAC,KAAK,CAAC;QACN,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3B,IAAI,CAAC;gBACH,qCAAqC;gBACrC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBACzC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAC9C,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;oBAC7C,mDAAmD;oBACnD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;oBAC5C,OAAO,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,mCAAmC;oBACnC,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC/B,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;wBAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;wBAC5C,OAAO,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;oBAChD,CAAC;oBAAC,MAAM,CAAC;wBACP,qDAAqD;wBACrD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;wBACnC,OAAO,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAA;gBAC3C,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC;QACF,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,gDAAgD;YAChD,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;gBACrD,OAAO,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;KACH,CAAC;SACC,QAAQ,EAAE;SACV,QAAQ,CAAC,0HAA0H,CAAC,CACxI,CAAC;IACJ,OAAO,SAAS,CAAC,IAAI,EAAE;SACpB,WAAW,EAAE;SACb,QAAQ,CAAC,cAAc,CAAC,CAAA;AAC7B,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,EAAE;IACxB,mBAAmB,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAA;IAC1D,mBAAmB,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAA;IAC9F,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;IACnD,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAA;AACpD,CAAC,CAAA"} \ 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 db6b0d21..f1c47495 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. Can be a Zod schema, a JSON schema string, or a path to a JSON file. */ - format?: (string | undefined) | undefined; + /** Format for structured outputs. Can be a Zod schema, a Zod schema string, a JSON schema string, or a path to a JSON file. */ + format?: (string | any) | undefined; } diff --git a/packages/kbot/schema.json b/packages/kbot/schema.json index c2befbe4..299d9285 100644 --- a/packages/kbot/schema.json +++ b/packages/kbot/schema.json @@ -188,8 +188,13 @@ "description": "Dry run - only write out parameters without making API calls" }, "format": { - "type": "string", - "description": "Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file." + "anyOf": [ + { + "type": "string" + }, + {} + ], + "description": "Format for structured outputs. Can be a Zod schema, a Zod schema string, 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 2d4c4d88..06c8e0f9 100644 --- a/packages/kbot/schema_ui.json +++ b/packages/kbot/schema_ui.json @@ -127,7 +127,7 @@ "ui:placeholder": false }, "format": { - "ui:description": "Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.", + "ui:description": "Format for structured outputs. Can be a Zod schema, a Zod schema string, 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/zod_schema.ts b/packages/kbot/src/zod_schema.ts index da3af02d..6a934d54 100644 --- a/packages/kbot/src/zod_schema.ts +++ b/packages/kbot/src/zod_schema.ts @@ -248,27 +248,45 @@ export const OptionsSchema = (opts?: any): 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); + z.union([ + z.string().transform((val) => { + try { + // Check if the string is a file path + if (exists(val) && val.endsWith('.json')) { + const content = readFS(val); + const schema = JSON.parse(content.toString()); + const zodSchemaStr = jsonSchemaToZod(schema); + // Evaluate the string to get the actual Zod schema + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } else { + // Try parsing as JSON schema first + try { + const schema = JSON.parse(val); + const zodSchemaStr = jsonSchemaToZod(schema); + const zodSchema = eval(`(${zodSchemaStr})`); + return zodResponseFormat(zodSchema, "format"); + } catch { + // If not JSON, try evaluating as Zod schema directly + const zodSchema = eval(`(${val})`); + return zodResponseFormat(zodSchema, "format"); + } + } + } catch (e) { + console.error(`Error parsing format: ${e}`) + return null; + } + }), + z.any().transform((val) => { + // If it's already a Zod schema, use it directly + if (val && typeof val === 'object' && 'parse' in val) { + return zodResponseFormat(val, "format"); } - 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() - .describe('Zod schema for structured outputs. Can be a Zod schema, a JSON schema string, or a path to a JSON file.') + .describe('Format for structured outputs. Can be a Zod schema, a Zod schema string, 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 c5d922a1..958f2dca 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. Can be a Zod schema, a JSON schema string, or a path to a JSON file. */ - format?: (string | undefined) | undefined; + /** Format for structured outputs. Can be a Zod schema, a Zod schema string, a JSON schema string, or a path to a JSON file. */ + format?: (string | any) | 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 index 9f44a968..4567d924 100644 --- a/packages/kbot/tests/response-format/africa-countries.json +++ b/packages/kbot/tests/response-format/africa-countries.json @@ -1,84 +1,94 @@ { "cities": [ { - "name": "Lagos", - "country": "Nigeria", - "population": 14779000 + "name": "Nigeria", + "population": 21140000, + "conflict": 0, + "exports": "Petroleum, Cocoa", + "languages": "English, Hausa, Igbo, Yoruba", + "religion": "Islam, Christianity, Indigenous beliefs", + "colonia": "Colonized by the British" }, { - "name": "Cairo", - "country": "Egypt", - "population": 20484965 + "name": "Egypt", + "population": 98420000, + "conflict": 0, + "exports": "Crude Oil, Cotton, Textiles", + "languages": "Arabic", + "religion": "Islam, Christianity", + "colonia": "Colonized by the British" }, { - "name": "Kinshasa", - "country": "Democratic Republic of the Congo", - "population": 15075000 + "name": "South Africa", + "population": 59310000, + "conflict": 0, + "exports": "Gold, Diamonds, Platinum", + "languages": "Zulu, Xhosa, Afrikaans, English", + "religion": "Christianity, Traditional African beliefs", + "colonia": "Colonized by the British and Dutch" }, { - "name": "Johannesburg", - "country": "South Africa", - "population": 9574417 + "name": "Kenya", + "population": 53700000, + "conflict": 0, + "exports": "Tea, Coffee, Cut Flowers", + "languages": "English, Swahili", + "religion": "Christianity, Islam, Hinduism", + "colonia": "Colonized by the British" }, { - "name": "Nairobi", - "country": "Kenya", - "population": 5545000 + "name": "Ethiopia", + "population": 112100000, + "conflict": 1, + "exports": "Coffee, Livestock, Pulses", + "languages": "Amharic, Oromo, Tigrinya", + "religion": "Christianity, Islam, Indigenous beliefs", + "colonia": "Briefly occupied by Italy" }, { - "name": "Luanda", - "country": "Angola", - "population": 8200000 + "name": "Ghana", + "population": 31280000, + "conflict": 0, + "exports": "Gold, Cocoa, Oil", + "languages": "English, Akan, Ewe", + "religion": "Christianity, Islam, Traditional African beliefs", + "colonia": "Colonized by the British" }, { - "name": "Addis Ababa", - "country": "Ethiopia", - "population": 4942826 + "name": "Morocco", + "population": 36470000, + "conflict": 0, + "exports": "Electronics, Phosphates, Textiles", + "languages": "Arabic, Berber", + "religion": "Islam", + "colonia": "Colonized by the French and Spanish" }, { - "name": "Khartoum", - "country": "Sudan", - "population": 6400000 + "name": "Algeria", + "population": 43850000, + "conflict": 0, + "exports": "Petroleum, Natural Gas", + "languages": "Arabic, Berber", + "religion": "Islam", + "colonia": "Colonized by the French" }, { - "name": "Dar es Salaam", - "country": "Tanzania", - "population": 6936403 + "name": "Uganda", + "population": 45740000, + "conflict": 0, + "exports": "Coffee, Fish, Tea", + "languages": "English, Swahili", + "religion": "Christianity, Islam", + "colonia": "Colonized by the British" }, { - "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 + "name": "Sudan", + "population": 43850000, + "conflict": 1, + "exports": "Gold, Oil, Gum Arabic", + "languages": "Arabic, English", + "religion": "Islam, Christianity", + "colonia": "Colonized by the British and Egyptians" } ] } \ No newline at end of file diff --git a/packages/kbot/tests/response-format/countries.json b/packages/kbot/tests/response-format/countries.json index 062caf87..f187be81 100644 --- a/packages/kbot/tests/response-format/countries.json +++ b/packages/kbot/tests/response-format/countries.json @@ -1,8 +1,8 @@ { "$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).", + "title": "countries Wrapper", + "description": "An object containing a list of countries (without coordinates).", "type": "object", "properties": { "cities": { @@ -12,15 +12,31 @@ "properties": { "name": { "type": "string", - "description": "City name." - }, - "country": { - "type": "string", - "description": "Country where the city is located." + "description": "Country name." }, "population": { "type": "integer", "description": "Total population of the city." + }, + "conflict": { + "type": "integer", + "description": "Is involved in a conflict." + }, + "exports": { + "type": "string", + "description": "Goods exported from the country." + }, + "languages": { + "type": "string", + "description": "list of languages spoken in the country." + }, + "religion": { + "type": "string", + "description": "list of religions practiced in the country." + }, + "colonia": { + "type": "string", + "description": "Colonial history of the country." } }, "required": ["name", "country"]