pyegeria 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- examples/widgets/cat/list_todos.py +59 -33
- examples/widgets/my/list_my_profile.py +61 -36
- examples/widgets/my/list_my_roles.py +40 -23
- examples/widgets/my/monitor_my_todos.py +45 -23
- examples/widgets/my/monitor_open_todos.py +36 -22
- examples/widgets/my/todo_actions.py +132 -71
- pyegeria/_client.py +1 -9
- pyegeria/egeria_my_client.py +1 -1
- pyegeria/egeria_ops_client.py +6 -2
- pyegeria/my_profile_omvs.py +1 -1
- {pyegeria-0.8.2.dist-info → pyegeria-0.8.3.dist-info}/METADATA +1 -1
- {pyegeria-0.8.2.dist-info → pyegeria-0.8.3.dist-info}/RECORD +15 -15
- {pyegeria-0.8.2.dist-info → pyegeria-0.8.3.dist-info}/LICENSE +0 -0
- {pyegeria-0.8.2.dist-info → pyegeria-0.8.3.dist-info}/WHEEL +0 -0
- {pyegeria-0.8.2.dist-info → pyegeria-0.8.3.dist-info}/entry_points.txt +0 -0
@@ -28,26 +28,38 @@ from pyegeria import (
|
|
28
28
|
from pyegeria.my_profile_omvs import MyProfile
|
29
29
|
|
30
30
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
31
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
32
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
33
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
34
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
31
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
32
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
33
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
34
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
35
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
36
|
+
)
|
37
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
38
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
39
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
40
|
+
)
|
41
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
42
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
43
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
44
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
45
|
+
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
46
|
+
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
|
47
|
+
|
48
|
+
|
49
|
+
def display_to_dos(
|
50
|
+
search_string: str,
|
51
|
+
status_filter: str,
|
52
|
+
server: str,
|
53
|
+
url: str,
|
54
|
+
username: str,
|
55
|
+
user_pass: str,
|
56
|
+
jupyter: bool = EGERIA_JUPYTER,
|
57
|
+
width: int = EGERIA_WIDTH,
|
58
|
+
):
|
47
59
|
m_client = MyProfile(server, url, user_id=username)
|
48
60
|
token = m_client.create_egeria_bearer_token(username, user_pass)
|
49
61
|
|
50
|
-
def generate_table(search_string:str =
|
62
|
+
def generate_table(search_string: str = "*") -> Table:
|
51
63
|
"""Make a new table."""
|
52
64
|
table = Table(
|
53
65
|
title=f"Open ToDos for Platform {url} @ {time.asctime()}",
|
@@ -56,7 +68,7 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
56
68
|
show_lines=True,
|
57
69
|
box=box.ROUNDED,
|
58
70
|
caption=f"ToDos for Server '{server}' @ Platform - {url}",
|
59
|
-
expand=True
|
71
|
+
expand=True,
|
60
72
|
)
|
61
73
|
|
62
74
|
table.add_column("Name")
|
@@ -70,7 +82,7 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
70
82
|
table.add_column("Sponsor")
|
71
83
|
table.add_column("Assigned")
|
72
84
|
|
73
|
-
todo_items = m_client.find_to_do(search_string,status
|
85
|
+
todo_items = m_client.find_to_do(search_string, status=status_filter)
|
74
86
|
|
75
87
|
if type(todo_items) is str:
|
76
88
|
name = " "
|
@@ -82,10 +94,10 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
82
94
|
|
83
95
|
status = " "
|
84
96
|
sponsor = " "
|
85
|
-
assigned_out =
|
97
|
+
assigned_out = ""
|
86
98
|
else:
|
87
99
|
for item in todo_items:
|
88
|
-
guid = item[
|
100
|
+
guid = item["elementHeader"]["guid"]
|
89
101
|
props = item["properties"]
|
90
102
|
name = props["name"]
|
91
103
|
type_name = props.get("toDoType", " ")
|
@@ -93,12 +105,12 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
93
105
|
priority = str(props.get("priority", " "))
|
94
106
|
due = props.get("dueTime", " ")[:-19]
|
95
107
|
completed = props.get("completionTime", " ")[:-10]
|
96
|
-
status = props.get("toDoStatus",
|
108
|
+
status = props.get("toDoStatus", "---")
|
97
109
|
|
98
|
-
assigned_out =
|
99
|
-
assigned_actors = item.get("assignedActors",
|
110
|
+
assigned_out = ""
|
111
|
+
assigned_actors = item.get("assignedActors", "---")
|
100
112
|
if type(assigned_actors) is list:
|
101
|
-
assigned_md =
|
113
|
+
assigned_md = ""
|
102
114
|
for actor in assigned_actors:
|
103
115
|
assigned_md += f"* {actor['uniqueName'].split(',')[0]}\n"
|
104
116
|
assigned_out = Markdown(assigned_md)
|
@@ -112,7 +124,16 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
112
124
|
status = f"[red]{status}"
|
113
125
|
|
114
126
|
table.add_row(
|
115
|
-
name,
|
127
|
+
name,
|
128
|
+
type_name,
|
129
|
+
guid,
|
130
|
+
created,
|
131
|
+
priority,
|
132
|
+
due,
|
133
|
+
completed,
|
134
|
+
status,
|
135
|
+
sponsor,
|
136
|
+
assigned_out,
|
116
137
|
)
|
117
138
|
|
118
139
|
m_client.close_session()
|
@@ -125,11 +146,13 @@ def display_to_dos(search_string: str, status_filter: str, server: str, url: str
|
|
125
146
|
# live.update(generate_table())
|
126
147
|
console = Console(width=width, force_terminal=not jupyter)
|
127
148
|
with console.pager():
|
128
|
-
|
129
149
|
console.print(generate_table(search_string))
|
130
150
|
|
131
|
-
|
132
|
-
|
151
|
+
except (
|
152
|
+
InvalidParameterException,
|
153
|
+
PropertyServerException,
|
154
|
+
UserNotAuthorizedException,
|
155
|
+
) as e:
|
133
156
|
print_exception_response(e)
|
134
157
|
except KeyboardInterrupt:
|
135
158
|
pass
|
@@ -152,12 +175,15 @@ def main():
|
|
152
175
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
153
176
|
try:
|
154
177
|
search_string = Prompt.ask("Enter the ToDo you are searching for", default="*")
|
155
|
-
status_filter = Prompt.ask(
|
156
|
-
|
157
|
-
|
178
|
+
status_filter = Prompt.ask(
|
179
|
+
"Enter an optional status filter ['OPEN','IN_PROGRESS','WAITING','COMPLETE',"
|
180
|
+
"'ABANDONED', 'None']",
|
181
|
+
default=None,
|
182
|
+
)
|
183
|
+
display_to_dos(search_string, status_filter, server, url, userid, user_pass)
|
158
184
|
except KeyboardInterrupt:
|
159
185
|
pass
|
160
186
|
|
161
187
|
|
162
188
|
if __name__ == "__main__":
|
163
|
-
main()
|
189
|
+
main()
|
@@ -30,22 +30,32 @@ from pyegeria.my_profile_omvs import MyProfile
|
|
30
30
|
|
31
31
|
disable_ssl_warnings = True
|
32
32
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
33
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
34
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
35
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
36
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
33
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
34
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
35
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
36
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
37
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
38
|
+
)
|
39
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
40
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
41
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
42
|
+
)
|
43
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
44
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
45
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
46
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
47
|
+
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
48
|
+
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "150"))
|
49
|
+
|
50
|
+
|
51
|
+
def display_my_profile(
|
52
|
+
server: str,
|
53
|
+
url: str,
|
54
|
+
username: str,
|
55
|
+
user_pass: str,
|
56
|
+
jupyter: bool = EGERIA_JUPYTER,
|
57
|
+
width: int = EGERIA_WIDTH,
|
58
|
+
):
|
49
59
|
try:
|
50
60
|
m_client = MyProfile(server, url, user_id=username, user_pwd=user_pass)
|
51
61
|
token = m_client.create_egeria_bearer_token(username, user_pass)
|
@@ -56,10 +66,14 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
|
|
56
66
|
|
57
67
|
console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
|
58
68
|
|
59
|
-
profile_props = my_profiles.get(
|
69
|
+
profile_props = my_profiles.get("profileProperties", "---")
|
60
70
|
name = profile_props["fullName"]
|
61
|
-
tree = Tree(
|
62
|
-
|
71
|
+
tree = Tree(
|
72
|
+
Panel(f"Profile of {name}", title="Personal Profile"),
|
73
|
+
expanded=True,
|
74
|
+
style="bright_white on black",
|
75
|
+
guide_style="bold bright_blue",
|
76
|
+
)
|
63
77
|
|
64
78
|
profile_props_md = f"\n* GUID: {my_profiles['elementHeader']['guid']}\n"
|
65
79
|
if type(profile_props) is dict:
|
@@ -67,32 +81,39 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
|
|
67
81
|
if type(profile_props[key]) is str:
|
68
82
|
profile_props_md += f"* {key}: {profile_props[key]}\n"
|
69
83
|
elif type(profile_props[key]) is dict:
|
70
|
-
p_md =
|
84
|
+
p_md = "\n* Additional Details:\n"
|
71
85
|
for k in profile_props[key].keys():
|
72
86
|
p_md += f"\t* {k}: {profile_props[key][k]}\n"
|
73
87
|
profile_props_md += p_md
|
74
|
-
t1 = tree.add(
|
75
|
-
|
88
|
+
t1 = tree.add(
|
89
|
+
Panel(
|
90
|
+
Markdown(profile_props_md), title="Profile Properties", expand=False
|
91
|
+
)
|
92
|
+
)
|
76
93
|
|
77
|
-
id_list_md=""
|
94
|
+
id_list_md = ""
|
78
95
|
for identities in my_profiles["userIdentities"]:
|
79
96
|
id_list_md += f"* {identities['userIdentity']['properties']['userId']}\n"
|
80
97
|
t2 = tree.add(Panel(Markdown(id_list_md), title="Identities", expand=False))
|
81
98
|
|
82
|
-
contact_methods = my_profiles[
|
99
|
+
contact_methods = my_profiles["contactMethods"]
|
83
100
|
for method in contact_methods:
|
84
|
-
contact = method[
|
101
|
+
contact = method["properties"]
|
85
102
|
contact_methods_md = ""
|
86
103
|
for key in contact.keys():
|
87
104
|
contact_methods_md += f"* {key}: {contact[key]}\n"
|
88
|
-
t3 = tree.add(
|
105
|
+
t3 = tree.add(
|
106
|
+
Panel(
|
107
|
+
Markdown(contact_methods_md), title="Contact Methods", expand=False
|
108
|
+
)
|
109
|
+
)
|
89
110
|
|
90
111
|
my_roles = my_profiles["roles"]
|
91
112
|
table = Table(
|
92
|
-
title
|
93
|
-
show_lines=
|
113
|
+
title=f" Roles of {name}",
|
114
|
+
show_lines=True,
|
94
115
|
box=box.ROUNDED,
|
95
|
-
expand=
|
116
|
+
expand=True,
|
96
117
|
)
|
97
118
|
table.add_column("Role Type")
|
98
119
|
table.add_column("Role")
|
@@ -100,20 +121,23 @@ def display_my_profile(server: str, url: str, username: str, user_pass:str,
|
|
100
121
|
for a_role in my_roles:
|
101
122
|
my_role_props = a_role["properties"]
|
102
123
|
role_type = my_role_props["typeName"]
|
103
|
-
role = my_role_props.get("title"," ")
|
124
|
+
role = my_role_props.get("title", " ")
|
104
125
|
role_guid = a_role["elementHeader"]["guid"]
|
105
|
-
table.add_row(
|
106
|
-
|
107
|
-
)
|
108
|
-
t4 = tree.add(Panel(table, title="Roles", expand=False ),expanded=True)
|
126
|
+
table.add_row(role_type, role, role_guid)
|
127
|
+
t4 = tree.add(Panel(table, title="Roles", expand=False), expanded=True)
|
109
128
|
|
110
129
|
print(tree)
|
111
130
|
|
112
|
-
except (
|
131
|
+
except (
|
132
|
+
InvalidParameterException,
|
133
|
+
PropertyServerException,
|
134
|
+
UserNotAuthorizedException,
|
135
|
+
) as e:
|
113
136
|
print_exception_response(e)
|
114
137
|
finally:
|
115
138
|
m_client.close_session()
|
116
139
|
|
140
|
+
|
117
141
|
def main():
|
118
142
|
parser = argparse.ArgumentParser()
|
119
143
|
parser.add_argument("--server", help="Name of the server to display status for")
|
@@ -130,5 +154,6 @@ def main():
|
|
130
154
|
|
131
155
|
display_my_profile(server, url, userid, user_pass)
|
132
156
|
|
157
|
+
|
133
158
|
if __name__ == "__main__":
|
134
|
-
main()
|
159
|
+
main()
|
@@ -27,22 +27,32 @@ from pyegeria.my_profile_omvs import MyProfile
|
|
27
27
|
|
28
28
|
disable_ssl_warnings = True
|
29
29
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
30
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
31
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
32
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
33
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
30
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
31
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
32
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
33
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
34
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
35
|
+
)
|
36
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
37
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
38
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
39
|
+
)
|
40
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
41
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
42
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
43
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
44
|
+
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
45
|
+
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
|
46
|
+
|
47
|
+
|
48
|
+
def display_my_roles(
|
49
|
+
server: str,
|
50
|
+
url: str,
|
51
|
+
username: str,
|
52
|
+
user_pass: str,
|
53
|
+
jupyter: bool = EGERIA_JUPYTER,
|
54
|
+
width: int = EGERIA_WIDTH,
|
55
|
+
):
|
46
56
|
m_client = MyProfile(server, url, user_id=username, user_pwd=user_pass)
|
47
57
|
token = m_client.create_egeria_bearer_token(username, user_pass)
|
48
58
|
my_profiles = m_client.get_my_profile()
|
@@ -59,7 +69,7 @@ def display_my_roles(server: str, url: str, username: str, user_pass:str,
|
|
59
69
|
show_lines=True,
|
60
70
|
box=box.ROUNDED,
|
61
71
|
caption=f"My Profile from Server '{server}' @ Platform - {url}\n Press 'q' to Quit",
|
62
|
-
expand=True
|
72
|
+
expand=True,
|
63
73
|
)
|
64
74
|
|
65
75
|
table.add_column("Name")
|
@@ -81,9 +91,11 @@ def display_my_roles(server: str, url: str, username: str, user_pass:str,
|
|
81
91
|
else:
|
82
92
|
name = my_profiles["profileProperties"]["fullName"]
|
83
93
|
job_title = my_profiles["profileProperties"]["jobTitle"]
|
84
|
-
id_list=" "
|
94
|
+
id_list = " "
|
85
95
|
for identities in my_profiles["userIdentities"]:
|
86
|
-
id_list =
|
96
|
+
id_list = (
|
97
|
+
f"{identities['userIdentity']['properties']['userId']} {id_list}"
|
98
|
+
)
|
87
99
|
|
88
100
|
my_guid = my_profiles["elementHeader"]["guid"]
|
89
101
|
|
@@ -91,7 +103,7 @@ def display_my_roles(server: str, url: str, username: str, user_pass:str,
|
|
91
103
|
for a_role in my_roles:
|
92
104
|
my_role_props = a_role["properties"]
|
93
105
|
role_type = my_role_props["typeName"]
|
94
|
-
role = my_role_props.get("title"," ")
|
106
|
+
role = my_role_props.get("title", " ")
|
95
107
|
role_guid = a_role["elementHeader"]["guid"]
|
96
108
|
table.add_row(
|
97
109
|
name, job_title, str(id_list), my_guid, role_type, role, role_guid
|
@@ -109,11 +121,15 @@ def display_my_roles(server: str, url: str, username: str, user_pass:str,
|
|
109
121
|
with console.pager():
|
110
122
|
console.print(generate_table())
|
111
123
|
|
112
|
-
|
113
|
-
|
124
|
+
except (
|
125
|
+
InvalidParameterException,
|
126
|
+
PropertyServerException,
|
127
|
+
UserNotAuthorizedException,
|
128
|
+
) as e:
|
114
129
|
print_exception_response(e)
|
115
130
|
assert e.related_http_code != "200", "Invalid parameters"
|
116
131
|
|
132
|
+
|
117
133
|
def main():
|
118
134
|
parser = argparse.ArgumentParser()
|
119
135
|
parser.add_argument("--server", help="Name of the server to display status for")
|
@@ -130,5 +146,6 @@ def main():
|
|
130
146
|
|
131
147
|
display_my_roles(server, url, userid, user_pass)
|
132
148
|
|
149
|
+
|
133
150
|
if __name__ == "__main__":
|
134
|
-
main()
|
151
|
+
main()
|
@@ -26,25 +26,34 @@ from pyegeria import (
|
|
26
26
|
from pyegeria.my_profile_omvs import MyProfile
|
27
27
|
|
28
28
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
29
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
30
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
31
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
32
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
29
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
30
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
31
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
32
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
33
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
34
|
+
)
|
35
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
36
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
37
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
38
|
+
)
|
39
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
40
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
41
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
42
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
43
|
+
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
44
|
+
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
|
41
45
|
|
42
46
|
disable_ssl_warnings = True
|
43
47
|
|
44
48
|
|
45
|
-
def display_my_todos(
|
46
|
-
|
47
|
-
|
49
|
+
def display_my_todos(
|
50
|
+
server: str,
|
51
|
+
url: str,
|
52
|
+
user: str,
|
53
|
+
user_pass: str,
|
54
|
+
jupyter: bool = EGERIA_JUPYTER,
|
55
|
+
width: int = EGERIA_WIDTH,
|
56
|
+
):
|
48
57
|
console = Console(width=width, force_terminal=not jupyter)
|
49
58
|
|
50
59
|
m_client = MyProfile(server, url, user_id=user)
|
@@ -88,8 +97,16 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
88
97
|
status = f"[red]{status}"
|
89
98
|
|
90
99
|
table.add_row(
|
91
|
-
str(identity),
|
92
|
-
|
100
|
+
str(identity),
|
101
|
+
name,
|
102
|
+
todo_type_name,
|
103
|
+
todo_guid,
|
104
|
+
created,
|
105
|
+
priority,
|
106
|
+
due,
|
107
|
+
completed,
|
108
|
+
status,
|
109
|
+
str(assigned_actors),
|
93
110
|
)
|
94
111
|
|
95
112
|
def generate_table() -> Table:
|
@@ -101,7 +118,7 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
101
118
|
show_lines=True,
|
102
119
|
box=box.ROUNDED,
|
103
120
|
caption=f"ToDos for Server '{server}' @ Platform - {url}",
|
104
|
-
expand=True
|
121
|
+
expand=True,
|
105
122
|
)
|
106
123
|
table.add_column("Actor")
|
107
124
|
table.add_column("ToDo Name")
|
@@ -115,7 +132,7 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
115
132
|
table.add_column("Sponsor")
|
116
133
|
|
117
134
|
my_profile = m_client.get_my_profile()
|
118
|
-
my_guid = my_profile["elementHeader"].get("guid","---")
|
135
|
+
my_guid = my_profile["elementHeader"].get("guid", "---")
|
119
136
|
my_ids = my_profile["userIdentities"]
|
120
137
|
my_title = my_profile["profileProperties"].get("jobTitle", "No Title")
|
121
138
|
user_ids = []
|
@@ -127,8 +144,8 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
127
144
|
if type(my_roles) is list:
|
128
145
|
for role in my_roles:
|
129
146
|
role_guid = role["elementHeader"]["guid"]
|
130
|
-
role_title = role["properties"].get("title","No Title")
|
131
|
-
add_rows(table,role_guid,role_title)
|
147
|
+
role_title = role["properties"].get("title", "No Title")
|
148
|
+
add_rows(table, role_guid, role_title)
|
132
149
|
|
133
150
|
# m_client.close_session()
|
134
151
|
return table
|
@@ -139,7 +156,11 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
139
156
|
time.sleep(2)
|
140
157
|
live.update(generate_table())
|
141
158
|
|
142
|
-
except (
|
159
|
+
except (
|
160
|
+
InvalidParameterException,
|
161
|
+
PropertyServerException,
|
162
|
+
UserNotAuthorizedException,
|
163
|
+
) as e:
|
143
164
|
print_exception_response(e)
|
144
165
|
|
145
166
|
except KeyboardInterrupt:
|
@@ -147,6 +168,7 @@ def display_my_todos(server: str, url: str, user: str, user_pass:str,
|
|
147
168
|
finally:
|
148
169
|
m_client.close_session()
|
149
170
|
|
171
|
+
|
150
172
|
def main():
|
151
173
|
parser = argparse.ArgumentParser()
|
152
174
|
parser.add_argument("--server", help="Name of the view server to connect to")
|
@@ -168,4 +190,4 @@ def main():
|
|
168
190
|
|
169
191
|
|
170
192
|
if __name__ == "__main__":
|
171
|
-
main()
|
193
|
+
main()
|
@@ -25,32 +25,42 @@ from pyegeria._exceptions import (
|
|
25
25
|
)
|
26
26
|
|
27
27
|
from pyegeria.my_profile_omvs import MyProfile
|
28
|
+
|
28
29
|
disable_ssl_warnings = True
|
29
30
|
|
30
31
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
31
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
32
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
33
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
34
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
32
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
33
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
34
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
35
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
36
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
37
|
+
)
|
38
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
39
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
40
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
41
|
+
)
|
42
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
43
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
44
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
45
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
46
|
+
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
47
|
+
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
|
48
|
+
|
49
|
+
|
50
|
+
def display_todos(
|
51
|
+
server: str,
|
52
|
+
url: str,
|
53
|
+
user: str,
|
54
|
+
user_pass: str,
|
55
|
+
jupyter: bool = EGERIA_JUPYTER,
|
56
|
+
width: int = EGERIA_WIDTH,
|
57
|
+
):
|
48
58
|
console = Console(width=width, force_terminal=not jupyter)
|
49
59
|
|
50
60
|
m_client = MyProfile(server, url, user_id=user)
|
51
61
|
token = m_client.create_egeria_bearer_token(user, user_pass)
|
52
62
|
|
53
|
-
def generate_table(search_string:str =
|
63
|
+
def generate_table(search_string: str = "*") -> Table:
|
54
64
|
"""Make a new table."""
|
55
65
|
table = Table(
|
56
66
|
header_style="bright_white on dark_blue",
|
@@ -60,7 +70,7 @@ def display_todos(server: str , url: str, user: str, user_pass:str,
|
|
60
70
|
show_lines=True,
|
61
71
|
box=box.ROUNDED,
|
62
72
|
caption=f"ToDos for Server '{server}' @ Platform - {url}",
|
63
|
-
expand=True
|
73
|
+
expand=True,
|
64
74
|
)
|
65
75
|
|
66
76
|
table.add_column("Name")
|
@@ -95,7 +105,7 @@ def display_todos(server: str , url: str, user: str, user_pass:str,
|
|
95
105
|
priority = str(props.get("priority", " "))
|
96
106
|
due = props.get("dueTime", " ")
|
97
107
|
completed = props.get("completionTime", " ")
|
98
|
-
status = props.get("toDoStatus",
|
108
|
+
status = props.get("toDoStatus", "---")
|
99
109
|
# assigned_actors = item["assignedActors"]
|
100
110
|
# sponsor = assigned_actors[0].get("uniqueName", " ")
|
101
111
|
sponsor = "erinoverview"
|
@@ -119,7 +129,11 @@ def display_todos(server: str , url: str, user: str, user_pass:str,
|
|
119
129
|
live.update(generate_table())
|
120
130
|
live.console.pager()
|
121
131
|
|
122
|
-
except (
|
132
|
+
except (
|
133
|
+
InvalidParameterException,
|
134
|
+
PropertyServerException,
|
135
|
+
UserNotAuthorizedException,
|
136
|
+
) as e:
|
123
137
|
print_exception_response(e)
|
124
138
|
except KeyboardInterrupt:
|
125
139
|
pass
|
@@ -143,4 +157,4 @@ def main():
|
|
143
157
|
|
144
158
|
|
145
159
|
if __name__ == "__main__":
|
146
|
-
main()
|
160
|
+
main()
|
@@ -26,33 +26,77 @@ peter_guid = "a187bc48-8154-491f-97b4-a2f3c3f1a00e"
|
|
26
26
|
tanya_guid = "26ec1614-bede-4b25-a2a3-f8ed26db3aaa"
|
27
27
|
|
28
28
|
ERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
29
|
-
EGERIA_KAFKA_ENDPOINT = os.environ.get(
|
30
|
-
EGERIA_PLATFORM_URL = os.environ.get(
|
31
|
-
EGERIA_VIEW_SERVER = os.environ.get(
|
32
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
@click.
|
46
|
-
@click.option(
|
47
|
-
|
48
|
-
|
49
|
-
@click.option(
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
@click.option(
|
54
|
-
|
55
|
-
|
29
|
+
EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
|
30
|
+
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
31
|
+
EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
|
32
|
+
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
33
|
+
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
34
|
+
)
|
35
|
+
EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
|
36
|
+
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
37
|
+
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
38
|
+
)
|
39
|
+
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
40
|
+
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
41
|
+
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
42
|
+
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
43
|
+
|
44
|
+
|
45
|
+
@click.command("create-todo")
|
46
|
+
@click.option(
|
47
|
+
"--server", default=EGERIA_VIEW_SERVER, help="Egeria metadata store to load"
|
48
|
+
)
|
49
|
+
@click.option(
|
50
|
+
"--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
|
51
|
+
)
|
52
|
+
@click.option("--userid", default=EGERIA_USER, help="Egeria user")
|
53
|
+
@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
|
54
|
+
@click.option("--timeout", default=60, help="Number of seconds to wait")
|
55
|
+
@click.option("--name", prompt="Todo Name", help="Name of Todo", required=True)
|
56
|
+
@click.option(
|
57
|
+
"--description",
|
58
|
+
prompt="Description",
|
59
|
+
help="Brief description of To Do item",
|
60
|
+
required=True,
|
61
|
+
)
|
62
|
+
@click.option(
|
63
|
+
"--type", prompt="Todo Type", help="Type of Todo", required=True, default="forMe"
|
64
|
+
)
|
65
|
+
@click.option(
|
66
|
+
"--priority",
|
67
|
+
prompt="Todo Priority",
|
68
|
+
type=int,
|
69
|
+
help="Priority of Todo",
|
70
|
+
required=True,
|
71
|
+
default=0,
|
72
|
+
)
|
73
|
+
@click.option(
|
74
|
+
"--due",
|
75
|
+
prompt="Due Date",
|
76
|
+
help="Due date of Todo (yyyy-mm-dd)",
|
77
|
+
default=datetime.now().strftime("%Y-%m-%d"),
|
78
|
+
required=True,
|
79
|
+
)
|
80
|
+
@click.option(
|
81
|
+
"--assigned-to",
|
82
|
+
prompt="Assigned to",
|
83
|
+
help="Party the Todo is assigned to",
|
84
|
+
required=True,
|
85
|
+
default=peter_guid,
|
86
|
+
)
|
87
|
+
def create_todo(
|
88
|
+
server,
|
89
|
+
url,
|
90
|
+
userid,
|
91
|
+
password,
|
92
|
+
timeout,
|
93
|
+
name,
|
94
|
+
description,
|
95
|
+
type,
|
96
|
+
priority,
|
97
|
+
due,
|
98
|
+
assigned_to,
|
99
|
+
):
|
56
100
|
"""Create a new ToDo item"""
|
57
101
|
m_client = MyProfile(server, url, user_id=userid, user_pwd=password)
|
58
102
|
token = m_client.create_egeria_bearer_token()
|
@@ -66,9 +110,9 @@ def create_todo(server, url, userid, password, timeout, name, description, type,
|
|
66
110
|
"toDoType": type,
|
67
111
|
"priority": priority,
|
68
112
|
"dueTime": due,
|
69
|
-
"status": "OPEN"
|
113
|
+
"status": "OPEN",
|
70
114
|
},
|
71
|
-
"assignToActorGUID": assigned_to
|
115
|
+
"assignToActorGUID": assigned_to,
|
72
116
|
}
|
73
117
|
|
74
118
|
resp = m_client.create_to_do(body)
|
@@ -83,15 +127,19 @@ def create_todo(server, url, userid, password, timeout, name, description, type,
|
|
83
127
|
m_client.close_session()
|
84
128
|
|
85
129
|
|
86
|
-
@click.command(
|
87
|
-
@click.option(
|
88
|
-
|
89
|
-
|
90
|
-
@click.option(
|
91
|
-
|
92
|
-
|
130
|
+
@click.command("delete-todo")
|
131
|
+
@click.option(
|
132
|
+
"--server", default=EGERIA_VIEW_SERVER, help="Egeria metadata store to load"
|
133
|
+
)
|
134
|
+
@click.option(
|
135
|
+
"--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
|
136
|
+
)
|
137
|
+
@click.option("--userid", default=EGERIA_USER, help="Egeria user")
|
138
|
+
@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
|
139
|
+
@click.option("--timeout", default=60, help="Number of seconds to wait")
|
140
|
+
@click.argument("todo-guid")
|
93
141
|
def delete_todo(server, url, userid, password, timeout, todo_guid):
|
94
|
-
"""Delete the todo item specified
|
142
|
+
"""Delete the todo item specified"""
|
95
143
|
m_client = MyProfile(server, url, user_id=userid, user_pwd=password)
|
96
144
|
token = m_client.create_egeria_bearer_token()
|
97
145
|
try:
|
@@ -105,26 +153,32 @@ def delete_todo(server, url, userid, password, timeout, todo_guid):
|
|
105
153
|
m_client.close_session()
|
106
154
|
|
107
155
|
|
108
|
-
@click.command(
|
109
|
-
@click.argument(
|
110
|
-
@click.option(
|
111
|
-
|
112
|
-
|
113
|
-
@click.option(
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
156
|
+
@click.command("change-todo-status")
|
157
|
+
@click.argument("todo-guid")
|
158
|
+
@click.option(
|
159
|
+
"--server", default=EGERIA_VIEW_SERVER, help="Egeria metadata store to load"
|
160
|
+
)
|
161
|
+
@click.option(
|
162
|
+
"--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
|
163
|
+
)
|
164
|
+
@click.option("--userid", default=EGERIA_USER, help="Egeria user")
|
165
|
+
@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
|
166
|
+
@click.option("--timeout", default=60, help="Number of seconds to wait")
|
167
|
+
@click.option(
|
168
|
+
"--new-status",
|
169
|
+
type=click.Choice(
|
170
|
+
["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED"],
|
171
|
+
case_sensitive="False",
|
172
|
+
),
|
173
|
+
help="Enter the new ToDo item status",
|
174
|
+
required=True,
|
175
|
+
)
|
118
176
|
def change_todo_status(server, url, userid, password, timeout, todo_guid, new_status):
|
119
177
|
"""Update a ToDo item status"""
|
120
178
|
m_client = MyProfile(server, url, user_id=userid, user_pwd=password)
|
121
179
|
token = m_client.create_egeria_bearer_token()
|
122
180
|
try:
|
123
|
-
|
124
|
-
body = {
|
125
|
-
"class": "ToDoProperties",
|
126
|
-
"toDoStatus": new_status
|
127
|
-
}
|
181
|
+
body = {"class": "ToDoProperties", "toDoStatus": new_status}
|
128
182
|
|
129
183
|
m_client.update_to_do(todo_guid, body, is_merge_update=True)
|
130
184
|
|
@@ -136,22 +190,26 @@ def change_todo_status(server, url, userid, password, timeout, todo_guid, new_st
|
|
136
190
|
m_client.close_session()
|
137
191
|
|
138
192
|
|
139
|
-
@click.command(
|
140
|
-
@click.option(
|
141
|
-
|
142
|
-
|
143
|
-
@click.option(
|
144
|
-
|
145
|
-
|
193
|
+
@click.command("mark-todo-complete")
|
194
|
+
@click.option(
|
195
|
+
"--server", default=EGERIA_VIEW_SERVER, help="Egeria metadata store to load"
|
196
|
+
)
|
197
|
+
@click.option(
|
198
|
+
"--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
|
199
|
+
)
|
200
|
+
@click.option("--userid", default=EGERIA_USER, help="Egeria user")
|
201
|
+
@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
|
202
|
+
@click.option("--timeout", default=60, help="Number of seconds to wait")
|
203
|
+
@click.argument("todo-guid")
|
146
204
|
def mark_todo_complete(server, url, userid, password, timeout, todo_guid):
|
147
205
|
"""Mark the specified todo as complete"""
|
148
206
|
m_client = MyProfile(server, url, user_id=userid, user_pwd=password)
|
149
207
|
try:
|
150
208
|
token = m_client.create_egeria_bearer_token()
|
151
209
|
body = {
|
152
|
-
|
153
|
-
|
154
|
-
|
210
|
+
"class": "ToDoProperties",
|
211
|
+
"completionTime": time.asctime(),
|
212
|
+
"toDoStatus": "COMPLETE",
|
155
213
|
}
|
156
214
|
|
157
215
|
m_client.update_to_do(todo_guid, body, is_merge_update=True)
|
@@ -164,20 +222,23 @@ def mark_todo_complete(server, url, userid, password, timeout, todo_guid):
|
|
164
222
|
m_client.close_session()
|
165
223
|
|
166
224
|
|
167
|
-
@click.command(
|
168
|
-
@click.option(
|
169
|
-
|
170
|
-
|
171
|
-
@click.option(
|
172
|
-
|
173
|
-
|
174
|
-
@click.
|
225
|
+
@click.command("reassign-todo")
|
226
|
+
@click.option(
|
227
|
+
"--server", default=EGERIA_VIEW_SERVER, help="Egeria metadata store to load"
|
228
|
+
)
|
229
|
+
@click.option(
|
230
|
+
"--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
|
231
|
+
)
|
232
|
+
@click.option("--userid", default=EGERIA_USER, help="Egeria user")
|
233
|
+
@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
|
234
|
+
@click.option("--timeout", default=60, help="Number of seconds to wait")
|
235
|
+
@click.argument("todo-guid")
|
236
|
+
@click.argument("new-actor-guid")
|
175
237
|
def reassign_todo(server, url, userid, password, timeout, todo_guid, new_actor_guid):
|
176
238
|
"""Reassign ToDo item to new actor"""
|
177
239
|
m_client = MyProfile(server, url, user_id=userid, user_pwd=password)
|
178
240
|
token = m_client.create_egeria_bearer_token()
|
179
241
|
try:
|
180
|
-
|
181
242
|
m_client.reassign_to_do(todo_guid, new_actor_guid)
|
182
243
|
|
183
244
|
click.echo(f"Reassigned Todo item {todo_guid} to {new_actor_guid}")
|
pyegeria/_client.py
CHANGED
@@ -135,15 +135,7 @@ class Client:
|
|
135
135
|
self.platform_url = platform_url
|
136
136
|
if validate_server_name(server_name):
|
137
137
|
self.server_name = server_name
|
138
|
-
# if self.sync_mode:
|
139
|
-
# self.session = httpx.Client(verify=self.ssl_verify)
|
140
|
-
# else:
|
141
|
-
# self.session = httpx.AsyncClient(verify=self.ssl_verify)
|
142
138
|
self.session = AsyncClient(verify=enable_ssl_check)
|
143
|
-
# if (len(template_guids) == 0) or (len(integration_guids) == 0):
|
144
|
-
# self.build_global_guid_lists()
|
145
|
-
# self.template_guids = template_guids
|
146
|
-
# self.integration_guids = integration_guids
|
147
139
|
|
148
140
|
def __enter__(self):
|
149
141
|
return self
|
@@ -207,7 +199,7 @@ class Client:
|
|
207
199
|
|
208
200
|
url = f"{self.platform_url}/api/token"
|
209
201
|
data = {"userId": user_id, "password": password}
|
210
|
-
async with AsyncClient(verify=
|
202
|
+
async with AsyncClient(verify=enable_ssl_check) as client:
|
211
203
|
try:
|
212
204
|
response = await client.post(url, json=data, headers=self.headers)
|
213
205
|
token = response.text
|
pyegeria/egeria_my_client.py
CHANGED
@@ -41,7 +41,7 @@ class EgeriaMy(MyProfile, FeedbackManager):
|
|
41
41
|
user_pwd: str = None,
|
42
42
|
token: str = None,
|
43
43
|
):
|
44
|
-
MyProfile.__init__(self, server_name, platform_url,
|
44
|
+
MyProfile.__init__(self, server_name, platform_url, user_id, user_pwd, token)
|
45
45
|
FeedbackManager.__init__(
|
46
46
|
self, server_name, platform_url, token, user_id, user_pwd
|
47
47
|
)
|
pyegeria/egeria_ops_client.py
CHANGED
@@ -25,10 +25,11 @@ from pyegeria import (
|
|
25
25
|
ServerOps,
|
26
26
|
EgeriaConfig,
|
27
27
|
Platform,
|
28
|
+
EgeriaMy,
|
28
29
|
)
|
29
30
|
|
30
31
|
|
31
|
-
class EgeriaOps(
|
32
|
+
class EgeriaOps(RuntimeManager, EgeriaConfig, ServerOps, EgeriaMy):
|
32
33
|
"""
|
33
34
|
Client for managing Egeria operations.
|
34
35
|
|
@@ -60,8 +61,11 @@ class EgeriaOps(EgeriaConfig, Platform, RuntimeManager, ServerOps):
|
|
60
61
|
token: str = None,
|
61
62
|
):
|
62
63
|
EgeriaConfig.__init__(self, server_name, platform_url, user_id, user_pwd)
|
63
|
-
Platform.__init__(self, server_name, platform_url, user_id, user_pwd)
|
64
64
|
RuntimeManager.__init__(
|
65
65
|
self, server_name, platform_url, user_id, user_pwd, token=token
|
66
66
|
)
|
67
67
|
ServerOps.__init__(self, server_name, platform_url, user_id, user_pwd)
|
68
|
+
|
69
|
+
EgeriaMy.__init__(
|
70
|
+
self, server_name, platform_url, user_id, user_pwd, token=token
|
71
|
+
)
|
pyegeria/my_profile_omvs.py
CHANGED
@@ -15,7 +15,7 @@ examples/widgets/cat/list_glossary.py,sha256=ybHFl1qebnE48GqtYaM1Gl26Vs9f9YAPAnr
|
|
15
15
|
examples/widgets/cat/list_projects.py,sha256=Jzs-DtIpPhCH-gY4PYT6mnRBWnEf4m18TFfcw8UymNU,8011
|
16
16
|
examples/widgets/cat/list_relationships.py,sha256=U9f78cOi4HyaacqNaFSMq_7rRxVcEczvwPv468GYw3Q,5869
|
17
17
|
examples/widgets/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFoh0,4609
|
18
|
-
examples/widgets/cat/list_todos.py,sha256=
|
18
|
+
examples/widgets/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
|
19
19
|
examples/widgets/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
|
20
20
|
examples/widgets/cli/__init__.py,sha256=6d_R0KZBNnJy9EBz9J2xvGFlx-3j_ZPqPCxKgdvYeDQ,291
|
21
21
|
examples/widgets/cli/egeria.py,sha256=yY_7QRTH7fo4qlHfqrf2OUHuyy_MbyMWexxgCbQAPIk,28755
|
@@ -26,12 +26,12 @@ examples/widgets/cli/egeria_tech.py,sha256=B0lmlSUVcUXS426jBA71sGSqyl4dqm967wR5A
|
|
26
26
|
examples/widgets/cli/ops_config.py,sha256=m4AfPjf-fR4EBTx8Dc2mcgrfWwAxb30YGeV-v79bg4U,1450
|
27
27
|
examples/widgets/my/README.md,sha256=ZheFhj_VoPMhcWjW3pGchHB0vH_A9PklSmrSkzKdrcQ,844
|
28
28
|
examples/widgets/my/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
29
|
-
examples/widgets/my/list_my_profile.py,sha256=
|
30
|
-
examples/widgets/my/list_my_roles.py,sha256=
|
31
|
-
examples/widgets/my/monitor_my_todos.py,sha256=
|
32
|
-
examples/widgets/my/monitor_open_todos.py,sha256=
|
29
|
+
examples/widgets/my/list_my_profile.py,sha256=jJaGAHrhFv9VQR9li5pzFN3ihqhHv9LmnAVPiKvPp3U,5678
|
30
|
+
examples/widgets/my/list_my_roles.py,sha256=AhyKXSQxBPDh2QQoL90bPQPkNnu1w7whpk9kZoBxRTQ,5175
|
31
|
+
examples/widgets/my/monitor_my_todos.py,sha256=YiwyQgtA7YsfW4-Ps-1ymvFjRqp-Egubv9j8iFUMUXE,6601
|
32
|
+
examples/widgets/my/monitor_open_todos.py,sha256=KDrAjdLPP3j0K9Y3G95BIgr51ktTx3mMlKydLFDF2YQ,5466
|
33
33
|
examples/widgets/my/my_profile_actions.py,sha256=ytPBLw7_UgYCv1ljxxHtaDCNG65djKZdfMYF6wFpEtU,4138
|
34
|
-
examples/widgets/my/todo_actions.py,sha256=
|
34
|
+
examples/widgets/my/todo_actions.py,sha256=uihltirrAPtwYNygnNBAVWgfS0W7acoETz1_h3XW_4o,8369
|
35
35
|
examples/widgets/ops/README.md,sha256=PJsSDcvMv6E6og6y-cwvxFX5lhCII0UCwgKiM1T17MQ,1595
|
36
36
|
examples/widgets/ops/__init__.py,sha256=SCfzF3-aMx8EpqLWmH7JQf13gTmMAtHRbg69oseLvi8,480
|
37
37
|
examples/widgets/ops/engine_actions.py,sha256=rxtCacBTdu6qHAXIvv7KfKZIpfj9-B3Uap1Qy-x7hF4,3013
|
@@ -65,7 +65,7 @@ examples/widgets/tech/list_valid_metadata_values.py,sha256=N3D0_BmREPszgde3uvvYd
|
|
65
65
|
examples/widgets/tech/x_list_related_elements.py,sha256=qBsf1619cecaMCTzG0MG22fAT32WNH2Z3CXrjo9z-5Y,5853
|
66
66
|
pyegeria/Xloaded_resources_omvs.py,sha256=xNLlmEXG8njFyiN08WKkT3D_9iLWzObM_2u5GTirjEo,3276
|
67
67
|
pyegeria/__init__.py,sha256=ZYtSwZtiO3sU9xT1NNIC_rqIy-90VrfxOeH2c2EQj9c,9465
|
68
|
-
pyegeria/_client.py,sha256=
|
68
|
+
pyegeria/_client.py,sha256=d1cG5p7yfZDwau3O4kvlHuB-XAey-mcT3Kz3wKwtHis,26164
|
69
69
|
pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
|
70
70
|
pyegeria/_exceptions.py,sha256=NJ7vAhmvusK1ENvY2MMrBB6A6TgpYjzS9QJxFH56b8c,18470
|
71
71
|
pyegeria/_globals.py,sha256=1Uc8392wjbiVN5L__RzxC1-U97RMXj77_iUsMSgeAjQ,638
|
@@ -79,15 +79,15 @@ pyegeria/core_omag_server_config.py,sha256=qp1mpTm8q6QrP1IOiXIDOpAGGyIG6fJJ0Kqu-
|
|
79
79
|
pyegeria/create_tech_guid_lists.py,sha256=jClpvURy20o4UV83LOwhGg3TZdHGzfjZ9y0MNZyG2To,4282
|
80
80
|
pyegeria/egeria_cat_client.py,sha256=30oCGJgz0UqAnBCwet9t6Lf5iS1-6r6p1ze53_xG0io,1995
|
81
81
|
pyegeria/egeria_config_client.py,sha256=oJ3Q4ts9ZayFJFB2cKGHaTqDyAZmsvx0GUzc35fEhdk,1030
|
82
|
-
pyegeria/egeria_my_client.py,sha256=
|
83
|
-
pyegeria/egeria_ops_client.py,sha256=
|
82
|
+
pyegeria/egeria_my_client.py,sha256=a-KHdqEwdaTwxrdpSNDy8vjDI26iZDqGSB_UFqvdoME,1340
|
83
|
+
pyegeria/egeria_ops_client.py,sha256=9w9CcYkzXAHZCrq-YuUS30Z13DXVNTdVntpSHBccKBY,2030
|
84
84
|
pyegeria/egeria_tech_client.py,sha256=SIm1Crh2EzjzmYHxiP-tE3dKJp8UpNkJRppVVsixPlQ,2179
|
85
85
|
pyegeria/feedback_manager_omvs.py,sha256=Snd2Vx3OgzGl3JY-ZhcCdg0U9qb1xeiDZXet_WbWWmk,162239
|
86
86
|
pyegeria/full_omag_server_config.py,sha256=LFexyOaEsE3GOY2zyUc2rCQcDFPc177BzzWgT7uED7k,46941
|
87
87
|
pyegeria/glossary_browser_omvs.py,sha256=LJbQJLhBwU5JJyjt6gQv9iGX0Gx-KmYMH-17hpyFtR0,103177
|
88
88
|
pyegeria/glossary_manager_omvs.py,sha256=9ZUEh7Y6roua0QSHk4MUiGtDqOizeCXuIjTPnI_zkVE,129866
|
89
89
|
pyegeria/mermaid_utilities.py,sha256=-0u2_rR4QTUU7hDFxNam-T5zRWMJOKSHzbW_2gUgMsM,8251
|
90
|
-
pyegeria/my_profile_omvs.py,sha256=
|
90
|
+
pyegeria/my_profile_omvs.py,sha256=OcexVwHGLV0JKHN257Un1BZLwcolSS7F6U6jj5uEmQM,40824
|
91
91
|
pyegeria/platform_services.py,sha256=nwuQxnnuf0bpV4LOTAdvpFUKAIUlqtYeXETMsOzFHRg,41710
|
92
92
|
pyegeria/project_manager_omvs.py,sha256=OtTFXjy1E8axtJdd-7cAETS5cy7Dq4qjjA9YqQ5gK1Q,74501
|
93
93
|
pyegeria/registered_info.py,sha256=QcOpQUZaM_6sAvdXM09Plxx-tBSJuNq9aD_yoqnL_Zg,6293
|
@@ -95,8 +95,8 @@ pyegeria/runtime_manager_omvs.py,sha256=pXsywkzAO85WCp1bqskmeG6kLHdAg12xVmjGG2WM
|
|
95
95
|
pyegeria/server_operations.py,sha256=mtl3P6D9LdquBrOzvPr1zapDxSJ-97RerPUJn_NiAto,16722
|
96
96
|
pyegeria/utils.py,sha256=pkVmS3RrbjaS9yz7FtOCwaOfV5FMqz-__Rt5koCnd9c,5374
|
97
97
|
pyegeria/valid_metadata_omvs.py,sha256=3NjdRkcKWQclGcELJIJPtz7RuenjoVWOXazgU70uCrY,36115
|
98
|
-
pyegeria-0.8.
|
99
|
-
pyegeria-0.8.
|
100
|
-
pyegeria-0.8.
|
101
|
-
pyegeria-0.8.
|
102
|
-
pyegeria-0.8.
|
98
|
+
pyegeria-0.8.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
99
|
+
pyegeria-0.8.3.dist-info/METADATA,sha256=P6_OEZf62XXxXGaC8G-JXDaeCea3kkioog7Mc1LLdn0,2817
|
100
|
+
pyegeria-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
|
101
|
+
pyegeria-0.8.3.dist-info/entry_points.txt,sha256=5Q9bDxIqPgdhd3lDnzdRSCYy9hZtNm_BL49bcmbBpGQ,3808
|
102
|
+
pyegeria-0.8.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|