nui-python-shared-utils 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

{nui_python_shared_utils-1.3.1.dist-info → nui_python_shared_utils-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nui-python-shared-utils
-Version: 1.3.1
+Version: 1.3.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

{nui_python_shared_utils-1.3.1.dist-info → nui_python_shared_utils-1.3.2.dist-info}/RECORD

@@ -20,7 +20,7 @@ nui_lambda_shared_utils/slack_setup/__init__.py,sha256=q78NzSznsSd3ri5OUohWxQt7r
 nui_lambda_shared_utils/slack_setup/channel_creator.py,sha256=xaeqzyEAqVqYj2EhN69UvcyZQ6LdFKYODPPCwxHInLA,172
 nui_lambda_shared_utils/slack_setup/channel_definitions.py,sha256=3TkdLzWvEMBMDy5jqOPMUGRgKQ3z9TN58D43V7O7LpE,180
 nui_lambda_shared_utils/slack_setup/setup_helpers.py,sha256=ex_RiUfiZqH9qGLQwmedezMbfp35uI-VQPevducfbBk,168
-nui_python_shared_utils-1.3.1.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
+nui_python_shared_utils-1.3.2.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
 nui_shared_utils/__init__.py,sha256=0yYLzo2zggr43W2zdybp7PBc5oPsU-kwh1M1r7CuFv4,6617
 nui_shared_utils/base_client.py,sha256=I1lKQGhrKyvujV2zps0TrtEdPDqMCwRQaIh6ceGONXQ,11016
 nui_shared_utils/cli.py,sha256=JJpSoQWKvAz4b8cO30yFNi5vY9jmqrCHzbFpvrVTkbU,8747
@@ -28,13 +28,13 @@ nui_shared_utils/cloudwatch_metrics.py,sha256=Rdyfy-3zAQqZkPL2krzjyB3FXYgrh7Hx56
 nui_shared_utils/config.py,sha256=ZbkUKDxnHMJiHNv-TlWKjotmf2mH1Vz3GaIXgGfWg7E,4524
 nui_shared_utils/db_client.py,sha256=HyVKJ1Su0dVPV1QI2MU5UtT8myDRCjKgV60xRL4SEdE,21726
 nui_shared_utils/error_handler.py,sha256=pJ6b_mI0Ait8QRbs9UmLzYUN-Ft0l_dnpudVO_6LRSE,12171
-nui_shared_utils/es_client.py,sha256=sSUouJqxc-Sx6NBBn8hXuOPohCd8--d4urRnRufCYrQ,15661
+nui_shared_utils/es_client.py,sha256=rLyexuL6_RXQpuMC4A2SeJDk30medx2qxOgWIG3A_7o,15765
 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/log_processors.py,sha256=x5gz1LEkbmoMCZ3ZB6q-mbn26dSzwh1trz4wSkBGxqk,5538
 nui_shared_utils/powertools_helpers.py,sha256=pVu9MVBC6PEirHBbMC-9nKreP9jk8wd0fQt6OWekzdk,10126
-nui_shared_utils/secrets_helper.py,sha256=38n6LZXNGY6mK24L6FEpE0JqcJYZRW2_2QTTtq16qYI,6054
+nui_shared_utils/secrets_helper.py,sha256=KoEKplGjfxc8HnhRXvxCRAqLKOOBN9oxKABjTlZvy4I,6806
 nui_shared_utils/slack_client.py,sha256=_qR7Q1GU7gvYhUxiaBxEohhoEYznqr8kz9enGfeDtn8,24759
 nui_shared_utils/slack_formatter.py,sha256=95g6XfAJst7RVhd0M0ahiF3gWWW5j96WYkCg5tLS6Zg,10894
 nui_shared_utils/timezone.py,sha256=TvtSZV7w3Vvz3NbMTcJSNbUf0ZxPwpFS-xfgye1h-4Q,3583
@@ -43,8 +43,8 @@ nui_shared_utils/slack_setup/__init__.py,sha256=OElyS3xk4F_YKH5uUUTDpN0ah1dOO3e5
 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-1.3.1.dist-info/METADATA,sha256=ibYjhgWQfaPsXbLpUW1Kq9eYCMEObLxqcqrgTwcHfm0,19387
-nui_python_shared_utils-1.3.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-nui_python_shared_utils-1.3.1.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
-nui_python_shared_utils-1.3.1.dist-info/top_level.txt,sha256=sNceq5okmEB54L-gm4a0OgGhnPlU62zYmlUoXKn-Fa8,41
-nui_python_shared_utils-1.3.1.dist-info/RECORD,,
+nui_python_shared_utils-1.3.2.dist-info/METADATA,sha256=-N4PxQPpnnqdwBjiZ-uCWfVdAgeYARr7tRfcXsoUuto,19387
+nui_python_shared_utils-1.3.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+nui_python_shared_utils-1.3.2.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
+nui_python_shared_utils-1.3.2.dist-info/top_level.txt,sha256=sNceq5okmEB54L-gm4a0OgGhnPlU62zYmlUoXKn-Fa8,41
+nui_python_shared_utils-1.3.2.dist-info/RECORD,,

nui_shared_utils/es_client.py

@@ -52,14 +52,14 @@ class ElasticsearchClient(BaseClient, ServiceHealthMixin):
     def _resolve_credentials_from_env(self) -> Optional[Dict[str, Any]]:
         """Resolve Elasticsearch credentials from environment variables.
 
-        Checks for ES_PASSWORD (required to trigger).
-        ES_USERNAME defaults to "elastic" if not set.
+        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")
+        password = os.environ.get("ES_PASSWORD") or os.environ.get("ES_PASS")
         if not password:
             return None
         return {
-            "username": os.environ.get("ES_USERNAME", "elastic"),
+            "username": os.environ.get("ES_USERNAME") or os.environ.get("ES_USER") or "elastic",
             "password": password,
         }
 

nui_shared_utils/secrets_helper.py

@@ -112,13 +112,29 @@ def get_elasticsearch_credentials(secret_name: Optional[str] = None) -> Dict:
     """
     Get Elasticsearch credentials.
 
+    Precedence (matching BaseServiceClient pattern):
+    1. Environment variables (ES_PASSWORD/ES_PASS + ES_USERNAME/ES_USER)
+    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, username, password
     """
     config = get_config()
+
+    # 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")