Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow reuse on validators to prevent reload error 

Otherwise this will cause an error if spaCy is live reloaded, e.g. in Streamlit
This commit is contained in:
Ines Montani 2020-08-25 17:13:11 +02:00
parent 0bab7c8b91
commit 94705c21c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spacy/schemas.py
View File

@ -63,7 +63,7 @@ class TokenPatternString(BaseModel):
class Config: class Config:
extra = "forbid" extra = "forbid"
@validator("*", pre=True, each_item=True) @validator("*", pre=True, each_item=True, allow_reuse=True)
def raise_for_none(cls, v): def raise_for_none(cls, v):
if v is None: if v is None:
raise ValueError("None / null is not allowed") raise ValueError("None / null is not allowed")
@ -84,7 +84,7 @@ class TokenPatternNumber(BaseModel):
class Config: class Config:
extra = "forbid" extra = "forbid"
@validator("*", pre=True, each_item=True) @validator("*", pre=True, each_item=True, allow_reuse=True)
def raise_for_none(cls, v): def raise_for_none(cls, v):
if v is None: if v is None:
raise ValueError("None / null is not allowed") raise ValueError("None / null is not allowed")
@ -145,7 +145,7 @@ class TokenPattern(BaseModel):
allow_population_by_field_name = True allow_population_by_field_name = True
alias_generator = lambda value: value.upper() alias_generator = lambda value: value.upper()
@validator("*", pre=True) @validator("*", pre=True, allow_reuse=True)
def raise_for_none(cls, v): def raise_for_none(cls, v):
if v is None: if v is None:
raise ValueError("None / null is not allowed") raise ValueError("None / null is not allowed")
@ -265,7 +265,7 @@ class ConfigSchema(BaseModel):
pretraining: Union[ConfigSchemaPretrain, ConfigSchemaPretrainEmpty] = {} pretraining: Union[ConfigSchemaPretrain, ConfigSchemaPretrainEmpty] = {}
components: Dict[str, Dict[str, Any]] components: Dict[str, Dict[str, Any]]
@root_validator @root_validator(allow_reuse=True)
def validate_config(cls, values): def validate_config(cls, values):
"""Perform additional validation for settings with dependencies.""" """Perform additional validation for settings with dependencies."""
pt = values.get("pretraining") pt = values.get("pretraining")