Skip to content

Commit

Permalink
Rework the PYDANTIC_ERRORS_INCLUDE_URL environment variable and doc…
Browse files Browse the repository at this point in the history
…ument it

Refs pydantic#1118 (comment)
  • Loading branch information
akx committed Dec 15, 2023
1 parent 7fa450d commit 507255a
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 2 deletions.
12 changes: 12 additions & 0 deletions python/pydantic_core/_pydantic_core.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,18 @@ class ValidationError(ValueError):
a JSON string.
"""

def __repr__(self) -> str:
"""
A string representation of the validation error.
Whether or not documentation URLs are included in the repr is controlled by the
environment variable `PYDANTIC_ERRORS_INCLUDE_URL` being set to `1` or
`true`; by default, URLs are shown.
Due to implementation details, this environment variable can only be set once,
before the first validation error is created.
"""

@final
class PydanticCustomError(ValueError):
def __new__(
Expand Down
12 changes: 10 additions & 2 deletions src/errors/validation_exception.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,16 @@ impl ValidationError {
static URL_ENV_VAR: GILOnceCell<bool> = GILOnceCell::new();

fn _get_include_url_env() -> bool {
match std::env::var("PYDANTIC_ERRORS_OMIT_URL") {
Ok(val) => val.is_empty(),
if std::env::var_os("PYDANTIC_ERRORS_OMIT_URL").is_some() {
// This is ugly (and is interposed weirdly into a printed traceback), but
// there probably isn't a much better way to surface a deprecation warning
// from so deep in the code. Hopefully there hadn't been too many users
// using the undocumented environment variable who will need to suffer
// the ugliness, and when they do, they'll act accordingly.
eprintln!("_pydantic_core: PYDANTIC_ERRORS_OMIT_URL is deprecated, use PYDANTIC_ERRORS_INCLUDE_URL instead");
}
match std::env::var("PYDANTIC_ERRORS_INCLUDE_URL") {
Ok(val) => val == "1" || val.to_lowercase() == "true",
Err(_) => true,
}
}
Expand Down
33 changes: 33 additions & 0 deletions tests/test_errors.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import enum
import os
import re
import subprocess
import sys
from decimal import Decimal
from typing import Any, Optional
Expand Down Expand Up @@ -1074,3 +1076,34 @@ def test_hide_input_in_json() -> None:

for error in exc_info.value.errors(include_input=False):
assert 'input' not in error


@pytest.mark.parametrize(
('include_url_value', 'expected_to_have_url'),
[
(None, True),
('1', True),
('True', True),
('no', False),
('0', False),
],
)
def test_include_errors_envvar(include_url_value, expected_to_have_url) -> None:
# Since `PYDANTIC_ERRORS_INCLUDE_URL` can only be set
# before a single import of `pydantic` we need to
# test this in a separate process.
code = "import pydantic_core; pydantic_core.SchemaValidator({'type': 'int'}).validate_python('ooo')"
env = os.environ.copy()
if include_url_value is not None:
env['PYDANTIC_ERRORS_INCLUDE_URL'] = include_url_value
env['PYDANTIC_ERRORS_OMIT_URL'] = 'foo' # this is ignored but should show a deprecation warning
result = subprocess.run(
[sys.executable, '-c', code],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
encoding='utf-8',
env=env,
)
assert result.returncode == 1
assert 'PYDANTIC_ERRORS_OMIT_URL is deprecated' in result.stdout
assert ('https://errors.pydantic.dev' in result.stdout) == expected_to_have_url

0 comments on commit 507255a

Please sign in to comment.