deepmerge added for merging dictionaries. all tests passed

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
     "eth-pydantic-types>=0.1.0a3", # need for pydantic compatible HexBytes
     "web3>=6.12.0",
     "pydantic>=2.5.2", # TODO: remove this
+    "deepmerge>=1.1.1",
 ]
 requires-python = ">=3.9"
 readme = "README.md"

src/bee_py/modules/chunk.py

@@ -33,8 +33,7 @@ def upload(
         "data": data,
         "headers": {**extract_upload_headers(postage_batch_id, options)},
     }
-
-    response = http(request_options, config)
+    response = http(request_options, config, False)
 
     if response.status_code != 200:  # noqa: PLR2004
         logger.info(response.json())
@@ -47,9 +46,9 @@ def upload(
 def download(request_options: BeeRequestOptions, _hash: ReferenceOrENS) -> Data:
     config = {
         "url": f"/{ENDPOINT}/{_hash}",
-        "method": "get",
+        "method": "GET",
     }
-    response = http(request_options, config)
+    response = http(request_options, config, False)
 
     if response.status_code != 200:  # noqa: PLR2004
         logger.info(response.json())

src/bee_py/utils/http.py

@@ -2,6 +2,7 @@
 from urllib.parse import urljoin
 
 import requests
+from deepmerge import always_merger  # type: ignore
 
 from bee_py.types.type import BeeRequestOptions
 
@@ -68,18 +69,17 @@ def http(
         options = {key_mapping.get(k, k): v for k, v in tmp_options.items()}
 
     try:
-        request_config = {
-            "headers": DEFAULT_HTTP_CONFIG["headers"].copy(),
-            **config,
-            **options,
-        }
+        intermediate_dict = always_merger.merge(config, options)
+        request_config = always_merger.merge(intermediate_dict, {"headers": DEFAULT_HTTP_CONFIG["headers"].copy()})
+
         request_config = maybe_run_on_request_hook(options, request_config)
+
         if sanitise:
             request_config = sanitise_config(request_config)
-
         if "http" not in request_config["url"]:
             msg = f"Invalid URL: {request_config['url']}"
             raise TypeError(msg)
+
         response = requests.request(**request_config)
         return response
     except Exception as e:

src/bee_py/utils/type.py

@@ -103,8 +103,8 @@ def assert_reference(value: Any) -> None:
 def assert_reference_or_ens(value: Any) -> None:
     if isinstance(value, dict):
         value = value.get("reference", None)
-    if isinstance(value, ReferenceResponse):
-        value = value.reference
+    if isinstance(value, (ReferenceResponse, Reference)):
+        value = str(value)
     if not isinstance(value, str):
         msg = "ReferenceOrEns has to be a string!"
         raise TypeError(msg)

tests/conftest.py

@@ -240,7 +240,7 @@ def peer_overlay(bee_debug_peer_ky_options) -> str:
 
 
 @pytest.fixture
-def random_byte_array(length=10, seed=500):
+def random_byte_array(length=100, seed=500):
     # * not completely random
     random.seed(seed)
     return bytearray(random.randint(0, 255) for _ in range(length))  # noqa: S311

tests/integration/test_bee_integration.py

@@ -28,10 +28,10 @@ def test_strip_trailing_slash():
     assert bee.url == "http://127.0.0.1:1633"
 
 
-def test_upload_and_downalod_chunk(bee_class, get_debug_postage):
-    content = bytes(bytearray(100))
+def test_upload_and_downalod_chunk(bee_class, get_debug_postage, random_byte_array):
+    data = bytes(random_byte_array)
 
-    referece = bee_class.upload_chunk(get_debug_postage, content)
+    referece = bee_class.upload_chunk(get_debug_postage, data)
     downloaded_chunk = bee_class.download_chunk(referece)
 
-    assert downloaded_chunk == content
+    assert downloaded_chunk.data == data