From 3b12a811966a7c4354c25a3edcce057ef3eae2df Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Tue, 24 Jun 2025 09:43:52 +0700 Subject: [PATCH] minor fir --- src/aeros_simulation/model.py | 2 ++ src/aeros_simulation/router.py | 2 +- src/aeros_simulation/schema.py | 1 + src/aeros_simulation/service.py | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/aeros_simulation/model.py b/src/aeros_simulation/model.py index 3bb5ce1..e8f1c0d 100644 --- a/src/aeros_simulation/model.py +++ b/src/aeros_simulation/model.py @@ -14,6 +14,8 @@ class AerosSimulation(Base, DefaultMixin): input = Column(JSON, nullable=True) result = Column(JSON, nullable=True) error = Column(JSON, nullable=True) + simulation_name = Column(String, nullable=False) + schematic_name = Column(String, nullable=False) calc_results = relationship( "AerosSimulationCalcResult", back_populates="aeros_simulation", lazy="raise" diff --git a/src/aeros_simulation/router.py b/src/aeros_simulation/router.py index 13a5839..ff5cd6d 100644 --- a/src/aeros_simulation/router.py +++ b/src/aeros_simulation/router.py @@ -50,7 +50,7 @@ async def run_simulations( simulation_id = simulation.id try: - sim_data = simulation_in.model_dump() + sim_data = simulation_in.model_dump(exclude={"SimulationName"}) sim_data["HubCnnId"] = str(simulation_id) ##background_tasks.add_task(execute_simulation, db_session=db_session ,simulation_id=simulation_id, sim_data=sim_data) diff --git a/src/aeros_simulation/schema.py b/src/aeros_simulation/schema.py index bff341c..e01fb2d 100644 --- a/src/aeros_simulation/schema.py +++ b/src/aeros_simulation/schema.py @@ -15,6 +15,7 @@ class SimulationInput(BaseModel): SimDuration: int = 3 DurationUnit: str = "UYear" SimNumRun: int = 1 + SimulationName: str = "DefaultSimulation" class SimulationNode(BaseModel): diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index 85000b3..b434c11 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -299,11 +299,13 @@ def convert_id_to_none_if_negative(value): async def create_simulation(*, db_session: DbSession, simulation_in: SimulationInput): """Create a new simulation.""" - input = simulation_in.model_dump() + input = simulation_in.model_dump(exclude={"SimulationName"}) active_simulations = { "status": "running", "started_at": datetime.now(), "input": input, + "simulation_name": simulation_in.SimulationName, + "schematic_name": input["SchematicName"], } simulation = AerosSimulation(**active_simulations)