Try sorting presigned urls and file paths

Author: duckduckgrayduck

documentcloud/documents.py

@@ -477,7 +477,6 @@ def upload_directory(self, path, handle_errors=False, extensions=".pdf", **kwarg
                 )
                 for p in sorted(file_paths)
             ]
-            print("POST body:", body)
             try:
                 response = self.client.post("documents/", json=body)
             except (APIError, RequestException) as exc:
@@ -493,9 +492,13 @@ def upload_directory(self, path, handle_errors=False, extensions=".pdf", **kwarg
 
             # Upload the files directly to storage
             create_json = response.json()
-            obj_list.extend(create_json)
-            presigned_urls = [j["presigned_url"] for j in create_json]
-            for url, file_path in zip(presigned_urls, file_paths):
+
+            sorted_create_json = sorted(create_json, key=lambda j: j["title"])
+            sorted_file_paths = sorted(file_paths, key=lambda p: self._get_title(p))
+            obj_list.extend(sorted_create_json)
+            presigned_urls = [j["presigned_url"] for j in sorted_create_json]
+            
+            for url, file_path in zip(presigned_urls, sorted_file_paths):
                 logger.info("Uploading %s to S3...", file_path)
                 try:
                     with open(file_path, "rb") as file:

tests/cassettes/fixtures/client.yaml

@@ -18,7 +18,7 @@ interactions:
     uri: https://dev.squarelet.com/api/token/
   response:
     body:
-      string: '{"refresh":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaCIsImV4cCI6MTc1ODgxMzI5NiwiaWF0IjoxNzU4NzI2ODk2LCJqdGkiOiI2MDAzNzY3NTQ3MDM0ZmEzYjgzZjQ1ZDM4ZWViOWJhNyIsInVzZXJfaWQiOiJmNjAyOWU4YS1kOGEyLTQxODgtOGEyMS1jZDA3M2EwMmVlNWMiLCJhdWQiOlsic3F1YXJlbGV0IiwibXVja3JvY2siLCJkb2N1bWVudGNsb3VkIl0sImlzcyI6WyJzcXVhcmVsZXQiXX0.ha8vr4DcxypK7MBcIGj3qaxZnYZ9iP8Y7XWstC06U-cpc7XU0o9Zcqzxny-CTIlkykqz9xNo2Vq5oWnVmcN4yyRa9Bzi1wEVJSPo9Ei-tdxKbGZynSbrxLMIj_W0mXnstRmQgA9VX3eMOBxgvuUDCH0AMGTwspFajfnnv-WUtdG0TB9GVWLGu2K6PqhO-aWutYxvHdtl5jWjh_9ZVqFz2y_qFAD2t6J-aGvPqEV2Ynm8o41jVS5bR3mpACsE07q2BU1P3lz77klpjAVX3ahjtbyu2JHZNBG4RRcySTippc6wClvNzDonta-oQKPJlms0Uk52tRwNqhJfWnGGecMgyA","access":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzU4NzI3MTk2LCJpYXQiOjE3NTg3MjY4OTYsImp0aSI6IjZlOGEwODRkZGVjYTQzNzM5YjQ3YTcxNjViNTA0NTNmIiwidXNlcl9pZCI6ImY2MDI5ZThhLWQ4YTItNDE4OC04YTIxLWNkMDczYTAyZWU1YyIsImF1ZCI6WyJzcXVhcmVsZXQiLCJtdWNrcm9jayIsImRvY3VtZW50Y2xvdWQiXSwiaXNzIjpbInNxdWFyZWxldCJdfQ.l9hkxMHXTjCof0fS4I4gf-lJ6NtP1TWoT6QJwuVpICfkZGWGw1yqA8yUAd95oPKJ5KMYXKAEPXUNdAfN3Fn21OyzLCOcdcmn-Y-GMJu2nTRc9TBKLQFGc0xWM5IO26vwFAfE2HZXFqtx_s4j192Tm5nVFGyO1AsapHU1dkcL0y9b5wMD7kls23Ub-BD2w6FtpAQMxfXhmMGjfDJByHn6qexM7CLvk2AKp_9dFmA2oNpWhzLIgXMS-d7ZaL8O-cpA5SK4vtJjo8bGX5Gaz_JyjwiupqixBB-3ci3mTZXfm_9OM9v08pmtrPlHSMwf4DGEedhhMJPkeLU4_2rwV86Owg"}'
+      string: '{"refresh":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaCIsImV4cCI6MTc1ODgxNTMyMiwiaWF0IjoxNzU4NzI4OTIyLCJqdGkiOiIyZGIyYjk2MGRiMTg0MjIwOTY0YWY5YTI2ZjUyNjQ3YyIsInVzZXJfaWQiOiJmNjAyOWU4YS1kOGEyLTQxODgtOGEyMS1jZDA3M2EwMmVlNWMiLCJhdWQiOlsic3F1YXJlbGV0IiwibXVja3JvY2siLCJkb2N1bWVudGNsb3VkIl0sImlzcyI6WyJzcXVhcmVsZXQiXX0.OBpX4-A48BbNHKr75vpgy7Ssdj-Ag63eJZ8Zo-aiHBoq5bGrA1dTcHkrglh61KI6Ji6w3zksv4DmfL1kvEkocd_cMB4bYRunfIKU2VMPn51F9Pm3YcDV27ogydh_tZykt3I4YfdIq4Ct5c97I8SyI0AS_7i347pKlaGoJynTZPezTZWUKIM9EtriQ9iT47HEDWH09fmcyvqA3afsgR70vSxxB_OLcHAnH0fZ1DP6F9oQh-nwOmooNlS7rTGikkVjZqlOXWJl3FLHsi4R_GD05b37XCyAEjo9RVf5fxEVbaeegKwCWEpRetQABrVnOFOdaeeVfjz8iAwVXBBV5o9yjQ","access":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzU4NzI5MjIyLCJpYXQiOjE3NTg3Mjg5MjIsImp0aSI6IjVjZjJjNTY0MmM5MjQ0YWNiOGI1MTE4ZDIzYzQxZjAyIiwidXNlcl9pZCI6ImY2MDI5ZThhLWQ4YTItNDE4OC04YTIxLWNkMDczYTAyZWU1YyIsImF1ZCI6WyJzcXVhcmVsZXQiLCJtdWNrcm9jayIsImRvY3VtZW50Y2xvdWQiXSwiaXNzIjpbInNxdWFyZWxldCJdfQ.ox04nvr_QyJh5z249PZuvQiy4YLLKKba_yF73J_osL6UcQcv-viGFqxXcMgObbcugvVPqSW4VEiCiEMPTgNhrrl7KzhFwtZlZv7QXRHcJP8N5hJbahaFwKHCJwUpHpM9qliAE0rVSQ1U3MfaEWGZTsj8JN2tM3gSp1fGguoY76N2AvD0KlykTsQZYHEbkO2gTrCm25WVFGxe-f7s58n_sSBgdvvM9vpNf3to6_AeZ2QwpUOG_rWplgvDE1ugILOdur2TSL5_RGgqI5KQltGdpURVYpeURiycZ-f1w-JPP7D8KDfawXV2N9lhBE7kP-Lb98qgh-vLAzazLLVBWDnB5Q"}'
     headers:
       Allow:
       - POST, OPTIONS
@@ -31,15 +31,15 @@ interactions:
       Cross-Origin-Opener-Policy:
       - same-origin
       Date:
-      - Wed, 24 Sep 2025 15:14:56 GMT
+      - Wed, 24 Sep 2025 15:48:42 GMT
       Referrer-Policy:
       - same-origin
       Server:
       - nginx/1.25.2
       Server-Timing:
-      - TimerPanel_utime;dur=214.24900000002367;desc="User CPU time", TimerPanel_stime;dur=47.786000000002105;desc="System
-        CPU time", TimerPanel_total;dur=262.0350000000258;desc="Total CPU time", TimerPanel_total_time;dur=129.43583900050726;desc="Elapsed
-        time", SQLPanel_sql_time;dur=5.449520998809021;desc="SQL 4 queries", CachePanel_total_time;dur=0;desc="Cache
+      - TimerPanel_utime;dur=244.6600000000103;desc="User CPU time", TimerPanel_stime;dur=47.13300000000231;desc="System
+        CPU time", TimerPanel_total;dur=291.7930000000126;desc="Total CPU time", TimerPanel_total_time;dur=135.79398800357012;desc="Elapsed
+        time", SQLPanel_sql_time;dur=4.552477003016975;desc="SQL 4 queries", CachePanel_total_time;dur=0;desc="Cache
         0 Calls"
       Set-Cookie:
       - op_browser_state=f5448717470b879d75a31d1e1e832e10c24a7586f91c49d672dea82f;
@@ -51,7 +51,7 @@ interactions:
       X-Frame-Options:
       - DENY
       djdt-store-id:
-      - 1c9784ab60894f39992428009825187d
+      - 7d41427a9d1846d6be4975c3f0b284b0
     status:
       code: 200
       message: OK