Skip to content

Commit a763beb

Browse files
authored
Merge pull request #25 from dwolfson/v.5.0
V.5.0 - moved dependency manager to poetry and made widgets commands.
2 parents 5714a5f + f5a8efb commit a763beb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1038
-481
lines changed

examples/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
"""
2+
SPDX-License-Identifier: Apache-2.0
3+
Copyright Contributors to the ODPi Egeria project.
4+
5+
Pyegeria examples package
26
3-
examples
47
"""
8+
9+

examples/Doc_Samples/Create_Collection_Sample.py renamed to examples/doc_samples/Create_Collection_Sample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
view_server = 'view-server'
1717
platform_url = 'https://localhost:9443'
1818
user = 'erinoverview'
19-
console = Console()
19+
console = Console(width=200)
2020

2121
try:
2222
c_client = CollectionManager(view_server, platform_url,
@@ -40,7 +40,7 @@
4040
display_name, description, collection_type,
4141
is_own_anchor)
4242
# Create first folder for Agriculture Insights
43-
parent_guid = "97bbfe07-6696-4550-bf8b-6b577d25bef0"
43+
parent_guid = "f53ea7c8-3107-4477-8459-9bc63f9e69af"
4444
parent_relationship_type_name = "CollectionMembership"
4545
display_name = "Agriculture Insights Collection"
4646
description = "A folder for agricultural insights data product collections"

examples/widgets/catalog_user/list_assets.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def generate_table(search_string:str = '*') -> Table:
118118
print_exception_response(e)
119119
assert e.related_http_code != "200", "Invalid parameters"
120120

121-
if __name__ == "__main__":
121+
def main():
122122
sus_guid = "f9b78b26-6025-43fa-9299-a905cc6d1575"
123123
parser = argparse.ArgumentParser()
124124
parser.add_argument("--server", help="Name of the server to display status for")
@@ -135,4 +135,7 @@ def generate_table(search_string:str = '*') -> Table:
135135
guid = sus_guid if args.sustainability else None
136136

137137
search_string = Prompt.ask("Enter the asset you are searching for:", default="*")
138-
display_assets(search_string, guid,server, url, userid)
138+
display_assets(search_string, guid,server, url, userid)
139+
140+
if __name__ == "__main__":
141+
main()

examples/widgets/catalog_user/view_asset_graph.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def build_nested_elements(nested_element: dict) -> Markdown:
229229
print_exception_response(e)
230230

231231

232-
if __name__ == "__main__":
232+
def main():
233233
parser = argparse.ArgumentParser()
234234

235235
parser.add_argument("--server", help="Name of the server to display status for")
@@ -243,3 +243,6 @@ def build_nested_elements(nested_element: dict) -> Markdown:
243243

244244
asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="8e35b39e-6ee7-4d60-aff5-4b09406c5e79")
245245
asset_viewer(asset_guid,server, url, userid)
246+
247+
if __name__ == "__main__":
248+
main()

examples/widgets/catalog_user/view_collection.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def walk_collection_hierarchy(collection_client: CollectionManager, root_collect
6363
print_exception_response(e)
6464

6565

66-
if __name__ == "__main__":
66+
def main():
6767
parser = argparse.ArgumentParser()
6868

6969
parser.add_argument("--server", help="Name of the server to display status for")
@@ -77,3 +77,6 @@ def walk_collection_hierarchy(collection_client: CollectionManager, root_collect
7777

7878
root_collection = Prompt.ask("Enter the Root Collection to start from:", default="Digital Products Root")
7979
collection_viewer(root_collection, server, url, userid)
80+
81+
if __name__ == "__main__":
82+
main()

examples/widgets/catalog_user/view_glossary.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def generate_table(search_string:str = '*') -> Table:
115115
print_exception_response(e)
116116
assert e.related_http_code != "200", "Invalid parameters"
117117

118-
if __name__ == "__main__":
118+
def main():
119119
sus_guid = "f9b78b26-6025-43fa-9299-a905cc6d1575"
120120
parser = argparse.ArgumentParser()
121121
parser.add_argument("--server", help="Name of the server to display status for")
@@ -132,4 +132,7 @@ def generate_table(search_string:str = '*') -> Table:
132132
guid = sus_guid if args.sustainability else None
133133

134134
search_string = Prompt.ask("Enter the term you are searching for:", default="*")
135-
display_glossary_terms(search_string, guid,server, url, userid)
135+
display_glossary_terms(search_string, guid,server, url, userid)
136+
137+
if __name__ == "__main__":
138+
main()

examples/widgets/developer/get_guid_info.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
"""
1212

1313
import argparse
14-
import httpx
1514
import json
16-
import time
1715

18-
from rich import box
1916
from rich import print
2017
from rich.console import Console
2118
from rich.prompt import Prompt
2219
from rich.text import Text
2320
from rich.tree import Tree
24-
from rich.json import JSON
2521

2622
from pyegeria import (
2723
InvalidParameterException,
@@ -30,7 +26,6 @@
3026
print_exception_response,
3127
Client
3228
)
33-
from pyegeria import ProjectManager
3429

3530

3631
def display_guid(guid: str, server: str, url: str, username: str):
@@ -63,11 +58,12 @@ def display_guid(guid: str, server: str, url: str, username: str):
6358

6459
except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException, ValueError) as e:
6560
if type(e) is str:
66-
print(e)
61+
print(e)
6762
else:
63+
console.print(f"\n Looks like the GUID isn't know...detailed message follows\n")
6864
print_exception_response(e)
6965

70-
if __name__ == "__main__":
66+
def main():
7167

7268
parser = argparse.ArgumentParser()
7369
parser.add_argument("--server", help="Name of the server to display status for")
@@ -83,4 +79,7 @@ def display_guid(guid: str, server: str, url: str, username: str):
8379

8480
guid = Prompt.ask("Enter the GUID to retrieve:", default=None)
8581

86-
display_guid(guid, server, url, userid)
82+
display_guid(guid, server, url, userid)
83+
84+
if __name__ == "__main__":
85+
main()

examples/widgets/developer/get_tech_details.py

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,19 @@
77
88
"""
99

10-
import time
1110
import argparse
1211

13-
from rich.box import Box
14-
from rich.markdown import Markdown
12+
from rich import print
13+
from rich.panel import Panel
1514
from rich.prompt import Prompt
16-
17-
from pyegeria._exceptions import (
18-
InvalidParameterException,
19-
PropertyServerException,
20-
UserNotAuthorizedException,
21-
print_exception_response,
22-
)
23-
from rich.table import Table
24-
from rich.live import Live
2515
from rich.text import Text
2616
from rich.tree import Tree
27-
from rich.markdown import Markdown
2817

29-
from rich import print
30-
from rich.console import Group
31-
from rich.panel import Panel
32-
from rich import box, align
33-
from rich.layout import Layout
34-
import rich
35-
from pyegeria import (CollectionManager, UserNotAuthorizedException, PropertyServerException,
18+
from pyegeria import (UserNotAuthorizedException, PropertyServerException,
3619
InvalidParameterException, AutomatedCuration)
20+
from pyegeria._exceptions import (
21+
print_exception_response,
22+
)
3723

3824
disable_ssl_warnings = True
3925

@@ -95,7 +81,7 @@ def view_tech_details(a_client: AutomatedCuration, root_collection_name: str, tr
9581
print_exception_response(e)
9682

9783

98-
if __name__ == "__main__":
84+
def main():
9985
parser = argparse.ArgumentParser()
10086

10187
parser.add_argument("--server", help="Name of the server to display status for")
@@ -109,3 +95,6 @@ def view_tech_details(a_client: AutomatedCuration, root_collection_name: str, tr
10995

11096
tech = Prompt.ask("Enter the Technology to start from:", default="PostgreSQL Server")
11197
tech_viewer(tech,server, url, userid)
98+
99+
if __name__ == "__main__":
100+
main()

examples/widgets/developer/list_asset_types.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def generate_table() -> Table:
7474
r_client.close_session()
7575

7676

77-
if __name__ == "__main__":
77+
def main():
7878
parser = argparse.ArgumentParser()
7979
parser.add_argument("--server", help="Name of the server to display status for")
8080
parser.add_argument("--url", help="URL Platform to connect to")
@@ -89,3 +89,6 @@ def generate_table() -> Table:
8989
guid = None
9090

9191
display_asset_types(server, url, userid)
92+
93+
if __name__ == "__main__":
94+
main()

0 commit comments

Comments
 (0)