Commit51d1acb

and

authored

Support strict mode in NativeOutput (#2084)

Co-authored-by: Douwe Maan <douwe@pydantic.dev>

1 parent90fc3fd commit51d1acbCopy full SHA for 51d1acb

File tree

+17

-0

lines changed

+17

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ def build(`
`182`	`182`	`_flatten_output_spec(output_spec.outputs),`
`183`	`183`	`name=output_spec.name,`
`184`	`184`	`description=output_spec.description,`
	`185`	`+strict=output_spec.strict,`
`185`	`186`	`)`
`186`	`187`	`)`
`187`	`188`	`elifisinstance(output_spec,PromptedOutput):`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,17 +154,21 @@ class NativeOutput(Generic[OutputDataT]):`
`154`	`154`	`"""The name of the structured output that will be passed to the model. If not specified and only one output is provided, the name of the output type or function will be used."""`
`155`	`155`	`description:str\|None`
`156`	`156`	`"""The description of the structured output that will be passed to the model. If not specified and only one output is provided, the docstring of the output type or function will be used."""`
	`157`	`+strict:bool\|None`
	`158`	`+"""Whether to use strict mode for the output, if the model supports it."""`
`157`	`159`
`158`	`160`	`def__init__(`
`159`	`161`	`self,`
`160`	`162`	`outputs:OutputTypeOrFunction[OutputDataT]\|Sequence[OutputTypeOrFunction[OutputDataT]],`
`161`	`163`	`*,`
`162`	`164`	`name:str\|None=None,`
`163`	`165`	`description:str\|None=None,`
	`166`	`+strict:bool\|None=None,`
`164`	`167`	`):`
`165`	`168`	`self.outputs=outputs`
`166`	`169`	`self.name=name`
`167`	`170`	`self.description=description`
	`171`	`+self.strict=strict`
`168`	`172`
`169`	`173`
`170`	`174`	`@dataclass(init=False)`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`frompydantic_aiimportAgent,ModelRetry,RunContext,UnexpectedModelBehavior,UserError,capture_run_messages`
`16`	`16`	`frompydantic_ai._outputimport (`
`17`	`17`	`NativeOutput,`
	`18`	`+NativeOutputSchema,`
`18`	`19`	`OutputSpec,`
`19`	`20`	`PromptedOutput,`
`20`	`21`	`TextOutput,`
`@@ -1513,6 +1514,17 @@ class CityLocation(BaseModel):`
`1513`	`1514`	`)`
`1514`	`1515`
`1515`	`1516`
	`1517`	`+deftest_native_output_strict_mode():`
	`1518`	`+classCityLocation(BaseModel):`
	`1519`	`+city:str`
	`1520`	`+country:str`
	`1521`	`+`
	`1522`	`+agent=Agent(output_type=NativeOutput(CityLocation,strict=True))`
	`1523`	`+output_schema=agent._output_schema# pyright: ignore[reportPrivateUsage]`
	`1524`	`+assertisinstance(output_schema,NativeOutputSchema)`
	`1525`	`+assertoutput_schema.object_def.strict`
	`1526`	`+`
	`1527`	`+`
`1516`	`1528`	`deftest_prompted_output_function_with_retry():`
`1517`	`1529`	`classWeather(BaseModel):`
`1518`	`1530`	`temperature:float`

Comments

(0)