pyegeria 5.4.0.7__tar.gz → 5.4.0.10__tar.gz

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/PKG-INFO

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

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/commands/cat/list_format_set.py

@@ -60,10 +60,12 @@ from pyegeria.egeria_tech_client import EgeriaTech
 
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+logger.enable("pyegeria")
 app_settings = get_app_config()
 app_config = app_settings.Environment
 config_logging()
 
+print(f"Console width is {app_config.console_width}")
 console = Console(
     style="bold bright_white on black",
     width=app_config.console_width,
@@ -318,6 +320,7 @@ def execute_format_set_action(
 
 def main():
     # First, parse just the format-set argument to determine which other arguments to add
+    logger.enable("pyegeria")
     initial_parser = argparse.ArgumentParser(add_help=False)
     initial_parser.add_argument("--format-set", help="Name of the output format set", required=True)
     initial_args, _ = initial_parser.parse_known_args()
@@ -365,11 +368,13 @@ def main():
 
     server = args.server if args.server is not None else app_config.egeria_view_server
     url = args.url if args.url is not None else app_config.egeria_view_server_url
+    print(f"root path: {app_config.pyegeria_root}, config_file: {app_config.egeria_config_file}")
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     format_set_name = args.format_set
     output_format = args.output_format
-    
+
+    logger.info(f"view server @ {url}")
     # Collect all user parameters from args
     kwargs = {}
     for param in user_params:

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/commands/cli/egeria.py

@@ -1049,7 +1049,7 @@ def show_cat_info(ctx):
 def show_format_set(ctx, format_set, output_format, search_string):
     """Dynamically generate output based on a format set"""
     c = ctx.obj
-
+    logger.info(f"Hey Egeria: view server @ {c.view_server_url}")
     execute_format_set_action(
         format_set, c.view_server, c.view_server_url,
         c.userid, c.password, output_format, search_string = search_string

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/pyegeria/_client_new.py

@@ -375,8 +375,11 @@ class Client2:
         """Make a request to the Egeria API."""
         try:
             loop = asyncio.get_running_loop()
-            coro = self._async_make_request(request_type, endpoint, payload, time_out, is_json)
-            return asyncio.run_coroutine_threadsafe(coro, loop).result()
+            if loop.is_running():
+                coro = self._async_make_request(request_type, endpoint, payload, time_out, is_json)
+                return asyncio.run_coroutine_threadsafe(coro, loop).result()
+            else:
+                return loop.run_until_complete(self._async_make_request(request_type, endpoint, payload, time_out, is_json))
         except RuntimeError:
             # No running loop exists; run the coroutine
             return asyncio.run(self._async_make_request(request_type, endpoint, payload, time_out, is_json))

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/pyegeria/load_config.py

@@ -262,7 +262,7 @@ def load_app_config(env_file: str = None):
     
     # If env_file is specified, use it to load environment variables
     if env_file is not None:
-        print(f"DEBUG: Loading environment variables from {env_file}")
+        logger.warning(f"DEBUG: Loading environment variables from {env_file}")
         env_settings = PyegeriaSettings.with_env_file(env_file)
         print(f"DEBUG: env_settings.pyegeria_root_path: {env_settings.pyegeria_root_path}")
         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):
                 config_file = env_settings.pyegeria_config_file
         else:
             logger.error(f"The .env file at {env_file} wasn't found")
-    
+    else:
+        logger.error(f"The .env file at {env_file} wasn't found-outer")
     # Use default values if still not set
     if root_path is None:
         root_path = ""
@@ -299,6 +300,7 @@ def load_app_config(env_file: str = None):
     config_file_path = os.path.join(root_path, config_file)
     
     if os.path.exists(config_file_path):
+        logger.info("Found config file at {}".format(config_file_path))
         try:
             with open(config_file_path, 'r') as f:
                 file_config = json.load(f)
@@ -355,7 +357,7 @@ def load_app_config(env_file: str = None):
     # Logging section
     log = config_dict["Logging"]
     log["console_filter_levels"] = _parse_list_env("PYEGERIA_CONSOLE_FILTER_LEVELS", log.get("console_filter_levels", ["ERROR"]))
-    log["console_logging_enabled"] = _parse_list_env("PYEGERIA_CONSOLE_LOGGING_ENABLED", log.get("console_logging_enabled", ["tests"]))
+    log["console_logging_enabled"] = _parse_list_env("PYEGERIA_CONSOLE_LOGGING_ENABLED", log.get("console_logging_enabled", ["pyegeria"]))
     log["console_logging_level"] = os.getenv("PYEGERIA_CONSOLE_LOG_LVL", log.get("console_logging_level", "INFO"))
     log["enable_logging"] = _parse_bool_env("PYEGERIA_ENABLE_LOGGING", log.get("enable_logging", False))
     log["file_logging_level"] = os.getenv("PYEGERIA_FILE_LOG_LVL", log.get("file_logging_level", "INFO"))

{pyegeria-5.4.0.7 → pyegeria-5.4.0.10}/pyproject.toml

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