Skip to content

Commit ab04bf5

Browse files
dwolfsondwolfson
authored
Merge pull request #35 from dwolfson/v.5.0
Renamed many of the widgets to support the new naming convention with…
2 parents 17dd14b + 06e9c18 commit ab04bf5

23 files changed

+198
-258
lines changed

‎examples/widgets/catalog_user/view_asset_graph.py‎ renamed to ‎examples/widgets/catalog_user/get_asset_graph.py‎

File renamed without changes.

‎examples/widgets/catalog_user/view_collection.py‎ renamed to ‎examples/widgets/catalog_user/get_collection.py‎

File renamed without changes.

‎examples/widgets/catalog_user/view_glossary.py‎ renamed to ‎examples/widgets/catalog_user/list_glossary.py‎

File renamed without changes.

‎examples/widgets/operational/view_asset_events.py‎ renamed to ‎examples/widgets/operational/monitor_asset_events.py‎

File renamed without changes.

‎examples/widgets/operational/view_coco_status.py‎ renamed to ‎examples/widgets/operational/monitor_coco_status.py‎

File renamed without changes.

‎examples/widgets/operational/view_eng_action_status.py‎ renamed to ‎examples/widgets/operational/monitor_eng_action_status.py‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
import os
1515
import sys
1616
import time
17-
1817
from rich import box
18+
1919
from rich.live import Live
2020
from rich.table import Table
21+
from rich.console import Console
2122

2223
from pyegeria import AutomatedCuration
2324
from pyegeria import (
@@ -42,7 +43,7 @@
4243
disable_ssl_warnings = True
4344

4445

45-
def display_status_engine_actions(server: str, url: str, user: str, user_pass:str):
46+
def display_status_engine_actions(server: str, url: str, user: str, user_pass:str, paging: bool):
4647
g_client = AutomatedCuration(server, url, user, user_pwd=user_pass)
4748

4849
def generate_table() -> Table:
@@ -118,13 +119,15 @@ def generate_table() -> Table:
118119
return table
119120

120121
try:
121-
# console = Console()
122-
# with console.pager():
123-
# console.print(generate_table())
124-
with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
125-
while True:
126-
time.sleep(2)
127-
live.update(generate_table())
122+
if paging is True:
123+
console = Console()
124+
with console.pager():
125+
console.print(generate_table())
126+
else:
127+
with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
128+
while True:
129+
time.sleep(2)
130+
live.update(generate_table())
128131

129132
except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
130133
print_exception_response(e)
@@ -133,20 +136,40 @@ def generate_table() -> Table:
133136
g_client.close_session()
134137

135138

136-
def main():
139+
def main_live():
140+
parser = argparse.ArgumentParser()
141+
parser.add_argument("--server", help="Name of the server to display status for")
142+
parser.add_argument("--url", help="URL Platform to connect to")
143+
parser.add_argument("--userid", help="User Id")
144+
parser.add_argument("--password", help="User Password")
145+
146+
args = parser.parse_args()
147+
148+
server = args.server if args.server is not None else EGERIA_VIEW_SERVER
149+
url = args.url if args.url is not None else EGERIA_PLATFORM_URL
150+
userid = args.userid if args.userid is not None else EGERIA_USER
151+
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
152+
153+
display_status_engine_actions(server=server, url=url, user=userid, user_pass=user_pass, paging=False)
154+
155+
def main_paging():
137156
parser = argparse.ArgumentParser()
138157
parser.add_argument("--server", help="Name of the server to display status for")
139158
parser.add_argument("--url", help="URL Platform to connect to")
140159
parser.add_argument("--userid", help="User Id")
141160
parser.add_argument("--password", help="User Password")
161+
142162
args = parser.parse_args()
143163

144164
server = args.server if args.server is not None else EGERIA_VIEW_SERVER
145165
url = args.url if args.url is not None else EGERIA_PLATFORM_URL
146166
userid = args.userid if args.userid is not None else EGERIA_USER
147167
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
148-
# print(f"Starting display_status_engine_actions with {server}, {url}, {userid}")
149-
display_status_engine_actions(server=server, url=url, user=userid, user_pass=user_pass)
150168

151-
if __name__ == "__main__":
152-
main()
169+
display_status_engine_actions(server=server, url=url, user=userid, user_pass=user_pass, paging=True)
170+
171+
if __name__ == "__main_live__":
172+
main_live()
173+
174+
if __name__ == "__main_paging__":
175+
main_paging()

‎examples/widgets/operational/view_gov_eng_status.py‎ renamed to ‎examples/widgets/operational/monitor_gov_eng_status.py‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
from rich.table import Table
2323
from rich.live import Live
2424
from rich import box
25-
from rich import console
25+
from rich.console import Console
26+
2627

2728
from pyegeria.server_operations import ServerOps
2829
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -39,7 +40,7 @@
3940

4041
disable_ssl_warnings = True
4142

42-
def display_gov_actions_status(server: str, url: str, username: str, user_pass:str):
43+
def display_gov_actions_status(server: str, url: str, username: str, user_pass:str, paging:bool):
4344
server_name = server
4445
s_client = ServerOps(server_name, url, username, user_pass)
4546

@@ -86,10 +87,15 @@ def generate_table() -> Table:
8687
return table
8788

8889
try:
89-
with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
90-
while True:
91-
time.sleep(2)
92-
live.update(generate_table())
90+
if paging is True:
91+
console = Console()
92+
with console.pager():
93+
console.print(generate_table())
94+
else:
95+
with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
96+
while True:
97+
time.sleep(2)
98+
live.update(generate_table())
9399

94100
except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
95101
print_exception_response(e)
@@ -99,7 +105,7 @@ def generate_table() -> Table:
99105
s_client.close_session()
100106

101107

102-
def main():
108+
def main_live():
103109
parser = argparse.ArgumentParser()
104110
parser.add_argument("--server", help="Name of the server to display status for")
105111
parser.add_argument("--url", help="URL Platform to connect to")
@@ -111,7 +117,25 @@ def main():
111117
url = args.url if args.url is not None else EGERIA_PLATFORM_URL
112118
userid = args.userid if args.userid is not None else EGERIA_USER
113119
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
114-
display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass)
120+
display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass, paging=False)
121+
122+
def main_paging():
123+
parser = argparse.ArgumentParser()
124+
parser.add_argument("--server", help="Name of the server to display status for")
125+
parser.add_argument("--url", help="URL Platform to connect to")
126+
parser.add_argument("--userid", help="User Id")
127+
parser.add_argument("--password", help="User Password")
128+
args = parser.parse_args()
129+
130+
server = args.server if args.server is not None else EGERIA_ENGINE_HOST
131+
url = args.url if args.url is not None else EGERIA_PLATFORM_URL
132+
userid = args.userid if args.userid is not None else EGERIA_USER
133+
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
134+
display_gov_actions_status(server=server, url=url, username=userid, user_pass=user_pass, paging=True)
135+
136+
if __name__ == "__main_live__":
137+
main_live()
138+
115139

116-
if __name__ == "__main__":
117-
main()
140+
if __name__ == "__main_paging__":
141+
main_paging()

‎examples/widgets/operational/view_integ_daemon_status.py‎ renamed to ‎examples/widgets/operational/monitor_integ_daemon_status.py‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from datetime import datetime
1818

1919
from rich import box
20+
from rich.console import Console
2021
from rich.live import Live
2122
from rich.table import Table
2223

@@ -43,7 +44,7 @@
4344

4445

4546
def display_integration_daemon_status(integ_server: str, integ_url: str,
46-
view_server:str, view_url: str, user: str, user_pass:str):
47+
view_server:str, view_url: str, user: str, user_pass:str, paging: bool):
4748
s_client = ServerOps(integ_server, integ_url, user)
4849
a_client = AutomatedCuration(view_server, view_url, user, user_pass)
4950
token = a_client.create_egeria_bearer_token()
@@ -119,11 +120,16 @@ def generate_table() -> Table:
119120
return table
120121

121122
try:
122-
with Live(generate_table(), refresh_per_second=4, screen=True) as live:
123-
while True:
124-
time.sleep(2)
125-
live.update(generate_table())
126-
live.console.pager()
123+
if paging is True:
124+
console = Console()
125+
with console.pager():
126+
console.print(generate_table())
127+
else:
128+
with Live(generate_table(), refresh_per_second=1, screen=True, vertical_overflow="visible") as live:
129+
while True:
130+
time.sleep(2)
131+
live.update(generate_table())
132+
127133

128134
except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
129135
print_exception_response(e)
@@ -134,7 +140,27 @@ def generate_table() -> Table:
134140
a_client.close_session()
135141

136142

137-
def main():
143+
def main_live():
144+
parser = argparse.ArgumentParser()
145+
parser.add_argument("--integ_server", help="Name of the integration server to display status for")
146+
parser.add_argument("--integ_url", help="URL Platform to connect to")
147+
parser.add_argument("--view_server", help="Name of the view server to use")
148+
parser.add_argument("--view_url", help="view server URL Platform to connect to")
149+
parser.add_argument("--userid", help="User Id")
150+
parser.add_argument("--password", help="User Password")
151+
args = parser.parse_args()
152+
153+
integ_server = args.integ_server if args.integ_server is not None else EGERIA_INTEGRATION_DAEMON
154+
integ_url = args.integ_url if args.integ_url is not None else EGERIA_INTEGRATION_DAEMON_URL
155+
view_server = args.view_server if args.view_server is not None else EGERIA_VIEW_SERVER
156+
view_url = args.view_url if args.view_url is not None else EGERIA_VIEW_SERVER_URL
157+
userid = args.userid if args.userid is not None else EGERIA_USER
158+
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
159+
display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
160+
view_server = view_server, view_url = view_url,
161+
user=userid, user_pass = user_pass, paging = False)
162+
163+
def main_paging():
138164
parser = argparse.ArgumentParser()
139165
parser.add_argument("--integ_server", help="Name of the integration server to display status for")
140166
parser.add_argument("--integ_url", help="URL Platform to connect to")
@@ -152,7 +178,9 @@ def main():
152178
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
153179
display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
154180
view_server = view_server, view_url = view_url,
155-
user=userid, user_pass = user_pass)
181+
user=userid, user_pass = user_pass, paging = True)
182+
if __name__ == "__main_live__":
183+
main_live()
156184

157-
if __name__ == "__main__":
158-
main()
185+
if __name__ == "__main_paging__":
186+
main_paging()

‎examples/widgets/operational/view_platform_status.py‎ renamed to ‎examples/widgets/operational/monitor_platform_status.py‎

File renamed without changes.

‎examples/widgets/operational/view_server_list.py‎ renamed to ‎examples/widgets/operational/monitor_server_list.py‎

File renamed without changes.

0 commit comments

Comments
 (0)