some model name changing, and constains model improvement
This commit is contained in:
parent
43d2088f13
commit
b472af6020
@ -36,4 +36,4 @@ async def solve(solver_run: SolverRun):
|
|||||||
items=[item.id for item in solver_run.items]
|
items=[item.id for item in solver_run.items]
|
||||||
)]
|
)]
|
||||||
)
|
)
|
||||||
return response
|
return solver_run
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
|
from models.attribute import Attribute
|
||||||
|
|
||||||
class Constraint(BaseModel):
|
class Constraint(BaseModel):
|
||||||
key: str
|
reference_attribute: Attribute
|
||||||
value: str
|
|
||||||
field_id: Optional[int]
|
|
||||||
option_id: Optional[int]
|
|
||||||
minimum: int
|
minimum: int
|
||||||
maximum: int
|
maximum: int
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from models.metadata import MetaData
|
from models.attribute import Attribute
|
||||||
|
|
||||||
class Item(BaseModel):
|
class Item(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
metadata: List[MetaData]
|
attribute: List[Attribute]
|
||||||
|
@ -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]
|
|
@ -9,4 +9,5 @@ class ObjectiveFunction(BaseModel):
|
|||||||
# likely with models representing each objective function type
|
# likely with models representing each objective function type
|
||||||
tif_targets: List[Target]
|
tif_targets: List[Target]
|
||||||
tcc_targets: List[Target]
|
tcc_targets: List[Target]
|
||||||
|
objective: "minimize"
|
||||||
weight: Dict = {'tif': 1, 'tcc': 1}
|
weight: Dict = {'tif': 1, 'tcc': 1}
|
||||||
|
@ -8,11 +8,10 @@ from models.objective_function import ObjectiveFunction
|
|||||||
from models.advanced_options import AdvancedOptions
|
from models.advanced_options import AdvancedOptions
|
||||||
|
|
||||||
class SolverRun(BaseModel):
|
class SolverRun(BaseModel):
|
||||||
token: str
|
|
||||||
items: List[Item]
|
items: List[Item]
|
||||||
constraints: List[Constraint]
|
constraints: List[Constraint]
|
||||||
irt_model: IRTModel
|
irt_model: IRTModel
|
||||||
objective_fuction: ObjectiveFunction
|
objective_fuction: ObjectiveFunction
|
||||||
total_form_items: int
|
total_form_items: int
|
||||||
advanced_options: Optional[List[AdvancedOptions]]
|
advanced_options: Optional[AdvancedOptions]
|
||||||
engine: str
|
engine: str
|
||||||
|
Loading…
x
Reference in New Issue
Block a user