Multipart upload

Author: gonchik

atlassian/VERSION

@@ -1 +1 @@
-5.0.0
+5.0.1

atlassian/rest_client.py

@@ -479,8 +479,23 @@ def request(
 
         headers = headers or self.default_headers
 
+        # ``requests`` reads file-like multipart values when preparing a
+        # request. Reset them before every attempt so a retry cannot upload an
+        # already-consumed, zero-byte file.
+        file_positions = []
+        if files:
+            for upload in files.values():
+                stream = upload[1] if isinstance(upload, (tuple, list)) and len(upload) > 1 else upload
+                if hasattr(stream, "seek") and hasattr(stream, "tell"):
+                    try:
+                        file_positions.append((stream, stream.tell()))
+                    except (OSError, ValueError):
+                        pass
+
         retry_handler = self._retry_handler()
         while True:
+            for stream, position in file_positions:
+                stream.seek(position)
             self.log_curl_debug(
                 method=method,
                 url=url,

tests/test_rest_client.py

@@ -3,6 +3,7 @@
 Unit tests for atlassian.rest_client module
 """
 
+import io
 from datetime import datetime, timedelta
 from types import SimpleNamespace
 
@@ -184,6 +185,37 @@ def test_advanced_mode(self):
         api = AtlassianRestAPI(url=f"{mockup_server()}/test", advanced_mode=True)
         assert api.advanced_mode is True
 
+    def test_request_rewinds_uploaded_file_before_retry(self):
+        class RetryingSession:
+            def __init__(self):
+                self.verify = True
+                self.payloads = []
+                self.responses = [
+                    SimpleNamespace(status_code=503, headers={}, reason="Unavailable", text=""),
+                    SimpleNamespace(status_code=200, headers={}, reason="OK", text=""),
+                ]
+
+            def request(self, **kwargs):
+                self.payloads.append(kwargs["files"]["file"][1].read())
+                return self.responses.pop(0)
+
+        session = RetryingSession()
+        api = AtlassianRestAPI(
+            url="https://example.test",
+            session=session,
+            advanced_mode=True,
+            retry_status_codes=[503],
+            max_backoff_retries=1,
+            backoff_factor=0,
+            backoff_jitter=0,
+        )
+        api.backoff_and_retry = True
+        api.use_urllib3_retry = False
+
+        api.request("POST", "attachment", files={"file": ("report.csv", io.BytesIO(b"small report"))})
+
+        assert session.payloads == [b"small report", b"small report"]
+
     def test_kerberos_configuration(self):
         """Test kerberos configuration"""
         # Test that kerberos config is accepted without errors