pyegeria 5.4.0.5__tar.gz → 5.4.0.6__tar.gz

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.4.0.5
+Version: 5.4.0.6
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/commands/cat/list_format_set.py

@@ -66,8 +66,8 @@ config_logging()
 
 console = Console(
     style="bold bright_white on black",
-    width=app_config["Console Width"],
-    force_terminal=not app_config["Egeria Jupyter"],
+    width=app_config.console_width,
+    force_terminal=not app_config.egeria_jupyter,
     )
 
 def execute_format_set_action(

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/commands/cli/egeria.py

@@ -138,8 +138,8 @@ from commands.tech.generic_actions import delete_element
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 app_settings = get_app_config()
-app_config = app_settings["Environment"]
-# config_logging()
+app_config = app_settings.Environment
+config_logging()
 
 
 @tui()
@@ -148,42 +148,42 @@ app_config = app_settings["Environment"]
 @click.group()
 @click.option(
     "--server",
-    default=app_config['Egeria Metadata Store'],
+    default=app_config.egeria_metadata_store,
     help="Egeria metadata store to work with",
 )
 @click.option(
     "--url",
-    default=app_config["Egeria Platform URL"],
+    default=app_config.egeria_platform_url,
     help="URL of Egeria metadata store platform to connect to",
 )
 @click.option(
     "--integration_daemon",
-    default=app_config["Egeria Integration Daemon"],
+    default=app_config.egeria_integration_daemon,
     help="Egeria integration daemon to work with",
 )
 @click.option(
     "--integration_daemon_url",
-    default=app_config['Egeria Integration Daemon URL'],
+    default=app_config.egeria_integration_daemon_url,
     help="URL of Egeria integration daemon platform to connect to",
 )
 @click.option(
     "--view_server",
-    default=app_config['Egeria View Server'],
+    default=app_config.egeria_view_server,
     help="Egeria view server to work with",
 )
 @click.option(
     "--view_server_url",
-    default=app_config['Egeria View Server URL'],
+    default=app_config.egeria_view_server_url,
     help="URL of Egeria view server platform to connect to",
 )
 @click.option(
     "--engine_host",
-    default=app_config['Egeria Engine Host'],
+    default=app_config.egeria_engine_host,
     help="Egeria engine host to work with",
 )
 @click.option(
     "--engine_host_url",
-    default=app_config['Egeria Engine Host URL'],
+    default=app_config.egeria_engine_host_url,
     help="URL of Egeria engine host platform to connect to",
 )
 
@@ -202,40 +202,40 @@ app_config = app_settings["Environment"]
     "--jupyter",
     is_flag=True,
     type=bool,
-    default=app_config['Egeria Jupyter'],
+    default=app_config.egeria_jupyter,
     help="Enable for rendering in a Jupyter terminal",
 )
 @click.option(
     "--width",
-    default=app_config['Console Width'],
+    default=app_config.console_width,
     type=int,
     help="Screen width, in characters, to use",
 )
 @click.option(
-    "--home_glossary_guid",
-    default=app_settings['User Profile']['Egeria Home Glossary Name'],
+    "--home_glossary_name",
+    default=app_settings.User_Profile.egeria_home_glossary_name,
     help="Glossary name to use as the home glossary",
 )
 @click.option(
     "--glossary_path",
-    default=app_config['Egeria Glossary Path'],
+    default=app_config.egeria_glossary_path,
     help="Path to glossary import/export files",
 )
 
 @click.option(
     "--root_path",
-    default=app_config['Pyegeria Root'],
+    default=app_config.pyegeria_root,
     help="Root path to use for file operations",
 )
 
 @click.option(
     "--inbox_path",
-    default=app_config['Dr.Egeria Inbox'],
+    default=app_config.dr_egeria_inbox,
     help="Path to inbox files",
 )
 @click.option(
     "--outbox_path",
-    default=app_config['Dr.Egeria Outbox'],
+    default=app_config.dr_egeria_outbox,
     help="Path to outbox files",
 )
 
@@ -255,7 +255,7 @@ def cli(
     timeout,
     jupyter,
     width,
-    home_glossary_guid,
+    home_glossary_name,
     glossary_path,
     root_path,
     inbox_path,
@@ -276,7 +276,7 @@ def cli(
         timeout,
         jupyter,
         width,
-        home_glossary_guid,
+        home_glossary_name,
         glossary_path,
         root_path,
         inbox_path,

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/commands/cli/egeria_cat.py

@@ -80,37 +80,37 @@ app_config = app_settings["Environment"]
 )
 @click.option(
     "--url",
-    default=app_config["Egeria Platform URL"],
+    default=app_config.egeria_platform_url,
     help="URL of Egeria metadata store platform to connect to",
 )
 @click.option(
     "--integration_daemon",
-    default=app_config["Egeria Integration Daemon"],
+    default=app_config.egeria_integration_daemon,
     help="Egeria integration daemon to work with",
 )
 @click.option(
     "--integration_daemon_url",
-    default=app_config['Egeria Integration Daemon URL'],
+    default=app_config.egeria_integration_daemon_url,
     help="URL of Egeria integration daemon platform to connect to",
 )
 @click.option(
     "--view_server",
-    default=app_config['Egeria View Server'],
+    default=app_config.egeria_view_server,
     help="Egeria view server to work with",
 )
 @click.option(
     "--view_server_url",
-    default=app_config['Egeria View Server URL'],
+    default=app_config.egeria_view_server_url,
     help="URL of Egeria view server platform to connect to",
 )
 @click.option(
     "--engine_host",
-    default=app_config['Egeria Engine Host'],
+    default=app_config.egeria_engine_host,
     help="Egeria engine host to work with",
 )
 @click.option(
     "--engine_host_url",
-    default=app_config['Egeria Engine Host URL'],
+    default=app_config.egeria_engine_host_url,
     help="URL of Egeria engine host platform to connect to",
 )
 
@@ -129,40 +129,40 @@ app_config = app_settings["Environment"]
     "--jupyter",
     is_flag=True,
     type=bool,
-    default=app_config['Egeria Jupyter'],
+    default=app_config.egeria_jupyter,
     help="Enable for rendering in a Jupyter terminal",
 )
 @click.option(
     "--width",
-    default=app_config['Console Width'],
+    default=app_config.console__width,
     type=int,
     help="Screen width, in characters, to use",
 )
 @click.option(
     "--home_glossary_guid",
-    default=app_settings['User Profile']['Egeria Home Glossary Name'],
+    default=app_settings.User_Profile.home_glossary_guid,
     help="Glossary name to use as the home glossary",
 )
 @click.option(
     "--glossary_path",
-    default=app_config['Egeria Glossary Path'],
+    default=app_config.egeria_platform_glossary_path,
     help="Path to glossary import/export files",
 )
 
 @click.option(
     "--root_path",
-    default=app_config['Pyegeria Root'],
+    default=app_config.pyegeria_root,
     help="Root path to use for file operations",
 )
 
 @click.option(
     "--inbox_path",
-    default=app_config['Dr.Egeria Inbox'],
+    default=app_config.dr_egeria_inbox,
     help="Path to inbox files",
 )
 @click.option(
     "--outbox_path",
-    default=app_config['Dr.Egeria Outbox'],
+    default=app_config.dr_egeria_outbox,
     help="Path to outbox files",
 )
 

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/commands/cli/ops_config.py

@@ -17,7 +17,7 @@ class Config(object):
         timeout: int,
         jupyter: bool,
         width: int,
-        home_glossary_guid: str,
+        home_glossary_name: str,
         glossary_path: str,
         root_path: str,
         inbox_path: str,
@@ -39,7 +39,7 @@ class Config(object):
         self.width = width
         self.server = server
         self.url = url
-        self.home_glossary_guid = home_glossary_guid
+        self.home_glossary_name = home_glossary_name
         self.glossary_path = glossary_path
         self.root_path = root_path
         self.inbox_path = inbox_path

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/pyegeria/load_config.py

@@ -376,7 +376,7 @@ def load_app_config(env_file: str = None):
     
     # Load user credentials with proper precedence
     # 1. Check OS environment variables
-    user_name = os.getenv("EGERIA_USER_NAME")
+    user_name = os.getenv("EGERIA_USER")
     user_pwd = os.getenv("EGERIA_USER_PASSWORD")
     
     # 2. If not set, check config file

{pyegeria-5.4.0.5 → pyegeria-5.4.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.4.0.5"
+version = "5.4.0.6"
 
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]