pyegeria 5.3.9.9.3__py3-none-any.whl → 5.5.3.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.
Potentially problematic release.
This version of pyegeria might be problematic. Click here for more details.
- commands/__init__.py +24 -0
- commands/cat/Dr-Egeria_md-orig.py +2 -2
- commands/cat/__init__.py +1 -17
- commands/cat/collection_actions.py +197 -0
- commands/cat/dr_egeria_command_help.py +372 -0
- commands/cat/dr_egeria_jupyter.py +7 -7
- commands/cat/dr_egeria_md.py +27 -182
- commands/cat/exp_list_glossaries.py +11 -14
- commands/cat/get_asset_graph.py +37 -267
- commands/cat/{get_collection.py → get_collection_tree.py} +10 -18
- commands/cat/get_project_dependencies.py +14 -14
- commands/cat/get_project_structure.py +15 -14
- commands/cat/get_tech_type_elements.py +16 -116
- commands/cat/glossary_actions.py +145 -298
- commands/cat/list_assets.py +3 -11
- commands/cat/list_cert_types.py +17 -63
- commands/cat/list_collections.py +46 -138
- commands/cat/list_deployed_catalogs.py +15 -27
- commands/cat/list_deployed_database_schemas.py +27 -43
- commands/cat/list_deployed_databases.py +16 -31
- commands/cat/list_deployed_servers.py +35 -54
- commands/cat/list_glossaries.py +18 -17
- commands/cat/list_projects.py +10 -12
- commands/cat/list_tech_type_elements.py +21 -37
- commands/cat/list_tech_types.py +13 -25
- commands/cat/list_terms.py +38 -79
- commands/cat/list_todos.py +4 -11
- commands/cat/list_user_ids.py +3 -10
- commands/cat/my_reports.py +559 -0
- commands/cat/run_report.py +394 -0
- commands/cat/run_report_orig.py +528 -0
- commands/cli/egeria.py +222 -247
- commands/cli/egeria_cat.py +68 -81
- commands/cli/egeria_my.py +13 -0
- commands/cli/egeria_ops.py +69 -74
- commands/cli/egeria_tech.py +17 -93
- commands/cli/ops_config.py +3 -6
- commands/{cat/list_categories.py → deprecated/list_data_designer.py} +53 -64
- commands/{cat/list_data_structures.py → deprecated/list_data_structures_full.py} +3 -6
- commands/deprecated/old_get_asset_graph.py +315 -0
- commands/my/__init__.py +0 -2
- commands/my/list_my_profile.py +27 -34
- commands/my/list_my_roles.py +1 -7
- commands/my/monitor_my_todos.py +1 -7
- commands/my/monitor_open_todos.py +6 -7
- commands/my/todo_actions.py +4 -5
- commands/ops/__init__.py +0 -2
- commands/ops/gov_server_actions.py +17 -21
- commands/ops/list_archives.py +17 -38
- commands/ops/list_catalog_targets.py +33 -40
- commands/ops/load_archive.py +35 -26
- commands/ops/{monitor_engine_activity_c.py → monitor_active_engine_activity.py} +51 -82
- commands/ops/{monitor_integ_daemon_status.py → monitor_daemon_status.py} +35 -55
- commands/ops/monitor_engine_activity.py +79 -77
- commands/ops/{monitor_gov_eng_status.py → monitor_engine_status.py} +10 -7
- commands/ops/monitor_platform_status.py +38 -50
- commands/ops/monitor_server_startup.py +6 -11
- commands/ops/monitor_server_status.py +7 -11
- commands/ops/orig_monitor_server_list.py +8 -8
- commands/ops/orig_monitor_server_status.py +1 -5
- commands/ops/refresh_integration_daemon.py +5 -5
- commands/ops/restart_integration_daemon.py +5 -5
- commands/ops/table_integ_daemon_status.py +6 -6
- commands/ops/x_engine_actions.py +7 -7
- commands/tech/__init__.py +0 -2
- commands/tech/{generic_actions.py → element_actions.py} +6 -11
- commands/tech/get_element_info.py +20 -29
- commands/tech/get_guid_info.py +23 -42
- commands/tech/get_tech_details.py +20 -35
- commands/tech/get_tech_type_template.py +28 -39
- commands/tech/list_all_om_type_elements.py +24 -30
- commands/tech/list_all_om_type_elements_x.py +22 -28
- commands/tech/list_all_related_elements.py +19 -28
- commands/tech/list_anchored_elements.py +22 -30
- commands/tech/list_asset_types.py +19 -24
- commands/tech/list_elements_by_classification_by_property_value.py +26 -32
- commands/tech/list_elements_by_property_value.py +19 -25
- commands/tech/list_elements_by_property_value_x.py +20 -28
- commands/tech/list_elements_for_classification.py +28 -41
- commands/tech/list_gov_action_processes.py +16 -27
- commands/tech/list_information_supply_chains.py +22 -30
- commands/tech/list_registered_services.py +14 -26
- commands/tech/list_related_elements_with_prop_value.py +15 -25
- commands/tech/list_related_specification.py +1 -4
- commands/tech/list_relationship_types.py +15 -25
- commands/tech/list_relationships.py +20 -36
- commands/tech/list_solution_blueprints.py +28 -33
- commands/tech/list_solution_components.py +23 -29
- commands/tech/list_solution_roles.py +21 -32
- commands/tech/list_tech_templates.py +51 -54
- commands/tech/list_valid_metadata_values.py +5 -9
- commands/tech/table_tech_templates.py +2 -6
- commands/tech/x_list_related_elements.py +1 -4
- examples/GeoSpatial Products Example.py +524 -0
- examples/Jupyter Notebooks/P-egeria-server-config.ipynb +2137 -0
- examples/Jupyter Notebooks/README.md +2 -0
- examples/Jupyter Notebooks/common/P-environment-check.ipynb +115 -0
- examples/Jupyter Notebooks/common/__init__.py +14 -0
- examples/Jupyter Notebooks/common/common-functions.ipynb +4694 -0
- examples/Jupyter Notebooks/common/environment-check.ipynb +52 -0
- examples/Jupyter Notebooks/common/globals.ipynb +184 -0
- examples/Jupyter Notebooks/common/globals.py +154 -0
- examples/Jupyter Notebooks/common/orig_globals.py +152 -0
- examples/format_sets/all_format_sets.json +910 -0
- examples/format_sets/custom_format_sets.json +268 -0
- examples/format_sets/subset_format_sets.json +187 -0
- examples/format_sets_save_load_example.py +291 -0
- examples/jacquard_data_sets.py +129 -0
- examples/output_formats_example.py +193 -0
- examples/test_jacquard_data_sets.py +54 -0
- examples/test_jacquard_data_sets_scenarios.py +94 -0
- md_processing/__init__.py +90 -0
- md_processing/command_dispatcher.py +33 -0
- md_processing/command_mapping.py +221 -0
- md_processing/data/commands/commands_data_designer.json +537 -0
- md_processing/data/commands/commands_external_reference.json +733 -0
- md_processing/data/commands/commands_feedback.json +155 -0
- md_processing/data/commands/commands_general.json +204 -0
- md_processing/data/commands/commands_glossary.json +218 -0
- md_processing/data/commands/commands_governance.json +3678 -0
- md_processing/data/commands/commands_product_manager.json +865 -0
- md_processing/data/commands/commands_project.json +642 -0
- md_processing/data/commands/commands_solution_architect.json +366 -0
- md_processing/data/commands.json +17568 -0
- md_processing/data/commands_working.json +30641 -0
- md_processing/data/gened_report_specs.py +6584 -0
- md_processing/data/generated_format_sets.json +6533 -0
- md_processing/data/generated_format_sets_old.json +4137 -0
- md_processing/data/generated_format_sets_old.py +45 -0
- md_processing/dr_egeria.py +182 -0
- md_processing/md_commands/__init__.py +3 -0
- md_processing/md_commands/data_designer_commands.py +1276 -0
- md_processing/md_commands/ext_ref_commands.py +530 -0
- md_processing/md_commands/feedback_commands.py +726 -0
- md_processing/md_commands/glossary_commands.py +684 -0
- md_processing/md_commands/governance_officer_commands.py +600 -0
- md_processing/md_commands/product_manager_commands.py +1266 -0
- md_processing/md_commands/project_commands.py +383 -0
- md_processing/md_commands/solution_architect_commands.py +1184 -0
- md_processing/md_commands/view_commands.py +295 -0
- md_processing/md_processing_utils/__init__.py +4 -0
- md_processing/md_processing_utils/common_md_proc_utils.py +1249 -0
- md_processing/md_processing_utils/common_md_utils.py +578 -0
- md_processing/md_processing_utils/determine_width.py +103 -0
- md_processing/md_processing_utils/extraction_utils.py +547 -0
- md_processing/md_processing_utils/gen_report_specs.py +643 -0
- md_processing/md_processing_utils/generate_dr_help.py +193 -0
- md_processing/md_processing_utils/generate_md_cmd_templates.py +144 -0
- md_processing/md_processing_utils/generate_md_templates.py +83 -0
- md_processing/md_processing_utils/md_processing_constants.py +1228 -0
- md_processing/md_processing_utils/message_constants.py +19 -0
- pyegeria/__init__.py +201 -443
- pyegeria/core/__init__.py +40 -0
- pyegeria/core/_base_platform_client.py +574 -0
- pyegeria/core/_base_server_client.py +573 -0
- pyegeria/core/_exceptions.py +457 -0
- pyegeria/core/_globals.py +60 -0
- pyegeria/core/_server_client.py +6073 -0
- pyegeria/core/_validators.py +257 -0
- pyegeria/core/config.py +654 -0
- pyegeria/{create_tech_guid_lists.py → core/create_tech_guid_lists.py} +0 -1
- pyegeria/core/load_config.py +37 -0
- pyegeria/core/logging_configuration.py +207 -0
- pyegeria/core/mcp_adapter.py +144 -0
- pyegeria/core/mcp_server.py +212 -0
- pyegeria/core/utils.py +405 -0
- pyegeria/deprecated/__init__.py +0 -0
- pyegeria/{_client.py → deprecated/_client.py} +62 -24
- pyegeria/{_deprecated_gov_engine.py → deprecated/_deprecated_gov_engine.py} +16 -16
- pyegeria/{classification_manager_omvs.py → deprecated/classification_manager_omvs.py} +1988 -1878
- pyegeria/deprecated/output_formatter_with_machine_keys.py +1127 -0
- pyegeria/{runtime_manager_omvs.py → deprecated/runtime_manager_omvs.py} +216 -229
- pyegeria/{valid_metadata_omvs.py → deprecated/valid_metadata_omvs.py} +93 -93
- pyegeria/{x_action_author_omvs.py → deprecated/x_action_author_omvs.py} +2 -3
- pyegeria/egeria_cat_client.py +25 -51
- pyegeria/egeria_client.py +140 -98
- pyegeria/egeria_config_client.py +48 -24
- pyegeria/egeria_tech_client.py +170 -83
- pyegeria/models/__init__.py +150 -0
- pyegeria/models/collection_models.py +168 -0
- pyegeria/models/models.py +654 -0
- pyegeria/omvs/__init__.py +84 -0
- pyegeria/omvs/action_author.py +342 -0
- pyegeria/omvs/actor_manager.py +5980 -0
- pyegeria/omvs/asset_catalog.py +842 -0
- pyegeria/omvs/asset_maker.py +2736 -0
- pyegeria/omvs/automated_curation.py +4403 -0
- pyegeria/omvs/classification_manager.py +11213 -0
- pyegeria/omvs/collection_manager.py +5780 -0
- pyegeria/omvs/community_matters_omvs.py +468 -0
- pyegeria/{core_omag_server_config.py → omvs/core_omag_server_config.py} +157 -157
- pyegeria/{data_designer_omvs.py → omvs/data_designer.py} +1991 -1691
- pyegeria/omvs/data_discovery.py +869 -0
- pyegeria/omvs/data_engineer.py +372 -0
- pyegeria/omvs/digital_business.py +1133 -0
- pyegeria/omvs/external_links.py +1752 -0
- pyegeria/omvs/feedback_manager.py +834 -0
- pyegeria/{full_omag_server_config.py → omvs/full_omag_server_config.py} +73 -69
- pyegeria/omvs/glossary_manager.py +3231 -0
- pyegeria/omvs/governance_officer.py +3009 -0
- pyegeria/omvs/lineage_linker.py +314 -0
- pyegeria/omvs/location_arena.py +1525 -0
- pyegeria/omvs/metadata_expert.py +668 -0
- pyegeria/omvs/metadata_explorer_omvs.py +2943 -0
- pyegeria/omvs/my_profile.py +1042 -0
- pyegeria/omvs/notification_manager.py +358 -0
- pyegeria/omvs/people_organizer.py +394 -0
- pyegeria/{platform_services.py → omvs/platform_services.py} +113 -193
- pyegeria/omvs/product_manager.py +1825 -0
- pyegeria/omvs/project_manager.py +1907 -0
- pyegeria/omvs/reference_data.py +1140 -0
- pyegeria/omvs/registered_info.py +334 -0
- pyegeria/omvs/runtime_manager.py +2817 -0
- pyegeria/omvs/schema_maker.py +446 -0
- pyegeria/{server_operations.py → omvs/server_operations.py} +27 -26
- pyegeria/omvs/solution_architect.py +6490 -0
- pyegeria/omvs/specification_properties.py +37 -0
- pyegeria/omvs/subject_area.py +1042 -0
- pyegeria/omvs/template_manager_omvs.py +236 -0
- pyegeria/omvs/time_keeper.py +1761 -0
- pyegeria/omvs/valid_metadata.py +3221 -0
- pyegeria/omvs/valid_metadata_lists.py +37 -0
- pyegeria/omvs/valid_type_lists.py +37 -0
- pyegeria/view/__init__.py +28 -0
- pyegeria/view/_output_format_models.py +514 -0
- pyegeria/view/_output_formats.py +14 -0
- pyegeria/view/base_report_formats.py +2719 -0
- pyegeria/view/dr_egeria_reports.py +56 -0
- pyegeria/view/format_set_executor.py +397 -0
- pyegeria/{md_processing_utils.py → view/md_processing_utils.py} +5 -5
- pyegeria/{mermaid_utilities.py → view/mermaid_utilities.py} +2 -154
- pyegeria/view/output_formatter.py +1297 -0
- pyegeria-5.5.3.3.dist-info/METADATA +218 -0
- pyegeria-5.5.3.3.dist-info/RECORD +241 -0
- {pyegeria-5.3.9.9.3.dist-info → pyegeria-5.5.3.3.dist-info}/WHEEL +2 -1
- pyegeria-5.5.3.3.dist-info/entry_points.txt +103 -0
- pyegeria-5.5.3.3.dist-info/top_level.txt +4 -0
- commands/cat/.DS_Store +0 -0
- commands/cat/README.md +0 -16
- commands/cli/txt_custom_v2.tcss +0 -19
- commands/my/README.md +0 -17
- commands/ops/README.md +0 -24
- commands/ops/monitor_asset_events.py +0 -108
- commands/tech/README.md +0 -24
- pyegeria/.DS_Store +0 -0
- pyegeria/README.md +0 -35
- pyegeria/_globals.py +0 -47
- pyegeria/_validators.py +0 -385
- pyegeria/asset_catalog_omvs.py +0 -864
- pyegeria/automated_curation_omvs.py +0 -3765
- pyegeria/collection_manager_omvs.py +0 -2744
- pyegeria/dr.egeria spec.md +0 -9
- pyegeria/egeria_my_client.py +0 -56
- pyegeria/feedback_manager_omvs.py +0 -4573
- pyegeria/glossary_browser_omvs.py +0 -3728
- pyegeria/glossary_manager_omvs.py +0 -2440
- pyegeria/m_test.py +0 -118
- pyegeria/md_processing_helpers.py +0 -58
- pyegeria/md_processing_utils_orig.py +0 -1103
- pyegeria/metadata_explorer_omvs.py +0 -2326
- pyegeria/my_profile_omvs.py +0 -1022
- pyegeria/output_formatter.py +0 -389
- pyegeria/project_manager_omvs.py +0 -1933
- pyegeria/registered_info.py +0 -167
- pyegeria/solution_architect_omvs.py +0 -2156
- pyegeria/template_manager_omvs.py +0 -1414
- pyegeria/utils.py +0 -197
- pyegeria-5.3.9.9.3.dist-info/METADATA +0 -72
- pyegeria-5.3.9.9.3.dist-info/RECORD +0 -143
- pyegeria-5.3.9.9.3.dist-info/entry_points.txt +0 -99
- /pyegeria/{_exceptions.py → deprecated/_exceptions.py} +0 -0
- {pyegeria-5.3.9.9.3.dist-info → pyegeria-5.5.3.3.dist-info/licenses}/LICENSE +0 -0
|
@@ -11,44 +11,23 @@ A simple status display for the Integration Daemon.
|
|
|
11
11
|
import argparse
|
|
12
12
|
import os
|
|
13
13
|
import time
|
|
14
|
-
from typing import Union
|
|
15
14
|
|
|
16
|
-
import nest_asyncio
|
|
17
15
|
from rich import box
|
|
18
16
|
from rich.console import Console
|
|
19
17
|
from rich.live import Live
|
|
20
18
|
from rich.prompt import Prompt
|
|
21
19
|
from rich.table import Table
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
InvalidParameterException,
|
|
27
|
-
PropertyServerException,
|
|
28
|
-
UserNotAuthorizedException,
|
|
29
|
-
print_exception_response,
|
|
30
|
-
)
|
|
31
|
-
|
|
32
|
-
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
|
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("EGERIA_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(
|
|
40
|
-
"EGERIA_INTEGRATION_DAEMON", "integration-daemon"
|
|
41
|
-
)
|
|
42
|
-
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
|
43
|
-
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
|
44
|
-
)
|
|
20
|
+
|
|
21
|
+
from pyegeria import EgeriaTech, PyegeriaException, settings, config_logging, \
|
|
22
|
+
PyegeriaClientException, print_basic_exception
|
|
23
|
+
|
|
45
24
|
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
|
46
25
|
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", 200))
|
|
49
26
|
|
|
50
27
|
disable_ssl_warnings = True
|
|
51
|
-
|
|
28
|
+
app_config = settings.Environment
|
|
29
|
+
settings.Logging.console_logging_level = "ERROR"
|
|
30
|
+
config_logging()
|
|
52
31
|
|
|
53
32
|
def display_integration_daemon_status(
|
|
54
33
|
search_list: list[str] = ["*"],
|
|
@@ -58,13 +37,15 @@ def display_integration_daemon_status(
|
|
|
58
37
|
integ_url: str = os.environ.get(
|
|
59
38
|
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
|
60
39
|
),
|
|
61
|
-
view_server: str =
|
|
62
|
-
view_url: str =
|
|
63
|
-
user: str =
|
|
64
|
-
user_pass: str =
|
|
40
|
+
view_server: str = app_config.egeria_view_server,
|
|
41
|
+
view_url: str = app_config.egeria_view_server_url,
|
|
42
|
+
user: str = EGERIA_USER,
|
|
43
|
+
user_pass: str = EGERIA_USER_PASSWORD,
|
|
44
|
+
|
|
45
|
+
width: int = app_config.console_width,
|
|
65
46
|
paging: bool = False,
|
|
66
|
-
|
|
67
|
-
|
|
47
|
+
|
|
48
|
+
jupyter: bool = app_config.egeria_jupyter,
|
|
68
49
|
sort: bool = True,
|
|
69
50
|
) -> None:
|
|
70
51
|
"""Display the status of connectors running on the specified Integration Daemon OMAG Server.
|
|
@@ -134,7 +115,6 @@ def display_integration_daemon_status(
|
|
|
134
115
|
table.add_column("Target Element", min_width=20)
|
|
135
116
|
table.add_column("Exception Message", min_width=10)
|
|
136
117
|
|
|
137
|
-
# server_guid = s_client.get_guid_for_name(integ_server)
|
|
138
118
|
|
|
139
119
|
token = s_client.refresh_egeria_bearer_token()
|
|
140
120
|
daemon_status = s_client.get_server_report(None, integ_server)
|
|
@@ -159,22 +139,24 @@ def display_integration_daemon_status(
|
|
|
159
139
|
last_refresh_time = connector.get("lastRefreshTime", "---")[:-10]
|
|
160
140
|
refresh_interval = str(connector.get("minMinutesBetweenRefresh", "---"))
|
|
161
141
|
exception_msg = connector.get("failingExceptionMessage", " ")
|
|
142
|
+
tgt_tab="---"
|
|
162
143
|
if connector_guid != "---":
|
|
163
144
|
targets = s_client.get_catalog_targets(connector_guid)
|
|
164
145
|
tgt_tab = Table()
|
|
165
146
|
tgt_tab.add_column("Target")
|
|
166
|
-
tgt_tab.add_column("
|
|
167
|
-
tgt_tab.add_column("Relationship GUID", no_wrap=True)
|
|
147
|
+
tgt_tab.add_column("Display Name")
|
|
168
148
|
|
|
169
149
|
if type(targets) == list:
|
|
170
150
|
targets_md = True
|
|
171
151
|
for target in targets:
|
|
172
|
-
t_name = target["catalogTargetName"
|
|
152
|
+
t_name = target['relatedBy']['relationshipProperties'].get("catalogTargetName",None)
|
|
173
153
|
# t_sync = target["permittedSynchronization"]
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
154
|
+
if t_name:
|
|
155
|
+
t_unique_name = target["properties"].get("displayName","---")
|
|
156
|
+
else:
|
|
157
|
+
t_unique_name = "---"
|
|
158
|
+
|
|
159
|
+
tgt_tab.add_row(t_name, t_unique_name)
|
|
178
160
|
# targets_md = Markdown(targets_m)
|
|
179
161
|
else:
|
|
180
162
|
targets_md = False
|
|
@@ -220,13 +202,11 @@ def display_integration_daemon_status(
|
|
|
220
202
|
live.update(generate_table(search_list))
|
|
221
203
|
|
|
222
204
|
except (
|
|
223
|
-
|
|
224
|
-
PropertyServerException,
|
|
225
|
-
UserNotAuthorizedException,
|
|
205
|
+
PyegeriaException, PyegeriaClientException,
|
|
226
206
|
) as e:
|
|
227
|
-
|
|
207
|
+
print_basic_exception(e)
|
|
228
208
|
|
|
229
|
-
except KeyboardInterrupt:
|
|
209
|
+
except KeyboardInterrupt as e:
|
|
230
210
|
pass
|
|
231
211
|
|
|
232
212
|
finally:
|
|
@@ -249,15 +229,15 @@ def main_live(paging: bool = False) -> None:
|
|
|
249
229
|
integ_server = (
|
|
250
230
|
args.integ_server
|
|
251
231
|
if args.integ_server is not None
|
|
252
|
-
else
|
|
232
|
+
else app_config.egeria_integration_daemon
|
|
253
233
|
)
|
|
254
234
|
integ_url = (
|
|
255
|
-
args.integ_url if args.integ_url is not None else
|
|
235
|
+
args.integ_url if args.integ_url is not None else app_config.egeria_integration_daemon_url
|
|
256
236
|
)
|
|
257
237
|
view_server = (
|
|
258
|
-
args.view_server if args.view_server is not None else
|
|
238
|
+
args.view_server if args.view_server is not None else app_config.egeria_view_server
|
|
259
239
|
)
|
|
260
|
-
view_url = args.view_url if args.view_url is not None else
|
|
240
|
+
view_url = args.view_url if args.view_url is not None else app_config.egeria_view_server_url
|
|
261
241
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
|
262
242
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
|
263
243
|
|
|
@@ -293,15 +273,15 @@ def main_paging(paging: bool = True) -> None:
|
|
|
293
273
|
integ_server = (
|
|
294
274
|
args.integ_server
|
|
295
275
|
if args.integ_server is not None
|
|
296
|
-
else
|
|
276
|
+
else app_config.egeria_integration_daemon
|
|
297
277
|
)
|
|
298
278
|
integ_url = (
|
|
299
|
-
args.integ_url if args.integ_url is not None else
|
|
279
|
+
args.integ_url if args.integ_url is not None else app_config.egeria_integration_daemon_url
|
|
300
280
|
)
|
|
301
281
|
view_server = (
|
|
302
|
-
args.view_server if args.view_server is not None else
|
|
282
|
+
args.view_server if args.view_server is not None else app_config.egeria_view_server
|
|
303
283
|
)
|
|
304
|
-
view_url = args.view_url if args.view_url is not None else
|
|
284
|
+
view_url = args.view_url if args.view_url is not None else app_config.egeria_view_server_url
|
|
305
285
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
|
306
286
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
|
307
287
|
search_list = Prompt.ask(
|
|
@@ -14,51 +14,39 @@ import json
|
|
|
14
14
|
import os
|
|
15
15
|
import sys
|
|
16
16
|
import time
|
|
17
|
-
|
|
17
|
+
from datetime import datetime
|
|
18
18
|
from rich import box
|
|
19
19
|
from rich.console import Console
|
|
20
20
|
from rich.live import Live
|
|
21
|
+
from rich.markdown import Markdown
|
|
21
22
|
from rich.table import Table
|
|
22
23
|
|
|
23
24
|
from pyegeria import (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
EgeriaTech,
|
|
26
|
+
PyegeriaException,
|
|
27
|
+
print_basic_exception,
|
|
28
|
+
settings,
|
|
29
|
+
config_logging
|
|
29
30
|
)
|
|
30
31
|
|
|
31
|
-
|
|
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("EGERIA_VIEW_SERVER", "view-server")
|
|
35
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
|
36
|
-
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
|
37
|
-
)
|
|
38
|
-
EGERIA_ENGINE_HOST = os.environ.get("INTEGRATION_ENGINE_HOST", "engine-host")
|
|
39
|
-
EGERIA_ENGINE_HOST_URL = os.environ.get(
|
|
40
|
-
"INTEGRATION_ENGINE_HOST_URL", "https://localhost:9443"
|
|
41
|
-
)
|
|
42
|
-
EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
|
|
43
|
-
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
|
44
|
-
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
|
32
|
+
|
|
45
33
|
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
|
46
34
|
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", "200"))
|
|
49
35
|
|
|
50
|
-
|
|
36
|
+
app_config = settings.Environment
|
|
37
|
+
config_logging()
|
|
38
|
+
console = Console(width = app_config.console_width)
|
|
51
39
|
|
|
52
40
|
|
|
53
|
-
def
|
|
41
|
+
def display_engine_activity_c(
|
|
54
42
|
row_limit: int = 0,
|
|
55
|
-
view_server: str =
|
|
56
|
-
view_url: str =
|
|
43
|
+
view_server: str = app_config.egeria_view_server,
|
|
44
|
+
view_url: str = app_config.egeria_view_server_url,
|
|
57
45
|
user: str = EGERIA_USER,
|
|
58
46
|
user_pass: str = EGERIA_USER_PASSWORD,
|
|
59
47
|
paging: bool = True,
|
|
60
|
-
jupyter: bool =
|
|
61
|
-
width: int =
|
|
48
|
+
jupyter: bool = app_config.egeria_jupyter,
|
|
49
|
+
width: int = app_config.console_width,
|
|
62
50
|
):
|
|
63
51
|
"""Display governance engine activity as a table.
|
|
64
52
|
|
|
@@ -81,7 +69,7 @@ def display_engine_activity(
|
|
|
81
69
|
width : int
|
|
82
70
|
The width of the console for table printing.
|
|
83
71
|
"""
|
|
84
|
-
g_client =
|
|
72
|
+
g_client = EgeriaTech(view_server, view_url, user, user_pwd=user_pass)
|
|
85
73
|
token = g_client.create_egeria_bearer_token()
|
|
86
74
|
|
|
87
75
|
def generate_table() -> Table:
|
|
@@ -99,17 +87,15 @@ def display_engine_activity(
|
|
|
99
87
|
expand=True,
|
|
100
88
|
)
|
|
101
89
|
table.add_column("Requested Time")
|
|
102
|
-
table.add_column("
|
|
103
|
-
table.add_column("
|
|
104
|
-
|
|
105
|
-
table.add_column("Request Type")
|
|
90
|
+
table.add_column("Core Info")
|
|
91
|
+
table.add_column("Target Elements")
|
|
92
|
+
|
|
106
93
|
table.add_column("Action Status")
|
|
107
|
-
table.add_column("Target Element")
|
|
108
94
|
table.add_column("Completion Time")
|
|
109
|
-
table.add_column("
|
|
110
|
-
table.add_column("Completion Message")
|
|
95
|
+
table.add_column("Core Results")
|
|
96
|
+
# table.add_column("Completion Message")
|
|
111
97
|
|
|
112
|
-
action_status = g_client.
|
|
98
|
+
action_status = g_client.find_engine_actions()
|
|
113
99
|
|
|
114
100
|
if type(action_status) is str:
|
|
115
101
|
requested_time = " "
|
|
@@ -124,7 +110,7 @@ def display_engine_activity(
|
|
|
124
110
|
elif type(action_status) is list:
|
|
125
111
|
sorted_action_status = sorted(
|
|
126
112
|
action_status,
|
|
127
|
-
key=lambda i: i.get("requestedTime",
|
|
113
|
+
key=lambda i: i.get("requestedTime", datetime.now().isoformat()),
|
|
128
114
|
reverse=True,
|
|
129
115
|
)
|
|
130
116
|
row_count = 0
|
|
@@ -132,56 +118,75 @@ def display_engine_activity(
|
|
|
132
118
|
if row_limit > 0 and row_count >= row_limit:
|
|
133
119
|
break
|
|
134
120
|
row_count += 1
|
|
135
|
-
requested_time = action.get("
|
|
136
|
-
start_time = action.get("startTime", " ")
|
|
137
|
-
completion_time = action.get("completionTime", " ")
|
|
121
|
+
requested_time = action['properties'].get("requestedStartTime", " ")[:-10]
|
|
122
|
+
start_time = action['properties'].get("startTime", " ")[:-10]
|
|
123
|
+
completion_time = action['properties'].get("completionTime", " ")[:-10]
|
|
124
|
+
completion_guards = action['properties'].get("completionGuards", " ")
|
|
138
125
|
|
|
139
|
-
engine_name = action["
|
|
140
|
-
request_type = action["requestType"
|
|
126
|
+
engine_name = action['properties'].get("executorEngineName",'---')
|
|
127
|
+
request_type = action['properties'].get("requestType",'---')
|
|
141
128
|
action_guid = action["elementHeader"]["guid"]
|
|
142
|
-
|
|
129
|
+
activity_status = action['properties'].get("activityStatus",'---')
|
|
130
|
+
if activity_status in (
|
|
143
131
|
"REQUESTED",
|
|
144
132
|
"APPROVED",
|
|
145
133
|
"WAITING",
|
|
146
134
|
"ACTIVATING",
|
|
147
135
|
):
|
|
148
|
-
action_status = f"[yellow]{
|
|
149
|
-
elif
|
|
150
|
-
action_status = f"[green]{
|
|
136
|
+
action_status = f"[yellow]{activity_status}"
|
|
137
|
+
elif activity_status in ("IN_PROGRESS", "COMPLETED"):
|
|
138
|
+
action_status = f"[green]{activity_status}"
|
|
151
139
|
else:
|
|
152
|
-
action_status = f"[red]{
|
|
153
|
-
|
|
154
|
-
|
|
140
|
+
action_status = f"[red]{activity_status}"
|
|
141
|
+
|
|
142
|
+
request_parameters_md = " "
|
|
143
|
+
request_parameters = action['properties'].get("requestParameters", "Empty")
|
|
144
|
+
if type(request_parameters) is dict:
|
|
145
|
+
for key, value in request_parameters.items():
|
|
146
|
+
request_parameters_md += f"\t* {key}: {value}\n"
|
|
147
|
+
#
|
|
148
|
+
# Discuss
|
|
149
|
+
#
|
|
150
|
+
targets = action['properties'].get("actionTargetElements", "Empty")
|
|
155
151
|
if type(targets) is list:
|
|
156
|
-
tgt_tab = Table()
|
|
157
|
-
tgt_tab.add_column("name")
|
|
158
|
-
tgt_tab.add_column("guid", no_wrap=True)
|
|
159
|
-
tgt_tab.add_column("type_name")
|
|
160
152
|
targets_md = ""
|
|
161
153
|
for target in targets:
|
|
162
154
|
t_name = target["actionTargetName"]
|
|
163
155
|
t_guid = target["actionTargetGUID"]
|
|
164
156
|
t_type = target["targetElement"]["type"]["typeName"]
|
|
165
|
-
|
|
157
|
+
targets_md += (
|
|
158
|
+
f"* Target Name: {t_name}\n"
|
|
159
|
+
f" * Target GUID: {t_guid}\n"
|
|
160
|
+
f" * Target Type: {t_type}\n"
|
|
161
|
+
)
|
|
162
|
+
|
|
166
163
|
# target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
|
|
167
|
-
target_element =
|
|
164
|
+
target_element = Markdown(f"{targets_md} ---\n")
|
|
168
165
|
else:
|
|
169
166
|
target_element = " "
|
|
170
167
|
|
|
171
|
-
process_name = action.get("processName", "
|
|
172
|
-
completion_message = action.get("completionMessage", " ")
|
|
173
|
-
|
|
168
|
+
process_name = action['properties'].get("processName", "Null")
|
|
169
|
+
completion_message = action['properties'].get("completionMessage", " ")
|
|
170
|
+
core_results_md = (
|
|
171
|
+
f"* Completion Guards: {completion_guards}\n"
|
|
172
|
+
f"* Completion Message: {completion_message}"
|
|
173
|
+
)
|
|
174
|
+
core_results_out = Markdown(core_results_md)
|
|
175
|
+
core_info_md = (
|
|
176
|
+
f"* Start Time: {start_time}\n* Engine Name: {engine_name}\n* GUID: {action_guid}\n"
|
|
177
|
+
f"* Request Type: {request_type}\n"
|
|
178
|
+
f"* Process Name: {process_name}\n"
|
|
179
|
+
f"---\n"
|
|
180
|
+
f"* Request Parameters: \n{request_parameters_md}\n"
|
|
181
|
+
)
|
|
182
|
+
core_info_out = Markdown(core_info_md)
|
|
174
183
|
table.add_row(
|
|
175
184
|
requested_time,
|
|
176
|
-
|
|
177
|
-
action_guid,
|
|
178
|
-
engine_name,
|
|
179
|
-
request_type,
|
|
180
|
-
action_status,
|
|
185
|
+
core_info_out,
|
|
181
186
|
target_element,
|
|
187
|
+
action_status,
|
|
182
188
|
completion_time,
|
|
183
|
-
|
|
184
|
-
completion_message,
|
|
189
|
+
core_results_out,
|
|
185
190
|
)
|
|
186
191
|
else:
|
|
187
192
|
print("Egeria integration daemon not running")
|
|
@@ -206,11 +211,9 @@ def display_engine_activity(
|
|
|
206
211
|
live.update(generate_table())
|
|
207
212
|
|
|
208
213
|
except (
|
|
209
|
-
|
|
210
|
-
PropertyServerException,
|
|
211
|
-
UserNotAuthorizedException,
|
|
214
|
+
PyegeriaException
|
|
212
215
|
) as e:
|
|
213
|
-
|
|
216
|
+
print_basic_exception(e)
|
|
214
217
|
except KeyboardInterrupt:
|
|
215
218
|
pass
|
|
216
219
|
finally:
|
|
@@ -229,13 +232,12 @@ def main_live():
|
|
|
229
232
|
|
|
230
233
|
args = parser.parse_args()
|
|
231
234
|
|
|
232
|
-
server = args.server if args.server is not None else
|
|
233
|
-
url = args.url if args.url is not None else
|
|
235
|
+
server = args.server if args.server is not None else app_config.egeria_view_server
|
|
236
|
+
url = args.url if args.url is not None else app_config.egeria_view_server_url
|
|
234
237
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
|
235
238
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
|
236
239
|
rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
|
|
237
|
-
|
|
238
|
-
display_engine_activity(
|
|
240
|
+
display_engine_activity_c(
|
|
239
241
|
rowlimit, server, url, user=userid, user_pass=user_pass, paging=False
|
|
240
242
|
)
|
|
241
243
|
|
|
@@ -252,13 +254,13 @@ def main_paging():
|
|
|
252
254
|
|
|
253
255
|
args = parser.parse_args()
|
|
254
256
|
|
|
255
|
-
server = args.server if args.server is not None else
|
|
256
|
-
url = args.url if args.url is not None else
|
|
257
|
+
server = args.server if args.server is not None else app_config.egeria_view_server
|
|
258
|
+
url = args.url if args.url is not None else app_config.egeria_view_server_url
|
|
257
259
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
|
258
260
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
|
259
261
|
rowlimit = int(args.rowlimit) if args.rowlimit is not None else 0
|
|
260
262
|
|
|
261
|
-
|
|
263
|
+
display_engine_activity_c(
|
|
262
264
|
rowlimit, server, url, user=userid, user_pass=user_pass, paging=True
|
|
263
265
|
)
|
|
264
266
|
|
|
@@ -21,9 +21,12 @@ from rich.table import Table
|
|
|
21
21
|
|
|
22
22
|
from pyegeria import (
|
|
23
23
|
EgeriaTech,
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
)
|
|
25
|
+
from pyegeria.core._exceptions import (
|
|
26
|
+
PyegeriaInvalidParameterException,
|
|
27
|
+
PyegeriaAPIException,
|
|
28
|
+
PyegeriaUnauthorizedException,
|
|
29
|
+
print_basic_exception,
|
|
27
30
|
)
|
|
28
31
|
|
|
29
32
|
EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
|
|
@@ -185,11 +188,11 @@ def display_gov_eng_status(
|
|
|
185
188
|
live.update(generate_table(search_list))
|
|
186
189
|
|
|
187
190
|
except (
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
+
PyegeriaInvalidParameterException,
|
|
192
|
+
PyegeriaAPIException,
|
|
193
|
+
PyegeriaUnauthorizedException,
|
|
191
194
|
) as e:
|
|
192
|
-
|
|
195
|
+
print_basic_exception(e)
|
|
193
196
|
|
|
194
197
|
except KeyboardInterrupt:
|
|
195
198
|
pass
|
|
@@ -16,45 +16,34 @@ from rich.live import Live
|
|
|
16
16
|
from rich.markdown import Markdown
|
|
17
17
|
from rich.table import Table
|
|
18
18
|
|
|
19
|
-
from pyegeria import
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
from pyegeria import (
|
|
20
|
+
RuntimeManager,
|
|
21
|
+
EgeriaTech,
|
|
22
|
+
PyegeriaException,
|
|
23
|
+
print_basic_exception,
|
|
24
|
+
settings,
|
|
25
|
+
config_logging
|
|
25
26
|
)
|
|
26
27
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
|
|
30
|
-
EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
|
|
31
|
-
EGERIA_VIEW_SERVER_URL = os.environ.get(
|
|
32
|
-
"EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
|
|
33
|
-
)
|
|
34
|
-
EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
|
|
35
|
-
EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
|
|
36
|
-
"EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
|
|
37
|
-
)
|
|
38
|
-
EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
|
|
39
|
-
EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
|
|
28
|
+
|
|
29
|
+
|
|
40
30
|
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
|
41
31
|
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
|
42
|
-
EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
|
|
43
|
-
EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
|
|
44
32
|
|
|
45
|
-
|
|
46
|
-
console = Console(width=
|
|
33
|
+
app_config = settings.Environment
|
|
34
|
+
console = Console(width = app_config.console_width)
|
|
35
|
+
config_logging()
|
|
47
36
|
|
|
48
37
|
|
|
49
38
|
def display_status(
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
39
|
+
view_server: str = app_config.egeria_view_server,
|
|
40
|
+
view_url: str = app_config.egeria_view_server_url,
|
|
41
|
+
user: str = EGERIA_USER,
|
|
42
|
+
user_pass: str = EGERIA_USER_PASSWORD,
|
|
43
|
+
jupyter: bool = app_config.egeria_jupyter,
|
|
44
|
+
width: int = app_config.console_width,
|
|
56
45
|
):
|
|
57
|
-
r_client = RuntimeManager(view_server, view_url, user)
|
|
46
|
+
r_client = RuntimeManager(view_server, view_url, user, user_pass)
|
|
58
47
|
token = r_client.create_egeria_bearer_token(user, user_pass)
|
|
59
48
|
|
|
60
49
|
def generate_table() -> Table:
|
|
@@ -70,10 +59,10 @@ def display_status(
|
|
|
70
59
|
show_lines=True,
|
|
71
60
|
# expand=True
|
|
72
61
|
)
|
|
73
|
-
table.add_column("Platform Name & GUID")
|
|
62
|
+
table.add_column("Platform Name & GUID", width = 36)
|
|
74
63
|
# table.add_column("Platform GUID")
|
|
75
|
-
table.add_column("Platform URL")
|
|
76
|
-
table.add_column("Platform Origin")
|
|
64
|
+
# table.add_column("Platform URL")
|
|
65
|
+
# table.add_column("Platform Origin")
|
|
77
66
|
table.add_column("Description")
|
|
78
67
|
table.add_column("Platform Started")
|
|
79
68
|
table.add_column("Servers")
|
|
@@ -91,15 +80,15 @@ def display_status(
|
|
|
91
80
|
sys.exit(1)
|
|
92
81
|
|
|
93
82
|
for platform in platform_list:
|
|
94
|
-
platform_name = platform
|
|
95
|
-
platform_guid = platform
|
|
96
|
-
platform_desc = platform
|
|
83
|
+
platform_name = platform.get("display_name", platform.get("properties", {}).get("displayName", "---"))
|
|
84
|
+
platform_guid = platform.get("guid", platform.get("elementHeader", {}).get("guid"))
|
|
85
|
+
platform_desc = platform.get("description", platform.get("properties", {}).get("description", "---"))
|
|
97
86
|
server_list = ""
|
|
98
87
|
|
|
99
88
|
platform_report = r_client.get_platform_report(platform_guid)
|
|
100
|
-
platform_url = platform_report.get("platformURLRoot", " ")
|
|
101
|
-
platform_origin = platform_report.get("platformOrigin", " ")
|
|
102
|
-
platform_build = platform_report.get("platformBuildProperties", " ")
|
|
89
|
+
platform_url = platform_report.get("platform_url_root", platform_report.get("platformURLRoot", " "))
|
|
90
|
+
platform_origin = platform_report.get("platform_origin", platform_report.get("platformOrigin", " "))
|
|
91
|
+
platform_build = platform_report.get("platform_build_properties", platform_report.get("platformBuildProperties", " "))
|
|
103
92
|
platform_build_md = ""
|
|
104
93
|
if type(platform_build) is dict:
|
|
105
94
|
for prop in platform_build:
|
|
@@ -109,9 +98,9 @@ def display_status(
|
|
|
109
98
|
platform_build_out = Markdown(platform_build_md)
|
|
110
99
|
else:
|
|
111
100
|
platform_build_out = platform_origin
|
|
112
|
-
platform_desc = f"{platform_desc}\n\n\t\t
|
|
101
|
+
platform_desc = f"{platform_desc}\n\n\t\t---\n\n{platform_build_md}"
|
|
113
102
|
platform_started = platform_report.get("platformStartTime", " ")
|
|
114
|
-
platform_id = f"{platform_name}\n\n\t\t
|
|
103
|
+
platform_id = f"{platform_name}\n\n\t\t---\n\n{platform_guid}\n\n\t\t---\n\n{platform_url}"
|
|
115
104
|
|
|
116
105
|
servers = platform_report.get("omagservers", None)
|
|
117
106
|
|
|
@@ -134,8 +123,8 @@ def display_status(
|
|
|
134
123
|
|
|
135
124
|
table.add_row(
|
|
136
125
|
platform_id,
|
|
137
|
-
platform_url,
|
|
138
|
-
platform_build_out,
|
|
126
|
+
# platform_url,
|
|
127
|
+
# platform_build_out,
|
|
139
128
|
platform_desc,
|
|
140
129
|
platform_started,
|
|
141
130
|
server_list,
|
|
@@ -147,7 +136,7 @@ def display_status(
|
|
|
147
136
|
platform_url = " "
|
|
148
137
|
platform_origin = " "
|
|
149
138
|
platform_started = " "
|
|
150
|
-
|
|
139
|
+
r_client.refresh_egeria_bearer_token()
|
|
151
140
|
return table
|
|
152
141
|
|
|
153
142
|
try:
|
|
@@ -157,11 +146,10 @@ def display_status(
|
|
|
157
146
|
live.update(generate_table())
|
|
158
147
|
|
|
159
148
|
except (
|
|
160
|
-
|
|
161
|
-
PropertyServerException,
|
|
162
|
-
UserNotAuthorizedException,
|
|
149
|
+
PyegeriaException
|
|
163
150
|
) as e:
|
|
164
|
-
|
|
151
|
+
# print_basic_exception(e)
|
|
152
|
+
console.print_exception()
|
|
165
153
|
|
|
166
154
|
except KeyboardInterrupt:
|
|
167
155
|
pass
|
|
@@ -177,8 +165,8 @@ def main():
|
|
|
177
165
|
parser.add_argument("--password", help="User Password")
|
|
178
166
|
args = parser.parse_args()
|
|
179
167
|
|
|
180
|
-
server = args.server if args.server is not None else
|
|
181
|
-
url = args.url if args.url is not None else
|
|
168
|
+
server = args.server if args.server is not None else app_config.egeria_view_server
|
|
169
|
+
url = args.url if args.url is not None else app_config.egeria_view_server_url
|
|
182
170
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
|
183
171
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
|
184
172
|
|