eyhc
/
rendercv
mirror of https://github.com/eyhc1/rendercv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve JSON Schema

This commit is contained in:
Sina Atalay 2024-02-17 18:46:58 +01:00
parent e9c38e7752
commit 70ebe03511
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rendercv/data_models.py
View File

@ -37,9 +37,14 @@ from .themes.sb2nov import Sb2novThemeOptions
# This type is used to validate the date fields in the data. # This type is used to validate the date fields in the data.
# See https://docs.pydantic.dev/2.5/concepts/types/#custom-types for more information # See https://docs.pydantic.dev/2.5/concepts/types/#custom-types for more information
# about custom types. # about custom types.
date_pattern_for_json_schema = r"\d{4}(-\d{2})?(-\d{2})?"
date_pattern_for_validation = r"\d{4}-\d{2}(-\d{2})?"
RenderCVDate = Annotated[ RenderCVDate = Annotated[
str, str,
pydantic.Field(pattern=r"\d{4}-\d{2}(-\d{2})?"), pydantic.Field(
pattern=date_pattern_for_validation,
json_schema_extra={"pattern": date_pattern_for_json_schema},
),
] ]
@ -233,24 +238,24 @@ class EntryBase(RenderCVBaseModel):
try: try:
end_date = get_date_object(model.end_date) end_date = get_date_object(model.end_date)
except ValueError as e: except ValueError as e:
raise ValueError(str(e), "end_date", model.end_date) raise ValueError(str(e), "end_date", str(model.end_date))
try: try:
start_date = get_date_object(model.start_date) start_date = get_date_object(model.start_date)
except ValueError as e: except ValueError as e:
raise ValueError(str(e), "start_date", model.start_date) raise ValueError(str(e), "start_date", str(model.start_date))
if start_date > end_date: if start_date > end_date:
raise ValueError( raise ValueError(
'"start_date" can not be after "end_date"!', '"start_date" can not be after "end_date"!',
"start_date", # this is the location of the error "start_date", # this is the location of the error
model.start_date, # this is value of the error str(model.start_date), # this is value of the error
) )
elif end_date > Date.today(): elif end_date > Date.today():
raise ValueError( raise ValueError(
'"end_date" cannot be in the future!', '"end_date" cannot be in the future!',
"end_date", # this is the location of the error "end_date", # this is the location of the error
model.end_date, # this is value of the error str(model.end_date), # this is value of the error
) )
return model return model
@ -947,7 +952,7 @@ class RenderCVDataModel(RenderCVBaseModel):
title="Curriculum Vitae", title="Curriculum Vitae",
description="The data of the CV.", description="The data of the CV.",
) )
design: RenderCVDesign | Any = pydantic.Field( design: RenderCVDesign | pydantic.json_schema.SkipJsonSchema[Any] = pydantic.Field(
default=ClassicThemeOptions(theme="classic"), default=ClassicThemeOptions(theme="classic"),
title="Design", title="Design",
description="The design information of the CV.", description="The design information of the CV.",