From 98d5ffe58a0dd9ead11ee3a480fee64ed7185d57 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Tue, 15 Nov 2022 22:57:03 +0800 Subject: [PATCH] Add mixing --- main.py | 78 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/main.py b/main.py index 9346512..583546f 100644 --- a/main.py +++ b/main.py @@ -1096,54 +1096,72 @@ async def fastapi_delete_source(network: str, req: Request) -> ChangeSet: ############################################################ # reaction 19.[REACTIONS] ############################################################ +@app.get('/getreactionschema/') +async def fastapi_get_reaction_schema(network: str) -> dict[str, dict[str, Any]]: + return get_reaction_schema(network) -def get_reaction_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_reaction_schema(name) +@app.get('/getreaction/') +async def fastapi_get_reaction(network: str) -> dict[str, Any]: + return get_reaction(network) -def get_reaction(name: str) -> dict[str, Any]: - return api.get_reaction(name) +@app.post('/setreaction/') +async def fastapi_set_reaction(network: str, req: Request) -> ChangeSet: + props = await req.json() + return set_reaction(network, ChangeSet(props)) -def set_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_reaction(name, cs) +@app.get('/getpipereactionschema/') +async def fastapi_get_pipe_reaction_schema(network: str) -> dict[str, dict[str, Any]]: + return get_pipe_reaction_schema(network) -def get_pipe_reaction_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_pipe_reaction_schema(name) +@app.get('/getpipereaction/') +async def fastapi_get_pipe_reaction(network: str, pipe: str) -> dict[str, Any]: + return get_pipe_reaction(network, pipe) -def get_pipe_reaction(name: str, pipe: str) -> dict[str, Any]: - return api.get_pipe_reaction(name, pipe) +@app.post('/setpipereaction/') +async def fastapi_set_pipe_reaction(network: str, req: Request) -> ChangeSet: + props = await req.json() + return set_pipe_reaction(network, ChangeSet(props)) -def set_pipe_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_pipe_reaction(name, cs) +@app.get('/gettankreactionschema/') +async def fastapi_get_tank_reaction_schema(network: str) -> dict[str, dict[str, Any]]: + return get_tank_reaction_schema(network) -def get_tank_reaction_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_tank_reaction_schema(name) +@app.get('/gettankreaction/') +async def fastapi_get_tank_reaction(network: str, tank: str) -> dict[str, Any]: + return get_tank_reaction(network, tank) -def get_tank_reaction(name: str, tank: str) -> dict[str, Any]: - return api.get_tank_reaction(name, tank) - -def set_tank_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_tank_reaction(name, cs) +@app.post('/settankreaction/') +async def fastapi_set_tank_reaction(network: str, req: Request) -> ChangeSet: + props = await req.json() + return set_tank_reaction(network, ChangeSet(props)) ############################################################ # mixing 20.[MIXING] ############################################################ +@app.get('/getmixingschema/') +async def get_mixing_schema(network: str) -> dict[str, dict[str, Any]]: + return get_mixing_schema(network) -def get_mixing_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_mixing_schema(name) +@app.get('/getmixing/') +async def get_mixing(network: str, tank: str) -> dict[str, Any]: + return get_mixing(network, tank) -def get_mixing(name: str, tank: str) -> dict[str, Any]: - return api.get_mixing(name, tank) - -def set_mixing(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_mixing(name, cs) +@app.post('/setmixing/') +async def set_mixing(network: str, req: Request) -> ChangeSet: + props = await req.json() + return api.set_mixing(network, ChangeSet(props)) # example: add_mixing(p, ChangeSet({'tank': 't0', 'model': MIXING_MODEL_MIXED, 'value': 10.0})) -def add_mixing(name: str, cs: ChangeSet) -> ChangeSet: - return api.add_mixing(name, cs) +@app.post('/addmixing/') +async def add_mixing(network: str, req: Request) -> ChangeSet: + props = await req.json() + return add_mixing(network, ChangeSet(props)) -def delete_mixing(name: str, cs: ChangeSet) -> ChangeSet: - return api.delete_mixing(name, cs) +@app.post('/deletemixing/') +async def delete_mixing(network: str, req: Request) -> ChangeSet: + props = await req.json() + return delete_mixing(network, ChangeSet(props)) ############################################################