precommits and consistent stubs

precommits and consistent stubs

Author: zzstoatzz

python/pydantic_core/_pydantic_core.pyi

@@ -427,6 +427,7 @@ def to_json(
         serialize_as_any: Whether to serialize fields with duck-typing serialization behavior.
         context: The context to use for serialization, this is passed to functional serializers as
             [`info.context`][pydantic_core.core_schema.SerializationInfo.context].
+        sort_keys: Whether to sort the keys of the serialized object.
 
     Raises:
         PydanticSerializationError: If serialization fails and no `fallback` function is provided.
@@ -479,6 +480,7 @@ def to_jsonable_python(
     fallback: Callable[[Any], Any] | None = None,
     serialize_as_any: bool = False,
     context: Any | None = None,
+    sort_keys: bool = False,
 ) -> Any:
     """
     Serialize/marshal a Python object to a JSON-serializable Python object including transforming and filtering data.
@@ -503,7 +505,7 @@ def to_jsonable_python(
         serialize_as_any: Whether to serialize fields with duck-typing serialization behavior.
         context: The context to use for serialization, this is passed to functional serializers as
             [`info.context`][pydantic_core.core_schema.SerializationInfo.context].
-
+        sort_keys: Whether to sort the keys of the serialized object.
     Raises:
         PydanticSerializationError: If serialization fails and no `fallback` function is provided.
 

tests/test.rs

@@ -104,6 +104,7 @@ a = A()
                     None,
                     false,
                     None,
+                    false,
                 )
                 .unwrap();
             let serialized: &[u8] = serialized.extract(py).unwrap();
@@ -212,6 +213,7 @@ dump_json_input_2 = {'a': 'something'}
                     None,
                     false,
                     None,
+                    false,
                 )
                 .unwrap();
             let repr = format!("{}", serialization_result.bind(py).repr().unwrap());
@@ -233,6 +235,7 @@ dump_json_input_2 = {'a': 'something'}
                     None,
                     false,
                     None,
+                    false,
                 )
                 .unwrap();
             let repr = format!("{}", serialization_result.bind(py).repr().unwrap());

tests/test_json.py

@@ -1,6 +1,7 @@
 import json
 import platform
 import re
+from typing import Any
 
 import pytest
 from dirty_equals import IsFloatNan, IsList
@@ -253,7 +254,7 @@ def test_to_json_fallback():
         ),
     ],
 )
-def test_to_json_sort_keys(input_value, unsorted_output_value, sorted_output_value):
+def test_to_json_sort_keys(input_value: dict[str, Any], unsorted_output_value: bytes, sorted_output_value: bytes):
     assert to_json(input_value) == unsorted_output_value
     assert to_json(input_value, sort_keys=True) == sorted_output_value
 
@@ -274,6 +275,21 @@ def test_to_jsonable_python_fallback():
     assert to_jsonable_python(Foobar(), fallback=fallback_func) == 'fallback:Foobar'
 
 
+@pytest.mark.parametrize(
+    'input_value,unsorted_output_value,sorted_output_value',
+    [
+        ({'b': 2, 'a': 1}, {'b': 2, 'a': 1}, {'a': 1, 'b': 2}),
+        ({'b': {'d': 4, 'c': 3}}, {'b': {'d': 4, 'c': 3}}, {'b': {'c': 3, 'd': 4}}),
+        ({'b': {'d': 4, 'c': 3}, 'a': 1}, {'b': {'d': 4, 'c': 3}, 'a': 1}, {'a': 1, 'b': {'c': 3, 'd': 4}}),
+    ],
+)
+def test_to_jsonable_python_sort_keys(
+    input_value: dict[str, Any], unsorted_output_value: dict[str, Any], sorted_output_value: dict[str, Any]
+):
+    assert to_jsonable_python(input_value) == unsorted_output_value
+    assert to_jsonable_python(input_value, sort_keys=True) == sorted_output_value
+
+
 def test_to_jsonable_python_schema_serializer():
     class Foobar:
         def __init__(self, my_foo: int, my_inners: list['Foobar']):