From dda6b45170160d025db69f9c82770146c98b45a8 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Fri, 19 May 2023 23:44:20 +0800 Subject: [PATCH] Refine --- main.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index fe5d00e..84f7bb4 100644 --- a/main.py +++ b/main.py @@ -1708,11 +1708,17 @@ async def fastapi_generate_virtual_district(network: str, req: Request) -> Chang # water_distribution_area 36 ############################################################ @app.get('/calculatedemandtonodes/') -async def fastapi_calculate_demand_to_nodes(network: str, demand: float, nodes: list[str]) -> dict[str, float]: +async def fastapi_calculate_demand_to_nodes(network: str, req: Request) -> dict[str, float]: + props = await req.json() + demand = props['demand'] + nodes = props['nodes'] return calculate_demand_to_nodes(network, demand, nodes) @app.get('/calculatedemandtoregion/') -async def fastapi_calculate_demand_to_region(network: str, demand: float, region: str) -> dict[str, float]: +async def fastapi_calculate_demand_to_region(network: str, req: Request) -> dict[str, float]: + props = await req.json() + demand = props['demand'] + region = props['region'] return calculate_demand_to_region(network, demand, region) @app.get('/calculatedemandtonetwork/')