ObjectId: Purges final Obj/int confusions

MolSSI · May 28, 2019 · 54993c5 · 54993c5
1 parent 3d6dfa5
commit 54993c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,6 +1,8 @@
 coverage:
   ignore:
     - */tests/*
+    - qcfractal/dashboard/* # early state
+    - qcfractal/migrations/* # difficult to test
     - qcfractal/_version.py
     - setup.py
   status:

diff --git a/qcfractal/interface/models/task_models.py b/qcfractal/interface/models/task_models.py
@@ -44,7 +44,7 @@ class PythonComputeSpec(BaseModel):
 
 class TaskRecord(BaseModel):
 
-    id: Union[ObjectId, int] = None
+    id: ObjectId = None
 
     spec: PythonComputeSpec
     parser: str

diff --git a/qcfractal/interface/models/torsiondrive.py b/qcfractal/interface/models/torsiondrive.py
@@ -47,7 +47,7 @@ class TorsionDriveInput(BaseModel):
 
     program: _td_constr = "torsiondrive"
     procedure: _td_constr = "torsiondrive"
-    initial_molecule: List[Union[ObjectId, Molecule, int]]
+    initial_molecule: List[Union[ObjectId, Molecule]]
     keywords: TDKeywords
     optimization_spec: OptimizationSpecification
     qc_spec: QCSpecification
@@ -78,15 +78,15 @@ class TorsionDriveRecord(RecordBase):
     program: _td_constr = "torsiondrive"
 
     # Input data
-    initial_molecule: List[Union[ObjectId, int]]
+    initial_molecule: List[ObjectId]
     keywords: TDKeywords
     optimization_spec: OptimizationSpecification
     qc_spec: QCSpecification
 
     # Output data
     final_energy_dict: Dict[str, float]
 
-    optimization_history: Dict[str, List[Union[ObjectId, int]]]
+    optimization_history: Dict[str, List[ObjectId]]
     minimum_positions: Dict[str, int]
 
     class Config(RecordBase.Config):