pyegeria 5.4.0.9__py3-none-any.whl → 5.4.0.11__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 -2
- pyegeria/load_config.py +5 -2
- {pyegeria-5.4.0.9.dist-info → pyegeria-5.4.0.11.dist-info}/METADATA +1 -1
- {pyegeria-5.4.0.9.dist-info → pyegeria-5.4.0.11.dist-info}/RECORD +7 -7
- {pyegeria-5.4.0.9.dist-info → pyegeria-5.4.0.11.dist-info}/LICENSE +0 -0
- {pyegeria-5.4.0.9.dist-info → pyegeria-5.4.0.11.dist-info}/WHEEL +0 -0
- {pyegeria-5.4.0.9.dist-info → pyegeria-5.4.0.11.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,12 @@ 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
|
368
|
-
print(f"root path: {app_config.
|
371
|
+
print(f"root path: {app_config.pyegeria_root}, config_file: {app_config.pyegeria_config_file}")
|
369
372
|
userid = args.userid if args.userid is not None else EGERIA_USER
|
370
373
|
user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
|
371
374
|
format_set_name = args.format_set
|
372
375
|
output_format = args.output_format
|
376
|
+
|
373
377
|
logger.info(f"view server @ {url}")
|
374
378
|
# Collect all user parameters from args
|
375
379
|
kwargs = {}
|
pyegeria/load_config.py
CHANGED
@@ -104,6 +104,7 @@ class EnvironmentConfig(BaseModel):
|
|
104
104
|
egeria_view_server_url: str = Field(default="https://localhost:9443", alias="Egeria View Server URL")
|
105
105
|
egeria_view_server: str = Field(default="qs-view-server", alias="Egeria View Server")
|
106
106
|
pyegeria_root: str = Field(default="/Users/dwolfson/localGit/egeria-v5-3/egeria-python", alias="Pyegeria Root")
|
107
|
+
pyegeria_config_file: str = Field(default="config.json", alias="Egeria Config File")
|
107
108
|
|
108
109
|
class Config:
|
109
110
|
populate_by_name = True
|
@@ -262,7 +263,7 @@ def load_app_config(env_file: str = None):
|
|
262
263
|
|
263
264
|
# If env_file is specified, use it to load environment variables
|
264
265
|
if env_file is not None:
|
265
|
-
|
266
|
+
logger.warning(f"DEBUG: Loading environment variables from {env_file}")
|
266
267
|
env_settings = PyegeriaSettings.with_env_file(env_file)
|
267
268
|
print(f"DEBUG: env_settings.pyegeria_root_path: {env_settings.pyegeria_root_path}")
|
268
269
|
print(f"DEBUG: env_settings.pyegeria_config_file: {env_settings.pyegeria_config_file}")
|
@@ -288,7 +289,8 @@ def load_app_config(env_file: str = None):
|
|
288
289
|
config_file = env_settings.pyegeria_config_file
|
289
290
|
else:
|
290
291
|
logger.error(f"The .env file at {env_file} wasn't found")
|
291
|
-
|
292
|
+
else:
|
293
|
+
logger.error(f"The .env file at {env_file} wasn't found-outer")
|
292
294
|
# Use default values if still not set
|
293
295
|
if root_path is None:
|
294
296
|
root_path = ""
|
@@ -299,6 +301,7 @@ def load_app_config(env_file: str = None):
|
|
299
301
|
config_file_path = os.path.join(root_path, config_file)
|
300
302
|
|
301
303
|
if os.path.exists(config_file_path):
|
304
|
+
logger.info("Found config file at {}".format(config_file_path))
|
302
305
|
try:
|
303
306
|
with open(config_file_path, 'r') as f:
|
304
307
|
file_config = json.load(f)
|
@@ -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=UWFy8l_oR7SmK4Py6D5NiB8qhTh8aijibpC_gD4SGmA,17203
|
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
|
@@ -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=q_NFmBlq4DPkWQmBa1hcWG1UzyOawWd34UT8Eri5pwo,22922
|
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.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
236
|
+
pyegeria-5.4.0.11.dist-info/METADATA,sha256=rcObH76ltVao6G_KiayuiSD9sv-n9tuGL3KGXRz0ve8,2974
|
237
|
+
pyegeria-5.4.0.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
238
|
+
pyegeria-5.4.0.11.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
|
239
|
+
pyegeria-5.4.0.11.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|