nui-python-shared-utils 2.4__py3-none-any.whl → 2.4.2__py3-none-any.whl

{nui_python_shared_utils-2.4.dist-info → nui_python_shared_utils-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nui-python-shared-utils
-Version: 2.4
+Version: 2.4.2
 Summary: Shared Python utilities for AWS Lambda, CLI tools, and agents with Slack, Elasticsearch, and monitoring integrations
 Home-page: https://github.com/nuimarkets/nui-python-shared-utils
 Author: NUI Markets
@@ -36,7 +36,6 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -45,7 +44,7 @@ Classifier: Topic :: System :: Monitoring
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Environment :: Console
 Classifier: Framework :: AWS CDK
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3>=1.20.0
@@ -102,7 +101,7 @@ Dynamic: requires-python
 # NUI Python Shared Utilities
 
 [![PyPI version](https://badge.fury.io/py/nui-python-shared-utils.svg)](https://badge.fury.io/py/nui-python-shared-utils)
-[![Python 3.9+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
+[![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Production-ready shared Python utilities for AWS Lambda functions, CLI tools, and agents. Provides standardized integrations for Slack, Elasticsearch, database, and monitoring. Built and battle-tested on the NUI platform with sensible defaults configurable for any environment.
@@ -222,7 +221,7 @@ from nui_shared_utils import get_secret, get_slack_credentials
 api_keys = get_secret("my-service/api-keys")
 
 # Specialized getters with normalized field names
-slack_creds = get_slack_credentials()  # Uses configured secret name
+slack_creds = get_slack_credentials()  # SLACK_BOT_TOKEN if set, else the configured secret
 ```
 
 **[→ See full secrets management guide](docs/getting-started/configuration.md#aws-secrets-manager)**

{nui_python_shared_utils-2.4.dist-info → nui_python_shared_utils-2.4.2.dist-info}/RECORD

@@ -1,34 +1,34 @@
-nui_python_shared_utils-2.4.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
+nui_python_shared_utils-2.4.2.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
 nui_shared_utils/__init__.py,sha256=wbm10x7THNbrCBGClWiWSVkTNxcBKcHZ-HjYpRQBFrk,13354
 nui_shared_utils/base_client.py,sha256=I1lKQGhrKyvujV2zps0TrtEdPDqMCwRQaIh6ceGONXQ,11016
 nui_shared_utils/cli.py,sha256=JJpSoQWKvAz4b8cO30yFNi5vY9jmqrCHzbFpvrVTkbU,8747
 nui_shared_utils/cloudwatch_metrics.py,sha256=p0J-s63UJDGK14TRGt0k8yoj7aWSSM55UKdgcuaT1dU,12098
-nui_shared_utils/config.py,sha256=ZbkUKDxnHMJiHNv-TlWKjotmf2mH1Vz3GaIXgGfWg7E,4524
-nui_shared_utils/db_client.py,sha256=HyVKJ1Su0dVPV1QI2MU5UtT8myDRCjKgV60xRL4SEdE,21726
+nui_shared_utils/config.py,sha256=heM-Zz-xKCAj6mQuhgKjfca3L6jws9Uwd2HiD1ehRXA,4704
+nui_shared_utils/db_client.py,sha256=cm3AM0OjCejE8ryxwXdgclXlyRQ0FZUr5nWUWHfLwVo,19444
 nui_shared_utils/error_handler.py,sha256=pJ6b_mI0Ait8QRbs9UmLzYUN-Ft0l_dnpudVO_6LRSE,12171
-nui_shared_utils/es_client.py,sha256=3MlrbddTrRN2mEH1b3TNzcmwYycLdujoIq_5_j-Cyfc,16714
+nui_shared_utils/es_client.py,sha256=9iyoYahpycIOHs0TEchRQKVUDCjhSwV7nU7L_SgzgXU,16969
 nui_shared_utils/es_query_builder.py,sha256=UuheQf8b2UXaOiJlYCKYIfKfVERDZ3ag1P0OOOWm9do,12158
 nui_shared_utils/jwt_auth.py,sha256=2Ag1zZKxd2R8QBz3aQA4h8OtKHQvUVKrjUp6lXpJxJU,9143
 nui_shared_utils/lambda_helpers.py,sha256=psHVotpmOfnmyQCoOt4MSIEj7VwWcy6gZM3vYSZwjOk,3041
 nui_shared_utils/llm.py,sha256=adNUO8Qbeb3__GvpROxWSUERkpiazKiGJFE5xzU5eZ0,8351
 nui_shared_utils/log_processors.py,sha256=x5gz1LEkbmoMCZ3ZB6q-mbn26dSzwh1trz4wSkBGxqk,5538
-nui_shared_utils/powertools_helpers.py,sha256=DGM6L0nBkhRpcQvj58s15jVfB3IH_4274aAoyW2Xi1o,13030
-nui_shared_utils/secrets_helper.py,sha256=_jQkMWzjayZ8vvyHG2yuuxur-SQYUUONfcsZ0MF8qOw,7025
-nui_shared_utils/slack_client.py,sha256=jvkLeBMA8WHOqdRzCEpG42FfBlMeWue8bZ1g1ZxF-UI,40304
+nui_shared_utils/powertools_helpers.py,sha256=y18dT648_go5YJcI3-w-zPH2qR7cCdKlzJHm0R1HK68,13016
+nui_shared_utils/secrets_helper.py,sha256=0dXfHAgGxYhM5tuChFi9Vz7JzJfu1slukjTIacN0IFY,11747
+nui_shared_utils/slack_client.py,sha256=RLux3n_VrNcAtjEvR382IMOy5d34zumbJ2_VZ5zNXwk,40425
 nui_shared_utils/slack_formatter.py,sha256=QT9VXApE0q09n_PmEVvaLCSfLW24vmowlCXF3Dzimfk,10850
 nui_shared_utils/snowflake_client.py,sha256=e3jH6_2mMqbtP1TE8-mUFFYrfGW9eqUPT5tlcgeCqx8,16181
-nui_shared_utils/timezone.py,sha256=gTiSK5NUG0Z8UY_AsB4ktIzLrZ0wwTXtdTUH-Npdvik,3837
+nui_shared_utils/timezone.py,sha256=m-Ilx9FI2Bwv-GZOZy71N_S94g26UK68jP8QEEKNw74,3867
 nui_shared_utils/utils.py,sha256=gOpw80tZGC24QsyesR8EySRODY-TFXG8cXUvggPBsRI,8184
 nui_shared_utils/logging/__init__.py,sha256=gVC853q3ja4RhcBVbf5jKO10lFX4upfsTvkKZx4wu54,1805
-nui_shared_utils/logging/binding.py,sha256=I5VNmtf4U2yt54aS4F0Djw4u22mfjwCpWvORUnJNkPU,13577
+nui_shared_utils/logging/binding.py,sha256=FJhC2RjzhTczWz43Bk1HiQGsorSVFVHvmNmPhbwlW78,13495
 nui_shared_utils/logging/fields.py,sha256=7jhBdyEXAJod61aKPCk68idECTAV-_BNjiABp9IRFZo,11194
 nui_shared_utils/logging/redaction.py,sha256=t-EtNhR1nK6IOae70GnieHxn_36_jYuuta32T1dMlP8,6928
 nui_shared_utils/slack_setup/__init__.py,sha256=OElyS3xk4F_YKH5uUUTDpN0ah1dOO3e52muIPjAMPW8,320
 nui_shared_utils/slack_setup/channel_creator.py,sha256=0gyCBIS0EC96SVn1Z2dD4Fpzk0xNdHSWyiCxoUQIUe8,10667
 nui_shared_utils/slack_setup/channel_definitions.py,sha256=atfz5ZhpqefOeLh1gShbWd-TLzgjPmhv95bfuTdmZog,5676
 nui_shared_utils/slack_setup/setup_helpers.py,sha256=pzzXMs12GI9sdZttWeYzgLPgC0xqPz7ZLHM1GUPNNXc,7219
-nui_python_shared_utils-2.4.dist-info/METADATA,sha256=APNpREIrigYHIaSvr5yyOi3HSqgu0iRgWpBoRWq_1Xo,22688
-nui_python_shared_utils-2.4.dist-info/WHEEL,sha256=a-udL2m4V_6Yn8b-uKzWb12RjRxwwMo6ohYFM24tpaY,91
-nui_python_shared_utils-2.4.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
-nui_python_shared_utils-2.4.dist-info/top_level.txt,sha256=YMRu5cnn3hxHoYq9wNvaI9atVHnTNVdswO5_cQSfnJI,17
-nui_python_shared_utils-2.4.dist-info/RECORD,,
+nui_python_shared_utils-2.4.2.dist-info/METADATA,sha256=mmzQthtSgUtuItVwaxcgItG0L5FCRogZPLgBCpBLhF4,22666
+nui_python_shared_utils-2.4.2.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+nui_python_shared_utils-2.4.2.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
+nui_python_shared_utils-2.4.2.dist-info/top_level.txt,sha256=YMRu5cnn3hxHoYq9wNvaI9atVHnTNVdswO5_cQSfnJI,17
+nui_python_shared_utils-2.4.2.dist-info/RECORD,,

{nui_python_shared_utils-2.4.dist-info → nui_python_shared_utils-2.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.2.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nui_shared_utils/config.py

@@ -34,7 +34,9 @@ class Config:
             slack_credentials_secret: AWS secret name for Slack credentials
             aws_region: AWS region for secrets/services
         """
-        # Elasticsearch settings
+        # Elasticsearch settings. An es_host passed here outranks a host carried in a
+        # credentials secret; the env-derived and built-in values do not.
+        self._es_host_explicit = es_host is not None
         if es_host is not None:
             self.es_host = es_host
         else:

nui_shared_utils/db_client.py

@@ -2,7 +2,6 @@
 Refactored Database client using BaseClient for DRY code patterns.
 """
 
-import os
 import time
 import logging
 from typing import Dict, List, Optional, Any
@@ -11,7 +10,7 @@ import pymysql
 
 from .base_client import BaseClient, ServiceHealthMixin
 from .utils import handle_client_errors, safe_close_connection
-from .secrets_helper import get_database_credentials
+from .secrets_helper import get_database_credentials, _db_credentials_from_env, _normalise_db_secret
 
 # Optional PostgreSQL support
 try:
@@ -27,47 +26,6 @@ log = logging.getLogger(__name__)
 _connection_pool = {}
 
 
-def _clean_expired_connections(pool_key: str, pool_recycle: int) -> None:
-    """
-    Clean expired connections from the pool.
-
-    Args:
-        pool_key: Pool identifier
-        pool_recycle: Maximum connection age in seconds (0 disables recycling)
-    """
-    if not pool_recycle or pool_recycle <= 0:
-        return
-    
-    if pool_key not in _connection_pool:
-        return
-    
-    current_time = time.time()
-    pool_entries = _connection_pool[pool_key]
-    
-    # Find expired connections
-    expired_connections = []
-    fresh_connections = []
-    
-    for entry in pool_entries:
-        age = current_time - entry["timestamp"]
-        if age > pool_recycle:
-            expired_connections.append(entry["connection"])
-        else:
-            fresh_connections.append(entry)
-    
-    # Close expired connections
-    for conn in expired_connections:
-        safe_close_connection(conn)
-    
-    # Update pool with only fresh connections
-    _connection_pool[pool_key] = fresh_connections
-    
-    if expired_connections:
-        log.debug(
-            f"Cleaned {len(expired_connections)} expired connections from pool {pool_key}"
-        )
-
-
 def get_pool_stats() -> Dict[str, Any]:
     """
     Get current connection pool statistics.
@@ -158,26 +116,8 @@ class DatabaseClient(BaseClient, ServiceHealthMixin):
         return None
 
     def _resolve_credentials_from_env(self) -> Optional[Dict[str, Any]]:
-        """Resolve MySQL credentials from environment variables.
-
-        Requires both DB_HOST and DB_PASSWORD to trigger.
-        """
-        host = os.environ.get("DB_HOST")
-        password = os.environ.get("DB_PASSWORD")
-        if not host or not password:
-            return None
-        port_str = os.environ.get("DB_PORT", "3306")
-        try:
-            port = int(port_str)
-        except ValueError:
-            raise ValueError(f"DB_PORT must be an integer, got: {port_str!r}")
-        return {
-            "host": host,
-            "port": port,
-            "username": os.environ.get("DB_USERNAME", "root"),
-            "password": password,
-            "database": os.environ.get("DB_DATABASE", "app"),
-        }
+        """Resolve MySQL credentials from DB_* env vars (DB_HOST + DB_PASSWORD required)."""
+        return _db_credentials_from_env("mysql")
 
     def _fetch_credentials_from_sm(self, secret_name: Optional[str]) -> Dict[str, Any]:
         """Override to use get_database_credentials for normalized field names."""
@@ -511,29 +451,11 @@ class PostgreSQLClient(BaseClient, ServiceHealthMixin):
         return None
 
     def _resolve_credentials_from_env(self) -> Optional[Dict[str, Any]]:
-        """Resolve PostgreSQL credentials from environment variables.
-
-        Requires both DB_HOST and DB_PASSWORD to trigger.
-        """
-        host = os.environ.get("DB_HOST")
-        password = os.environ.get("DB_PASSWORD")
-        if not host or not password:
-            return None
-        port_str = os.environ.get("DB_PORT", "5432")
-        try:
-            port = int(port_str)
-        except ValueError:
-            raise ValueError(f"DB_PORT must be an integer, got: {port_str!r}")
-        return {
-            "host": host,
-            "port": port,
-            "username": os.environ.get("DB_USERNAME", "postgres"),
-            "password": password,
-            "database": os.environ.get("DB_DATABASE", "postgres"),
-        }
+        """Resolve PostgreSQL credentials from DB_* env vars (DB_HOST + DB_PASSWORD required)."""
+        return _db_credentials_from_env("postgresql")
 
     def _fetch_credentials_from_sm(self, secret_name: Optional[str]) -> Dict[str, Any]:
-        """Override with auth-specific credential handling."""
+        """Fetch from Secrets Manager, preferring the auth_* keys when requested and present."""
         from .secrets_helper import get_secret
 
         resolved_secret_name = self._resolve_secret_name(secret_name)
@@ -548,8 +470,7 @@ class PostgreSQLClient(BaseClient, ServiceHealthMixin):
                 "password": raw_creds.get("auth_password"),
                 "database": raw_creds.get("auth_database", "auth-service-db"),
             }
-        else:
-            return get_database_credentials(resolved_secret_name)
+        return _normalise_db_secret(raw_creds, "postgresql")
 
     @contextmanager
     def get_connection(self, database: Optional[str] = None):

nui_shared_utils/es_client.py

@@ -2,7 +2,6 @@
 Refactored Elasticsearch client using BaseClient for DRY code patterns.
 """
 
-import os
 import logging
 from datetime import datetime, timedelta
 from typing import Dict, Iterator, List, Optional, Any, Tuple
@@ -11,7 +10,8 @@ from elasticsearch import Elasticsearch
 from elasticsearch.helpers import streaming_bulk as es_streaming_bulk
 
 from .base_client import BaseClient, ServiceHealthMixin
-from .utils import handle_client_errors, resolve_config_value
+from .utils import handle_client_errors
+from .secrets_helper import _es_credentials_from_env, _es_host_with_port, _normalise_es_secret, _resolve_es_host
 
 log = logging.getLogger(__name__)
 
@@ -55,29 +55,27 @@ class ElasticsearchClient(BaseClient, ServiceHealthMixin):
         Accepts both conventions: ES_PASSWORD/ES_USERNAME and ES_PASS/ES_USER.
         Password is required to trigger. Username defaults to "elastic".
         """
-        password = os.environ.get("ES_PASSWORD") or os.environ.get("ES_PASS")
-        if not password:
-            return None
-        return {
-            "username": os.environ.get("ES_USERNAME") or os.environ.get("ES_USER") or "elastic",
-            "password": password,
-        }
+        return _es_credentials_from_env()
+
+    def _fetch_credentials_from_sm(self, secret_name: Optional[str]) -> Dict[str, Any]:
+        """Fetch from Secrets Manager; normalise host, username, password and keep any other keys."""
+        raw = super()._fetch_credentials_from_sm(secret_name)
+        return {**raw, **_normalise_es_secret(raw)}
 
     def _create_service_client(self) -> Elasticsearch:
         """Create Elasticsearch client with resolved configuration."""
-        # Resolve host using utility
-        host = resolve_config_value(
-            self._host_override,
-            ["ES_HOST", "ELASTICSEARCH_HOST"],
-            getattr(self.config, "es_host", "localhost:9200")
-        )
+        # Host precedence: constructor arg > ES_HOST/ELASTICSEARCH_HOST > configure(es_host=...)
+        # > credentials "host" (e.g. from the secret) > default. Shared with get_elasticsearch_credentials.
+        if self._host_override is not None:
+            host = self._host_override
+        else:
+            host = _resolve_es_host(self.credentials.get("host"))
+        host = _es_host_with_port(host)
 
         parsed = urlparse(host)
         if parsed.scheme and parsed.netloc:  # Valid URL with scheme://netloc
             es_url = host
         else:
-            if ":" not in host:
-                host = f"{host}:9200"
             scheme = self.client_config.get("scheme", "http")
             es_url = f"{scheme}://{host}"
 

nui_shared_utils/logging/binding.py

@@ -306,7 +306,6 @@ def log_exception(binder: Any, exc: BaseException, message: str) -> None:
         extra={
             F.ERROR_TYPE: type(exc).__name__,
             F.ERROR_MESSAGE: str(exc),
-            # 3-arg form for Python 3.9 compatibility (single-arg added in 3.10).
             F.ERROR_STACK: "".join(traceback.format_exception(type(exc), exc, exc.__traceback__)),
         },
     )

nui_shared_utils/powertools_helpers.py

@@ -75,7 +75,7 @@ def get_powertools_logger(
     and enforces UTC timezone for consistency with log aggregation systems.
 
     Args:
-        service_name: Service identifier (e.g., "nui-tender-analyser", "connect-email-ingest")
+        service_name: Service identifier (e.g., "order-processor", "email-ingest")
         level: Log level (DEBUG, INFO, WARNING, ERROR, CRITICAL). Default: INFO
         local_dev_colors: Enable coloredlogs for local development. Default: True
 
@@ -182,7 +182,7 @@ def powertools_handler(
 
     Args:
         service_name: Service identifier for logging and metrics dimensions
-        metrics_namespace: CloudWatch namespace for metrics (e.g., "NUI/TenderAnalyser").
+        metrics_namespace: CloudWatch namespace for metrics (e.g., "Ecommerce/Orders").
                           If None, metrics publishing is disabled.
         slack_alert_channel: Slack channel for error alerts (e.g., "#alerts", "#errors").
                             If None, Slack alerting is disabled.

nui_shared_utils/secrets_helper.py

@@ -6,7 +6,8 @@ Shared across all AWS Lambda functions.
 import os
 import json
 import logging
-from typing import Dict, Optional
+from urllib.parse import urlparse
+from typing import Any, Dict, Optional
 
 from .config import get_config
 
@@ -86,41 +87,180 @@ def get_secret(secret_name: str) -> Dict:
         raise Exception(f"Unexpected error retrieving secret {secret_name}: {str(e)}")
 
 
+# Per-engine defaults for database credentials. The env tier fills all three;
+# the Secrets Manager tier fills port and database only, so a secret missing its
+# username stays visibly broken rather than borrowing a guessed one.
+_DB_DEFAULTS: Dict[str, Dict[str, Any]] = {
+    "mysql": {"port": 3306, "username": "root", "database": "app"},
+    "postgresql": {"port": 5432, "username": "postgres", "database": "postgres"},
+}
+
+
+def _db_credentials_from_env(engine: str = "mysql") -> Optional[Dict[str, Any]]:
+    """
+    Resolve database credentials from DB_* environment variables.
+
+    Both DB_HOST and DB_PASSWORD must be set; otherwise returns None so the
+    caller falls through to Secrets Manager. Shared by the database clients and
+    get_database_credentials.
+
+    Args:
+        engine: Key into the per-engine defaults ("mysql" or "postgresql")
+
+    Raises:
+        ValueError: DB_PORT is set but is not an integer
+    """
+    host = os.environ.get("DB_HOST")
+    password = os.environ.get("DB_PASSWORD")
+    if not host or not password:
+        return None
+    defaults = _DB_DEFAULTS[engine]
+    port_str = os.environ.get("DB_PORT", str(defaults["port"]))
+    try:
+        port = int(port_str)
+    except ValueError:
+        raise ValueError(f"DB_PORT must be an integer, got: {port_str!r}")
+    return {
+        "host": host,
+        "port": port,
+        "username": os.environ.get("DB_USERNAME", defaults["username"]),
+        "password": password,
+        "database": os.environ.get("DB_DATABASE", defaults["database"]),
+    }
+
+
+def _normalise_db_secret(creds: Dict[str, Any], engine: str = "mysql") -> Dict[str, Any]:
+    """
+    Map a database secret onto host, port, username, password, database.
+
+    Accepts the common alternative field names (endpoint/hostname, user, dbname)
+    and fills a missing port or database from the engine's defaults.
+    """
+    defaults = _DB_DEFAULTS[engine]
+    return {
+        "host": creds.get("host", creds.get("endpoint", creds.get("hostname"))),
+        "port": int(creds.get("port", defaults["port"])),
+        "username": creds.get("username", creds.get("user")),
+        "password": creds.get("password"),
+        "database": creds.get("database", creds.get("dbname", defaults["database"])),
+    }
+
+
+def _es_credentials_from_env() -> Optional[Dict[str, Any]]:
+    """
+    Resolve Elasticsearch username and password from environment variables.
+
+    Accepts ES_PASSWORD/ES_USERNAME and ES_PASS/ES_USER. A password is required
+    to trigger; the username defaults to "elastic". Returns None otherwise.
+    """
+    password = os.environ.get("ES_PASSWORD") or os.environ.get("ES_PASS")
+    if not password:
+        return None
+    return {
+        "username": os.environ.get("ES_USERNAME") or os.environ.get("ES_USER") or "elastic",
+        "password": password,
+    }
+
+
+def _normalise_es_secret(creds: Dict[str, Any]) -> Dict[str, Any]:
+    """Map an Elasticsearch secret onto host, username, password (host may be None)."""
+    return {
+        "host": creds.get("host"),
+        "username": creds.get("username", "elastic"),
+        "password": creds.get("password"),
+    }
+
+
+def _resolve_es_host(credentials_host: Optional[str] = None) -> str:
+    """
+    Pick the Elasticsearch host: ES_HOST (or ELASTICSEARCH_HOST), then a host set
+    explicitly through configure(es_host=...) or Config(es_host=...), then the host
+    carried by the resolved credentials, then the configured default (localhost:9200).
+    """
+    env_host = os.environ.get("ES_HOST") or os.environ.get("ELASTICSEARCH_HOST")
+    if env_host:
+        return env_host
+    config = get_config()
+    if getattr(config, "_es_host_explicit", False) is True:
+        return config.es_host
+    return credentials_host or config.es_host
+
+
+def _es_host_with_port(host: str) -> str:
+    """
+    Return ``host`` unchanged when it is a URL (scheme://netloc) or already names a
+    port; otherwise append the default port ``:9200``.
+    """
+    parsed = urlparse(host)
+    if parsed.scheme and parsed.netloc:
+        return host
+    if ":" not in host:
+        return f"{host}:9200"
+    return host
+
+
+def _slack_credentials_from_env() -> Optional[Dict[str, Any]]:
+    """
+    Resolve Slack credentials from SLACK_BOT_TOKEN (required to trigger) and
+    SLACK_WEBHOOK_URL (optional). Returns None when no bot token is set.
+    """
+    bot_token = os.environ.get("SLACK_BOT_TOKEN")
+    if not bot_token:
+        return None
+    return {"bot_token": bot_token, "webhook_url": os.environ.get("SLACK_WEBHOOK_URL") or None}
+
+
+def _normalise_slack_secret(creds: Dict[str, Any]) -> Dict[str, Any]:
+    """Map a Slack secret onto bot_token (or legacy token) and optional webhook_url.
+
+    An empty or null ``bot_token`` falls back to ``token``.
+    """
+    return {
+        "bot_token": creds.get("bot_token") or creds.get("token"),
+        "webhook_url": creds.get("webhook_url"),
+    }
+
+
 def get_database_credentials(secret_name: Optional[str] = None) -> Dict:
     """
-    Get database credentials with standardized field names.
+    Get MySQL database credentials with standardized field names.
+
+    Precedence (matching DatabaseClient):
+    1. Environment variables (DB_HOST + DB_PASSWORD, optional DB_PORT,
+       DB_USERNAME, DB_DATABASE)
+    2. AWS Secrets Manager
 
     Args:
-        secret_name: Override default from configuration or environment
+        secret_name: Override default secret name for Secrets Manager lookup.
+            Ignored when credentials are resolved from environment variables.
 
     Returns:
         Dict with host, port, username, password, database
     """
+    env_creds = _db_credentials_from_env("mysql")
+    if env_creds is not None:
+        return env_creds
+
     config = get_config()
     secret = secret_name or os.environ.get("DB_CREDENTIALS_SECRET") or config.db_credentials_secret
     if not secret:
         raise ValueError("No database secret name provided")
 
-    creds = get_secret(secret)
-
-    # Normalize field names
-    return {
-        "host": creds.get("host", creds.get("endpoint", creds.get("hostname"))),
-        "port": int(creds.get("port", 3306)),
-        "username": creds.get("username", creds.get("user")),
-        "password": creds.get("password"),
-        "database": creds.get("database", creds.get("dbname", "app")),
-    }
+    return _normalise_db_secret(get_secret(secret), "mysql")
 
 
 def get_elasticsearch_credentials(secret_name: Optional[str] = None) -> Dict:
     """
     Get Elasticsearch credentials.
 
-    Precedence (matching BaseServiceClient pattern):
+    Precedence (matching ElasticsearchClient):
     1. Environment variables (ES_PASSWORD/ES_PASS + ES_USERNAME/ES_USER)
     2. AWS Secrets Manager
 
+    The host is ES_HOST (or ELASTICSEARCH_HOST), then a host set with
+    configure(es_host=...), then the secret's ``host`` field, then the default,
+    with ``:9200`` appended when no port is given and it is not a URL.
+
     Args:
         secret_name: Override default secret name for Secrets Manager lookup.
             Ignored when credentials are resolved from environment variables.
@@ -128,58 +268,44 @@ def get_elasticsearch_credentials(secret_name: Optional[str] = None) -> Dict:
     Returns:
         Dict with host, username, password
     """
-    config = get_config()
+    creds = _es_credentials_from_env()
+    if creds is None:
+        config = get_config()
+        secret = secret_name or os.environ.get("ES_CREDENTIALS_SECRET") or config.es_credentials_secret
+        if not secret:
+            raise ValueError("No Elasticsearch secret name provided")
+        creds = _normalise_es_secret(get_secret(secret))
 
-    # Environment variables first (local dev, CLI usage)
-    es_password = os.environ.get("ES_PASSWORD") or os.environ.get("ES_PASS")
-    if es_password:
-        es_user = os.environ.get("ES_USERNAME") or os.environ.get("ES_USER") or "elastic"
-        host = os.environ.get("ES_HOST") or config.es_host
-        if ":" not in host and not host.startswith("http"):
-            host = f"{host}:9200"
-        return {"host": host, "username": es_user, "password": es_password}
-
-    # Secrets Manager (Lambda runtime)
-    secret = secret_name or os.environ.get("ES_CREDENTIALS_SECRET") or config.es_credentials_secret
-    if not secret:
-        raise ValueError("No Elasticsearch secret name provided")
+    host = _es_host_with_port(_resolve_es_host(creds.get("host")))
 
-    creds = get_secret(secret)
-
-    # Use configuration system for host defaults instead of hardcoded value
-    host = os.environ.get("ES_HOST") or creds.get("host") or config.es_host
-    # Ensure port is included if not already present
-    if ":" not in host and not host.startswith("http"):
-        host = f"{host}:9200"
-
-    return {
-        "host": host,
-        "username": creds.get("username", "elastic"),
-        "password": creds.get("password"),
-    }
+    return {"host": host, "username": creds["username"], "password": creds["password"]}
 
 
 def get_slack_credentials(secret_name: Optional[str] = None) -> Dict:
     """
     Get Slack bot credentials.
 
+    Precedence (matching SlackClient):
+    1. Environment variables (SLACK_BOT_TOKEN, optional SLACK_WEBHOOK_URL)
+    2. AWS Secrets Manager
+
     Args:
-        secret_name: Override default from configuration or environment
+        secret_name: Override default secret name for Secrets Manager lookup.
+            Ignored when credentials are resolved from environment variables.
 
     Returns:
         Dict with bot_token and optional webhook_url
     """
+    env_creds = _slack_credentials_from_env()
+    if env_creds is not None:
+        return env_creds
+
     config = get_config()
     secret = secret_name or os.environ.get("SLACK_CREDENTIALS_SECRET") or config.slack_credentials_secret
     if not secret:
         raise ValueError("No Slack secret name provided")
 
-    creds = get_secret(secret)
-
-    return {
-        "bot_token": creds.get("bot_token", creds.get("token")),
-        "webhook_url": creds.get("webhook_url"),  # Optional
-    }
+    return _normalise_slack_secret(get_secret(secret))
 
 
 def get_api_key(secret_name: str, key_field: str = "api_key") -> str:

nui_shared_utils/slack_client.py

@@ -19,6 +19,7 @@ except ImportError:
     YAML_AVAILABLE = False
 
 from .base_client import BaseClient, ServiceHealthMixin
+from .secrets_helper import _normalise_slack_secret, _slack_credentials_from_env
 from .utils import create_aws_client, handle_client_errors
 from .lambda_helpers import get_lambda_environment_info
 
@@ -258,14 +259,12 @@ class SlackClient(BaseClient, ServiceHealthMixin):
         Checks for SLACK_BOT_TOKEN (required to trigger).
         Optionally picks up SLACK_WEBHOOK_URL.
         """
-        bot_token = os.environ.get("SLACK_BOT_TOKEN")
-        if not bot_token:
-            return None
-        creds: Dict[str, Any] = {"bot_token": bot_token}
-        webhook_url = os.environ.get("SLACK_WEBHOOK_URL")
-        if webhook_url:
-            creds["webhook_url"] = webhook_url
-        return creds
+        return _slack_credentials_from_env()
+
+    def _fetch_credentials_from_sm(self, secret_name: Optional[str]) -> Dict[str, Any]:
+        """Fetch from Secrets Manager; normalise bot_token, webhook_url and keep any other keys."""
+        raw = super()._fetch_credentials_from_sm(secret_name)
+        return {**raw, **_normalise_slack_secret(raw)}
 
     def _create_service_client(self) -> WebClient:
         """Create Slack WebClient with credentials."""

nui_shared_utils/timezone.py

@@ -13,8 +13,8 @@ from zoneinfo import ZoneInfo
 # Supported timezones
 NZ_TZ = ZoneInfo("Pacific/Auckland")  # Primary timezone
 AUS_TZ = ZoneInfo("Australia/Sydney")
-US_EAST_TZ = ZoneInfo("US/Eastern")
-US_WEST_TZ = ZoneInfo("US/Pacific")
+US_EAST_TZ = ZoneInfo("America/New_York")
+US_WEST_TZ = ZoneInfo("America/Los_Angeles")
 EUR_TZ = ZoneInfo("Europe/London")
 
 
@@ -115,7 +115,7 @@ def get_timezone_options() -> List[Tuple[str, str]]:
     return [
         ("nz", "New Zealand (Pacific/Auckland)"),
         ("aus", "Australia (Australia/Sydney)"),
-        ("us_east", "US Eastern (US/Eastern)"),
-        ("us_west", "US Pacific (US/Pacific)"),
+        ("us_east", "US Eastern (America/New_York)"),
+        ("us_west", "US Pacific (America/Los_Angeles)"),
         ("eur", "Europe (Europe/London)"),
     ]