pyegeria 5.4.0.2__tar.gz → 5.4.0.3__tar.gz

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/PKG-INFO

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

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/commands/cat/list_collections.py

@@ -151,6 +151,7 @@ def display_collections(
                 collections, key=lambda k: k["display_name"]
             )
             for collection in sorted_collection_list:
+
                 display_name = collection["display_name"]
                 qualified_name = collection["qualified_name"]
                 guid = collection["GUID"]

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/pyegeria/_exceptions_new.py

@@ -16,11 +16,9 @@ from rich.table import Table
 from rich.text import Text
 from rich import print, box
 from rich.console import Console
-from pyegeria.load_config import get_app_config
-from pyegeria._exceptions import EgeriaErrorCode
 
-app_settings = get_app_config()
-EGERIA_WIDTH = app_settings.get("console_width", 200)
+
+EGERIA_WIDTH = os.getenv("PYEGERIA_CONSOLE_WIDTH", 200)
 console = Console(width=EGERIA_WIDTH)
 
 """
@@ -313,7 +311,7 @@ def print_exception_response(e: PyegeriaException):
     if isinstance(e, PyegeriaException):
         console.print(Markdown(f"\n---\n# Exception: {e.__class__.__name__}"))
         msg: Text = Text(e.__str__(), overflow="fold")
-        if e.related_http_code:
+        if hasattr(e, 'related_http_code') and e.related_http_code:
             related_response = e.response.json()
             exception_msg_id = related_response.get("exceptionErrorMessageId", None)
             if exception_msg_id:

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/pyegeria/load_config.py

@@ -3,19 +3,29 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-This module configures logging for pyegeria.
-"""
-import os
-from loguru import logger
+This module manages configuration information for pyegeria and pyegeria clients.
 
-# PYEGERIA_LOG_DIRECTORY = os.getenv("PYEGERIA_LOG_DIRECTORY", "logs")
-# PYEGERIA_CONSOLE_LOG_LVL = os.getenv("PYEGERIA_CONSOLE_LOG_LVL", "INFO")
-# PYEGERIA_FILE_LOG_LVL = os.getenv("PYEGERIA_FILE_LOG_LVL", "TRACE")
+The load_app_config() function loads configuration information:
+1) Default configuration variables are specified in the Dict structure below.
+2) We construct a path to an external configuration JSON file from the Environment Variables
+    - PYEGERIA_ROOT_PATH
+    - PYEGERIA_CONFIG_FILE
+3) If a valid configuration file is found, the configuration will be loaded on top of the default configuration.
+4) We then update the in-memory configuration from Environment Variables, if set.
 
-# config.py
+The result is that Environment Variable values take priority over configuration file values which override the defaults.
 
+The get_app_config() function is used by other modules to get configuration information from the configuration structure
+and makes it available as a dict.
+
+"""
+import inspect
 import os
 import json
+from loguru import logger
+from pyegeria._exceptions_new import PyegeriaInvalidParameterException
+
+
 # from dotenv import load_dotenv # pip install python-dotenv if you use .env files
 
 # --- Configuration Loading Logic ---
@@ -34,9 +44,6 @@ def load_app_config():
         # Configuration already loaded, return existing instance
         return _app_config
 
-    # 1. Load .env variables first if present (for local development)
-    #    This ensures os.getenv can pick them up.
-    # load_dotenv()
 
     # Define default configuration values
     config = {
@@ -92,8 +99,6 @@ def load_app_config():
         }
 }
 
-    # 2. Load from a configuration file (e.g., config.json)
-    #    This allows overriding defaults with file-based settings.
     root_path = os.getenv("PYEGERIA_ROOT_PATH", config["Environment"].get("Pyegeria Root",""))
     config_file = os.getenv("PYEGERIA_CONFIG_FILE", "config.json")
     config_file_path = os.path.join(root_path,config_file)
@@ -107,9 +112,9 @@ def load_app_config():
             print(f"Warning: Could not parse {config_file_path}. Using defaults/env vars.")
         except Exception as e:
             print(f"Warning: Error reading {config_file_path}: {e}. Using defaults/env vars.")
+    else:
+        logger.warning(f"Warning: Could not find {config_file_path}. Using defaults/env vars.")
 
-    # 3. Override with environment variables
-    #    Environment variables take highest precedence.
     debug = config["Debug"]
     debug['debug_mode'] = os.getenv("PYEGERIA_DEBUG_MODE", debug.get("debug_mode", False))
     debug["enable_logger_catch"] = os.getenv("PYEGERIA_ENABLE_LOGGER_CATCH", debug.get("enable_logger_catch", False))
@@ -144,7 +149,7 @@ def load_app_config():
     log["console_logging_level"] = os.getenv("PYEGERIA_CONSOLE_LOG_LVL", log.get("console_logging_level", None))
     log["enable_logging"] = os.getenv("PYEGERIA_ENABLE_LOGGING", log.get("enable_logging", False))
     log["file_logging_level"] = os.getenv("PYEGERIA_FILE_LOG_LVL", log.get("file_logging_level","INFO"))
-    log["log_directory"] = os.getenv("PYEGERIA_LOG_DIRECTORY", log.get("log_directory",None))
+    log["log_directory"] = os.getenv("PYEGERIA_LOG_DIRECTORY", log.get("log_directory",'logs'))
     log["logging_console_format"] = os.getenv("PYEGERIA_LOGGING_CONSOLE_FORMAT", log.get("logging_console_format",
                                              " <green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level}</level> | "
                                              "<cyan>{name}</cyan>:<cyan>{line}</cyan> - "
@@ -160,6 +165,12 @@ def load_app_config():
     user["user_name"] = os.getenv("EGERIA_USER_NAME", "peterprofile")
     user["user_pwd"] = os.getenv("EGERIA_USER_PASSWORD", "secret")
 
+    if not user.get("user_pwd"):
+        context: dict = {}
+        context['caller method'] = inspect.currentframe().f_back.f_code.co_name
+        additional_info: dict = {"reason": "Egeria user password is not found in the environment"}
+        raise PyegeriaInvalidParameterException(None, context, additional_info)
+
 
 
 

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/pyegeria/logging_configuration.py

@@ -161,7 +161,7 @@ def config_logging():
 
     # Get the directory for log files from the environment variable
     log_app_settings = app_settings["Logging"]
-    log_directory = log_app_settings.get("log_directory","/tmp")
+    log_directory = log_app_settings.get("log_directory","/Users/dwolfson/localGit/egeria-v-3/egeria-python/logs")
     console_logging_level = log_app_settings.get("console_logging_level","SUCCESS")
     logging_console_format = log_app_settings.get("console_format","{time:YYYY-MM-DD HH:mm:ss} | {level} | {module}:{line}"
                                                                " - {message} - {extra}")
@@ -183,7 +183,7 @@ def config_logging():
     logger.add(log_file_path,
                level=file_logging_level,
                format=logging_file_format,
-               filter = "collection_manager_omvs",
+               filter = "",
                retention="7 days",  # Keep logs for 7 days
                rotation="10 MB", # rotate logs once they are 10mb
                compression="zip")

{pyegeria-5.4.0.2 → pyegeria-5.4.0.3}/pyproject.toml

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