OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #77: (api -> master)

Browse Source 
Merge Request: Support to list project

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/77
This commit is contained in:
王琼钰
2022-10-30 23:06:27 +08:00
parent a9704fe4b1 e8abbef5a6
commit c697fb158b
6 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/__init__.py
View File

@@ -1,4 +1,4 @@
from .project import have_project, create_project, delete_project
from .project import list_project, have_project, create_project, delete_project
from .project import is_project_open, get_project_open_count, open_project, close_project
from .project import copy_project

7
api/operation.py
View File

@@ -49,6 +49,13 @@ class SqlChangeSet:
self.redo_cs = redo_cs
self.undo_cs = undo_cs
class BatchSqlChangeSet:
def __init__(self, redo_sql: str, undo_sql: str, redo_cs: list[dict[str, str]], undo_cs: list[dict[str, str]]) -> None:
self.redo_sql = redo_sql
self.undo_sql = undo_sql
self.redo_cs = redo_cs
self.undo_cs = undo_cs
def read(name: str, sql: str) -> Row:
with conn[name].cursor(row_factory=dict_row) as cur:

9
api/project.py
View File

@@ -1,10 +1,19 @@
import psycopg as pg
from psycopg.rows import dict_row
from .connection import g_conn_dict as conn
# no undo/redo
_project_open_count: dict[str, int] = {}
def list_project() -> list[str]:
ps = []
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
with conn.cursor(row_factory=dict_row) as cur:
for p in cur.execute(f"select datname from pg_database where datname <> 'postgres' and datname <> 'template0' and datname <> 'template1' and datname <> 'project'"):
ps.append(p['datname'])
return ps
def have_project(name: str) -> bool:
with pg.connect(conninfo="dbname=postgres host=127.0.0.1", autocommit=True) as conn:
with conn.cursor() as cur:

44
api/s9_demands.py
View File

@@ -1,5 +1,5 @@
from .operation import *
from .s2_junctions import *
def get_demand_schema(name: str) -> dict[str, dict[str, Any]]:
return { 'junction' : {'type': 'str' , 'optional': False , 'readonly': True },
@@ -21,7 +21,7 @@ def get_demand(name: str, junction: str) -> dict[str, Any]:
return { 'junction': junction, 'demands': ds }
def set_demand_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
def set_demand_cache(name: str, cs: ChangeSet) -> BatchSqlChangeSet:
junction = cs.operations[0]['junction']
old = get_demand(name, junction)
new = { 'junction': junction, 'demands': [] }
@@ -40,7 +40,8 @@ def set_demand_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
redo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});"
new['demands'].append({ 'demand': demand, 'pattern': pattern, 'category': category })
undo_sql = f"delete from demands where junction = {f_junction};"
undo_sql = ''
_undo_sql = f"delete from demands where junction = {f_junction};"
for r in old['demands']:
demand = float(r['demand'])
pattern = str(r['pattern'])
@@ -48,13 +49,38 @@ def set_demand_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
f_demand = demand
f_pattern = f"'{pattern}'" if pattern != None else 'null'
f_category = f"'{category}'" if category != None else 'null'
undo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});"
redo_cs = g_update_prefix | { 'type': 'demand' } | new
undo_cs = g_update_prefix | { 'type': 'demand' } | old
_undo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});"
return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
redo_cs = []
redo_cs.append(g_update_prefix | { 'type': 'demand' } | new)
undo_cs = []
undo_cs.append(g_update_prefix | { 'type': 'demand' } | old)
cache = None | SqlChangeSet
if len(cs.operations[0]['demands']) > 0:
r = cs.operations[0]['demands'][0]
demand = float(r['demand'])
pattern = str(r['pattern']) if 'pattern' in r and r['pattern'] != None else None
cache = set_junction_cache(name, ChangeSet({'id': junction, 'demand': demand, 'pattern': pattern}))
else:
cache = set_junction_cache(name, ChangeSet({'id': junction, 'demand': None, 'pattern': None}))
if cache != None:
redo_sql += '\n'
redo_sql += cache.redo_sql
undo_sql += cache.undo_sql
undo_sql += '\n'
undo_sql += _undo_sql
redo_cs.append(cache.redo_cs)
undo_cs.append(cache.undo_cs)
undo_cs.reverse()
return BatchSqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
def set_demand(name: str, cs: ChangeSet) -> ChangeSet:
return execute_command(name, set_demand_cache(name, cs))
css = set_demand_cache(name, cs)
return execute_batch(name, css.redo_sql, css.undo_sql, css.redo_cs, css.undo_cs)

30
test_tjnetwork.py
View File

@@ -1323,8 +1323,12 @@ class TestApi:
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
assert get_junction(p, 'j1')['demand'] == 10.0
set_demand(p, ChangeSet({'junction': 'j1', 'demands': []}))
assert get_junction(p, 'j1')['demand'] == None
d = get_demand(p, 'j1')
assert d['junction'] == 'j1'
assert d['demands'] == []
@@ -1339,8 +1343,9 @@ class TestApi:
add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
assert is_junction(p, 'j1')
cs = set_demand(p, ChangeSet({'junction': 'j1', 'demands': [{'demand': 10.0, 'pattern': None, 'category': 'x'},
{'demand': 20.0, 'pattern': None, 'category': None}]})).operations[0]
result = set_demand(p, ChangeSet({'junction': 'j1', 'demands': [{'demand': 10.0, 'pattern': None, 'category': 'x'},
{'demand': 20.0, 'pattern': None, 'category': None}]}))
cs = result.operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'demand'
assert cs['junction'] == 'j1'
@@ -1352,14 +1357,26 @@ class TestApi:
assert ds[1]['demand'] == 20.0
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == 10.0
cs = execute_undo(p).operations[0]
result = execute_undo(p)
cs = result.operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'demand'
assert cs['junction'] == 'j1'
assert len(cs['demands']) == 0
cs = execute_redo(p).operations[0]
result = execute_redo(p)
cs = result.operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'demand'
assert cs['junction'] == 'j1'
@@ -1371,6 +1388,11 @@ class TestApi:
assert ds[1]['demand'] == 20.0
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == 10.0
self.leave(p)

7
tjnetwork.py
View File

@@ -116,6 +116,9 @@ def read_inp(name: str, inp: str) -> None:
# operation
############################################################
def list_project() -> list[str]:
return api.list_project()
def get_current_operation(name: str) -> int:
return api.get_current_operation(name)
@@ -427,7 +430,7 @@ def delete_curve(name: str, cs: ChangeSet) -> ChangeSet:
############################################################
# control 12.[CONTROLS]
# control 13.[CONTROLS]
############################################################
def get_control_schema(name: str) -> dict[str, dict[str, Any]]:
@@ -442,7 +445,7 @@ def set_control(name: str, cs: ChangeSet) -> ChangeSet:
############################################################
# rule 13.[RULES]
# rule 14.[RULES]
############################################################
def get_rule_schema(name: str) -> dict[str, dict[str, Any]]: