From cf9e8dc3bfdfe76076724356792d72343b8646c4 Mon Sep 17 00:00:00 2001
From: Ajeya Bhat <ajeya@outpost.run>
Date: Tue, 21 May 2024 17:02:19 +0530
Subject: [PATCH] fix: complete

---
 outpostcli/lfs/storage_class/gcs.py   |  3 ---
 outpostcli/lfs/storage_class/utils.py | 20 ++++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/outpostcli/lfs/storage_class/gcs.py b/outpostcli/lfs/storage_class/gcs.py
index 5b9f9c5..8957d3c 100644
--- a/outpostcli/lfs/storage_class/gcs.py
+++ b/outpostcli/lfs/storage_class/gcs.py
@@ -1,5 +1,3 @@
-import os
-from math import ceil
 from multiprocessing import cpu_count
 from typing import Any, Dict, List, Literal, TypedDict
 
@@ -13,7 +11,6 @@
 from outpostcli.lfs.storage_class.utils import (
     abort_multipart_upload,
     complete_multipart_upload,
-    initiate_multipart_upload,
 )
 
 _log = create_lfs_logger(__name__)
diff --git a/outpostcli/lfs/storage_class/utils.py b/outpostcli/lfs/storage_class/utils.py
index 0f8111f..84f25dd 100644
--- a/outpostcli/lfs/storage_class/utils.py
+++ b/outpostcli/lfs/storage_class/utils.py
@@ -38,26 +38,14 @@ def part_dict_list_to_xml(multi_parts: List[UploadedPartObject]):
     wait=wait_exponential(multiplier=1, min=1, max=60),  # Exponential backoff
 )
 def complete_multipart_upload(url: str, parts: List[UploadedPartObject]):
-    r = requests.post(url, data=part_dict_list_to_xml(parts))
+    r = requests.post(
+        url,
+        data=part_dict_list_to_xml(sorted(parts, key=lambda x: x.get("part_number"))),  # type: ignore
+    )
     r.raise_for_status()
     return r
 
 
-@handle_request_errors
-@retry(
-    reraise=True,
-    stop=stop_after_attempt(4),  # Maximum number of retries
-    wait=wait_exponential(multiplier=1, min=1, max=60),  # Exponential backoff
-)
-def initiate_multipart_upload(url: str) -> str:
-    r = requests.post(url, headers={"Content-Type": "application/octet-stream"})
-    r.raise_for_status()
-    # parse uploadid from response example response
-    #   <?xml version='1.0' encoding='UTF-8'?><InitiateMultipartUploadResult xmlns='http://s3.amazonaws.com/doc/2006-03-01/'><Bucket>pr-cache-bucket-0</Bucket><Key>randomfile.tar.gz</Key><UploadId>ABPnzm5hfCDjy44Aa2WDHPxGL9kDyJ3GwtFvToGhVYgNul2PiIOcGI8siu_HjXHeYRkbPxo</UploadId></InitiateMultipartUploadResult>
-    upload_id = r.text.split("<UploadId>")[1].split("</UploadId>")[0]
-    return upload_id
-
-
 @handle_request_errors
 @retry(
     reraise=True,