Include JSON Schema input core schema in function schemas #11085

Viicos · 2024-12-10T20:36:05Z

Change Summary

Partly fixes #11033.
Requires pydantic/pydantic-core#1572

Related issue number

Checklist

The pull request title is a good summary of the changes - it will be used in the changelog
Unit tests for the changes exist
Tests pass on CI
Documentation reflects the changes where applicable
My PR is ready to review, please add a comment including the phrase "please review" to assign reviewers

cloudflare-workers-and-pages · 2024-12-10T20:36:39Z

Deploying pydantic-docs with Cloudflare Pages

Latest commit:	`008f6d9`
Status:	✅ Deploy successful!
Preview URL:	https://190a7bc0.pydantic-docs.pages.dev
Branch Preview URL:	https://js-input-type-in-cs.pydantic-docs.pages.dev

View logs

Viicos · 2024-12-10T21:14:46Z

pydantic/_internal/_core_utils.py

@@ -280,12 +280,37 @@ def handle_dict_schema(self, schema: core_schema.DictSchema, f: Walk) -> core_sc
            schema['values_schema'] = self.walk(values_schema, f)
        return schema

-    def handle_function_schema(self, schema: AnyFunctionSchema, f: Walk) -> core_schema.CoreSchema:


This method was in reality never used: there's no 'function' core schema. Instead, a method for each type was created.

Viicos · 2024-12-10T21:14:55Z

pydantic/_internal/_core_utils.py

+            schema['json_schema_input_schema'] = self.walk(schema['json_schema_input_schema'], f)
+        return schema
+
+    # TODO duplicate schema types for serializers and validators, needs to be deduplicated:


Will do in a follow up PR.

Great. Can you open an issue just so we can track?

Viicos · 2024-12-10T21:15:49Z

tests/test_utils.py

@@ -637,29 +637,6 @@ def walk(s, recurse):
    }


-def test_handle_function_schema():


This test was added for coverage purposes, because as mentioned the method couldn't be called in "real" code

sydney-runkle

Seems like a nice simplification, thanks for implementing this. Tells us, we shouldn't put core schemas in metadata.

I do think it's unfortunate that we have to store json schema related info on core schemas, but hey, they're coupled, so we might as well take advantage in v2.

sydney-runkle · 2024-12-11T03:41:49Z

pydantic/_internal/_core_utils.py

+            schema['json_schema_input_schema'] = self.walk(schema['json_schema_input_schema'], f)
+        return schema
+
+    # TODO duplicate schema types for serializers and validators, needs to be deduplicated:


Great. Can you open an issue just so we can track?

codspeed-hq · 2024-12-11T12:13:07Z

CodSpeed Performance Report

Merging #11085 will not alter performance

_{Comparing js-input-type-in-cs (008f6d9) with main (d8b610c)}

Summary

✅ 46 untouched benchmarks

github-actions · 2024-12-11T12:15:13Z

Coverage report

This PR does not seem to contain any modification to coverable code.

Viicos · 2024-12-17T12:34:20Z

pydantic/functional_validators.py

@@ -229,13 +223,6 @@ def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaH
            serialization = None

        input_schema = handler.generate_schema(self.json_schema_input_type)


Note to self: although the default json_schema_input_type value is Any, we should also account for PydanticUndefined if explicitly set.

pyproject.toml

Co-authored-by: Sydney Runkle <54324534+sydney-runkle@users.noreply.github.com>

github-actions bot added the relnotes-fix Used for bugfixes. label Dec 10, 2024

Viicos force-pushed the js-input-type-in-cs branch from cb8e796 to 212a9c5 Compare December 10, 2024 21:13

Viicos commented Dec 10, 2024

View reviewed changes

sydney-runkle approved these changes Dec 11, 2024

View reviewed changes

Viicos mentioned this pull request Dec 11, 2024

Make sure core schema types are unique #11087

Open

1 task

Viicos force-pushed the js-input-type-in-cs branch from 212a9c5 to 7e62daa Compare December 11, 2024 12:06

Include JSON Schema input core schema in function schemas

de23974

Viicos force-pushed the js-input-type-in-cs branch from 7e62daa to de23974 Compare December 11, 2024 12:12

sydney-runkle added the backport-2.10 label Dec 12, 2024

Viicos commented Dec 17, 2024

View reviewed changes

Merge branch 'main' into js-input-type-in-cs

9ff54ad

sydney-runkle reviewed Dec 18, 2024

View reviewed changes

pyproject.toml Outdated Show resolved Hide resolved

Update pyproject.toml

008f6d9

sydney-runkle enabled auto-merge (squash) December 18, 2024 14:18

sydney-runkle merged commit 47ba4a5 into main Dec 18, 2024
52 checks passed

sydney-runkle deleted the js-input-type-in-cs branch December 18, 2024 14:20

Viicos added a commit that referenced this pull request Dec 18, 2024

Include JSON Schema input core schema in function schemas (#11085)

2968a14

Co-authored-by: Sydney Runkle <54324534+sydney-runkle@users.noreply.github.com>

Viicos mentioned this pull request Dec 18, 2024

Include JSON Schema input core schema in function schemas #11142

Merged

5 tasks

sydney-runkle mentioned this pull request Dec 18, 2024

Known v2.10 Issues - Fixes in Progress #10910

Closed

36 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Include JSON Schema input core schema in function schemas #11085

Include JSON Schema input core schema in function schemas #11085

Uh oh!

Viicos commented Dec 10, 2024 •

edited

Loading

Uh oh!

cloudflare-workers-and-pages bot commented Dec 10, 2024 •

edited

Loading

Uh oh!

Viicos Dec 10, 2024

Uh oh!

Viicos Dec 10, 2024

Uh oh!

sydney-runkle Dec 11, 2024

Uh oh!

Viicos Dec 11, 2024

Uh oh!

Viicos Dec 10, 2024

Uh oh!

sydney-runkle left a comment

Uh oh!

sydney-runkle Dec 11, 2024

Uh oh!

codspeed-hq bot commented Dec 11, 2024 •

edited

Loading

Uh oh!

github-actions bot commented Dec 11, 2024 •

edited

Loading

Uh oh!

Viicos Dec 17, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

		@@ -637,29 +637,6 @@ def walk(s, recurse):
		}


		def test_handle_function_schema():

		@@ -229,13 +223,6 @@ def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaH
		serialization = None

		input_schema = handler.generate_schema(self.json_schema_input_type)

Uh oh!

Include JSON Schema input core schema in function schemas #11085

Include JSON Schema input core schema in function schemas #11085

Uh oh!

Conversation

Viicos commented Dec 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Change Summary

Related issue number

Checklist

Uh oh!

cloudflare-workers-and-pages bot commented Dec 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying pydantic-docs with Cloudflare Pages

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sydney-runkle left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codspeed-hq bot commented Dec 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging #11085 will not alter performance

Summary

Uh oh!

github-actions bot commented Dec 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Viicos commented Dec 10, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Dec 10, 2024 •

edited

Loading

codspeed-hq bot commented Dec 11, 2024 •

edited

Loading

github-actions bot commented Dec 11, 2024 •

edited

Loading