pyegeria 5.4.0.7__py3-none-any.whl → 5.4.0.10__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.
- commands/cat/list_format_set.py +6 -1
- commands/cli/egeria.py +1 -1
- pyegeria/_client_new.py +5 -2
- pyegeria/load_config.py +5 -3
- {pyegeria-5.4.0.7.dist-info → pyegeria-5.4.0.10.dist-info}/METADATA +1 -1
- {pyegeria-5.4.0.7.dist-info → pyegeria-5.4.0.10.dist-info}/RECORD +9 -9
- {pyegeria-5.4.0.7.dist-info → pyegeria-5.4.0.10.dist-info}/LICENSE +0 -0
- {pyegeria-5.4.0.7.dist-info → pyegeria-5.4.0.10.dist-info}/WHEEL +0 -0
- {pyegeria-5.4.0.7.dist-info → pyegeria-5.4.0.10.dist-info}/entry_points.txt +0 -0
commands/cat/list_format_set.py
CHANGED
@@ -60,10 +60,12 @@ from pyegeria.egeria_tech_client import EgeriaTech
|
|
60
60
|
|
61
61
|
EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
|
62
62
|
EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
|
63
|
+
logger.enable("pyegeria")
|
63
64
|
app_settings = get_app_config()
|
64
65
|
app_config = app_settings.Environment
|
65
66
|
config_logging()
|
66
67
|
|
68
|
+
print(f"Console width is {app_config.console_width}")
|
67
69
|
console = Console(
|
68
70
|
style="bold bright_white on black",
|
69
71
|
width=app_config.console_width,
|
@@ -318,6 +320,7 @@ def execute_format_set_action(
|
|
318
320
|
|
319
321
|
def main():
|
320
322
|
# First, parse just the format-set argument to determine which other arguments to add
|
323
|
+
logger.enable("pyegeria")
|
321
324
|
initial_parser = argparse.ArgumentParser(add_help=False)
|
322
325
|
initial_parser.add_argument("--format-set", help="Name of the output format set", required=True)
|
323
326
|
initial_args, _ = initial_parser.parse_known_args()
|
@@ -365,11 +368,13 @@ def main():
|
|
365
368
|
|
366
369
|
server = args.server if args.server is not None else app_config.egeria_view_server
|
367
370
|
url = args.url if args.url is not None else app_config.egeria_view_server_url
|
371
|
+
print(f"root path: {app_config.pyegeria_root}, config_file: {app_config.egeria_config_file}")
|
368
372
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
369
373
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
370
374
|
format_set_name = args.format_set
|
371
375
|
output_format = args.output_format
|
372
|
-
|
376
|
+
|
377
|
+
logger.info(f"view server @ {url}")
|
373
378
|
# Collect all user parameters from args
|
374
379
|
kwargs = {}
|
375
380
|
for param in user_params:
|
commands/cli/egeria.py
CHANGED
@@ -1049,7 +1049,7 @@ def show_cat_info(ctx):
|
|
1049
1049
|
def show_format_set(ctx, format_set, output_format, search_string):
|
1050
1050
|
"""Dynamically generate output based on a format set"""
|
1051
1051
|
c = ctx.obj
|
1052
|
-
|
1052
|
+
logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
|
1053
1053
|
execute_format_set_action(
|
1054
1054
|
format_set, c.view_server, c.view_server_url,
|
1055
1055
|
c.userid, c.password, output_format, search_string = search_string
|
pyegeria/_client_new.py
CHANGED
@@ -375,8 +375,11 @@ class Client2:
|
|
375
375
|
"""Make a request to the Egeria API."""
|
376
376
|
try:
|
377
377
|
loop = asyncio.get_running_loop()
|
378
|
-
|
379
|
-
|
378
|
+
if loop.is_running():
|
379
|
+
coro = self._async_make_request(request_type, endpoint, payload, time_out, is_json)
|
380
|
+
return asyncio.run_coroutine_threadsafe(coro, loop).result()
|
381
|
+
else:
|
382
|
+
return loop.run_until_complete(self._async_make_request(request_type, endpoint, payload, time_out, is_json))
|
380
383
|
except RuntimeError:
|
381
384
|
# No running loop exists; run the coroutine
|
382
385
|
return asyncio.run(self._async_make_request(request_type, endpoint, payload, time_out, is_json))
|
pyegeria/load_config.py
CHANGED
@@ -262,7 +262,7 @@ def load_app_config(env_file: str = None):
|
|
262
262
|
|
263
263
|
# If env_file is specified, use it to load environment variables
|
264
264
|
if env_file is not None:
|
265
|
-
|
265
|
+
logger.warning(f"DEBUG: Loading environment variables from {env_file}")
|
266
266
|
env_settings = PyegeriaSettings.with_env_file(env_file)
|
267
267
|
print(f"DEBUG: env_settings.pyegeria_root_path: {env_settings.pyegeria_root_path}")
|
268
268
|
print(f"DEBUG: env_settings.pyegeria_config_file: {env_settings.pyegeria_config_file}")
|
@@ -288,7 +288,8 @@ def load_app_config(env_file: str = None):
|
|
288
288
|
config_file = env_settings.pyegeria_config_file
|
289
289
|
else:
|
290
290
|
logger.error(f"The .env file at {env_file} wasn't found")
|
291
|
-
|
291
|
+
else:
|
292
|
+
logger.error(f"The .env file at {env_file} wasn't found-outer")
|
292
293
|
# Use default values if still not set
|
293
294
|
if root_path is None:
|
294
295
|
root_path = ""
|
@@ -299,6 +300,7 @@ def load_app_config(env_file: str = None):
|
|
299
300
|
config_file_path = os.path.join(root_path, config_file)
|
300
301
|
|
301
302
|
if os.path.exists(config_file_path):
|
303
|
+
logger.info("Found config file at {}".format(config_file_path))
|
302
304
|
try:
|
303
305
|
with open(config_file_path, 'r') as f:
|
304
306
|
file_config = json.load(f)
|
@@ -355,7 +357,7 @@ def load_app_config(env_file: str = None):
|
|
355
357
|
# Logging section
|
356
358
|
log = config_dict["Logging"]
|
357
359
|
log["console_filter_levels"] = _parse_list_env("PYEGERIA_CONSOLE_FILTER_LEVELS", log.get("console_filter_levels", ["ERROR"]))
|
358
|
-
log["console_logging_enabled"] = _parse_list_env("PYEGERIA_CONSOLE_LOGGING_ENABLED", log.get("console_logging_enabled", ["
|
360
|
+
log["console_logging_enabled"] = _parse_list_env("PYEGERIA_CONSOLE_LOGGING_ENABLED", log.get("console_logging_enabled", ["pyegeria"]))
|
359
361
|
log["console_logging_level"] = os.getenv("PYEGERIA_CONSOLE_LOG_LVL", log.get("console_logging_level", "INFO"))
|
360
362
|
log["enable_logging"] = _parse_bool_env("PYEGERIA_ENABLE_LOGGING", log.get("enable_logging", False))
|
361
363
|
log["file_logging_level"] = os.getenv("PYEGERIA_FILE_LOG_LVL", log.get("file_logging_level", "INFO"))
|
@@ -21,7 +21,7 @@ commands/cat/list_deployed_catalogs.py,sha256=VdN6R9kRVWX-fGIgubOigvMVPzhF-hKQep
|
|
21
21
|
commands/cat/list_deployed_database_schemas.py,sha256=1Qicke1R2_7Xi3Qf5sp8KJ3_reAIt0z1iaz2sG8Z0Qs,9458
|
22
22
|
commands/cat/list_deployed_databases.py,sha256=ryrBW1CxJRfOeLP978qQwxb5oImqhIsHghtcpWeBIrw,7587
|
23
23
|
commands/cat/list_deployed_servers.py,sha256=_xR7EaaCsxIjTphxmoCZlARoja_vQqZ881pFiEuhw-8,5719
|
24
|
-
commands/cat/list_format_set.py,sha256=
|
24
|
+
commands/cat/list_format_set.py,sha256=4gmdX-st9G9Vyv1yRbBH7Wmk-IkmGDcF3ZUqDKp3MPA,17201
|
25
25
|
commands/cat/list_glossaries.py,sha256=pKJdiRMrSBpmPv0yOWoR_CdGZP06MuxfPGwCXc-kSQw,7666
|
26
26
|
commands/cat/list_projects.py,sha256=NzWTuepTGUEyxK-eWvuUxtBgCtNWubVwmz2eqm2UN1c,7997
|
27
27
|
commands/cat/list_tech_type_elements.py,sha256=-9omj5en9dSP1xMSljYVHyfXsuhuE1bO2IFj_bZPhAs,6873
|
@@ -31,7 +31,7 @@ commands/cat/list_todos.py,sha256=NitCw0uyVVjmN1hxb1W-I4FbOsa8wQxW2ICyOElHyc8,65
|
|
31
31
|
commands/cat/list_user_ids.py,sha256=X5Q-YNEp38saPYDuy9VwdQC5Qpa4HyC3WvAdbyp_P6M,5108
|
32
32
|
commands/cli/__init__.py,sha256=E6vPW3P3iuVPyrwtDIWvU9P0JXOGqP8KupeIZdxc6wc,298
|
33
33
|
commands/cli/debug_log,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
34
|
-
commands/cli/egeria.py,sha256=
|
34
|
+
commands/cli/egeria.py,sha256=bNnWrVBazMDswK7uuYt4NG74nGYhri-O6Ps6KCHibqw,52257
|
35
35
|
commands/cli/egeria_cat.py,sha256=dzi6WIe-OydX5pRVImtH5TqhqsGynGyJSiaivlrOLus,18299
|
36
36
|
commands/cli/egeria_login_tui.py,sha256=bh9MvJcZPpixXkEtWh_4NK4YcRdeHSVDUBTIhQncSyY,9498
|
37
37
|
commands/cli/egeria_my.py,sha256=pWFgznhBs34a6ldRExAFGmZ7K-wBYqjTUfvdUtPq_uc,6349
|
@@ -187,7 +187,7 @@ md_processing/md_processing_utils/message_constants.py,sha256=UBf18obM83umM6zplR
|
|
187
187
|
pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
|
188
188
|
pyegeria/__init__.py,sha256=jKqMWRZZoQ7SMpbXQajAfmPTkUc8MX7Du5ALYylBonM,31185
|
189
189
|
pyegeria/_client.py,sha256=hJHn5pD8sbelP_M9dK-M5Z2CYqpRXzXfg1UCgAdQ6dQ,33416
|
190
|
-
pyegeria/_client_new.py,sha256=
|
190
|
+
pyegeria/_client_new.py,sha256=nXKojaveeLvwIEiSzHRGN53pVnM-Vj8-0kLaAxERp-s,27722
|
191
191
|
pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
|
192
192
|
pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
|
193
193
|
pyegeria/_exceptions_new.py,sha256=rxfT3KcBUCeXoz_JJotTzylT0o9SZ_yu4EMuWMScCF8,18182
|
@@ -212,7 +212,7 @@ pyegeria/full_omag_server_config.py,sha256=CQqLCy_3DZFvJZEOcGf50HWdFaWpiAIs6z-kK
|
|
212
212
|
pyegeria/glossary_browser_omvs.py,sha256=Jb2Tt2qNjnoWQNBDMdZiuQffH6nC4lKekZNEJCiW5BE,166966
|
213
213
|
pyegeria/glossary_manager_omvs.py,sha256=vXHlBuJxUIAkSI7OKbYcspmcfxxX-L7oe5J0AiEefVI,87991
|
214
214
|
pyegeria/governance_officer_omvs.py,sha256=14UnC-fS5LUsWzx-RuzUX_ZNVxldqvVSvZFvJDv980I,91580
|
215
|
-
pyegeria/load_config.py,sha256=
|
215
|
+
pyegeria/load_config.py,sha256=pGR9P_GCMkMK9ugRDiYvruX21O8XizSrioOW9ZAEm2I,22833
|
216
216
|
pyegeria/load_config_orig.py,sha256=lOM37vdIBcYfLQFTLP5bDuNc7vTFGBNYPfqHtWGNvA4,11624
|
217
217
|
pyegeria/logging_configuration.py,sha256=R1pMPHb7Gm8bxRkrvgFFCpIc7cI05FyZS7aWQTErTHM,7715
|
218
218
|
pyegeria/md_processing_helpers.py,sha256=xlQuK5eP_PJqUdy4BScQ97NyBD95jMS3EUg0wK5CsZo,2137
|
@@ -232,8 +232,8 @@ pyegeria/template_manager_omvs.py,sha256=chBljs1vy5wr9DRAtbvIt4Cob_7HxGfxLkCNlDT
|
|
232
232
|
pyegeria/utils.py,sha256=CAh8LItgmGf5UHIYeYAOE4roHg1wuBk3zQ1lxK7lcZA,6805
|
233
233
|
pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
|
234
234
|
pyegeria/x_action_author_omvs.py,sha256=RcqSzahUKCtvb_3u_wyintAlc9WFkC_2v0E12TZs8lQ,6433
|
235
|
-
pyegeria-5.4.0.
|
236
|
-
pyegeria-5.4.0.
|
237
|
-
pyegeria-5.4.0.
|
238
|
-
pyegeria-5.4.0.
|
239
|
-
pyegeria-5.4.0.
|
235
|
+
pyegeria-5.4.0.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
236
|
+
pyegeria-5.4.0.10.dist-info/METADATA,sha256=S8OsjCjUmREYzGgeOntkN0fYaUhYmp8zv-H3I5ZR-DE,2974
|
237
|
+
pyegeria-5.4.0.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
238
|
+
pyegeria-5.4.0.10.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
|
239
|
+
pyegeria-5.4.0.10.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|