From 8de0c00741631deb2748dc999e17d7ebc92707cd Mon Sep 17 00:00:00 2001 From: Shyam D Date: Thu, 22 Oct 2020 09:39:34 -0700 Subject: [PATCH] ensure enums saved as values --- emmet-core/emmet/core/provenance.py | 3 +++ emmet-core/emmet/core/symmetry.py | 3 +++ emmet-core/emmet/core/vasp/task.py | 3 +++ emmet-core/emmet/core/vasp/validation.py | 1 + emmet-core/emmet/core/xas.py | 3 +++ 5 files changed, 13 insertions(+) diff --git a/emmet-core/emmet/core/provenance.py b/emmet-core/emmet/core/provenance.py index 0a95751673..db364a0b42 100644 --- a/emmet-core/emmet/core/provenance.py +++ b/emmet-core/emmet/core/provenance.py @@ -76,6 +76,9 @@ class Provenance(PropertyDoc): description="List of history nodes specifying the transformations or orignation of this material", ) + class Config: + use_enum_values = True + @validator("authors") def remove_duplicate_authors(cls, authors): authors_dict = {entry.name.lower(): entry for entry in authors} diff --git a/emmet-core/emmet/core/symmetry.py b/emmet-core/emmet/core/symmetry.py index e556fc9f80..a09f47620a 100644 --- a/emmet-core/emmet/core/symmetry.py +++ b/emmet-core/emmet/core/symmetry.py @@ -55,6 +55,9 @@ class SymmetryData(BaseModel): version: str = Field(None, title="SPGLib version") + class Config: + use_enum_values = True + @classmethod def from_structure(cls, structure: Structure) -> "SymmetryData": symprec = SETTINGS.SYMPREC diff --git a/emmet-core/emmet/core/vasp/task.py b/emmet-core/emmet/core/vasp/task.py index 2c140596b5..ce2dacf669 100644 --- a/emmet-core/emmet/core/vasp/task.py +++ b/emmet-core/emmet/core/vasp/task.py @@ -124,6 +124,9 @@ class TaskDocument(StructureMetadata): None, description="List of sandboxes this task document is allowed in" ) + class Config: + use_enum_values = True + @property def run_type(self) -> RunType: return run_type(self.input.parameters) diff --git a/emmet-core/emmet/core/vasp/validation.py b/emmet-core/emmet/core/vasp/validation.py index 1ac7374749..3c4f6f6cdf 100644 --- a/emmet-core/emmet/core/vasp/validation.py +++ b/emmet-core/emmet/core/vasp/validation.py @@ -36,6 +36,7 @@ class ValidationDoc(BaseModel): class Config: extra = "allow" + use_enum_values = True @classmethod def from_task_doc( diff --git a/emmet-core/emmet/core/xas.py b/emmet-core/emmet/core/xas.py index 984851ad26..4f875c7504 100644 --- a/emmet-core/emmet/core/xas.py +++ b/emmet-core/emmet/core/xas.py @@ -29,6 +29,9 @@ class XASDoc(SpectrumDoc): ..., title="Absorption Edge", description="The interaction edge for XAS" ) + class Config: + use_enum_values = True + @classmethod def from_spectrum( cls,