Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/_vendor/zod-to-json-schema/parsers/optional.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ import { JsonSchema7Type, parseDef } from '../parseDef';
import { Refs } from '../Refs';

export const parseOptionalDef = (def: ZodOptionalDef, refs: Refs): JsonSchema7Type | undefined => {
if (refs.openaiStrictMode) {
const fieldName = refs.propertyPath?.slice(-1)[0] || 'unknown';

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since refs.propertyPath is an array, can we replace .slice(-1)[0] with .at(-1) here? Using .at(-1) improves readability and performance by directly accessing the last element without creating a new array.
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/at

console.warn(
`Warning: Field "${fieldName}" uses .optional() which is not supported by OpenAI API Structured Outputs. ` +
`Please use .nullable() instead. ` +
`See: https://platform.openai.com/docs/guides/structured-outputs#all-fields-must-be-required`,
);
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary use of string concatenation (+) since we are already using template literals.

if (refs.currentPath.toString() === refs.propertyPath?.toString()) {
return parseDef(def.innerType._def, refs);
}
Expand Down
18 changes: 18 additions & 0 deletions tests/helpers/zod.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,24 @@ describe('zodResponseFormat', () => {
`);
});

it('warns when using optional fields with OpenAI API', () => {
const consoleSpy = jest.spyOn(console, 'warn');

zodResponseFormat(
z.object({
required: z.string(),
optional: z.string().optional(),
}),
'test',
);

expect(consoleSpy).toHaveBeenCalledWith(
expect.stringContaining('uses .optional() which is not supported by OpenAI API Structured Outputs'),
);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we also test expect(consoleSpy).toHaveBeenCalledTimes(1); to ensure this is called only once.

consoleSpy.mockRestore();
});

it('automatically adds properties with defaults to `required`', () => {
expect(
zodResponseFormat(
Expand Down