From db246c0aa24b5de4ab18b2a4e4ef71c5b60e5083 Mon Sep 17 00:00:00 2001 From: Sagar Vora <16315650+sagarvora@users.noreply.github.com> Date: Thu, 3 Jul 2025 17:29:31 +0530 Subject: [PATCH] refactor: use global imports --- frappe/utils/typing_validations.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/frappe/utils/typing_validations.py b/frappe/utils/typing_validations.py index 9f0b82d9d8..408fd0f691 100644 --- a/frappe/utils/typing_validations.py +++ b/frappe/utils/typing_validations.py @@ -6,8 +6,10 @@ from typing import ForwardRef, TypeVar, Union from unittest import mock from pydantic import ConfigDict, PydanticUserError -from pydantic import TypeAdapter as PyTypeAdapter +from pydantic import TypeAdapter as PydanticTypeAdapter +from pydantic import ValidationError as PydanticValidationError +import frappe from frappe.exceptions import FrappeTypeError SLACK_DICT = { @@ -76,11 +78,11 @@ def raise_type_error( @lru_cache(maxsize=2048) def TypeAdapter(type_): try: - return PyTypeAdapter(type_, config=FrappePydanticConfig) + return PydanticTypeAdapter(type_, config=FrappePydanticConfig) except PydanticUserError as e: # Cannot set config for types BaseModel, TypedDict and dataclass if e.code == "type-adapter-config-unused": - return PyTypeAdapter(type_) + return PydanticTypeAdapter(type_) raise e @@ -99,10 +101,6 @@ def transform_parameter_types(func: Callable, args: tuple, kwargs: dict): ): return args, kwargs - from pydantic import ValidationError as PyValidationError - - import frappe - annotations = func.__annotations__ new_args, new_kwargs = list(args), kwargs @@ -160,7 +158,7 @@ def transform_parameter_types(func: Callable, args: tuple, kwargs: dict): # validate the type set using pydantic - raise a TypeError if Validation is raised or Ellipsis is returned try: current_arg_value_after = TypeAdapter(current_arg_type).validate_python(current_arg_value) - except (TypeError, PyValidationError) as e: + except (TypeError, PydanticValidationError) as e: raise_type_error(func, current_arg, current_arg_type, current_arg_value, current_exception=e) if isinstance(current_arg_value_after, EllipsisType):