some model name changing, and constains model improvement

This commit is contained in:
Josh Burman 2021-09-14 11:46:51 -04:00
parent 43d2088f13
commit b472af6020
6 changed files with 8 additions and 17 deletions

View File

@ -36,4 +36,4 @@ async def solve(solver_run: SolverRun):
items=[item.id for item in solver_run.items]
)]
)
return response
return solver_run

View File

@ -1,10 +1,9 @@
from pydantic import BaseModel
from typing import Optional
from models.attribute import Attribute
class Constraint(BaseModel):
key: str
value: str
field_id: Optional[int]
option_id: Optional[int]
reference_attribute: Attribute
minimum: int
maximum: int

View File

@ -1,8 +1,8 @@
from pydantic import BaseModel
from typing import List
from models.metadata import MetaData
from models.attribute import Attribute
class Item(BaseModel):
id: int
metadata: List[MetaData]
attribute: List[Attribute]

View File

@ -1,8 +0,0 @@
from pydantic import BaseModel
from typing import Optional
class MetaData(BaseModel):
key: str
value: str
field_id: Optional[int]
option_id: Optional[int]

View File

@ -9,4 +9,5 @@ class ObjectiveFunction(BaseModel):
# likely with models representing each objective function type
tif_targets: List[Target]
tcc_targets: List[Target]
objective: "minimize"
weight: Dict = {'tif': 1, 'tcc': 1}

View File

@ -8,11 +8,10 @@ from models.objective_function import ObjectiveFunction
from models.advanced_options import AdvancedOptions
class SolverRun(BaseModel):
token: str
items: List[Item]
constraints: List[Constraint]
irt_model: IRTModel
objective_fuction: ObjectiveFunction
total_form_items: int
advanced_options: Optional[List[AdvancedOptions]]
advanced_options: Optional[AdvancedOptions]
engine: str