Updates to config variables for consistency - and then corresponding cleanup

Signed-off-by: Dan Wolfson <dan.wolfson@pdr-associates.com>

Author: dwolfson

commands/cat/collection_actions.py

@@ -14,7 +14,12 @@
 
 
 from pyegeria import (
-    EgeriaTech, body_slimmer, settings,
+    print_basic_exception,
+    EgeriaTech,
+    settings,
+    EgeriaTech,
+    settings,
+    settings,
     PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
 )
 app_config = settings.Environment

commands/cat/dr_egeria.py

@@ -29,8 +29,8 @@
 # User credentials are only from environment variables or command line (not stored in config for security)
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", app_config.console_width or 190))
-EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", str(app_config.egeria_jupyter)).lower() in ("true", "1", "yes")
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", settings.Environment.egeria_width or 190))
+EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", str(settings.Environment.egeria_jupyter)).lower() in ("true", "1", "yes")
 
 console = Console(width=EGERIA_WIDTH)
 
@@ -80,7 +80,7 @@ def process_markdown_file(input_file: str, output_folder: str, directive: str,
     usage_level = "Advanced" if advanced else "Basic"
     try:
         # Instantiate the client
-        from pyegeria import EgeriaTech
+        from pyegeria import settings, EgeriaTech
         client = EgeriaTech(server, url, userid, user_pass)
         client.create_egeria_bearer_token()
         asyncio.run(process_md_file_v2(

commands/cat/dr_egeria_command_help.py

@@ -26,6 +26,13 @@
     MarkdownIt = None
 
 from pyegeria import (
+    PyegeriaException,
+    print_basic_exception,
+    EgeriaTech,
+    settings,
+    EgeriaTech,
+    settings,
+    settings,
     EgeriaTech,
     PyegeriaException, print_basic_exception, print_validation_error,
 )
@@ -45,7 +52,7 @@
 # Let's check config.py for the exact attribute name.
 
 EGERIA_HOME_GLOSSARY_GUID = user_profile.egeria_home_glossary_name 
-EGERIA_WIDTH = env.console_width
+EGERIA_WIDTH = settings.Environment.egeria_width
 EGERIA_PLATFORM_URL = env.egeria_platform_url
 EGERIA_VIEW_SERVER = env.egeria_view_server
 EGERIA_VIEW_SERVER_URL = env.egeria_view_server_url
@@ -54,7 +61,7 @@
 EGERIA_JUPYTER = env.egeria_jupyter
 
 def _get_console_width_from_config(default_width: int = EGERIA_WIDTH) -> int:
-    return env.console_width
+    return settings.Environment.egeria_width
 
 def _get_outbox_dir() -> str:
     root = env.pyegeria_root

commands/cat/exp_list_glossaries.py

@@ -22,6 +22,9 @@
 
 
 from pyegeria import (
+    print_basic_exception,
+    EgeriaTech,
+    EgeriaTech,
     EgeriaTech,
 PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
 )

commands/cat/get_asset_graph.py

@@ -15,6 +15,10 @@
 from commands.cat.run_report import list_generic
 from pyegeria.core.config import settings
 from pyegeria import (
+    PyegeriaException,
+    print_basic_exception,
+    settings,
+    settings,
     PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table, PyegeriaException
 )
 
@@ -26,13 +30,13 @@
 
 guid_list = []
 
-console = Console(width=app_config.console_width, force_terminal=(not app_config.egeria_jupyter))
+console = Console(width=settings.Environment.egeria_width, force_terminal=(not app_config.egeria_jupyter))
 
 
 def asset_viewer(asset_guid: str, output_format: str = "TABLE", view_server: str = app_config.egeria_view_server,
                  view_url: str = app_config.egeria_view_server_url, user: str = EGERIA_USER,
-                 user_pass: str = EGERIA_USER_PASSWORD, jupyter: bool = app_config.egeria_jupyter,
-                 width: int = app_config.console_width, prompt_missing: bool = False, write_file: bool = False,
+                 user_pass: str = EGERIA_USER_PASSWORD, jupyter: bool = settings.Environment.egeria_jupyter,
+                 width: int = settings.Environment.egeria_width, prompt_missing: bool = False, write_file: bool = False,
                  render_table: bool = False, table_caption: str | None = None, use_pager: bool = True):
     try:
         list_generic(report_spec="Asset-Graph", output_format=output_format, view_server=view_server,

commands/cat/get_collection_tree.py

@@ -17,6 +17,7 @@
 from rich.tree import Tree
 
 from pyegeria import (
+    print_basic_exception,
     CollectionManager,
     NO_ELEMENTS_FOUND,
     PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table

commands/cat/get_project_dependencies.py

@@ -19,6 +19,7 @@
 from rich.tree import Tree
 
 from pyegeria import (
+    print_basic_exception,
     ProjectManager,
     PyegeriaAPIException, PyegeriaClientException,
     print_basic_exception,

commands/cat/get_project_structure.py

@@ -19,6 +19,7 @@
 from rich.tree import Tree
 
 from pyegeria import (
+    print_basic_exception,
     ProjectManager,
     PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table, print_validation_error
 )

commands/cat/get_tech_type_elements.py

@@ -13,6 +13,10 @@
 
 from commands.cat.run_report import list_generic
 from pyegeria import (
+    print_basic_exception,
+    config_logging,
+    settings,
+    settings,
     settings,
     config_logging, print_basic_exception, PyegeriaAPIException, PyegeriaClientException
 )
@@ -22,7 +26,7 @@
 
 app_config = settings.Environment
 config_logging()
-console = Console(width=app_config.console_width)
+console = Console(width=settings.Environment.egeria_width)
 
 guid_list = []
 
@@ -33,8 +37,8 @@ def tech_viewer(
     platform_url: str,
     user: str,
     user_pass: str,
-    jupyter: bool = app_config.egeria_jupyter,
-    width: int = app_config.console_width,
+    jupyter: bool = settings.Environment.egeria_jupyter,
+    width: int = settings.Environment.egeria_width,
 ):
     try:
         list_generic(report_spec = "Tech-Type-Elements", output_format = "TABLE", view_server = server_name,

commands/cat/glossary_actions.py

@@ -10,13 +10,13 @@
 
 import json
 import os
-import sys
 
 import click
 
 from pyegeria import (
-    EgeriaTech, body_slimmer, settings, NO_ELEMENTS_FOUND, TERM_STATUS,
-    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
+    TERM_STATUS, EgeriaTech, NO_ELEMENTS_FOUND, body_slimmer,
+    settings,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception
 )
 
 app_config = settings.Environment