nui-python-shared-utils 2.0__py3-none-any.whl → 2.1__py3-none-any.whl

{nui_python_shared_utils-2.0.dist-info → nui_python_shared_utils-2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nui-python-shared-utils
-Version: 2.0
+Version: 2.1
 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
@@ -49,11 +49,11 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3>=1.20.0
-Requires-Dist: pytz>=2021.3
 Requires-Dist: click>=8.0.0
 Requires-Dist: pyyaml>=6.0
+Requires-Dist: tzdata>=2023.3; platform_system == "Windows"
 Provides-Extra: elasticsearch
-Requires-Dist: elasticsearch<8.0.0,>=7.17.0; extra == "elasticsearch"
+Requires-Dist: elasticsearch<10.0.0,>=7.17.0; extra == "elasticsearch"
 Provides-Extra: database
 Requires-Dist: pymysql>=1.0.0; extra == "database"
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "database"
@@ -64,12 +64,14 @@ Requires-Dist: aws-lambda-powertools<4.0.0,>=3.6.0; extra == "powertools"
 Requires-Dist: coloredlogs>=15.0; extra == "powertools"
 Provides-Extra: jwt
 Requires-Dist: rsa>=4.9; extra == "jwt"
+Provides-Extra: timezone
+Requires-Dist: tzdata>=2023.3; extra == "timezone"
 Provides-Extra: snowflake
 Requires-Dist: snowflake-sql-api<0.2.0,>=0.1.1; extra == "snowflake"
 Provides-Extra: llm
 Requires-Dist: anthropic[bedrock]<1.0.0,>=0.45.0; extra == "llm"
 Provides-Extra: all
-Requires-Dist: elasticsearch<8.0.0,>=7.17.0; extra == "all"
+Requires-Dist: elasticsearch<10.0.0,>=7.17.0; extra == "all"
 Requires-Dist: pymysql>=1.0.0; extra == "all"
 Requires-Dist: psycopg2-binary>=2.9.0; extra == "all"
 Requires-Dist: slack-sdk>=3.19.0; extra == "all"
@@ -85,11 +87,11 @@ Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: mypy>=0.990; extra == "dev"
 Requires-Dist: boto3-stubs[essential]>=1.20.0; extra == "dev"
 Requires-Dist: types-PyYAML>=6.0.0; extra == "dev"
-Requires-Dist: types-pytz>=2021.3.0; extra == "dev"
 Requires-Dist: twine>=4.0.0; extra == "dev"
 Requires-Dist: build>=0.8.0; extra == "dev"
 Requires-Dist: rsa>=4.9; extra == "dev"
 Requires-Dist: cryptography>=41.0.0; extra == "dev"
+Requires-Dist: tzdata>=2023.3; extra == "dev"
 Requires-Dist: snowflake-sql-api<0.2.0,>=0.1.1; extra == "dev"
 Requires-Dist: anthropic[bedrock]<1.0.0,>=0.45.0; extra == "dev"
 Dynamic: author

{nui_python_shared_utils-2.0.dist-info → nui_python_shared_utils-2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nui_python_shared_utils-2.0.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
+nui_python_shared_utils-2.1.dist-info/licenses/LICENSE,sha256=vGe2mC5yLUb8toYlY3T36ZwCB5zQUW5hlCtEMiqokhM,1071
 nui_shared_utils/__init__.py,sha256=vFS5oaw7_iHgHnLRifDYYyb7au6G2nYJ6ztqMs-hrQs,13289
 nui_shared_utils/base_client.py,sha256=I1lKQGhrKyvujV2zps0TrtEdPDqMCwRQaIh6ceGONXQ,11016
 nui_shared_utils/cli.py,sha256=JJpSoQWKvAz4b8cO30yFNi5vY9jmqrCHzbFpvrVTkbU,8747
@@ -6,7 +6,7 @@ nui_shared_utils/cloudwatch_metrics.py,sha256=p0J-s63UJDGK14TRGt0k8yoj7aWSSM55UK
 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=rLyexuL6_RXQpuMC4A2SeJDk30medx2qxOgWIG3A_7o,15765
+nui_shared_utils/es_client.py,sha256=3MlrbddTrRN2mEH1b3TNzcmwYycLdujoIq_5_j-Cyfc,16714
 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
@@ -15,9 +15,9 @@ nui_shared_utils/log_processors.py,sha256=x5gz1LEkbmoMCZ3ZB6q-mbn26dSzwh1trz4wSk
 nui_shared_utils/powertools_helpers.py,sha256=qc-lYLfY-QX20gALfPOJcihrtJhiCU-fJW8rsPT7LJE,11037
 nui_shared_utils/secrets_helper.py,sha256=_jQkMWzjayZ8vvyHG2yuuxur-SQYUUONfcsZ0MF8qOw,7025
 nui_shared_utils/slack_client.py,sha256=wXE0D4T4FWt1giz9Xmp71RustpaJYeLAZo6JxulDVko,25550
-nui_shared_utils/slack_formatter.py,sha256=95g6XfAJst7RVhd0M0ahiF3gWWW5j96WYkCg5tLS6Zg,10894
+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=TvtSZV7w3Vvz3NbMTcJSNbUf0ZxPwpFS-xfgye1h-4Q,3583
+nui_shared_utils/timezone.py,sha256=gTiSK5NUG0Z8UY_AsB4ktIzLrZ0wwTXtdTUH-Npdvik,3837
 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
@@ -27,8 +27,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-2.0.dist-info/METADATA,sha256=bK7P8bMGhOLpSyVQsZ3gwrWRZ6KZksIoAJIlj6V-qHM,22584
-nui_python_shared_utils-2.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-nui_python_shared_utils-2.0.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
-nui_python_shared_utils-2.0.dist-info/top_level.txt,sha256=YMRu5cnn3hxHoYq9wNvaI9atVHnTNVdswO5_cQSfnJI,17
-nui_python_shared_utils-2.0.dist-info/RECORD,,
+nui_python_shared_utils-2.1.dist-info/METADATA,sha256=fWK7ffhd2g2e4rKPJeAhStSKUECYAxImYWsvGZyTbvM,22688
+nui_python_shared_utils-2.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+nui_python_shared_utils-2.1.dist-info/entry_points.txt,sha256=TrJ3Z4kz3oXfy6InXn20jHu7rnTwo-4EA0KRFX3fkL0,66
+nui_python_shared_utils-2.1.dist-info/top_level.txt,sha256=YMRu5cnn3hxHoYq9wNvaI9atVHnTNVdswO5_cQSfnJI,17
+nui_python_shared_utils-2.1.dist-info/RECORD,,

nui_shared_utils/es_client.py

@@ -97,24 +97,37 @@ class ElasticsearchClient(BaseClient, ServiceHealthMixin):
             retry_on_timeout=self.client_config.get("retry_on_timeout", True),
         )
 
+    @staticmethod
+    def _body_with_size(body: Dict, size: int) -> Dict:
+        """Return a copy of ``body`` carrying ``size``.
+
+        ``size`` travels inside the request body rather than as a sibling keyword
+        argument, which is the one call shape every supported client major accepts.
+        On elasticsearch-py 8.x/9.x, passing ``body=`` alongside a body field as a
+        keyword folds that keyword into the caller's dict (mutating it) and raises
+        ``ValueError`` if the key is already there, so reusing a body dict for two
+        searches breaks. A body that carries its own ``size`` is accepted unchanged
+        by 7.17, 8.x and 9.x, and leaves the caller's dict alone.
+        """
+        return {**body, "size": size}
+
     @handle_client_errors(default_return=[])
     def search(self, index: str, body: Dict, size: int = 100) -> List[Dict]:
         """
         Execute search query with error handling.
-        
+
         Args:
             index: Index pattern to search
             body: Elasticsearch query body
-            size: Maximum results to return
-            
+            size: Maximum results to return (overrides any ``size`` in ``body``)
+
         Returns:
             List of hit documents
         """
         def _search_operation():
             response = self._service_client.search(
                 index=index,
-                body=body,
-                size=size,
+                body=self._body_with_size(body, size),
                 ignore_unavailable=True
             )
             return [hit["_source"] for hit in response["hits"]["hits"]]
@@ -141,8 +154,7 @@ class ElasticsearchClient(BaseClient, ServiceHealthMixin):
         def _aggregate_operation():
             response = self._service_client.search(
                 index=index,
-                body=body,
-                size=0,  # Only need aggregations
+                body=self._body_with_size(body, 0),  # Only need aggregations
                 ignore_unavailable=True
             )
             return response.get("aggregations", {})
@@ -374,7 +386,9 @@ class ElasticsearchClient(BaseClient, ServiceHealthMixin):
                 format="json",
                 h="index,health,status,docs.count,store.size"
             )
-            return response or []
+            # 8.x/9.x return a response wrapper around the JSON array; normalise to
+            # a plain list so callers get the same type on every client major.
+            return list(response) if response else []
 
         return self._execute_with_error_handling(
             "get_indices_info",

nui_shared_utils/slack_formatter.py

@@ -4,8 +4,9 @@ Provides a builder pattern for creating Slack Block Kit messages.
 """
 
 from typing import Dict, List, Any, Optional, Union
-from datetime import datetime, timedelta
-import pytz
+from datetime import datetime, timedelta, timezone
+
+from .timezone import NZ_TZ
 
 # Severity emoji mapping
 SEVERITY_EMOJI = {"critical": "🚨", "warning": "⚠️", "info": "ℹ️", "success": "✅", "error": "❌"}
@@ -42,25 +43,23 @@ def format_number(value: Union[int, float], decimals: int = 0) -> str:
 def format_nz_time(dt: Optional[datetime] = None) -> str:
     """Format datetime in NZ timezone."""
     if dt is None:
-        dt = datetime.utcnow()
+        dt = datetime.now(timezone.utc)
     elif not dt.tzinfo:
-        dt = dt.replace(tzinfo=pytz.UTC)
+        dt = dt.replace(tzinfo=timezone.utc)
 
-    nz_tz = pytz.timezone("Pacific/Auckland")
-    nz_time = dt.astimezone(nz_tz)
+    nz_time = dt.astimezone(NZ_TZ)
     return nz_time.strftime("%I:%M %p %Z")
 
 
 def format_date_range(start: datetime, end: datetime) -> str:
     """Format a date range in NZ timezone."""
-    nz_tz = pytz.timezone("Pacific/Auckland")
     if not start.tzinfo:
-        start = start.replace(tzinfo=pytz.UTC)
+        start = start.replace(tzinfo=timezone.utc)
     if not end.tzinfo:
-        end = end.replace(tzinfo=pytz.UTC)
+        end = end.replace(tzinfo=timezone.utc)
 
-    start_nz = start.astimezone(nz_tz)
-    end_nz = end.astimezone(nz_tz)
+    start_nz = start.astimezone(NZ_TZ)
+    end_nz = end.astimezone(NZ_TZ)
 
     if start_nz.date() == end_nz.date():
         return f"{start_nz.strftime('%b %d')} {start_nz.strftime('%I:%M %p')} - {end_nz.strftime('%I:%M %p %Z')}"

nui_shared_utils/timezone.py

@@ -1,17 +1,21 @@
 """
 Timezone utilities for multi-timezone handling (NZ primary, AUS/US/EUR secondary).
+
+Zone data comes from the standard library's ``zoneinfo``, which reads the system
+IANA database. Environments without one (Windows, minimal images such as Alpine)
+need the ``tzdata`` package: `pip install nui-python-shared-utils[timezone]`.
 """
 
 from datetime import datetime, timezone
-import pytz
-from typing import List, Tuple, Optional
+from typing import List, Optional, Tuple
+from zoneinfo import ZoneInfo
 
 # Supported timezones
-NZ_TZ = pytz.timezone("Pacific/Auckland")  # Primary timezone
-AUS_TZ = pytz.timezone("Australia/Sydney")
-US_EAST_TZ = pytz.timezone("US/Eastern")
-US_WEST_TZ = pytz.timezone("US/Pacific")
-EUR_TZ = pytz.timezone("Europe/London")
+NZ_TZ = ZoneInfo("Pacific/Auckland")  # Primary timezone
+AUS_TZ = ZoneInfo("Australia/Sydney")
+US_EAST_TZ = ZoneInfo("US/Eastern")
+US_WEST_TZ = ZoneInfo("US/Pacific")
+EUR_TZ = ZoneInfo("Europe/London")
 
 
 def nz_time(utc_dt: Optional[datetime] = None) -> datetime:
@@ -28,7 +32,7 @@ def nz_time(utc_dt: Optional[datetime] = None) -> datetime:
         utc_dt = datetime.now(timezone.utc)
 
     if utc_dt.tzinfo is None:
-        utc_dt = pytz.UTC.localize(utc_dt)
+        utc_dt = utc_dt.replace(tzinfo=timezone.utc)
 
     return utc_dt.astimezone(NZ_TZ)
 
@@ -66,7 +70,7 @@ def format_multi_timezone(dt: Optional[datetime] = None, primary_tz: str = "nz",
         dt = datetime.now(timezone.utc)
 
     if dt.tzinfo is None:
-        dt = pytz.UTC.localize(dt)
+        dt = dt.replace(tzinfo=timezone.utc)
 
     # Timezone mapping
     tz_map = {"nz": NZ_TZ, "aus": AUS_TZ, "us_east": US_EAST_TZ, "us_west": US_WEST_TZ, "eur": EUR_TZ}