pyegeria 5.4.2.2__py3-none-any.whl → 5.4.3__py3-none-any.whl

pyegeria/_output_formats.py

@@ -73,13 +73,13 @@ from loguru import logger
 
 from pyegeria._output_format_models import (Column, Format, ActionParameter, FormatSet, FormatSetDict,
                                             save_format_sets_to_json, load_format_sets_from_json)
-from pyegeria.config import settings
+# from pyegeria.config import settings
 
 
 # Get the configured value for the user format sets directory
 
-USER_FORMAT_SETS_DIR = os.path.expanduser(settings.Environment.pyegeria_user_format_sets_dir)
-
+# USER_FORMAT_SETS_DIR = os.path.expanduser(settings.Environment.pyegeria_user_format_sets_dir)
+USER_FORMAT_SETS_DIR = os.getenv("PYEGERIA_USER_FORMAT_SETS_DIR", "./")
 # Constants
 MD_SEPARATOR = "\n---\n\n"
 

pyegeria/config.py

@@ -27,7 +27,7 @@ import json
 from typing import List, Optional, Union, Dict, Any
 
 from loguru import logger
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, validator, ConfigDict
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from pyegeria._exceptions_new import PyegeriaInvalidParameterException, PyegeriaException
@@ -105,15 +105,13 @@ class EnvironmentConfig(BaseModel):
     egeria_platform_url: str = Field(default="https://localhost:9443", alias="Egeria Platform URL")
     egeria_view_server_url: str = Field(default="https://localhost:9443", alias="Egeria View Server URL")
     egeria_view_server: str = Field(default="qs-view-server", alias="Egeria View Server")
-    pyegeria_root: str = Field(default="/Users/dwolfson/localGit/egeria-v5-3/egeria-python", alias="Pyegeria Root")
+    pyegeria_root: str = Field(default="", alias="Pyegeria Root")
     pyegeria_config_directory: str = Field(default="", alias="Pyegeria Config Directory")
     pyegeria_config_file: str = Field(default="config.json", alias="Egeria Config File")
     pyegeria_publishing_root: str = Field(default="/dr-egeria-outbox", alias="Pyegeria Publishing Root")
     pyegeria_user_format_sets_dir: str = Field(default="~/.pyegeria/format_sets", alias="Pyegeria User Format Sets Dir")
     
-    class Config:
-        populate_by_name = True
-        extra = "allow"
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
 
 class DebugConfig(BaseModel):
@@ -122,9 +120,7 @@ class DebugConfig(BaseModel):
     enable_logger_catch: bool = False
     timeout_seconds: int = 30
     
-    class Config:
-        populate_by_name = True
-        extra = "allow"
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
 
 class LoggingConfig(BaseModel):
@@ -138,9 +134,7 @@ class LoggingConfig(BaseModel):
     logging_console_format: str = " <green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level}</level> | <cyan>{name}</cyan>:<cyan>{line}</cyan> - <level>{message}</level> -{extra}"
     logging_file_format: str = " {time:YYYY-MM-DD HH:mm:ss} | {level} | {function}:{line} - {message }-{extra}"
     
-    class Config:
-        populate_by_name = True
-        extra = "allow"
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
 
 class UserProfileConfig(BaseModel):
@@ -151,21 +145,7 @@ class UserProfileConfig(BaseModel):
     user_name: Optional[str] = "erinoverview"
     user_pwd: Optional[str] = "secret"
     
-    @validator('user_name')
-    # def validate_user_name(cls, v):
-    #     if not v:
-    #         raise ValueError("Egeria user name is not found in the configuration")
-    #     return v
-    #
-    # @validator('user_pwd')
-    # def validate_user_pwd(cls, v):
-    #     if not v:
-    #         raise ValueError("Egeria user password is not found in the configuration")
-    #     return v
-    
-    class Config:
-        populate_by_name = True
-        extra = "allow"
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
 
 class AppConfig(BaseModel):
@@ -210,9 +190,7 @@ class AppConfig(BaseModel):
         # If not found, return the default
         return default
     
-    class Config:
-        populate_by_name = True
-        extra = "allow"
+    model_config = ConfigDict(populate_by_name=True, extra='allow')
 
 
 # --- Configuration Loading Logic ---
@@ -220,7 +198,31 @@ class AppConfig(BaseModel):
 # Private variable to hold the loaded configuration
 _app_config = None
 
-def load_app_config(env_file: str = None):
+def _resolve_env_settings(env_file: str | None) -> PyegeriaSettings:
+    if env_file:
+        return PyegeriaSettings.with_env_file(env_file)
+    return PyegeriaSettings()
+
+
+def _find_config_file_path(settings: PyegeriaSettings) -> str | None:
+    config_dir = (settings.pyegeria_config_directory or "").strip()
+    root_path = (settings.pyegeria_root_path or "").strip()
+    config_file = (settings.pyegeria_config_file or "config.json").strip()
+
+    candidates = []
+    if config_dir:
+        candidates.append(os.path.join(config_dir, config_file))
+    if root_path:
+        candidates.append(os.path.join(root_path, config_file))
+    candidates.append(os.path.abspath(os.path.join(os.getcwd(), "config.json")))
+
+    for path in candidates:
+        if path and os.path.exists(path):
+            return path
+    return None
+
+
+def load_app_config(env_file: str | None = None):
     """
     Loads application configuration from files and environment variables.
     This function should ideally be called only once at application startup.
@@ -246,118 +248,57 @@ def load_app_config(env_file: str = None):
         # Configuration already loaded, return existing instance
         return _app_config
 
-    # Start with default configuration from Pydantic models
-    config_dict = {
+    # 1) Defaults from models
+    config_dict: dict[str, Any] = {
         "Environment": {},
         "Debug": {},
         "Logging": {},
         "User Profile": {},
-        "feature_x_enabled": False
+        "feature_x_enabled": False,
     }
-    
-    # Initialize env_settings with default values
-    env_settings = PyegeriaSettings()
-    
-    # First check if OS environment variables are set for PYEGERIA_CONFIG_DIRECTORY, PYEGERIA_ROOT_PATH and PYEGERIA_CONFIG_FILE
-    config_directory = os.getenv("PYEGERIA_CONFIG_DIRECTORY")
-    root_path = os.getenv("PYEGERIA_ROOT_PATH")
-    config_file = os.getenv("PYEGERIA_CONFIG_FILE")
-    
-    logger.info(f"DEBUG: Initial config_directory from OS env: {config_directory}")
-    logger.info(f"DEBUG: Initial root_path from OS env: {root_path}")
-    logger.info(f"DEBUG: Initial config_file from OS env: {config_file}")
-    logger.info(f"DEBUG: env_file parameter: {env_file}")
-    
-    # If env_file is specified, use it to load environment variables
-    if env_file is not None:
-        logger.trace(f"DEBUG: Loading environment variables from {env_file}")
-        env_settings = PyegeriaSettings.with_env_file(env_file)
-
-        # If env_file is specified, always use its values, regardless of OS environment variables
-        config_directory = env_settings.pyegeria_config_directory
-        root_path = env_settings.pyegeria_root_path
-        config_file = env_settings.pyegeria_config_file
-    # If config_file is set but config_directory and root_path are not, we'll try to load the config file first
-    # and only check the .env file if we still don't have a config_directory or root_path after loading the config file
-    elif config_file is not None and config_directory is None and root_path is None:
-        # We'll check for a .env file later if needed
-        pass
-    # If any of config_directory, root_path, or config_file is not set, check for a .env file in the current directory
-    elif (config_directory is None or root_path is None or config_file is None):
-        if os.path.exists(".env"):
-            logger.info("Found .env file")
-            logger.debug(f"DEBUG: Loading environment variables from .env in current directory")
-            env_settings = PyegeriaSettings()
-            logger.debug(f"DEBUG: env_settings.pyegeria_config_directory: {env_settings.pyegeria_config_directory}")
-            logger.debug(f"DEBUG: env_settings.pyegeria_root_path: {env_settings.pyegeria_root_path}")
-            logger.debug(f"DEBUG: env_settings.pyegeria_config_file: {env_settings.pyegeria_config_file}")
-            if config_directory is None:
-                config_directory = env_settings.pyegeria_config_directory
-            if root_path is None:
-                root_path = env_settings.pyegeria_root_path
-            if config_file is 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 config_directory is None:
-        config_directory = ""
-    if root_path is None:
-        root_path = ""
-    if config_file is None:
-        config_file = "config.json"
-    
-    # Construct the config file path - prefer config_directory over root_path
-    if config_directory:
-        config_file_path = os.path.join(config_directory, config_file)
-    else:
-        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))
+
+    # 2) Load env settings from OS/.env according to env_file
+    env_settings = _resolve_env_settings(env_file)
+
+    # 3) Load config file if found
+    file_path = _find_config_file_path(env_settings)
+    if file_path:
+        logger.info(f"Using config file: {file_path}")
         try:
-            with open(config_file_path, 'r') as f:
-                file_config = json.load(f)
-                config_dict.update(file_config)  # Merge/override defaults
-                
-                # If config_directory is not set from environment variables or .env file,
-                # set it from the config file if available
-                if not config_directory and "Environment" in file_config and "Pyegeria Config Directory" in file_config["Environment"]:
-                    config_directory = file_config["Environment"]["Pyegeria Config Directory"]
-                    logger.debug(f"DEBUG: Setting config_directory from config file: {config_directory}")
-                # If config_directory is still not set and root_path is not set from environment variables or .env file,
-                # set root_path from the config file if available
-                if not config_directory and not root_path and "Environment" in file_config and "Pyegeria Root" in file_config["Environment"]:
-                    root_path = file_config["Environment"]["Pyegeria Root"]
-                    logger.debug(f"DEBUG: Setting root_path from config file: {root_path}")
-        except json.JSONDecodeError:
-            logger.warning(f"Warning: Could not parse {config_file_path}. Using defaults/env vars.")
+            with open(file_path, "r") as f:
+                file_cfg = json.load(f)
+                if isinstance(file_cfg, dict):
+                    config_dict.update(file_cfg)
+                else:
+                    logger.warning("Config file root is not an object; ignoring.")
         except Exception as e:
-            logger.warning(f"Warning: Error reading {config_file_path}: {e}. Using defaults/env vars.")
+            logger.warning(f"Could not read/parse config file '{file_path}': {e}. Continuing with defaults+env.")
     else:
-        logger.warning(f"Warning: Could not find {config_file_path}. Using defaults/env vars.")
-
-    # The root_path has already been set with the correct precedence order:
-    # 1. If env_file is passed in, use that file to load environment variables
-    # 2. Otherwise, first check OS environment variables
-    # 3. If not set, check for a .env file in the current directory
-    # 4. If still not set, use the default value
-    # We don't need to set it again here, as that would override the precedence order
-    env = config_dict.get("Environment", {})
-
-    # Update configuration from environment variables
-    # Debug section
-    debug = config_dict["Debug"]
-    debug['debug_mode'] = _parse_bool_env("PYEGERIA_DEBUG_MODE", debug.get("debug_mode", False))
-    debug["enable_logger_catch"] = _parse_bool_env("PYEGERIA_ENABLE_LOGGER_CATCH", debug.get("enable_logger_catch", False))
-    debug["timeout_seconds"] = int(os.getenv("PYEGERIA_TIMEOUT_SECONDS", debug.get("timeout_seconds", 30)))
-
-    # Environment section
-    env = config_dict["Environment"]
-    # Use the settings from .env file, but allow OS environment variables to override them
+        logger.debug("No config.json found; continuing with defaults + env.")
+
+    # 4) Overlay environment variables
+    # Debug
+    dbg = config_dict.setdefault("Debug", {})
+    dbg["debug_mode"] = _parse_bool_env("PYEGERIA_DEBUG_MODE", bool(dbg.get("debug_mode", False)))
+    dbg["enable_logger_catch"] = _parse_bool_env("PYEGERIA_ENABLE_LOGGER_CATCH", bool(dbg.get("enable_logger_catch", False)))
+    dbg["timeout_seconds"] = int(os.getenv("PYEGERIA_TIMEOUT_SECONDS", dbg.get("timeout_seconds", 30)))
+
+    # Environment
+    env = config_dict.setdefault("Environment", {})
+    default_root = env.get("Pyegeria Root") or os.getcwd()
+    env_config_dir = os.getenv("PYEGERIA_CONFIG_DIRECTORY", env_settings.pyegeria_config_directory or "")
+    env_root = os.getenv("PYEGERIA_ROOT_PATH", env_settings.pyegeria_root_path or default_root)
+    env_config_file = os.getenv("PYEGERIA_CONFIG_FILE", env_settings.pyegeria_config_file or "config.json")
+
+    env["Pyegeria Config Directory"] = env_config_dir
+    env["pyegeria_config_directory"] = env_config_dir
+    env["Pyegeria Root"] = env_root
+    env["pyegeria_root"] = env_root
+    env["Egeria Config File"] = env_config_file
+    env["pyegeria_config_file"] = env_config_file
+
     env["Console Width"] = int(os.getenv("PYEGERIA_CONSOLE_WIDTH", env.get("Console Width", env_settings.pyegeria_console_width)))
+    env["console_width"] = env["Console Width"]
     env["Dr.Egeria Inbox"] = os.getenv("DR_EGERIA_INBOX_PATH", env.get("Dr.Egeria Inbox", "md_processing/dr-egeria-inbox"))
     env["Dr.Egeria Outbox"] = os.getenv("DR_EGERIA_OUTBOX_PATH", env.get("Dr.Egeria Outbox", "md_processing/dr-egeria-outbox"))
     env["Egeria Engine Host"] = os.getenv("EGERIA_ENGINE_HOST", env.get("Egeria Engine Host", "qs-engine-host"))
@@ -365,79 +306,56 @@ def load_app_config(env_file: str = None):
     env["Egeria Glossary Path"] = os.getenv("EGERIA_GLOSSARY_PATH", env.get("Egeria Glossary Path", "glossary"))
     env["Egeria Integration Daemon"] = os.getenv("EGERIA_INTEGRATION_DAEMON", env.get("Egeria Integration Daemon", "qs-integration-daemon"))
     env["Egeria Integration Daemon URL"] = os.getenv("EGERIA_INTEGRATION_DAEMON_URL", env.get("Egeria Integration Daemon URL", "https://localhost:9443"))
-    env["Egeria Jupyter"] = _parse_bool_env("EGERIA_JUPYTER", env.get("Egeria Jupyter", True))
+    env["Egeria Jupyter"] = _parse_bool_env("EGERIA_JUPYTER", bool(env.get("Egeria Jupyter", True)))
     env["Egeria Kafka Endpoint"] = os.getenv("EGERIA_KAFKA", env.get("Egeria Kafka Endpoint", "localhost:9192"))
     env["Egeria Mermaid Folder"] = os.getenv("EGERIA_MERMAID_FOLDER", env.get("Egeria Mermaid Folder", "mermaid_graphs"))
     env["Egeria Metadata Store"] = os.getenv("EGERIA_METADATA_STORE", env.get("Egeria Metadata Store", "qs-metadata-store"))
     env["Egeria Platform URL"] = os.getenv("EGERIA_PLATFORM_URL", env.get("Egeria Platform URL", "https://localhost:9443"))
     env["Egeria View Server"] = os.getenv("EGERIA_VIEW_SERVER", env.get("Egeria View Server", "qs-view-server"))
     env["Egeria View Server URL"] = os.getenv("EGERIA_VIEW_SERVER_URL", env.get("Egeria View Server URL", "https://localhost:9443"))
-    env['Pyegeria Publishing Root'] = os.getenv("PYEGERIA_PUBLISHING_ROOT", env.get("Pyegeria Publishing Root", "/dr-egeria-outbox"))
-    env['Pyegeria User Format Sets Dir'] = os.getenv("PYEGERIA_USER_FORMAT_SETS_DIR", env.get("Pyegeria User Format Sets Dir", "~/.pyegeria/format_sets"))
-    # Set Pyegeria Config Directory to the config_directory value we've already determined with the correct precedence order
-    env["Pyegeria Config Directory"] = config_directory
-    # Set Pyegeria Root to the root_path value we've already determined with the correct precedence order
-    env["Pyegeria Root"] = root_path
-
-    # Logging section
-    log = config_dict["Logging"]
-    log["console_filter_levels"] = _parse_list_env("PYEGERIA_CONSOLE_FILTER_LEVELS", log.get("console_filter_levels", ["ERROR","WARNING","INFO","SUCCESS"]))
+    env["Pyegeria Publishing Root"] = os.getenv("PYEGERIA_PUBLISHING_ROOT", env.get("Pyegeria Publishing Root", "/dr-egeria-outbox"))
+    env["Pyegeria User Format Sets Dir"] = os.getenv("PYEGERIA_USER_FORMAT_SETS_DIR", env.get("Pyegeria User Format Sets Dir", "~/.pyegeria/format_sets"))
+
+    # Logging
+    log = config_dict.setdefault("Logging", {})
+    log["console_filter_levels"] = _parse_list_env("PYEGERIA_CONSOLE_FILTER_LEVELS", log.get("console_filter_levels", ["ERROR", "WARNING", "INFO", "SUCCESS"]))
     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["enable_logging"] = _parse_bool_env("PYEGERIA_ENABLE_LOGGING", bool(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", '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> - "
-                                             "<level>{message}</level> -{extra}"))
-    log["logging_file_format"] = os.getenv("PYEGERIA_LOGGING_FILE_FORMAT", log.get("logging_file_format",
-                                           "{time:YYYY-MM-DD HH:mm:ss} | {level} | {function}:{line} "
-                                           "- {message}-{extra}"))
-
-    # User Profile section
-    user = config_dict["User Profile"]
-    user["Egeria Home Collection"] = os.getenv("EGERIA_HOME_COLLECTION", user.get("Egeria Home Collection", "myHome"))
+    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> - <level>{message}</level> -{extra}",
+        ),
+    )
+    log["logging_file_format"] = os.getenv(
+        "PYEGERIA_LOGGING_FILE_FORMAT",
+        log.get("logging_file_format", " {time:YYYY-MM-DD HH:mm:ss} | {level} | {function}:{line} - {message }-{extra}"),
+    )
+
+    # User Profile
+    user = config_dict.setdefault("User Profile", {})
+    user["Egeria Home Collection"] = os.getenv("EGERIA_HOME_COLLECTION", user.get("Egeria Home Collection", "MyHome"))
     user["Egeria Home Glossary Name"] = os.getenv("EGERIA_HOME_GLOSSARY_NAME", user.get("Egeria Home Glossary Name", "Egeria-Markdown"))
-    user["Egeria Local Qualifier"] = os.getenv("EGERIA_LOCAL_QUALIFIER", user.get("Egeria Local Qualifier", "myLocal"))
-    
-    # Load user credentials with proper precedence
-    # 1. Check OS environment variables
-    user_name = os.getenv("EGERIA_USER")
-    user_pwd = os.getenv("EGERIA_USER_PASSWORD")
-    
-    # 2. If not set, check config file
-    if user_name is None:
-        user_name = user.get("user_name")
-    if user_pwd is None:
-        user_pwd = user.get("user_pwd")
-    
-    # 3. If still not set and we have env_settings, check .env file
-    if (user_name is None or user_pwd is None) and 'env_settings' in locals():
-        if user_name is None:
-            user_name = env_settings.egeria_user_name
-        if user_pwd is None:
-            user_pwd = env_settings.egeria_user_password
-    
-    # Set the values in the config dictionary
+    user["Egeria Local Qualifier"] = os.getenv("EGERIA_LOCAL_QUALIFIER", user.get("Egeria Local Qualifier", "PDR"))
+
+    user_name = os.getenv("EGERIA_USER", user.get("user_name") or env_settings.egeria_user_name or None)
+    user_pwd = os.getenv("EGERIA_USER_PASSWORD", user.get("user_pwd") or env_settings.egeria_user_password or None)
     user["user_name"] = user_name
     user["user_pwd"] = user_pwd
 
     # Feature flags
-    # Ensure feature_x_enabled is a boolean, regardless of what's in the config file
-    feature_x = config_dict.get("feature_x_enabled", False)
-    feature_x = _parse_bool_value(feature_x)
-    # Check if the environment variable is set, which would override the config value
-    if "FEATURE_X_ENABLED" in os.environ:
-        feature_x = _parse_bool_value(os.getenv("FEATURE_X_ENABLED"))
+    feature_x = _parse_bool_value(os.getenv("FEATURE_X_ENABLED", config_dict.get("feature_x_enabled", False)))
     config_dict["feature_x_enabled"] = feature_x
 
+    # Debug print of env before model creation
     try:
-        # Create Pydantic model from the configuration dictionary
-        # _app_config = AppConfig(**config_dict) <-- why? todo
-        _app_config = AppConfig()
-    except ValueError as e:
-        # Handle validation errors from Pydantic
+        logger.info(f"DEBUG ENV SECTION: {config_dict.get('Environment')}")
+        _app_config = AppConfig(**config_dict)
+    except Exception as e:
         context = {"caller method": inspect.currentframe().f_back.f_code.co_name}
         additional_info = {"reason": str(e)}
         raise PyegeriaInvalidParameterException(None, context, additional_info)
@@ -521,4 +439,10 @@ def _parse_list_env(env_var: str, default: List[str]) -> List[str]:
     return default
 
 
-settings = get_app_config()
+# Export a lazily-evaluated settings accessor to avoid import-time side effects
+class _LazySettings:
+    def __getattr__(self, name):
+        cfg = get_app_config()
+        return getattr(cfg, name)
+
+settings = _LazySettings()

pyegeria/load_config.py

@@ -0,0 +1,36 @@
+"""
+Compatibility shim for legacy imports.
+Re-exports configuration loading utilities from pyegeria.config.
+"""
+# Import config lazily inside functions to avoid import-time side effects in tests
+from importlib import import_module
+
+def load_app_config(env_file: str | None = None):
+    return import_module('pyegeria.config').load_app_config(env_file)
+
+def get_app_config(env_file: str | None = None):
+    return import_module('pyegeria.config').get_app_config(env_file)
+
+class PyegeriaSettings:
+    def __new__(cls, *args, **kwargs):
+        # Construct a real settings instance from pyegeria.config
+        return import_module('pyegeria.config').PyegeriaSettings(*args, **kwargs)
+
+    @classmethod
+    def with_env_file(cls, env_file: str):
+        return import_module('pyegeria.config').PyegeriaSettings.with_env_file(env_file)
+
+# expose the cached instance for tests that reset it directly
+from . import config as _config
+
+def __getattr__(name):
+    if name == "_app_config":
+        return _config._app_config
+    raise AttributeError(name)
+
+
+def __setattr__(name, value):
+    if name == "_app_config":
+        _config._app_config = value
+    else:
+        globals()[name] = value

pyegeria-5.4.3.dist-info/METADATA

@@ -0,0 +1,163 @@
+Metadata-Version: 2.3
+Name: pyegeria
+Version: 5.4.3
+Summary: A python client for Egeria
+License: Apache 2.0
+Keywords: egeria,metadata,governance
+Author: Dan Wolfson
+Author-email: dan.wolfson@pdr-associates.com
+Requires-Python: >3.12,<4.0.0
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: License :: Other/Proprietary License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: click
+Requires-Dist: httpx
+Requires-Dist: inflect (>=7.5.0,<8.0.0)
+Requires-Dist: jupyter
+Requires-Dist: jupyter-notebook-parser (>=0.1.4,<0.2.0)
+Requires-Dist: loguru (>=0.7.3,<0.8.0)
+Requires-Dist: mermaid-py
+Requires-Dist: poetry-core (>=2.1.3,<3.0.0)
+Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
+Requires-Dist: pydantic-settings (>=2.10.1,<3.0.0)
+Requires-Dist: pydevd-pycharm (>=252.23892.364,<253.0.0)
+Requires-Dist: pytest (>=8.3.5,<9.0.0)
+Requires-Dist: requests
+Requires-Dist: rich
+Requires-Dist: textual
+Requires-Dist: trogon (>=0.6.0,<0.7.0)
+Requires-Dist: urllib3
+Requires-Dist: validators
+Requires-Dist: wcwidth (==0.2.13)
+Project-URL: Homepage, https://github.com/odpi/egeria-python
+Project-URL: Repository, https://github.com/odpi/egeria-python
+Description-Content-Type: text/markdown
+
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the ODPi Egeria project. -->
+
+![Egeria Logo](https://egeria-project.org/assets/images/egeria-header.png)
+
+[![GitHub](https://img.shields.io/github/license/odpi/egeria)](LICENSE)
+
+
+# pyegeria: a python client for Egeria
+
+This is a package for easily using the Egeria
+open metadata environment from python. Details about the
+open source Egeria project can be found at [Egeria Project](https://egeria-project.org).
+
+This package is in active development. There is initial
+support for many of Egeria's services including configuration and operation.  This client depends on 
+This release supports Egeria 5.1 - although most of the functions may work on earlier versions of Egeria as well. 
+
+The code is organized to mimic the existing Egeria Java Client structure.
+
+The commands folder holds the Egeria Command Line Interface and corresponding commands
+to visualize and use Egeria. The commands also serve as useful examples.
+
+An examples folder holds some useful examples showing different facets of using pyegeria.
+
+WARNING: files that start with "X" are in-progress placeholders that are not meant to be used..they will mature and 
+evolve.
+
+All feedback is welcome. Please engage via our [community](http://egeria-project.org/guides/community/), 
+team calls, or via github issues in this repo. If interested in contributing,
+you can engage via the community or directly reach out to
+[dan.wolfson\@pdr-associates.com](mailto:dan.wolfson@pdr-associates.com?subject=pyegeria).
+
+This is a learning experience.
+
+## Configuration
+
+pyegeria uses a simple, predictable precedence for configuration:
+
+1. Built-in defaults (Pydantic models in pyegeria.config)
+2. Config file (JSON) if found
+3. Environment variables (OS env and optional .env)
+4. Explicit env file passed to get_app_config/load_app_config
+
+Environment always overrides config file, which overrides defaults.
+
+### Where to put your configuration
+
+- Config file: A JSON file named config.json. The loader looks in this order:
+  - If PYEGERIA_CONFIG_DIRECTORY is set: $PYEGERIA_CONFIG_DIRECTORY/$PYEGERIA_CONFIG_FILE
+  - Else if PYEGERIA_ROOT_PATH is set: $PYEGERIA_ROOT_PATH/$PYEGERIA_CONFIG_FILE
+  - Else: ./config.json (the current working directory)
+
+- .env file: Optional. If present in the current working directory (.env), variables from it will be loaded. You can also pass a specific env file path to get_app_config(env_file=...) or load_app_config(env_file=...). For sample variables, see config/env in this repo.
+
+### Common environment variables
+
+- PYEGERIA_CONFIG_DIRECTORY: directory containing your config.json
+- PYEGERIA_ROOT_PATH: root folder used to resolve config.json when CONFIG_DIRECTORY is not set
+- PYEGERIA_CONFIG_FILE: filename of the configuration JSON (default: config.json)
+- PYEGERIA_CONSOLE_WIDTH: integer console width (e.g., 200 or 280)
+- EGERIA_PLATFORM_URL, EGERIA_VIEW_SERVER_URL, EGERIA_ENGINE_HOST_URL: URLs for your Egeria servers
+- EGERIA_USER, EGERIA_USER_PASSWORD: credentials used by some clients
+- Logging related: PYEGERIA_ENABLE_LOGGING, PYEGERIA_LOG_DIRECTORY, PYEGERIA_CONSOLE_LOG_LVL, PYEGERIA_FILE_LOG_LVL, etc.
+
+See config/env for more variables and defaults.
+
+### Example .env
+
+# PYEGERIA_CONFIG_DIRECTORY=/path/to/configs
+# PYEGERIA_ROOT_PATH=/path/to/project
+# PYEGERIA_CONFIG_FILE=config.json
+# EGERIA_PLATFORM_URL=https://localhost:9443
+# EGERIA_VIEW_SERVER=qs-view-server
+# EGERIA_VIEW_SERVER_URL=https://localhost:9443
+# EGERIA_USER=myuser
+# EGERIA_USER_PASSWORD=mypassword
+# PYEGERIA_CONSOLE_WIDTH=280
+
+Lines starting with # are comments. Quotes are optional; python-dotenv/pydantic-settings handle both.
+
+### Example config.json (minimal)
+
+{
+  "Environment": {
+    "Pyegeria Root": ".",
+    "Egeria Platform URL": "https://localhost:9443"
+  },
+  "User Profile": {
+    "Egeria Home Collection": "MyHome"
+  }
+}
+
+### Programmatic usage
+
+from pyegeria import get_app_config
+cfg = get_app_config()  # uses OS env and ./.env
+# or with explicit env file
+cfg = get_app_config(env_file="/path/to/dev.env")
+
+# Access values via Pydantic models
+print(cfg.Environment.egeria_platform_url)
+print(cfg.Logging.enable_logging)
+
+### CLI quick checks
+
+- Validate your env file:
+  python scripts/validate_env.py --env config/env
+  python scripts/validate_env.py               # auto-detects ./config/env or ./.env
+
+- Run tests (requires Poetry):
+  poetry install
+  poetry run pytest -v
+
+### Troubleshooting
+
+- If your env doesn’t seem to apply, confirm which config.json is used (the loader checks PYEGERIA_CONFIG_DIRECTORY first, then PYEGERIA_ROOT_PATH, then ./config.json).
+- .env files are optional. Missing .env is not an error.
+- You can always override values with OS environment variables (they take precedence over config.json).
+
+
+
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the ODPi Egeria project.

{pyegeria-5.4.2.2.dist-info → pyegeria-5.4.3.dist-info}/RECORD

@@ -4496,14 +4496,14 @@ pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
 pyegeria/_exceptions_new.py,sha256=srmrlqoWy7VvOJOhPcYFKW32MCIovgEg5J7PrYDxzQA,19706
 pyegeria/_globals.py,sha256=qSU5hM4uuJZPp-YapEEKxfcdgH9hauc6R7gRkELLroY,1132
 pyegeria/_output_format_models.py,sha256=p9fTYaIa5KyTMIR4-JAbE9g66_gGMPTnUqjIq20Zr1o,14494
-pyegeria/_output_formats.py,sha256=JRM3tBDVtNahlEI4V1tKNAbEyuIPK6VwRHTzojqSy28,35751
+pyegeria/_output_formats.py,sha256=3G0mrgiX6ZIJBv4FSN6hs3fpYReyebZi4VvcZw3Ly6g,35826
 pyegeria/_validators.py,sha256=pNxND0dN2qvyuGE52N74l1Ezfrh2p9Hao2ziR_t1ENI,7425
 pyegeria/asset_catalog_omvs.py,sha256=P6FceMP0FgakGSOt3ePxpEbsF7nnypzo1aQahjdL_94,29021
 pyegeria/automated_curation_omvs.py,sha256=tzwCyXL0Hx8UjryBBWcPoEuBRajXZpLuwPQ1vuOg2yc,130349
 pyegeria/classification_manager_omvs.py,sha256=kMyDP_dtHf2czU4ZlWYrakQtccPoteadlUCpWRRFJ1Q,187235
 pyegeria/collection_manager.py,sha256=Atx-9M-GCJB9Ej0TXlSxB4NOxSZCDuuLKyW04UYANlw,234516
 pyegeria/collection_models.py,sha256=d3DdWONqDdAeuUQgussiCNfvhKIDFpaI35cdW_Tv4_0,5315
-pyegeria/config.py,sha256=XwxIfHpvmzrw5dJrcKSIRP_5lpPybsLT499z7d61kr0,25162
+pyegeria/config.py,sha256=MZ8_V8A9p8mFgARuk1nuK4z-U1_EeEZTJeESSwu-VzU,20435
 pyegeria/core_omag_server_config.py,sha256=pNQpocICkZx8sRsTw5DPUe-TFyxlIo1U88qqgci_f7I,97764
 pyegeria/create_tech_guid_lists.py,sha256=hf5q8Xrdsz-bqeIW3yTORZ1XB6_BrKzLDWWwC_bNG2g,4811
 pyegeria/data_designer.py,sha256=i7tsR1_7puyW4MGdMHjJRAozz6MYuOn-hdw24O-rmVY,185907
@@ -4516,6 +4516,7 @@ pyegeria/feedback_manager_omvs.py,sha256=0xBs0p54vmdfVYYgQ8pOanLC4fxfgTk1Z61Y6D1
 pyegeria/full_omag_server_config.py,sha256=CQqLCy_3DZFvJZEOcGf50HWdFaWpiAIs6z-kKyjvpDA,47464
 pyegeria/glossary_manager.py,sha256=H9puosVy1ni0bqJ0sCeRZiKMzvXU8kOvkY5Qwh02CgI,111189
 pyegeria/governance_officer.py,sha256=Omgn1ZLQRAH0Ob5cdLA1P5BcbIpuJ2cIbGnTDovreMc,100285
+pyegeria/load_config.py,sha256=XDwPAHB3MvGRuoP8kg1lJJAI4BgMWZ3TYxfxYROgJj4,1188
 pyegeria/load_config_orig.py,sha256=lOM37vdIBcYfLQFTLP5bDuNc7vTFGBNYPfqHtWGNvA4,11624
 pyegeria/logging_configuration.py,sha256=BxTQRN-7OOdk5t1f1xSn8gKU8iT-MfWEgbn6cYWrRsY,7674
 pyegeria/md_processing_helpers.py,sha256=xlQuK5eP_PJqUdy4BScQ97NyBD95jMS3EUg0wK5CsZo,2137
@@ -4536,8 +4537,8 @@ pyegeria/template_manager_omvs.py,sha256=chBljs1vy5wr9DRAtbvIt4Cob_7HxGfxLkCNlDT
 pyegeria/utils.py,sha256=qgiYEdCRrrL6SpX1sceZQVYR40-rfFAhUJEhsubcx80,6889
 pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
 pyegeria/x_action_author_omvs.py,sha256=RcqSzahUKCtvb_3u_wyintAlc9WFkC_2v0E12TZs8lQ,6433
-pyegeria-5.4.2.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.4.2.2.dist-info/METADATA,sha256=hyuJPpSkkxzOjUasVT7Z-7YIzc4cc8cBdJsF6oAYbeY,3064
-pyegeria-5.4.2.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyegeria-5.4.2.2.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
-pyegeria-5.4.2.2.dist-info/RECORD,,
+pyegeria-5.4.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.4.3.dist-info/METADATA,sha256=bfze_AmW_t2p-wiIuL7_qsIWHY0X7Hd9FSM7Z2FVbBg,6290
+pyegeria-5.4.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyegeria-5.4.3.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
+pyegeria-5.4.3.dist-info/RECORD,,

pyegeria-5.4.2.2.dist-info/METADATA

@@ -1,78 +0,0 @@
-Metadata-Version: 2.3
-Name: pyegeria
-Version: 5.4.2.2
-Summary: A python client for Egeria
-License: Apache 2.0
-Keywords: egeria,metadata,governance
-Author: Dan Wolfson
-Author-email: dan.wolfson@pdr-associates.com
-Requires-Python: >3.12,<4.0.0
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click
-Requires-Dist: httpx
-Requires-Dist: inflect (>=7.5.0,<8.0.0)
-Requires-Dist: jupyter
-Requires-Dist: jupyter-notebook-parser (>=0.1.4,<0.2.0)
-Requires-Dist: loguru (>=0.7.3,<0.8.0)
-Requires-Dist: mermaid-py
-Requires-Dist: poetry-core (>=2.1.3,<3.0.0)
-Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
-Requires-Dist: pydantic (>=2.11.7,<3.0.0)
-Requires-Dist: pydantic-settings (>=2.10.1,<3.0.0)
-Requires-Dist: pydevd-pycharm (>=252.23892.364,<253.0.0)
-Requires-Dist: pytest (>=8.3.5,<9.0.0)
-Requires-Dist: requests
-Requires-Dist: rich
-Requires-Dist: textual
-Requires-Dist: trogon (>=0.6.0,<0.7.0)
-Requires-Dist: urllib3
-Requires-Dist: validators
-Requires-Dist: wcwidth (==0.2.13)
-Project-URL: Homepage, https://github.com/odpi/egeria-python
-Project-URL: Repository, https://github.com/odpi/egeria-python
-Description-Content-Type: text/markdown
-
-<!-- SPDX-License-Identifier: CC-BY-4.0 -->
-<!-- Copyright Contributors to the ODPi Egeria project. -->
-
-![Egeria Logo](https://egeria-project.org/assets/images/egeria-header.png)
-
-[![GitHub](https://img.shields.io/github/license/odpi/egeria)](LICENSE)
-
-
-# pyegeria: a python client for Egeria
-
-This is a package for easily using the Egeria
-open metadata environment from python. Details about the
-open source Egeria project can be found at [Egeria Project](https://egeria-project.org).
-
-This package is in active development. There is initial
-support for many of Egeria's services including configuration and operation.  This client depends on 
-This release supports Egeria 5.1 - although most of the functions may work on earlier versions of Egeria as well. 
-
-The code is organized to mimic the existing Egeria Java Client structure.
-
-The commands folder holds the Egeria Command Line Interface and corresponding commands
-to visualize and use Egeria. The commands also serve as useful examples.
-
-An examples folder holds some useful examples showing different facets of using pyegeria.
-
-WARNING: files that start with "X" are in-progress placeholders that are not meant to be used..they will mature and 
-evolve.
-
-All feedback is welcome. Please engage via our [community](http://egeria-project.org/guides/community/), 
-team calls, or via github issues in this repo. If interested in contributing,
-you can engage via the community or directly reach out to
-[dan.wolfson\@pdr-associates.com](mailto:dan.wolfson@pdr-associates.com?subject=pyegeria).
-
-This is a learning experience.
-
-
-
-----
-License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
-Copyright Contributors to the ODPi Egeria project.