Make the modeling metadata optional

batdata/schemas/__init__.py

@@ -2,14 +2,14 @@
 from datetime import date
 from typing import List, Tuple, Optional, Dict
 
-from pydantic import BaseModel, Field, AnyUrl, Extra
+from pydantic import BaseModel, Field, AnyUrl
 
 from batdata.schemas.modeling import ModelMetadata
 from batdata.schemas.battery import BatteryDescription
 from batdata.version import __version__
 
 
-class BatteryMetadata(BaseModel, extra=Extra.allow):
+class BatteryMetadata(BaseModel, extra='allow'):
     """Representation for the metadata about a battery
 
     The metadata captures the information about what experiment was run
@@ -35,7 +35,7 @@ class BatteryMetadata(BaseModel, extra=Extra.allow):
     battery: Optional[BatteryDescription] = Field(None, description="Description of the battery being tested")
 
     # Fields that describe source of synthetic data
-    modeling: ModelMetadata = Field(None, description="Description of simulation approach")
+    modeling: Optional[ModelMetadata] = Field(None, description="Description of simulation approach")
 
     # Fields that describe the source of data
     source: Optional[str] = Field(None, description="Organization who created this data")

batdata/schemas/battery.py

@@ -1,10 +1,10 @@
 """Schemas associated with the components of a battery"""
 from typing import Optional, List
 
-from pydantic import BaseModel, Field, Extra
+from pydantic import BaseModel, Field
 
 
-class ElectrodeDescription(BaseModel, extra=Extra.allow):
+class ElectrodeDescription(BaseModel, extra='allow'):
     """Description of an electrode"""
 
     name: str = Field(..., description='Short description of the electrolyte type')
@@ -20,22 +20,22 @@ class ElectrodeDescription(BaseModel, extra=Extra.allow):
     porosity: Optional[float] = Field(None, description='Relative volume of the electrode occupied by gas (units: %)', ge=0, le=100)
 
 
-class ElectrolyteAdditive(BaseModel, extra=Extra.allow):
+class ElectrolyteAdditive(BaseModel, extra='allow'):
     """Additive to the electrolyte"""
 
     name: str = Field(..., description='Name of the additive')
     amount: Optional[float] = Field(None, description='Amount added to the solution')
     units: Optional[float] = Field(None, description='Units of the amount')
 
 
-class ElectrolyteDescription(BaseModel, extra=Extra.allow):
+class ElectrolyteDescription(BaseModel, extra='allow'):
     """Description of the electrolyte"""
 
     name: str = Field(..., description='Short description of the electrolyte types')
     additives: List[ElectrolyteAdditive] = Field(default_factory=list, help='Any additives present in the electrolyte')
 
 
-class BatteryDescription(BaseModel, extra=Extra.allow):
+class BatteryDescription(BaseModel, extra='allow'):
     """Description of the entire battery"""
 
     # Overall design information

batdata/schemas/modeling.py

@@ -26,7 +26,7 @@ class ModelTypes(str, Enum):
     IRI: https://w3id.org/emmo#EMMO_67c70dcd_2adf_4e6c_b3f8_f33dd1512487"""
 
 
-class ModelMetadata(BaseModel):
+class ModelMetadata(BaseModel, extra='allow'):
     """Describe the type and version of a computational tool used to generate battery data"""
 
     # High-level information about the code