fix: upload method

fix: upload fixes

Author: dreinon

poetry.lock

@@ -126,9 +126,8 @@ async def list(
             Search options, including `limit`, `offset`, and `sortBy`.
         """
         extra_options = options or {}
-        body = dict(DEFAULT_SEARCH_OPTIONS, **extra_options)
         extra_headers = {"Content-Type": "application/json"}
-        body["prefix"] = path or ""
+        body = {**DEFAULT_SEARCH_OPTIONS, **extra_options, "prefix": path or ""}
         response = await self._request(
             "POST",
             f"/object/list/{self.id}",
@@ -167,13 +166,13 @@ async def upload(
         file
             The File object to be stored in the bucket. or a async generator of chunks
         file_options
-            HTTP headers. For example `cacheControl`
+            HTTP headers. For example `cache-control`
         """
         if file_options is None:
             file_options = {}
-        headers = dict(self._client.headers, **DEFAULT_FILE_OPTIONS, **file_options)
+        headers = {**self._client.headers, **DEFAULT_FILE_OPTIONS, **file_options}
         filename = path.rsplit("/", maxsplit=1)[-1]
-        files = {"file": (filename, open(file, "rb"), headers["contentType"])}
+        files = {"file": (filename, open(file, "rb"), headers.pop("content-type"))}
         _path = self._get_final_path(path)
 
         return await self._request(

storage3/_async/file_api.py

@@ -126,9 +126,8 @@ def list(
             Search options, including `limit`, `offset`, and `sortBy`.
         """
         extra_options = options or {}
-        body = dict(DEFAULT_SEARCH_OPTIONS, **extra_options)
         extra_headers = {"Content-Type": "application/json"}
-        body["prefix"] = path or ""
+        body = {**DEFAULT_SEARCH_OPTIONS, **extra_options, "prefix": path or ""}
         response = self._request(
             "POST",
             f"/object/list/{self.id}",
@@ -167,13 +166,13 @@ def upload(
         file
             The File object to be stored in the bucket. or a async generator of chunks
         file_options
-            HTTP headers. For example `cacheControl`
+            HTTP headers. For example `cache-control`
         """
         if file_options is None:
             file_options = {}
-        headers = dict(self._client.headers, **DEFAULT_FILE_OPTIONS, **file_options)
+        headers = {**self._client.headers, **DEFAULT_FILE_OPTIONS, **file_options}
         filename = path.rsplit("/", maxsplit=1)[-1]
-        files = {"file": (filename, open(file, "rb"), headers["contentType"])}
+        files = {"file": (filename, open(file, "rb"), headers.pop("content-type"))}
         _path = self._get_final_path(path)
 
         return self._request(

storage3/_sync/file_api.py

@@ -7,7 +7,7 @@
     },
 }
 DEFAULT_FILE_OPTIONS = {
-    "cacheControl": "3600",
-    "contentType": "text/plain;charset=UTF-8",
+    "cache-control": "3600",
+    "content-type": "text/plain;charset=UTF-8",
     "x-upsert": "false",
 }

storage3/constants.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from time import sleep
 from typing import TYPE_CHECKING
 from uuid import uuid4
 
@@ -105,6 +106,7 @@ def file(tmp_path: Path, uuid_factory: Callable[[], str]) -> dict[str, str]:
         "bucket_folder": bucket_folder,
         "bucket_path": bucket_path,
         "mime_type": "image/svg+xml",
+        "file_content": file_content,
     }
 
 
@@ -119,14 +121,18 @@ async def test_client_upload_file(
     file_name = file["name"]
     file_path = file["local_path"]
     mime_type = file["mime_type"]
+    file_content = file["file_content"]
     bucket_file_path = file["bucket_path"]
     bucket_folder = file["bucket_folder"]
     options = {"content-type": mime_type}
 
     await storage_file_client.upload(bucket_file_path, file_path, options)
+
+    sleep(3)
+
+    image = await storage_file_client.download(bucket_file_path)
     files = await storage_file_client.list(bucket_folder)
     image_info = next((f for f in files if f.get("name") == file_name), None)
 
-    assert files
-    assert image_info is not None
+    assert image == file_content
     assert image_info.get("metadata", {}).get("mimetype") == mime_type

tests/_async/test_client.py

@@ -105,6 +105,7 @@ def file(tmp_path: Path, uuid_factory: Callable[[], str]) -> dict[str, str]:
         "bucket_folder": bucket_folder,
         "bucket_path": bucket_path,
         "mime_type": "image/svg+xml",
+        "file_content": file_content,
     }
 
 
@@ -119,14 +120,16 @@ def test_client_upload_file(
     file_name = file["name"]
     file_path = file["local_path"]
     mime_type = file["mime_type"]
+    file_content = file["file_content"]
     bucket_file_path = file["bucket_path"]
     bucket_folder = file["bucket_folder"]
     options = {"content-type": mime_type}
 
     storage_file_client.upload(bucket_file_path, file_path, options)
+
+    image = storage_file_client.download(bucket_file_path)
     files = storage_file_client.list(bucket_folder)
     image_info = next((f for f in files if f.get("name") == file_name), None)
 
-    assert files
-    assert image_info is not None
+    assert image == file_content
     assert image_info.get("metadata", {}).get("mimetype") == mime_type