Refine

main.py

@@ -1592,16 +1592,19 @@ async def fastapi_get_district_metering_area(network: str, id: str) -> dict[str,
     return get_district_metering_area(network, id)
 
 @app.post('/setdistrictmeteringarea/')
-async def fastapi_set_district_metering_area(network: str, cs: ChangeSet) -> ChangeSet:
-    return set_district_metering_area(network, cs)
+async def fastapi_set_district_metering_area(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return set_district_metering_area(network, ChangeSet(props))
 
 @app.post('/adddistrictmeteringarea/')
-async def fastapi_add_district_metering_area(network: str, cs: ChangeSet) -> ChangeSet:
-    return add_district_metering_area(network, cs)
+async def fastapi_add_district_metering_area(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return add_district_metering_area(network, ChangeSet(props))
 
 @app.post('/deletedistrictmeteringarea/')
-async def fastapi_delete_district_metering_area(network: str, cs: ChangeSet) -> ChangeSet:
-    return delete_district_metering_area(network, cs)
+async def fastapi_delete_district_metering_area(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return delete_district_metering_area(network, ChangeSet(props))
 
 @app.get('/getalldistrictmeteringareaids/')
 async def fastapi_get_all_district_metering_area_ids(network: str) -> list[str]:
@@ -1612,46 +1615,48 @@ async def getalldistrictmeteringareas(network: str) -> list[dict[str, Any]]:
     return get_all_district_metering_areas(network)
 
 @app.post('/generatedistrictmeteringarea/')
-async def fastapi_generate_district_metering_area(network: str, part_count: int = 1, part_type: int = PARTITION_TYPE_RB) -> ChangeSet:
+async def fastapi_generate_district_metering_area(network: str, part_count: int, part_type: int) -> ChangeSet:
     return generate_district_metering_area(network, part_count, part_type)
 
 @app.post('/generatesubdistrictmeteringarea/')
-async def fastapi_generate_sub_district_metering_area(network: str, dma: str, part_count: int = 1, part_type: int = PARTITION_TYPE_RB) -> ChangeSet:
+async def fastapi_generate_sub_district_metering_area(network: str, dma: str, part_count: int, part_type: int) -> ChangeSet:
     return generate_sub_district_metering_area(network, dma, part_count, part_type)
 
 ############################################################
 # service_area 34
 ############################################################
 @app.get('/calculateservicearea/')
-async def fastapi_calculate_service_area(network: str, time_index: int = 0) -> dict[str, Any]:
+async def fastapi_calculate_service_area(network: str, time_index: int) -> dict[str, Any]:
     return calculate_service_area(network, time_index)
 
 @app.get('/getserviceareaschema/')
-def fastapi_get_service_area_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_service_area_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_service_area_schema(network)
 
 @app.get('/getservicearea/')
-def fastapi_get_service_area(network: str, id: str) -> dict[str, Any]:
+async def fastapi_get_service_area(network: str, id: str) -> dict[str, Any]:
     return get_service_area(network, id)
 
 @app.post('/setservicearea/')
-def fastapi_set_service_area(network: str, cs: ChangeSet) -> ChangeSet:
-    return set_service_area(network, cs)
+async def fastapi_set_service_area(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return set_service_area(network, ChangeSet(props))
 
 @app.post('/addservicearea/')
-def fastapi_add_service_area(network: str, cs: ChangeSet) -> ChangeSet:
-    return add_service_area(network, cs)
+async def fastapi_add_service_area(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return add_service_area(network, ChangeSet(props))
 
 @app.post('/deleteservicearea/')
-def fastapi_delete_service_area(network: str, cs: ChangeSet) -> ChangeSet:
+async def fastapi_delete_service_area(network: str, cs: ChangeSet) -> ChangeSet:
     return delete_service_area(network, cs)
 
 @app.get('/getallserviceareas/')
-def fastapi_get_all_service_areas(network: str) -> list[dict[str, Any]]:
+async def fastapi_get_all_service_areas(network: str) -> list[dict[str, Any]]:
     return get_all_service_areas(network)
 
 @app.post('/generateservicearea/')
-def fastapi_generate_service_area(network: str) -> ChangeSet:
+async def fastapi_generate_service_area(network: str) -> ChangeSet:
     return generate_service_area(network)
 
 
@@ -1671,16 +1676,19 @@ async def fastapi_get_virtual_district(network: str, id: str) -> dict[str, Any]:
     return get_virtual_district(network, id)
 
 @app.post('/setvirtualdistrict/')
-async def fastapi_set_virtual_district(network: str, cs: ChangeSet) -> ChangeSet:
-    return set_virtual_district(network, cs)
+async def fastapi_set_virtual_district(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return set_virtual_district(network, ChangeSet(props))
 
 @app.post('/addvirtualdistrict/')
-async def fastapi_add_virtual_district(network: str, cs: ChangeSet) -> ChangeSet:
-    return add_virtual_district(network, cs)
+async def fastapi_add_virtual_district(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return add_virtual_district(network, ChangeSet(props))
 
 @app.post('/deletevirtualdistrict/')
-async def fastapi_delete_virtual_district(network: str, cs: ChangeSet) -> ChangeSet:
-    return delete_virtual_district(network, cs)
+async def fastapi_delete_virtual_district(network: str, req: Request) -> ChangeSet:
+    props = await req.json()
+    return delete_virtual_district(network, ChangeSet(props))
 
 @app.get('/getallvirtualdistrict/')
 async def fastapi_get_all_virtual_district(network: str) -> list[dict[str, Any]]: