fix: build-sync in storage

Author: o-santi

src/storage/src/storage3/_sync/bucket.py

@@ -2,8 +2,7 @@
 
 from typing import Any, Optional
 
-from httpx import Client, HTTPStatusError, Response
-from httpx._types import HeaderTypes
+from httpx import Client, Headers, HTTPStatusError, Response
 from yarl import URL
 
 from ..exceptions import StorageApiError
@@ -16,7 +15,7 @@
 class SyncStorageBucketAPI:
     """This class abstracts access to the endpoint to the Get, List, Empty, and Delete operations on a bucket"""
 
-    def __init__(self, session: Client, url: str, headers: HeaderTypes) -> None:
+    def __init__(self, session: Client, url: str, headers: Headers) -> None:
         if url and url[-1] != "/":
             print("Storage endpoint URL should have a trailing slash.")
             url += "/"

src/storage/src/storage3/_sync/client.py

@@ -3,7 +3,7 @@
 from typing import Optional
 from warnings import warn
 
-from httpx import Client
+from httpx import Client, Headers
 
 from storage3.constants import DEFAULT_TIMEOUT
 
@@ -63,7 +63,7 @@ def __init__(
             follow_redirects=True,
             http2=True,
         )
-        super().__init__(self.session, url, headers)
+        super().__init__(self.session, url, Headers(headers))
 
     def __enter__(self) -> SyncStorageClient:
         return self
@@ -79,4 +79,4 @@ def from_(self, id: str) -> SyncBucketProxy:
         id
             The unique identifier of the bucket
         """
-        return SyncBucketProxy(id, self._base_url, self._client)
+        return SyncBucketProxy(id, self._base_url, self._headers, self._client)

src/storage/src/storage3/_sync/file_api.py

@@ -8,7 +8,7 @@
 from pathlib import Path
 from typing import Any, List, Literal, Optional, Union, cast
 
-from httpx import Client, HTTPStatusError, Response
+from httpx import Client, Headers, HTTPStatusError, Response
 from yarl import URL
 
 from ..constants import DEFAULT_FILE_OPTIONS, DEFAULT_SEARCH_OPTIONS
@@ -49,6 +49,7 @@ class SyncBucketActionsMixin:
     id: str
     _base_url: URL
     _client: Client
+    _headers: Headers
 
     def _request(
         self,
@@ -62,10 +63,12 @@ def _request(
     ) -> Response:
         try:
             url_path = self._base_url.joinpath(*path).with_query(query_params)
+            headers = headers or dict()
+            headers.update(self._headers)
             response = self._client.request(
                 method,
                 str(url_path),
-                headers=headers or {},
+                headers=headers,
                 json=json,
                 files=files,
                 **kwargs,
@@ -561,4 +564,5 @@ class SyncBucketProxy(SyncBucketActionsMixin):
 
     id: str
     _base_url: URL
+    _headers: Headers
     _client: Client = field(repr=False)

src/storage/tests/_sync/test_bucket.py

@@ -1,7 +1,7 @@
 from unittest.mock import Mock
 
 import pytest
-from httpx import Client, HTTPStatusError, Response
+from httpx import Client, Headers, HTTPStatusError, Response
 
 from storage3 import SyncBucket, SyncStorageBucketAPI
 from storage3.exceptions import StorageApiError
@@ -16,12 +16,12 @@ def mock_client():
 
 
 @pytest.fixture
-def headers() -> dict[str, str]:
-    return {}
+def headers() -> Headers:
+    return Headers()
 
 
 @pytest.fixture
-def storage_api(mock_client: Client, headers: dict[str, str]) -> SyncStorageBucketAPI:
+def storage_api(mock_client: Client, headers: Headers) -> SyncStorageBucketAPI:
     return SyncStorageBucketAPI(mock_client, "", headers)