phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-06-28 02:53:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade pydantic to latest

Browse source
This commit is contained in:
Hardik Shah 2024-08-12 15:14:21 -07:00
parent 2cd8b2ff5b
commit 37da47ef8e
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
llama_toolchain/common/prompt_for_config.py
View file

@ -11,7 +11,7 @@ from enum import Enum
from typing import Any, get_args, get_origin, List, Literal, Optional, Type, Union
from pydantic import BaseModel
from pydantic.fields import ModelField
from pydantic_core import PydanticUndefinedType
from typing_extensions import Annotated
@ -43,19 +43,11 @@ def get_non_none_type(field_type):
return next(arg for arg in get_args(field_type) if arg is not type(None))
def manually_validate_field(model: Type[BaseModel], field: ModelField, value: Any):
validators = field.class_validators.values()
for validator in validators:
if validator.pre:
value = validator.func(model, value)
# Apply type coercion
value = field.type_(value)
for validator in validators:
if not validator.pre:
value = validator.func(model, value)
def manually_validate_field(model: Type[BaseModel], field_name: str, value: Any):
validators = model.__pydantic_decorators__.field_validators
for _name, validator in validators.items():
if field_name in validator.info.fields:
validator.func(value)
return value
@ -89,9 +81,11 @@ def prompt_for_config(
default_value = existing_value
else:
default_value = (
field.default if not isinstance(field.default, type(Ellipsis)) else None
field.default
if not isinstance(field.default, PydanticUndefinedType)
else None
)
is_required = field.required
is_required = field.is_required
# Skip fields with Literal type
if get_origin(field_type) is Literal:
@ -247,7 +241,9 @@ def prompt_for_config(
try:
# Validate the field using our manual validation function
validated_value = manually_validate_field(config_type, field, value)
validated_value = manually_validate_field(
config_type, field_name, value
)
config_data[field_name] = validated_value
break
except ValueError as e: