python: Improve retry behavior and logging; bump Python version to 1.13.8

gaikwadabhishek · gaikwadabhishek · commit 4e0f35668e50 · 2025-05-15T17:51:46.000-07:00
- Added  to retry config to handle additional timeout scenarios
- Enhanced object file logging to include the object path for better traceability
- Bumped Python version to 1.13.8

Signed-off-by: Abhishek Gaikwad &lt;gaikwadabhishek1997@gmail.com&gt;
diff --git a/python/CHANGELOG.md b/python/CHANGELOG.md
@@ -8,9 +8,15 @@ We structure this changelog in accordance with [Keep a Changelog](https://keepac
 
 ## Unreleased
 
+## [1.13.7] - 2025-05-15
+
 ### Added
 
 - Add `obj_timeout` and `init_timeout` fields in `InitETLArgs` type to align with updated API fields.
+- Add `urllib3.exceptions.TimeoutError` to retry config to handle additional timeout scenarios.
+
+### Changed
+- Enhance object file logging to include the object path for better traceability.
 
 ## [1.13.7] - 2025-05-06
 
diff --git a/python/aistore/sdk/obj/content_iterator.py b/python/aistore/sdk/obj/content_iterator.py
@@ -21,6 +21,16 @@ def __init__(self, client: ObjectClient, chunk_size: int):
         self._client = client
         self._chunk_size = chunk_size
 
+    @property
+    def client(self) -> ObjectClient:
+        """
+        Get the client associated with this content iterator.
+
+        Returns:
+            ObjectClient: The client used to access object content.
+        """
+        return self._client
+
     def iter(self, offset: int = 0) -> Iterator[bytes]:
         """
         Create an iterator over the object content, applying an optional offset.
diff --git a/python/aistore/sdk/obj/obj_file/object_file.py b/python/aistore/sdk/obj/obj_file/object_file.py
@@ -40,6 +40,11 @@ def __init__(self, content_iterator: ContentIterator, max_resume: int):
         self._resume_total = 0  # Tracks the number of resume attempts
         self._closed = False
 
+    @property
+    def content_iterator(self) -> ContentIterator:
+        """Return the content iterator."""
+        return self._content_iterator
+
     @override
     def __enter__(self):
         self._iterable = self._content_iterator.iter()
@@ -125,8 +130,14 @@ def read(self, size: Optional[int] = -1) -> bytes:
                     size -= len(chunk)
 
         except Exception as err:
-            # Handle any unexpected errors, log them, close the file, and re-raise
-            logger.error("Error reading, closing file: (%s)", err)
+            obj_path = self.content_iterator.client.path
+            # Handle any unexpected errors, log them with context, close the file, and re-raise
+            logger.error(
+                "Error while reading object at '%s': %s. Closing file.",
+                obj_path,
+                err,
+                exc_info=True,
+            )
             self.close()
             raise err
 
diff --git a/python/aistore/sdk/obj/obj_file/utils.py b/python/aistore/sdk/obj/obj_file/utils.py
@@ -85,8 +85,10 @@ def handle_chunked_encoding_error(
         ObjectFileReaderMaxResumeError: If the maximum number of resume attempts is exceeded.
     """
     resume_total = increment_resume(resume_total, max_resume, err)
+    obj_path = content_iterator.client.path
     logger.warning(
-        "Chunked encoding error (%s), retrying %d/%d",
+        "Chunked encoding error while reading '%s': (%s), retrying %d/%d",
+        obj_path,
         err,
         resume_total,
         max_resume,
diff --git a/python/aistore/sdk/obj/object_client.py b/python/aistore/sdk/obj/object_client.py
@@ -44,6 +44,16 @@ def __init__(
         if uname:
             self._initialize_target_client()
 
+    @property
+    def path(self) -> str:
+        """
+        Get the URL path for the object.
+
+        Returns:
+            str: The URL path for the object.
+        """
+        return self._request_path
+
     def _initialize_target_client(self, force: bool = False):
         """
         Initialize a new RequestClient pointing to the target node for the object.
diff --git a/python/aistore/sdk/retry_config.py b/python/aistore/sdk/retry_config.py
@@ -5,6 +5,7 @@
 import logging
 from dataclasses import dataclass
 from urllib3.util.retry import Retry
+from urllib3.exceptions import TimeoutError as Urllib3TimeoutError
 from tenacity import (
     Retrying,
     wait_exponential,
@@ -27,6 +28,7 @@
     ChunkedEncodingError,
     RequestsConnectionError,
     AISRetryableError,
+    Urllib3TimeoutError,
 )
 
 
@@ -82,7 +84,7 @@ def default() -> "RetryConfig":
                 wait=wait_exponential(multiplier=1, min=1, max=10),
                 stop=stop_after_delay(60),
                 retry=retry_if_exception_type(NETWORK_RETRY_EXCEPTIONS),
-                before_sleep=before_sleep_log(logging.getLogger(), logging.DEBUG),
+                before_sleep=before_sleep_log(logging.getLogger(), logging.WARNING),
                 reraise=True,
             ),
         )
diff --git a/python/aistore/version.py b/python/aistore/version.py
@@ -1 +1 @@
-__version__ = "1.13.7"
+__version__ = "1.13.8"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "1.13.7"`
	`1`	`+__version__ = "1.13.8"`