Merge branch 'main' into feat/use-eitherfloat

Author: JeanArhancet

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+<!-- Thank you for your contribution! -->
+
+## Change Summary
+
+<!-- Please give a short summary of the changes. -->
+
+## Related issue number
+
+<!-- Are there any issues opened that will be resolved by merging this change? -->
+<!-- WARNING: please use "fix #123" style references so the issue is closed when this PR is merged. -->
+
+## Checklist
+
+* [ ] Unit tests for the changes exist
+* [ ] Documentation reflects the changes where applicable
+* [ ] Pydantic tests pass with this `pydantic-core` (except for expected changes)
+* [ ] My PR is ready to review, **please add a comment including the phrase "please review" to assign reviewers**

.github/workflows/ci.yml

@@ -151,7 +151,7 @@ jobs:
           python-version: '3.11'
 
       - run: pip install -r tests/requirements.txt
-      - run: 'pip install "maturin>=0.15,<0.16" typing_extensions'
+      - run: 'pip install "maturin>=1,<2" typing_extensions'
       - run: make build-dev
 
       - run: pip freeze
@@ -254,7 +254,7 @@ jobs:
           version: '3.1.32'
           actions-cache-folder: emsdk-cache
 
-      - run: pip install 'maturin>=0.15,<0.16' 'black>=22.3.0,<23' typing_extensions
+      - run: pip install 'maturin>=1,<2' 'black>=22.3.0,<23' typing_extensions
 
       - name: build wheels
         run: make build-wasm
@@ -361,6 +361,7 @@ jobs:
           architecture: ${{ matrix.python-architecture || 'x64' }}
 
       - run: pip install -U twine 'black>=22.3.0,<23' typing_extensions
+
       # generate self-schema now, so we don't have to do so inside docker in maturin build
       - run: python generate_self_schema.py
 
@@ -380,6 +381,7 @@ jobs:
           container: ${{ matrix.container }}
           args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 pypy3.7 pypy3.8 pypy3.9' }}
           rust-toolchain: stable
+          docker-options: -e CI
 
       - run: ${{ matrix.ls || 'ls -lh' }} dist/
 

.github/workflows/codspeed.yml

@@ -46,7 +46,12 @@ jobs:
       - name: cache rust
         uses: Swatinem/rust-cache@v2
 
-      - run: pip install . -v
+      - name: Install pydantic-core
+        # build-prod does not include MiMalloc because it bypasses Maturin
+        run: |
+          pip install -e .
+          make build-prod
+          python -c 'import pydantic_core'
         env:
           CONST_RANDOM_SEED: 0 # Fix the compile time RNG seed
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pydantic-core"
-version = "0.38.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/pydantic/pydantic-core"
@@ -26,15 +26,15 @@ include = [
 ]
 
 [dependencies]
-pyo3 = "0.18.2"
+pyo3 = "0.19.0"
 regex = "1.6.0"
-strum = { version = "0.24.1", features = ["derive"] }
+strum = { version = "0.25.0", features = ["derive"] }
 strum_macros = "0.24.3"
 serde_json = {version = "1.0.87", features = ["preserve_order"]}
 enum_dispatch = "0.3.8"
 serde = "1.0.147"
 mimalloc = { version = "0.1.30", default-features = false, optional = true }
-speedate = "0.8.1"
+speedate = "0.9.0"
 ahash = "0.8.0"
 url = "2.3.1"
 # idna is already required by url, added here to be explicit
@@ -51,17 +51,23 @@ crate-type = ["cdylib", "rlib"]
 extension-module = ["pyo3/extension-module"]
 # required for cargo bench
 auto-initialize = ["pyo3/auto-initialize"]
-default = ["mimalloc", "mimalloc/local_dynamic_tls", "pyo3/generate-import-lib", "pyo3/num-bigint"]
+# disabled for benchmarks since it makes microbenchmark performance more flakey
+mimalloc-allocator = ["mimalloc", "mimalloc/local_dynamic_tls"]
+default = ["pyo3/generate-import-lib", "pyo3/num-bigint"]
 
 [profile.release]
 lto = "fat"
 codegen-units = 1
 strip = true
 
+[profile.bench]
+debug = true
+strip = false
+
 [dev-dependencies]
-pyo3 = { version = "0.18.2", features = ["auto-initialize"] }
+pyo3 = { version = "0.19.0", features = ["auto-initialize"] }
 
 [build-dependencies]
 version_check = "0.9.4"
 # used where logic has to be version/distribution specific, e.g. pypy
-pyo3-build-config = "0.18.2"
+pyo3-build-config = "0.19.0"

Cargo.toml

@@ -6,15 +6,21 @@ use std::str::from_utf8;
 fn generate_self_schema() {
     println!("cargo:rerun-if-changed=pydantic_core/core_schema.py");
     println!("cargo:rerun-if-changed=generate_self_schema.py");
-    if Path::new("./src/self_schema.py").exists() && option_env!("DEBIAN_FRONTEND") == Some("noninteractive") {
-        // self_schema.py already exists and DEBIAN_FRONTEND indicates we're in a maturin build,
-        // skip running generate_self_schema.py
+    if Path::new("./src/self_schema.py").exists() && option_env!("CI") == Some("true") {
+        // self_schema.py already exists and CI indicates we're running on a github actions build,
+        // don't bother generating again
         return;
     }
-    let output = Command::new(env::var("PYTHON").unwrap_or_else(|_| "python3".to_owned()))
-        .arg("generate_self_schema.py")
-        .output()
-        .expect("failed to execute process");
+
+    let output = Command::new(
+        env::var("PYTHON")
+            .ok()
+            .or_else(|| pyo3_build_config::get().executable.clone())
+            .unwrap_or_else(|| "python3".to_owned()),
+    )
+    .arg("generate_self_schema.py")
+    .output()
+    .expect("failed to execute process");
 
     if !output.status.success() {
         let stdout = from_utf8(&output.stdout).unwrap();

build.rs

@@ -95,7 +95,7 @@ def tagged_union(std_union_schema: Dict[str, Any], discriminator_key: str, ref:
         first, *rest = literal
         tagged_choices[first] = choice
         for arg in rest:
-            tagged_choices[arg] = first
+            tagged_choices[arg] = choice
     s = {'type': 'tagged-union', 'discriminator': discriminator_key, 'choices': tagged_choices}
     if ref is not None:
         s['ref'] = ref
@@ -129,15 +129,8 @@ def type_dict_schema(typed_dict) -> dict[str, Any]:  # noqa: C901
                     schema = {'type': 'list', 'items_schema': schema_ref_validator}
                 elif fr_arg == 'Dict[str, CoreSchema]':
                     schema = {'type': 'dict', 'keys_schema': {'type': 'str'}, 'values_schema': schema_ref_validator}
-                elif fr_arg == 'Dict[Union[str, int], Union[str, int, CoreSchema]]':
-                    schema = {
-                        'type': 'dict',
-                        'keys_schema': {'type': 'union', 'choices': [{'type': 'str'}, {'type': 'int'}]},
-                        'values_schema': {
-                            'type': 'union',
-                            'choices': [{'type': 'str'}, {'type': 'int'}, schema_ref_validator],
-                        },
-                    }
+                elif fr_arg == 'Dict[Hashable, CoreSchema]':
+                    schema = {'type': 'dict', 'keys_schema': {'type': 'any'}, 'values_schema': schema_ref_validator}
                 else:
                     raise ValueError(f'Unknown Schema forward ref: {fr_arg}')
             else:

generate_self_schema.py

@@ -9,6 +9,7 @@
     PydanticOmit,
     PydanticSerializationError,
     PydanticSerializationUnexpectedValue,
+    PydanticUndefined,
     SchemaError,
     SchemaSerializer,
     SchemaValidator,
@@ -42,6 +43,7 @@
     'Url',
     'MultiHostUrl',
     'ArgsKwargs',
+    'PydanticUndefined',
     'SchemaError',
     'ErrorDetails',
     'InitErrorDetails',

pydantic_core/__init__.py

@@ -267,6 +267,8 @@ class ArgsKwargs:
     @property
     def kwargs(self) -> 'dict[str, Any] | None': ...
 
+PydanticUndefined: object
+
 def list_all_errors() -> 'list[ErrorTypeInfo]':
     """
     Get information about all built-in errors.