Skip to content

Commit

Permalink
fix(deps): update dependency pydantic to v2 (main) (#2604)
Browse files Browse the repository at this point in the history
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [pydantic](https://togithub.com/pydantic/pydantic)
([changelog](https://docs.pydantic.dev/latest/changelog/)) |
`>=1.7.4,<1.11` -> `>=1.7.4,<2.6` |
[![age](https://developer.mend.io/api/mc/badges/age/pypi/pydantic/2.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/pydantic/2.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/pydantic/1.10.13/2.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/pydantic/1.10.13/2.5.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>pydantic/pydantic (pydantic)</summary>

###
[`v2.5.3`](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.3):
2023-12-22

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.5.2...v2.5.3)

##### v2.5.3 (2023-12-22)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.3)

##### What's Changed

##### Packaging

-   uprev `pydantic-core` to 2.14.6

##### Fixes

- Fix memory leak with recursive definitions creating reference cycles
by [@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/pydantic-core#1125](https://togithub.com/pydantic/pydantic-core/pull/1125)

Full Changelog:
https://github.com/pydantic/pydantic/compare/v2.5.2...v2.5.3/

###
[`v2.5.2`](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.2):
2023-11-22

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.5.1...v2.5.2)

#### v2.5.2 (2023-11-22)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.2)

##### What's Changed

##### Packaging

-   uprev `pydantic-core` to 2.14.5

##### New Features

- Add `ConfigDict.ser_json_inf_nan` by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;8159](https://togithub.com/pydantic/pydantic/pull/8159)

##### Fixes

- Fix validation of `Literal` from JSON keys when used as `dict` key by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1075](https://togithub.com/pydantic/pydantic-core/pull/1075)
- Fix bug re `custom_init` on members of `Union` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1076](https://togithub.com/pydantic/pydantic-core/pull/1076)
- Fix `JsonValue` `bool` serialization by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;8190](https://togithub.com/pydantic/pydantic/pull/8159)
- Fix handling of unhashable inputs with `Literal` in `Union`s by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1089](https://togithub.com/pydantic/pydantic-core/pull/1089)

###
[`v2.5.1`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v251-2023-11-15)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.5.0...v2.5.1)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.1)

##### What's Changed

##### Packaging

- uprev pydantic-core to 2.14.3 by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;8120](https://togithub.com/pydantic/pydantic/pull/8120)

##### Fixes

- Fix package description limit by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;8097](https://togithub.com/pydantic/pydantic/pull/8097)
- Fix `ValidateCallWrapper` error when creating a model which has a
@&#8203;validate_call wrapped field annotation by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;8110](https://togithub.com/pydantic/pydantic/pull/8110)

###
[`v2.5.0`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v250-2023-11-13)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.4.2...v2.5.0)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.5.0)

The code released in v2.5.0 is functionally identical to that of
v2.5.0b1.

##### What's Changed

##### Packaging

- Update pydantic-core from 2.10.1 to 2.14.1, significant changes from
these updates are described below, full changelog
[here](https://togithub.com/pydantic/pydantic-core/compare/v2.10.1...v2.14.1)
- Update to `pyright==1.1.335` by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;8075](https://togithub.com/pydantic/pydantic/pull/8075)

##### New Features

- Allow plugins to catch non `ValidationError` errors by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7806](https://togithub.com/pydantic/pydantic/pull/7806)
- Support `__doc__` argument in `create_model()` by
[@&#8203;chris-spann](https://togithub.com/chris-spann) in
[#&#8203;7863](https://togithub.com/pydantic/pydantic/pull/7863)
- Expose `regex_engine` flag - meaning you can use with the Rust or
Python regex libraries in constraints by
[@&#8203;utkini](https://togithub.com/utkini) in
[#&#8203;7768](https://togithub.com/pydantic/pydantic/pull/7768)
- Save return type generated from type annotation in `ComputedFieldInfo`
by [@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7889](https://togithub.com/pydantic/pydantic/pull/7889)
- Adopting `ruff` formatter by
[@&#8203;Luca-Blight](https://togithub.com/Luca-Blight) in
[#&#8203;7930](https://togithub.com/pydantic/pydantic/pull/7930)
- Added `validation_error_cause` to config by
[@&#8203;zakstucke](https://togithub.com/zakstucke) in
[#&#8203;7626](https://togithub.com/pydantic/pydantic/pull/7626)
- Make path of the item to validate available in plugin by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7861](https://togithub.com/pydantic/pydantic/pull/7861)
- Add `CallableDiscriminator` and `Tag` by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7983](https://togithub.com/pydantic/pydantic/pull/7983)
- `CallableDiscriminator` renamed to `Discriminator` by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;8047](https://togithub.com/pydantic/pydantic/pull/8047)
- Make union case tags affect union error messages by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;8001](https://togithub.com/pydantic/pydantic/pull/8001)
- Add `examples` and `json_schema_extra` to `@computed_field` by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;8013](https://togithub.com/pydantic/pydantic/pull/8013)
- Add `JsonValue` type by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7998](https://togithub.com/pydantic/pydantic/pull/7998)
- Allow `str` as argument to `Discriminator` by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;8047](https://togithub.com/pydantic/pydantic/pull/8047)
- Add `SchemaSerializer.__reduce__` method to enable pickle
serialization by [@&#8203;edoakes](https://togithub.com/edoakes) in
[pydantic/pydantic-core#1006](https://togithub.com/pydantic/pydantic-core/pull/1006)

##### Changes

- **Significant Change:** replace `ultra_strict` with new smart union
implementation, the way unions are validated has changed significantly
to improve performance and correctness, we have worked hard to
absolutely minimise the number of cases where behaviour has changed, see
the PR for details - by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/pydantic-core#867](https://togithub.com/pydantic/pydantic-core/pull/867)
- Add support for instance method reassignment when `extra='allow'` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7683](https://togithub.com/pydantic/pydantic/pull/7683)
- Support JSON schema generation for `Enum` types with no cases by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7927](https://togithub.com/pydantic/pydantic/pull/7927)
- Warn if a class inherits from `Generic` before `BaseModel` by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7891](https://togithub.com/pydantic/pydantic/pull/7891)

##### Performance

- New custom JSON parser, `jiter` by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[pydantic/pydantic-core#974](https://togithub.com/pydantic/pydantic-core/pull/974)
- PGO build for MacOS M1 by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[pydantic/pydantic-core#1063](https://togithub.com/pydantic/pydantic-core/pull/1063)
- Use `__getattr__` for all package imports, improve import time by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7947](https://togithub.com/pydantic/pydantic/pull/7947)

##### Fixes

- Fix `mypy` issue with subclasses of `RootModel` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7677](https://togithub.com/pydantic/pydantic/pull/7677)
- Properly rebuild the `FieldInfo` when a forward ref gets evaluated by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7698](https://togithub.com/pydantic/pydantic/pull/7698)
- Fix failure to load `SecretStr` from JSON (regression in v2.4) by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7729](https://togithub.com/pydantic/pydantic/pull/7729)
- Fix `defer_build` behavior with `TypeAdapter` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7736](https://togithub.com/pydantic/pydantic/pull/7736)
- Improve compatibility with legacy `mypy` versions by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7742](https://togithub.com/pydantic/pydantic/pull/7742)
- Fix: update `TypeVar` handling when default is not set by
[@&#8203;pmmmwh](https://togithub.com/pmmmwh) in
[#&#8203;7719](https://togithub.com/pydantic/pydantic/pull/7719)
- Support specification of `strict` on `Enum` type fields by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7761](https://togithub.com/pydantic/pydantic/pull/7761)
- Wrap `weakref.ref` instead of subclassing to fix `cloudpickle`
serialization by [@&#8203;edoakes](https://togithub.com/edoakes) in
[#&#8203;7780](https://togithub.com/pydantic/pydantic/pull/7780)
- Keep values of private attributes set within `model_post_init` in
subclasses by [@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7775](https://togithub.com/pydantic/pydantic/pull/7775)
- Add more specific type for non-callable `json_schema_extra` by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7803](https://togithub.com/pydantic/pydantic/pull/7803)
- Raise an error when deleting frozen (model) fields by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7800](https://togithub.com/pydantic/pydantic/pull/7800)
- Fix schema sorting bug with default values by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7817](https://togithub.com/pydantic/pydantic/pull/7817)
- Use generated alias for aliases that are not specified otherwise by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7802](https://togithub.com/pydantic/pydantic/pull/7802)
- Support `strict` specification for `UUID` types by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7865](https://togithub.com/pydantic/pydantic/pull/7865)
- JSON schema: fix extra parameter handling by
[@&#8203;me-and](https://togithub.com/me-and) in
[#&#8203;7810](https://togithub.com/pydantic/pydantic/pull/7810)
- Fix: support `pydantic.Field(kw_only=True)` with inherited dataclasses
by [@&#8203;PrettyWood](https://togithub.com/PrettyWood) in
[#&#8203;7827](https://togithub.com/pydantic/pydantic/pull/7827)
- Support `validate_call` decorator for methods in classes with
`__slots__` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7883](https://togithub.com/pydantic/pydantic/pull/7883)
- Fix pydantic dataclass problem with `dataclasses.field` default by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7898](https://togithub.com/pydantic/pydantic/pull/7898)
- Fix schema generation for generics with union type bounds by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7899](https://togithub.com/pydantic/pydantic/pull/7899)
- Fix version for `importlib_metadata` on python 3.7 by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7904](https://togithub.com/pydantic/pydantic/pull/7904)
- Support `|` operator (Union) in PydanticRecursiveRef by
[@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;7892](https://togithub.com/pydantic/pydantic/pull/7892)
- Fix `display_as_type` for `TypeAliasType` in python 3.12 by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7929](https://togithub.com/pydantic/pydantic/pull/7929)
- Add support for `NotRequired` generics in `TypedDict` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7932](https://togithub.com/pydantic/pydantic/pull/7932)
- Make generic `TypeAliasType` specifications produce different schema
definitions by [@&#8203;alexdrydew](https://togithub.com/alexdrydew) in
[#&#8203;7893](https://togithub.com/pydantic/pydantic/pull/7893)
- Added fix for signature of inherited dataclass by
[@&#8203;howsunjow](https://togithub.com/howsunjow) in
[#&#8203;7925](https://togithub.com/pydantic/pydantic/pull/7925)
- Make the model name generation more robust in JSON schema by
[@&#8203;joakimnordling](https://togithub.com/joakimnordling) in
[#&#8203;7881](https://togithub.com/pydantic/pydantic/pull/7881)
- Fix plurals in validation error messages (in tests) by
[@&#8203;Iipin](https://togithub.com/Iipin) in
[#&#8203;7972](https://togithub.com/pydantic/pydantic/pull/7972)
- `PrivateAttr` is passed from `Annotated` default position by
[@&#8203;tabassco](https://togithub.com/tabassco) in
[#&#8203;8004](https://togithub.com/pydantic/pydantic/pull/8004)
- Don't decode bytes (which may not be UTF8) when displaying SecretBytes
by [@&#8203;alexmojaki](https://togithub.com/alexmojaki) in
[#&#8203;8012](https://togithub.com/pydantic/pydantic/pull/8012)
- Use `classmethod` instead of `classmethod[Any, Any, Any]` by
[@&#8203;Mr-Pepe](https://togithub.com/Mr-Pepe) in
[#&#8203;7979](https://togithub.com/pydantic/pydantic/pull/7979)
- Clearer error on invalid Plugin by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;8023](https://togithub.com/pydantic/pydantic/pull/8023)
- Correct pydantic dataclasses import by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;8027](https://togithub.com/pydantic/pydantic/pull/8027)
- Fix misbehavior for models referencing redefined type aliases by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;8050](https://togithub.com/pydantic/pydantic/pull/8050)
- Fix `Optional` field with `validate_default` only performing one field
validation by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1002](https://togithub.com/pydantic/pydantic-core/pull/1002)
- Fix `definition-ref` bug with `Dict` keys by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1014](https://togithub.com/pydantic/pydantic-core/pull/1014)
- Fix bug allowing validation of `bool` types with
`coerce_numbers_to_str=True` by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1017](https://togithub.com/pydantic/pydantic-core/pull/1017)
- Don't accept `NaN` in float and decimal constraints by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/pydantic-core#1037](https://togithub.com/pydantic/pydantic-core/pull/1037)
- Add `lax_str` and `lax_int` support for enum values not inherited from
str/int by [@&#8203;michaelhly](https://togithub.com/michaelhly) in
[pydantic/pydantic-core#1015](https://togithub.com/pydantic/pydantic-core/pull/1015)
- Support subclasses in lists in `Union` of `List` types by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1039](https://togithub.com/pydantic/pydantic-core/pull/1039)
- Allow validation against `max_digits` and `decimals` to pass if
normalized or non-normalized input is valid by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[pydantic/pydantic-core#1049](https://togithub.com/pydantic/pydantic-core/pull/1049)
- Fix: proper pluralization in `ValidationError` messages by
[@&#8203;Iipin](https://togithub.com/Iipin) in
[pydantic/pydantic-core#1050](https://togithub.com/pydantic/pydantic-core/pull/1050)
- Disallow the string `'-'` as `datetime` input by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/speedate#52](https://togithub.com/pydantic/speedate/pull/52) &
[pydantic/pydantic-core#1060](https://togithub.com/pydantic/pydantic-core/pull/1060)
- Fix: NaN and Inf float serialization by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/pydantic-core#1062](https://togithub.com/pydantic/pydantic-core/pull/1062)
- Restore manylinux-compatible PGO builds by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[pydantic/pydantic-core#1068](https://togithub.com/pydantic/pydantic-core/pull/1068)

##### New Contributors

##### `pydantic`

- [@&#8203;schneebuzz](https://togithub.com/schneebuzz) made their first
contribution in
[#&#8203;7699](https://togithub.com/pydantic/pydantic/pull/7699)
- [@&#8203;edoakes](https://togithub.com/edoakes) made their first
contribution in
[#&#8203;7780](https://togithub.com/pydantic/pydantic/pull/7780)
- [@&#8203;alexmojaki](https://togithub.com/alexmojaki) made their first
contribution in
[#&#8203;7775](https://togithub.com/pydantic/pydantic/pull/7775)
- [@&#8203;NickG123](https://togithub.com/NickG123) made their first
contribution in
[#&#8203;7751](https://togithub.com/pydantic/pydantic/pull/7751)
- [@&#8203;gowthamgts](https://togithub.com/gowthamgts) made their first
contribution in
[#&#8203;7830](https://togithub.com/pydantic/pydantic/pull/7830)
- [@&#8203;jamesbraza](https://togithub.com/jamesbraza) made their first
contribution in
[#&#8203;7848](https://togithub.com/pydantic/pydantic/pull/7848)
- [@&#8203;laundmo](https://togithub.com/laundmo) made their first
contribution in
[#&#8203;7850](https://togithub.com/pydantic/pydantic/pull/7850)
- [@&#8203;rahmatnazali](https://togithub.com/rahmatnazali) made their
first contribution in
[#&#8203;7870](https://togithub.com/pydantic/pydantic/pull/7870)
- [@&#8203;waterfountain1996](https://togithub.com/waterfountain1996)
made their first contribution in
[#&#8203;7878](https://togithub.com/pydantic/pydantic/pull/7878)
- [@&#8203;chris-spann](https://togithub.com/chris-spann) made their
first contribution in
[#&#8203;7863](https://togithub.com/pydantic/pydantic/pull/7863)
- [@&#8203;me-and](https://togithub.com/me-and) made their first
contribution in
[#&#8203;7810](https://togithub.com/pydantic/pydantic/pull/7810)
- [@&#8203;utkini](https://togithub.com/utkini) made their first
contribution in
[#&#8203;7768](https://togithub.com/pydantic/pydantic/pull/7768)
- [@&#8203;bn-l](https://togithub.com/bn-l) made their first
contribution in
[#&#8203;7744](https://togithub.com/pydantic/pydantic/pull/7744)
- [@&#8203;alexdrydew](https://togithub.com/alexdrydew) made their first
contribution in
[#&#8203;7893](https://togithub.com/pydantic/pydantic/pull/7893)
- [@&#8203;Luca-Blight](https://togithub.com/Luca-Blight) made their
first contribution in
[#&#8203;7930](https://togithub.com/pydantic/pydantic/pull/7930)
- [@&#8203;howsunjow](https://togithub.com/howsunjow) made their first
contribution in
[#&#8203;7925](https://togithub.com/pydantic/pydantic/pull/7925)
- [@&#8203;joakimnordling](https://togithub.com/joakimnordling) made
their first contribution in
[#&#8203;7881](https://togithub.com/pydantic/pydantic/pull/7881)
- [@&#8203;icfly2](https://togithub.com/icfly2) made their first
contribution in
[#&#8203;7976](https://togithub.com/pydantic/pydantic/pull/7976)
- [@&#8203;Yummy-Yums](https://togithub.com/Yummy-Yums) made their first
contribution in
[#&#8203;8003](https://togithub.com/pydantic/pydantic/pull/8003)
- [@&#8203;Iipin](https://togithub.com/Iipin) made their first
contribution in
[#&#8203;7972](https://togithub.com/pydantic/pydantic/pull/7972)
- [@&#8203;tabassco](https://togithub.com/tabassco) made their first
contribution in
[#&#8203;8004](https://togithub.com/pydantic/pydantic/pull/8004)
- [@&#8203;Mr-Pepe](https://togithub.com/Mr-Pepe) made their first
contribution in
[#&#8203;7979](https://togithub.com/pydantic/pydantic/pull/7979)
- [@&#8203;0x00cl](https://togithub.com/0x00cl) made their first
contribution in
[#&#8203;8010](https://togithub.com/pydantic/pydantic/pull/8010)
- [@&#8203;barraponto](https://togithub.com/barraponto) made their first
contribution in
[#&#8203;8032](https://togithub.com/pydantic/pydantic/pull/8032)

##### `pydantic-core`

- [@&#8203;sisp](https://togithub.com/sisp) made their first
contribution in
[pydantic/pydantic-core#995](https://togithub.com/pydantic/pydantic-core/pull/995)
- [@&#8203;michaelhly](https://togithub.com/michaelhly) made their first
contribution in
[pydantic/pydantic-core#1015](https://togithub.com/pydantic/pydantic-core/pull/1015)

###
[`v2.4.2`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v242-2023-09-27)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.4.1...v2.4.2)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.4.2)

##### What's Changed

##### Fixes

- Fix bug with JSON schema for sequence of discriminated union by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7647](https://togithub.com/pydantic/pydantic/pull/7647)
- Fix schema references in discriminated unions by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7646](https://togithub.com/pydantic/pydantic/pull/7646)
- Fix json schema generation for recursive models by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7653](https://togithub.com/pydantic/pydantic/pull/7653)
- Fix `models_json_schema` for generic models by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7654](https://togithub.com/pydantic/pydantic/pull/7654)
- Fix xfailed test for generic model signatures by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7658](https://togithub.com/pydantic/pydantic/pull/7658)

##### New Contributors

- [@&#8203;austinorr](https://togithub.com/austinorr) made their first
contribution in
[#&#8203;7657](https://togithub.com/pydantic/pydantic/pull/7657)
- [@&#8203;peterHoburg](https://togithub.com/peterHoburg) made their
first contribution in
[#&#8203;7670](https://togithub.com/pydantic/pydantic/pull/7670)

###
[`v2.4.1`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v241-2023-09-26)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.4.0...v2.4.1)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.4.1)

##### What's Changed

##### Packaging

- Update pydantic-core to 2.10.1 by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;7633](https://togithub.com/pydantic/pydantic/pull/7633)

##### Fixes

- Serialize unsubstituted type vars as `Any` by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7606](https://togithub.com/pydantic/pydantic/pull/7606)
- Remove schema building caches by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7624](https://togithub.com/pydantic/pydantic/pull/7624)
- Fix an issue where JSON schema extras weren't JSON encoded by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7625](https://togithub.com/pydantic/pydantic/pull/7625)

###
[`v2.4.0`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v240-2023-09-22)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.3.0...v2.4.0)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.4.0)

##### What's Changed

##### Packaging

- Update pydantic-core to 2.10.0 by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7542](https://togithub.com/pydantic/pydantic/pull/7542)

##### New Features

- Add `Base64Url` types by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7286](https://togithub.com/pydantic/pydantic/pull/7286)
- Implement optional `number` to `str` coercion by
[@&#8203;lig](https://togithub.com/lig) in
[#&#8203;7508](https://togithub.com/pydantic/pydantic/pull/7508)
- Allow access to `field_name` and `data` in all validators if there is
data and a field name by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7542](https://togithub.com/pydantic/pydantic/pull/7542)
- Add `BaseModel.model_validate_strings` and
`TypeAdapter.validate_strings` by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7552](https://togithub.com/pydantic/pydantic/pull/7552)
- Add Pydantic `plugins` experimental implementation by
[@&#8203;lig](https://togithub.com/lig)
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) and
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;6820](https://togithub.com/pydantic/pydantic/pull/6820)

##### Changes

- Do not override `model_post_init` in subclass with private attrs by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;7302](https://togithub.com/pydantic/pydantic/pull/7302)
- Make fields with defaults not required in the serialization schema by
default by [@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7275](https://togithub.com/pydantic/pydantic/pull/7275)
- Mark `Extra` as deprecated by
[@&#8203;disrupted](https://togithub.com/disrupted) in
[#&#8203;7299](https://togithub.com/pydantic/pydantic/pull/7299)
- Make `EncodedStr` a dataclass by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7396](https://togithub.com/pydantic/pydantic/pull/7396)
- Move `annotated_handlers` to be public by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7569](https://togithub.com/pydantic/pydantic/pull/7569)

##### Performance

- Simplify flattening and inlining of `CoreSchema` by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7523](https://togithub.com/pydantic/pydantic/pull/7523)
- Remove unused copies in `CoreSchema` walking by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7528](https://togithub.com/pydantic/pydantic/pull/7528)
- Add caches for collecting definitions and invalid schemas from a
CoreSchema by [@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7527](https://togithub.com/pydantic/pydantic/pull/7527)
- Eagerly resolve discriminated unions and cache cases where we can't by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7529](https://togithub.com/pydantic/pydantic/pull/7529)
- Replace `dict.get` and `dict.setdefault` with more verbose versions in
`CoreSchema` building hot paths by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7536](https://togithub.com/pydantic/pydantic/pull/7536)
- Cache invalid `CoreSchema` discovery by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7535](https://togithub.com/pydantic/pydantic/pull/7535)
- Allow disabling `CoreSchema` validation for faster startup times by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7565](https://togithub.com/pydantic/pydantic/pull/7565)

##### Fixes

- Fix config detection for `TypedDict` from grandparent classes by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7272](https://togithub.com/pydantic/pydantic/pull/7272)
- Fix hash function generation for frozen models with unusual MRO by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7274](https://togithub.com/pydantic/pydantic/pull/7274)
- Make `strict` config overridable in field for Path by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7281](https://togithub.com/pydantic/pydantic/pull/7281)
- Use `ser_json_<timedelta|bytes>` on default in `GenerateJsonSchema` by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7269](https://togithub.com/pydantic/pydantic/pull/7269)
- Adding a check that alias is validated as an identifier for Python by
[@&#8203;andree0](https://togithub.com/andree0) in
[#&#8203;7319](https://togithub.com/pydantic/pydantic/pull/7319)
- Raise an error when computed field overrides field by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7346](https://togithub.com/pydantic/pydantic/pull/7346)
- Fix applying `SkipValidation` to referenced schemas by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7381](https://togithub.com/pydantic/pydantic/pull/7381)
- Enforce behavior of private attributes having double leading
underscore by [@&#8203;lig](https://togithub.com/lig) in
[#&#8203;7265](https://togithub.com/pydantic/pydantic/pull/7265)
- Standardize `__get_pydantic_core_schema__` signature by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7415](https://togithub.com/pydantic/pydantic/pull/7415)
- Fix generic dataclass fields mutation bug (when using `TypeAdapter`)
by [@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7435](https://togithub.com/pydantic/pydantic/pull/7435)
- Fix `TypeError` on `model_validator` in `wrap` mode by
[@&#8203;pmmmwh](https://togithub.com/pmmmwh) in
[#&#8203;7496](https://togithub.com/pydantic/pydantic/pull/7496)
- Improve enum error message by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7506](https://togithub.com/pydantic/pydantic/pull/7506)
- Make `repr` work for instances that failed initialization when
handling `ValidationError`s by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7439](https://togithub.com/pydantic/pydantic/pull/7439)
- Fixed a regular expression denial of service issue by limiting
whitespaces by [@&#8203;prodigysml](https://togithub.com/prodigysml) in
[#&#8203;7360](https://togithub.com/pydantic/pydantic/pull/7360)
- Fix handling of `UUID` values having `UUID.version=None` by
[@&#8203;lig](https://togithub.com/lig) in
[#&#8203;7566](https://togithub.com/pydantic/pydantic/pull/7566)
- Fix `__iter__` returning private `cached_property` info by
[@&#8203;sydney-runkle](https://togithub.com/sydney-runkle) in
[#&#8203;7570](https://togithub.com/pydantic/pydantic/pull/7570)
- Improvements to version info message by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7594](https://togithub.com/pydantic/pydantic/pull/7594)

##### New Contributors

- [@&#8203;15498th](https://togithub.com/15498th) made their first
contribution in
[#&#8203;7238](https://togithub.com/pydantic/pydantic/pull/7238)
- [@&#8203;GabrielCappelli](https://togithub.com/GabrielCappelli) made
their first contribution in
[#&#8203;7213](https://togithub.com/pydantic/pydantic/pull/7213)
- [@&#8203;tobni](https://togithub.com/tobni) made their first
contribution in
[#&#8203;7184](https://togithub.com/pydantic/pydantic/pull/7184)
- [@&#8203;redruin1](https://togithub.com/redruin1) made their first
contribution in
[#&#8203;7282](https://togithub.com/pydantic/pydantic/pull/7282)
- [@&#8203;FacerAin](https://togithub.com/FacerAin) made their first
contribution in
[#&#8203;7288](https://togithub.com/pydantic/pydantic/pull/7288)
- [@&#8203;acdha](https://togithub.com/acdha) made their first
contribution in
[#&#8203;7297](https://togithub.com/pydantic/pydantic/pull/7297)
- [@&#8203;andree0](https://togithub.com/andree0) made their first
contribution in
[#&#8203;7319](https://togithub.com/pydantic/pydantic/pull/7319)
- [@&#8203;gordonhart](https://togithub.com/gordonhart) made their first
contribution in
[#&#8203;7375](https://togithub.com/pydantic/pydantic/pull/7375)
- [@&#8203;pmmmwh](https://togithub.com/pmmmwh) made their first
contribution in
[#&#8203;7496](https://togithub.com/pydantic/pydantic/pull/7496)
- [@&#8203;disrupted](https://togithub.com/disrupted) made their first
contribution in
[#&#8203;7299](https://togithub.com/pydantic/pydantic/pull/7299)
- [@&#8203;prodigysml](https://togithub.com/prodigysml) made their first
contribution in
[#&#8203;7360](https://togithub.com/pydantic/pydantic/pull/7360)

###
[`v2.3.0`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v230-2023-08-23)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.2.1...v2.3.0)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.3.0)

- 🔥 Remove orphaned changes file from repo by
[@&#8203;lig](https://togithub.com/lig) in
[#&#8203;7168](https://togithub.com/pydantic/pydantic/pull/7168)
- Add copy button on documentation by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7190](https://togithub.com/pydantic/pydantic/pull/7190)
- Fix docs on JSON type by [@&#8203;Kludex](https://togithub.com/Kludex)
in [#&#8203;7189](https://togithub.com/pydantic/pydantic/pull/7189)
- Update mypy 1.5.0 to 1.5.1 in CI by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7191](https://togithub.com/pydantic/pydantic/pull/7191)
- fix download links badge by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7200](https://togithub.com/pydantic/pydantic/pull/7200)
- add 2.2.1 to changelog by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7212](https://togithub.com/pydantic/pydantic/pull/7212)
- Make ModelWrapValidator protocols generic by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7154](https://togithub.com/pydantic/pydantic/pull/7154)
- Correct `Field(..., exclude: bool)` docs by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7214](https://togithub.com/pydantic/pydantic/pull/7214)
- Make shadowing attributes a warning instead of an error by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7193](https://togithub.com/pydantic/pydantic/pull/7193)
- Document `Base64Str` and `Base64Bytes` by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7192](https://togithub.com/pydantic/pydantic/pull/7192)
- Fix `config.defer_build` for serialization first cases by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7024](https://togithub.com/pydantic/pydantic/pull/7024)
- clean Model docstrings in JSON Schema by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7210](https://togithub.com/pydantic/pydantic/pull/7210)
- fix [#&#8203;7228](https://togithub.com/pydantic/pydantic/pull/7228)
(typo): docs in `validators.md` to correct `validate_default` kwarg by
[@&#8203;lmmx](https://togithub.com/lmmx) in
[#&#8203;7229](https://togithub.com/pydantic/pydantic/pull/7229)
- ✅ Implement `tzinfo.fromutc` method for `TzInfo` in `pydantic-core` by
[@&#8203;lig](https://togithub.com/lig) in
[#&#8203;7019](https://togithub.com/pydantic/pydantic/pull/7019)
- Support `__get_validators__` by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7197](https://togithub.com/pydantic/pydantic/pull/7197)

###
[`v2.2.1`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v221-2023-08-18)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.2.0...v2.2.1)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.2.1)

- Make `xfail`ing test for root model extra stop `xfail`ing by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6937](https://togithub.com/pydantic/pydantic/pull/6937)
- Optimize recursion detection by stopping on the second visit for the
same object by [@&#8203;mciucu](https://togithub.com/mciucu) in
[#&#8203;7160](https://togithub.com/pydantic/pydantic/pull/7160)
- fix link in docs by
[@&#8203;tlambert03](https://togithub.com/tlambert03) in
[#&#8203;7166](https://togithub.com/pydantic/pydantic/pull/7166)
- Replace MiMalloc w/ default allocator by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[pydantic/pydantic-core#900](https://togithub.com/pydantic/pydantic-core/pull/900)
- Bump pydantic-core to 2.6.1 and prepare 2.2.1 release by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7176](https://togithub.com/pydantic/pydantic/pull/7176)

###
[`v2.2.0`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v220-2023-08-17)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.1.1...v2.2.0)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.2.0)

- Split "pipx install" setup command into two commands on the
documentation site by [@&#8203;nomadmtb](https://togithub.com/nomadmtb)
in [#&#8203;6869](https://togithub.com/pydantic/pydantic/pull/6869)
- Deprecate `Field.include` by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6852](https://togithub.com/pydantic/pydantic/pull/6852)
- Fix typo in default factory error msg by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6880](https://togithub.com/pydantic/pydantic/pull/6880)
- Simplify handling of typing.Annotated in GenerateSchema by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6887](https://togithub.com/pydantic/pydantic/pull/6887)
- Re-enable fastapi tests in CI by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6883](https://togithub.com/pydantic/pydantic/pull/6883)
- Make it harder to hit collisions with json schema defrefs by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6566](https://togithub.com/pydantic/pydantic/pull/6566)
- Cleaner error for invalid input to `Path` fields by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6903](https://togithub.com/pydantic/pydantic/pull/6903)
- :memo: support Coordinate Type by
[@&#8203;yezz123](https://togithub.com/yezz123) in
[#&#8203;6906](https://togithub.com/pydantic/pydantic/pull/6906)
- Fix `ForwardRef` wrapper for py 3.10.0 (shim until bpo-45166) by
[@&#8203;randomir](https://togithub.com/randomir) in
[#&#8203;6919](https://togithub.com/pydantic/pydantic/pull/6919)
- Fix misbehavior related to copying of RootModel by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6918](https://togithub.com/pydantic/pydantic/pull/6918)
- Fix issue with recursion error caused by ParamSpec by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6923](https://togithub.com/pydantic/pydantic/pull/6923)
- Add section about Constrained classes to the Migration Guide by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;6924](https://togithub.com/pydantic/pydantic/pull/6924)
- Use `main` branch for badge links by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;6925](https://togithub.com/pydantic/pydantic/pull/6925)
- Add test for v1/v2 Annotated discrepancy by
[@&#8203;carlbordum](https://togithub.com/carlbordum) in
[#&#8203;6926](https://togithub.com/pydantic/pydantic/pull/6926)
- Make the v1 mypy plugin work with both v1 and v2 by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6921](https://togithub.com/pydantic/pydantic/pull/6921)
- Fix issue where generic models couldn't be parametrized with BaseModel
by [@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6933](https://togithub.com/pydantic/pydantic/pull/6933)
- Remove xfail for discriminated union with alias by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6938](https://togithub.com/pydantic/pydantic/pull/6938)
- add field_serializer to computed_field by
[@&#8203;andresliszt](https://togithub.com/andresliszt) in
[#&#8203;6965](https://togithub.com/pydantic/pydantic/pull/6965)
- Use union_schema with Type\[Union\[...]] by
[@&#8203;JeanArhancet](https://togithub.com/JeanArhancet) in
[#&#8203;6952](https://togithub.com/pydantic/pydantic/pull/6952)
- Fix inherited typeddict attributes / config by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6981](https://togithub.com/pydantic/pydantic/pull/6981)
- fix dataclass annotated before validator called twice by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6998](https://togithub.com/pydantic/pydantic/pull/6998)
- Update test-fastapi deselected tests by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7014](https://togithub.com/pydantic/pydantic/pull/7014)
- Fix validator doc format by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7015](https://togithub.com/pydantic/pydantic/pull/7015)
- Fix typo in docstring of model_json_schema by
[@&#8203;AdamVinch-Federated](https://togithub.com/AdamVinch-Federated)
in [#&#8203;7032](https://togithub.com/pydantic/pydantic/pull/7032)
- remove unused "type ignores" with pyright by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7026](https://togithub.com/pydantic/pydantic/pull/7026)
- Add benchmark representing FastAPI startup time by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7030](https://togithub.com/pydantic/pydantic/pull/7030)
- Fix json_encoders for Enum subclasses by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7029](https://togithub.com/pydantic/pydantic/pull/7029)
- Update docstring of `ser_json_bytes` regarding base64 encoding by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;7052](https://togithub.com/pydantic/pydantic/pull/7052)
- Allow `@validate_call` to work on async methods by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7046](https://togithub.com/pydantic/pydantic/pull/7046)
- Fix: mypy error with `Settings` and `SettingsConfigDict` by
[@&#8203;JeanArhancet](https://togithub.com/JeanArhancet) in
[#&#8203;7002](https://togithub.com/pydantic/pydantic/pull/7002)
- Fix some typos (repeated words and it's/its) by
[@&#8203;eumiro](https://togithub.com/eumiro) in
[#&#8203;7063](https://togithub.com/pydantic/pydantic/pull/7063)
- Fix the typo in docstring by
[@&#8203;harunyasar](https://togithub.com/harunyasar) in
[#&#8203;7062](https://togithub.com/pydantic/pydantic/pull/7062)
- Docs: Fix broken URL in the pydantic-settings package recommendation
by [@&#8203;swetjen](https://togithub.com/swetjen) in
[#&#8203;6995](https://togithub.com/pydantic/pydantic/pull/6995)
- Handle constraints being applied to schemas that don't accept it by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6951](https://togithub.com/pydantic/pydantic/pull/6951)
- Replace almost_equal_floats with math.isclose by
[@&#8203;eumiro](https://togithub.com/eumiro) in
[#&#8203;7082](https://togithub.com/pydantic/pydantic/pull/7082)
- bump pydantic-core to 2.5.0 by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;7077](https://togithub.com/pydantic/pydantic/pull/7077)
- Add `short_version` and use it in links by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7115](https://togithub.com/pydantic/pydantic/pull/7115)
- 📝 Add usage link to `RootModel` by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7113](https://togithub.com/pydantic/pydantic/pull/7113)
- Revert "Fix default port for mongosrv DSNs
([#&#8203;6827](https://togithub.com/pydantic/pydantic/issues/6827))" by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;7116](https://togithub.com/pydantic/pydantic/pull/7116)
- Clarify validate_default and \_Unset handling in usage docs and
migration guide by [@&#8203;benbenbang](https://togithub.com/benbenbang)
in [#&#8203;6950](https://togithub.com/pydantic/pydantic/pull/6950)
- Tweak documentation of `Field.exclude` by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;7086](https://togithub.com/pydantic/pydantic/pull/7086)
- Do not require `validate_assignment` to use `Field.frozen` by
[@&#8203;Viicos](https://togithub.com/Viicos) in
[#&#8203;7103](https://togithub.com/pydantic/pydantic/pull/7103)
- tweaks to `_core_utils` by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;7040](https://togithub.com/pydantic/pydantic/pull/7040)
- Make DefaultDict working with set by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7126](https://togithub.com/pydantic/pydantic/pull/7126)
- Don't always require typing.Generic as a base for partially
parametrized models by [@&#8203;dmontagu](https://togithub.com/dmontagu)
in [#&#8203;7119](https://togithub.com/pydantic/pydantic/pull/7119)
- Fix issue with JSON schema incorrectly using parent class core schema
by [@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7020](https://togithub.com/pydantic/pydantic/pull/7020)
- Fix xfailed test related to TypedDict and alias_generator by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6940](https://togithub.com/pydantic/pydantic/pull/6940)
- Improve error message for NameEmail by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6939](https://togithub.com/pydantic/pydantic/pull/6939)
- Fix generic computed fields by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6988](https://togithub.com/pydantic/pydantic/pull/6988)
- Reflect namedtuple default values during validation by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7144](https://togithub.com/pydantic/pydantic/pull/7144)
- Update dependencies, fix pydantic-core usage, fix CI issues by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7150](https://togithub.com/pydantic/pydantic/pull/7150)
- Add mypy 1.5.0 by [@&#8203;hramezani](https://togithub.com/hramezani)
in [#&#8203;7118](https://togithub.com/pydantic/pydantic/pull/7118)
- Handle non-json native enum values by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7056](https://togithub.com/pydantic/pydantic/pull/7056)
- document `round_trip` in Json type documentation by
[@&#8203;jc-louis](https://togithub.com/jc-louis) in
[#&#8203;7137](https://togithub.com/pydantic/pydantic/pull/7137)
- Relax signature checks to better support builtins and C extension
functions as validators by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;7101](https://togithub.com/pydantic/pydantic/pull/7101)
- add union_mode='left_to_right' by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;7151](https://togithub.com/pydantic/pydantic/pull/7151)
- Include an error message hint for inherited ordering by
[@&#8203;yvalencia91](https://togithub.com/yvalencia91) in
[#&#8203;7124](https://togithub.com/pydantic/pydantic/pull/7124)
- Fix one docs link and resolve some warnings for two others by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;7153](https://togithub.com/pydantic/pydantic/pull/7153)
- Include Field extra keys name in warning by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;7136](https://togithub.com/pydantic/pydantic/pull/7136)

###
[`v2.1.1`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v211-2023-07-25)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.1.0...v2.1.1)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.1.1)

- Skip FieldInfo merging when unnecessary by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6862](https://togithub.com/pydantic/pydantic/pull/6862)

###
[`v2.1.0`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v210-2023-07-25)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.0.3...v2.1.0)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.1.0)

- Add `StringConstraints` for use as Annotated metadata by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6605](https://togithub.com/pydantic/pydantic/pull/6605)
- Try to fix intermittently failing CI by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6683](https://togithub.com/pydantic/pydantic/pull/6683)
- Remove redundant example of optional vs default. by
[@&#8203;ehiggs-deliverect](https://togithub.com/ehiggs-deliverect) in
[#&#8203;6676](https://togithub.com/pydantic/pydantic/pull/6676)
- Docs update by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6692](https://togithub.com/pydantic/pydantic/pull/6692)
- Remove the Validate always section in validator docs by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6679](https://togithub.com/pydantic/pydantic/pull/6679)
- Fix recursion error in json schema generation by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6720](https://togithub.com/pydantic/pydantic/pull/6720)
- Fix incorrect subclass check for secretstr by
[@&#8203;AlexVndnblcke](https://togithub.com/AlexVndnblcke) in
[#&#8203;6730](https://togithub.com/pydantic/pydantic/pull/6730)
- update pdm / pdm lockfile to 2.8.0 by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6714](https://togithub.com/pydantic/pydantic/pull/6714)
- unpin pdm on more CI jobs by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6755](https://togithub.com/pydantic/pydantic/pull/6755)
- improve source locations for auxiliary packages in docs by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6749](https://togithub.com/pydantic/pydantic/pull/6749)
- Assume builtins don't accept an info argument by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6754](https://togithub.com/pydantic/pydantic/pull/6754)
- Fix bug where calling `help(BaseModelSubclass)` raises errors by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6758](https://togithub.com/pydantic/pydantic/pull/6758)
- Fix mypy plugin handling of `@model_validator(mode="after")` by
[@&#8203;ljodal](https://togithub.com/ljodal) in
[#&#8203;6753](https://togithub.com/pydantic/pydantic/pull/6753)
- update pydantic-core to 2.3.1 by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6756](https://togithub.com/pydantic/pydantic/pull/6756)
- Mypy plugin for settings by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6760](https://togithub.com/pydantic/pydantic/pull/6760)
- Use `contentSchema` keyword for JSON schema by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6715](https://togithub.com/pydantic/pydantic/pull/6715)
- fast-path checking finite decimals by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6769](https://togithub.com/pydantic/pydantic/pull/6769)
- Docs update by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6771](https://togithub.com/pydantic/pydantic/pull/6771)
- Improve json schema doc by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6772](https://togithub.com/pydantic/pydantic/pull/6772)
- Update validator docs by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6695](https://togithub.com/pydantic/pydantic/pull/6695)
- Fix typehint for wrap validator by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6788](https://togithub.com/pydantic/pydantic/pull/6788)
- 🐛 Fix validation warning for unions of Literal and other type by
[@&#8203;lig](https://togithub.com/lig) in
[#&#8203;6628](https://togithub.com/pydantic/pydantic/pull/6628)
- Update documentation for generics support in V2 by
[@&#8203;tpdorsey](https://togithub.com/tpdorsey) in
[#&#8203;6685](https://togithub.com/pydantic/pydantic/pull/6685)
- add pydantic-core build info to `version_info()` by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6785](https://togithub.com/pydantic/pydantic/pull/6785)
- Fix pydantic dataclasses that use slots with default values by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6796](https://togithub.com/pydantic/pydantic/pull/6796)
- Fix inheritance of hash function for frozen models by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6789](https://togithub.com/pydantic/pydantic/pull/6789)
- ✨ Add `SkipJsonSchema` annotation by
[@&#8203;Kludex](https://togithub.com/Kludex) in
[#&#8203;6653](https://togithub.com/pydantic/pydantic/pull/6653)
- Error if an invalid field name is used with Field by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6797](https://togithub.com/pydantic/pydantic/pull/6797)
- Add `GenericModel` to `MOVED_IN_V2` by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6776](https://togithub.com/pydantic/pydantic/pull/6776)
- Remove unused code from `docs/usage/types/custom.md` by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6803](https://togithub.com/pydantic/pydantic/pull/6803)
- Fix `float` -> `Decimal` coercion precision loss by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6810](https://togithub.com/pydantic/pydantic/pull/6810)
- remove email validation from the north star benchmark by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6816](https://togithub.com/pydantic/pydantic/pull/6816)
- Fix link to mypy by
[@&#8203;progsmile](https://togithub.com/progsmile) in
[#&#8203;6824](https://togithub.com/pydantic/pydantic/pull/6824)
- Improve initialization hooks example by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6822](https://togithub.com/pydantic/pydantic/pull/6822)
- Fix default port for mongosrv DSNs by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6827](https://togithub.com/pydantic/pydantic/pull/6827)
- Improve API documentation, in particular more links between usage and
API docs by [@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6780](https://togithub.com/pydantic/pydantic/pull/6780)
- update pydantic-core to 2.4.0 by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6831](https://togithub.com/pydantic/pydantic/pull/6831)
- Fix `annotated_types.MaxLen` validator for custom sequence types by
[@&#8203;ImogenBits](https://togithub.com/ImogenBits) in
[#&#8203;6809](https://togithub.com/pydantic/pydantic/pull/6809)
- Update V1 by [@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6833](https://togithub.com/pydantic/pydantic/pull/6833)
- Make it so callable JSON schema extra works by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6798](https://togithub.com/pydantic/pydantic/pull/6798)
- Fix serialization issue with `InstanceOf` by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6829](https://togithub.com/pydantic/pydantic/pull/6829)
- Add back support for `json_encoders` by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6811](https://togithub.com/pydantic/pydantic/pull/6811)
- Update field annotations when building the schema by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6838](https://togithub.com/pydantic/pydantic/pull/6838)
- Use `WeakValueDictionary` to fix generic memory leak by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6681](https://togithub.com/pydantic/pydantic/pull/6681)
- Add `config.defer_build` to optionally make model building lazy by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6823](https://togithub.com/pydantic/pydantic/pull/6823)
- delegate `UUID` serialization to pydantic-core by
[@&#8203;davidhewitt](https://togithub.com/davidhewitt) in
[#&#8203;6850](https://togithub.com/pydantic/pydantic/pull/6850)
- Update `json_encoders` docs by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6848](https://togithub.com/pydantic/pydantic/pull/6848)
- Fix error message for `staticmethod`/`classmethod` order with
validate_call by [@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6686](https://togithub.com/pydantic/pydantic/pull/6686)
- Improve documentation for `Config` by
[@&#8203;samuelcolvin](https://togithub.com/samuelcolvin) in
[#&#8203;6847](https://togithub.com/pydantic/pydantic/pull/6847)
- Update serialization doc to mention `Field.exclude` takes priority
over call-time `include/exclude` by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6851](https://togithub.com/pydantic/pydantic/pull/6851)
- Allow customizing core schema generation by making `GenerateSchema`
public by [@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6737](https://togithub.com/pydantic/pydantic/pull/6737)

###
[`v2.0.3`](https://togithub.com/pydantic/pydantic/blob/HEAD/HISTORY.md#v203-2023-07-05)

[Compare
Source](https://togithub.com/pydantic/pydantic/compare/v2.0.2...v2.0.3)

[GitHub
release](https://togithub.com/pydantic/pydantic/releases/tag/v2.0.3)

- Mention PyObject (v1) moving to ImportString (v2) in migration doc by
[@&#8203;slafs](https://togithub.com/slafs) in
[#&#8203;6456](https://togithub.com/pydantic/pydantic/pull/6456)
- Fix release-tweet CI by [@&#8203;Kludex](https://togithub.com/Kludex)
in [#&#8203;6461](https://togithub.com/pydantic/pydantic/pull/6461)
- Revise the section on required / optional / nullable fields. by
[@&#8203;ybressler](https://togithub.com/ybressler) in
[#&#8203;6468](https://togithub.com/pydantic/pydantic/pull/6468)
- Warn if a type hint is not in fact a type by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6479](https://togithub.com/pydantic/pydantic/pull/6479)
- Replace TransformSchema with GetPydanticSchema by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6484](https://togithub.com/pydantic/pydantic/pull/6484)
- Fix the un-hashability of various annotation types, for use in caching
generic containers by [@&#8203;dmontagu](https://togithub.com/dmontagu)
in [#&#8203;6480](https://togithub.com/pydantic/pydantic/pull/6480)
- PYD-164: Rework custom types docs by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6490](https://togithub.com/pydantic/pydantic/pull/6490)
- Fix ci by [@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6507](https://togithub.com/pydantic/pydantic/pull/6507)
- Fix forward ref in generic by
[@&#8203;adriangb](https://togithub.com/adriangb) in
[#&#8203;6511](https://togithub.com/pydantic/pydantic/pull/6511)
- Fix generation of serialization JSON schemas for
core_schema.ChainSchema by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6515](https://togithub.com/pydantic/pydantic/pull/6515)
- Document the change in `Field.alias` behavior in Pydantic V2 by
[@&#8203;hramezani](https://togithub.com/hramezani) in
[#&#8203;6508](https://togithub.com/pydantic/pydantic/pull/6508)
- Give better error message attempting to compute the json schema of a
model with undefined fields by
[@&#8203;dmontagu](https://togithub.com/dmontagu) in
[#&#8203;6519](https://togithub.com/pydantic/pydantic/pull/6519)
- Document `alias_priority` by
[@&#8203;tpdorsey](https://togithub.com/tpdorsey) in
[#&#8203;6520](https://togithub.com/pydantic/pydantic/pull/6520)
- Add redirect for types documentation by
[@&#8203;tpdorsey](https://togithub.com/tpdorsey) in
[#&#8203;6513](https://t

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these
updates again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/libretime/libretime).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xNDQuMiIsInVwZGF0ZWRJblZlciI6IjM3LjEwMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: jo <ljonas@riseup.net>
  • Loading branch information
renovate[bot] and jooola committed Dec 27, 2023
1 parent 8a8dd98 commit 7db7eb0
Show file tree
Hide file tree
Showing 11 changed files with 510 additions and 71 deletions.
21 changes: 12 additions & 9 deletions playout/libretime_playout/config.py
Expand Up @@ -7,7 +7,7 @@
RabbitMQConfig,
StreamConfig,
)
from pydantic import BaseModel, root_validator
from pydantic import BaseModel, model_validator

CACHE_DIR = Path.cwd() / "scheduler"
RECORD_DIR = Path.cwd() / "recorder"
Expand Down Expand Up @@ -37,18 +37,21 @@ class LiquidsoapConfig(BaseModel):
harbor_ssl_private_key: Optional[str] = None
harbor_ssl_password: Optional[str] = None

@root_validator
@classmethod
def _validate_harbor_ssl(cls, values: dict):
harbor_ssl_certificate = values.get("harbor_ssl_certificate")
harbor_ssl_private_key = values.get("harbor_ssl_private_key")
if harbor_ssl_certificate is not None and harbor_ssl_private_key is None:
@model_validator(mode="after")
def _validate_harbor_ssl(self):
if (
self.harbor_ssl_certificate is not None
and self.harbor_ssl_private_key is None
):
raise ValueError("missing 'harbor_ssl_private_key' value")

if harbor_ssl_certificate is None and harbor_ssl_private_key is not None:
if (
self.harbor_ssl_certificate is None
and self.harbor_ssl_private_key is not None
):
raise ValueError("missing 'harbor_ssl_certificate' value")

return values
return self


class Config(BaseConfig):
Expand Down
3 changes: 1 addition & 2 deletions shared/libretime_shared/config/__init__.py
@@ -1,4 +1,5 @@
from ._base import DEFAULT_CONFIG_FILEPATH, DEFAULT_ENV_PREFIX, BaseConfig
from ._fields import AnyHttpUrlStr, AnyUrlStr, StrNoLeadingSlash, StrNoTrailingSlash
from ._models import (
AudioChannels,
AudioFormat,
Expand All @@ -11,6 +12,4 @@
StorageConfig,
StreamConfig,
SystemOutput,
no_leading_slash_validator,
no_trailing_slash_validator,
)
2 changes: 1 addition & 1 deletion shared/libretime_shared/config/_base.py
Expand Up @@ -38,7 +38,7 @@ def __init__(
if _filepath is not None:
_filepath = Path(_filepath)

env_loader = EnvLoader(_self.schema(), _env_prefix, _env_delimiter)
env_loader = EnvLoader(_self.model_json_schema(), _env_prefix, _env_delimiter)

values = deep_merge_dict(
kwargs,
Expand Down
8 changes: 7 additions & 1 deletion shared/libretime_shared/config/_env.py
Expand Up @@ -140,7 +140,7 @@ def _get_mapping(

return mapping

# pylint: disable=too-many-return-statements
# pylint: disable=too-many-return-statements,too-many-branches
def _get(
self,
env_name: str,
Expand All @@ -160,7 +160,13 @@ def _get(
if "$ref" in schema:
schema = self._resolve_ref(schema["$ref"])

if "const" in schema:
return self._env.get(env_name, None)

if "type" in schema:
if schema["type"] == "null":
return None

if schema["type"] in ("string", "integer", "boolean"):
return self._env.get(env_name, None)

Expand Down
69 changes: 69 additions & 0 deletions shared/libretime_shared/config/_fields.py
@@ -0,0 +1,69 @@
from typing import Any, Optional

from pydantic import (
AfterValidator,
AnyHttpUrl,
AnyUrl,
GetCoreSchemaHandler,
GetJsonSchemaHandler,
TypeAdapter,
)
from pydantic.json_schema import JsonSchemaValue
from pydantic_core import Url
from pydantic_core.core_schema import CoreSchema, no_info_after_validator_function
from typing_extensions import Annotated

StrNoTrailingSlash = Annotated[str, AfterValidator(lambda x: str(x).rstrip("/"))]
StrNoLeadingSlash = Annotated[str, AfterValidator(lambda x: str(x).lstrip("/"))]


class AnyUrlStr(str):
_type_adapter = TypeAdapter(AnyUrl)
obj: Url

@classmethod
def __get_pydantic_core_schema__(
cls,
_: Any,
handler: GetCoreSchemaHandler,
) -> CoreSchema:
return no_info_after_validator_function(cls, handler(str))

@classmethod
def __get_pydantic_json_schema__(
cls,
core_schema: CoreSchema,
handler: GetJsonSchemaHandler,
) -> JsonSchemaValue:
field_schema = handler(core_schema)
field_schema.update(format="uri")
return field_schema

def __new__(cls, value: str) -> "AnyUrlStr":
url_obj = cls._type_adapter.validate_strings(value)
self = str.__new__(cls, str(url_obj).rstrip("/"))
self.obj = url_obj
return self

def __repr__(self) -> str:
return f"{self.__class__.__name__}({super().__repr__()})"

@property
def scheme(self) -> str:
return self.obj.scheme

@property
def host(self) -> Optional[str]:
return self.obj.host

@property
def port(self) -> Optional[int]:
return self.obj.port

@property
def path(self) -> Optional[str]:
return self.obj.path


class AnyHttpUrlStr(AnyUrlStr):
_type_adapter = TypeAdapter(AnyHttpUrl)
67 changes: 17 additions & 50 deletions shared/libretime_shared/config/_models.py
@@ -1,59 +1,33 @@
import sys
from enum import Enum
from typing import TYPE_CHECKING, Any, List, Literal, Optional, Union
from typing import List, Literal, Optional, Union

# pylint: disable=no-name-in-module
from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, validator
from pydantic import BaseModel, Field, field_validator
from typing_extensions import Annotated

from ._fields import AnyHttpUrlStr, AnyUrlStr, StrNoLeadingSlash, StrNoTrailingSlash

if sys.version_info < (3, 9):
from backports.zoneinfo import ZoneInfo, ZoneInfoNotFoundError
else:
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError


if TYPE_CHECKING:
from pydantic.typing import AnyClassMethod


def no_trailing_slash_validator(key: str) -> "AnyClassMethod":
# pylint: disable=unused-argument
def strip_trailing_slash(cls: Any, value: Any) -> Any:
if isinstance(value, str):
return value.rstrip("/")
return value

return validator(key, pre=True, allow_reuse=True)(strip_trailing_slash)


def no_leading_slash_validator(key: str) -> "AnyClassMethod":
# pylint: disable=unused-argument
def strip_leading_slash(cls: Any, value: Any) -> Any:
if isinstance(value, str):
return value.lstrip("/")
return value

return validator(key, pre=True, allow_reuse=True)(strip_leading_slash)


# GeneralConfig
########################################################################################


# pylint: disable=too-few-public-methods
class GeneralConfig(BaseModel):
public_url: AnyHttpUrl
public_url: AnyHttpUrlStr
api_key: str
secret_key: Optional[str] = None

timezone: str = "UTC"

allowed_cors_origins: List[AnyHttpUrl] = []

# Validators
_public_url_no_trailing_slash = no_trailing_slash_validator("public_url")
allowed_cors_origins: List[AnyHttpUrlStr] = []

@validator("timezone")
@field_validator("timezone")
@classmethod
def _validate_timezone(cls, value: str) -> str:
try:
Expand All @@ -70,10 +44,7 @@ def _validate_timezone(cls, value: str) -> str:

# pylint: disable=too-few-public-methods
class StorageConfig(BaseModel):
path: str = "/srv/libretime"

# Validators
_path_no_trailing_slash = no_trailing_slash_validator("path")
path: StrNoTrailingSlash = "/srv/libretime"


# DatabaseConfig
Expand Down Expand Up @@ -122,7 +93,7 @@ def url(self) -> str:

class BaseInput(BaseModel):
enabled: bool = True
public_url: Optional[AnyUrl] = None
public_url: Optional[AnyUrlStr] = None


class InputKind(str, Enum):
Expand All @@ -131,12 +102,10 @@ class InputKind(str, Enum):

class HarborInput(BaseInput):
kind: Literal[InputKind.HARBOR] = InputKind.HARBOR
mount: str
mount: StrNoLeadingSlash
port: int
secure: bool = False

_mount_no_leading_slash = no_leading_slash_validator("mount")


class MainHarborInput(HarborInput):
mount: str = "main"
Expand All @@ -162,7 +131,7 @@ class BaseAudio(BaseModel):
channels: AudioChannels = AudioChannels.STEREO
bitrate: int

@validator("bitrate")
@field_validator("bitrate")
@classmethod
def _validate_bitrate(cls, value: int) -> int:
# Once the liquidsoap script generation supports it, fine tune
Expand Down Expand Up @@ -200,11 +169,11 @@ class AudioOpus(BaseAudio):
class IcecastOutput(BaseModel):
kind: Literal["icecast"] = "icecast"
enabled: bool = False
public_url: Optional[AnyUrl] = None
public_url: Optional[AnyUrlStr] = None

host: str = "localhost"
port: int = 8000
mount: str
mount: StrNoLeadingSlash
source_user: str = "source"
source_password: str
admin_user: str = "admin"
Expand All @@ -222,13 +191,11 @@ class IcecastOutput(BaseModel):

mobile: bool = False

_mount_no_leading_slash = no_leading_slash_validator("mount")


class ShoutcastOutput(BaseModel):
kind: Literal["shoutcast"] = "shoutcast"
enabled: bool = False
public_url: Optional[AnyUrl] = None
public_url: Optional[AnyUrlStr] = None

host: str = "localhost"
port: int = 8000
Expand Down Expand Up @@ -264,9 +231,9 @@ class SystemOutput(BaseModel):

# pylint: disable=too-few-public-methods
class Outputs(BaseModel):
icecast: List[IcecastOutput] = Field([], max_items=3)
shoutcast: List[ShoutcastOutput] = Field([], max_items=1)
system: List[SystemOutput] = Field([], max_items=1)
icecast: List[IcecastOutput] = Field([], max_length=3)
shoutcast: List[ShoutcastOutput] = Field([], max_length=1)
system: List[SystemOutput] = Field([], max_length=1)

@property
def merged(self) -> List[Union[IcecastOutput, ShoutcastOutput]]:
Expand Down
2 changes: 1 addition & 1 deletion shared/requirements.txt
Expand Up @@ -2,5 +2,5 @@
# This file is auto-generated by tools/extract_requirements.py.
backports.zoneinfo>=0.2.1,<0.3;python_version<'3.9'
click>=8.0.4,<8.2
pydantic>=1.7.4,<1.11
pydantic>=2.5.0,<2.6
pyyaml>=5.3.1,<6.1
2 changes: 1 addition & 1 deletion shared/setup.py
Expand Up @@ -14,7 +14,7 @@
install_requires=[
"backports.zoneinfo>=0.2.1,<0.3;python_version<'3.9'",
"click>=8.0.4,<8.2",
"pydantic>=1.7.4,<1.11",
"pydantic>=2.5.0,<2.6",
"pyyaml>=5.3.1,<6.1",
],
extras_require={
Expand Down

0 comments on commit 7db7eb0

Please sign in to comment.