22 Nov Update. integration/modules/test_chunk.py all tests added & passed.structlog added for logging.

Author: Aviksaikat

Diff for: pdm.lock

@@ -6,6 +6,7 @@ description = "Python client library for connecting to Bee decentralised storage
 authors = [{ name = "SAIKAT KARMAKAR", email = "[email protected]" }]
 dependencies = [
     "eth-ape>=0.6.25",
+    "structlog>=23.2.0",
 ]
 requires-python = ">=3.9"
 readme = "README.md"

Diff for: pyproject.toml

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+bee-factory start --detach 1.9.0
+
+# BEE_POSTAGE
+bee_postage=$(echo "Y" | swarm-cli stamp buy --bee-api-url http://localhost:1633/ --depth 23 --amount 100000000000 | grep "Stamp ID" | cut -d ' ' -f3)
+
+# BEE_PEER_POSTAGE
+bee_peer_postage=$(echo "Y" | swarm-cli stamp buy --bee-api-url http://localhost:11633/ --depth 23 --amount 100000000000 | grep "Stamp ID" | cut -d ' ' -f3)
+
+echo "BEE_POSTAGE: $bee_posage"
+echo "BEE_PEER_POSTAGE: $bee_peer_posage"

Diff for: setup_integration_test.sh

@@ -27,12 +27,6 @@ def __init__(self, data: bytes, span: bytes):
         self.data = data
         self.span = span
 
-    def data(self):
-        return self.data
-
-    def span(self):
-        return self.span
-
     def payload(self) -> bytes:
         return flex_bytes_at_offset(self.data, CAC_PAYLOAD_OFFSET, MIN_PAYLOAD_SIZE, MAX_PAYLOAD_SIZE)
 

Diff for: src/bee_py/chunk/cac.py

@@ -2,7 +2,8 @@
 
 from ape.managers.accounts import AccountAPI
 from eth_typing import ChecksumAddress as AddressType
-from pydantic import BaseModel
+from hexbytes import HexBytes
+from pydantic.dataclasses import dataclass
 
 from bee_py.chunk.bmt import bmt_hash
 from bee_py.chunk.cac import (
@@ -21,7 +22,7 @@
 from bee_py.utils.bytes import bytes_at_offset, bytes_equal, flex_bytes_at_offset
 from bee_py.utils.error import BeeError
 from bee_py.utils.hash import keccak256_hash
-from bee_py.utils.hex import bytes_to_hex
+from bee_py.utils.hex import bytes_to_hex, hex_to_bytes
 
 # * Global variables
 IDENTIFIER_SIZE = 32
@@ -36,7 +37,8 @@
 Identifier = NewType("Identifier", bytes)
 
 
-class SingleOwnerChunkBase(BaseModel):
+@dataclass
+class SingleOwnerChunkBase:
     """Abstract base class for Single Owner Chunks (SOCs).
 
     Represents a SOC, a type of chunk that allows a user to assign arbitrary data to an address
@@ -61,12 +63,32 @@ class SingleOwnerChunk(SingleOwnerChunkBase, Chunk):
     with all its properties and behaviors defined.
 
     Attributes:
+        data: The data contained in the SOC.
         identifier: The identifier of the SOC.
         signature: The signature of the SOC.
+        span: The span of the SOC.
+        payload: The payload of the SOC.
+        address: The address of the SOC.
         owner: The owner of the SOC.
     """
 
-    pass
+    def __init__(
+        self,
+        data: bytes,
+        identifier: Identifier,
+        signature: bytes,
+        span: bytes,
+        payload: bytes,
+        address: HexBytes,
+        owner: AddressType,
+    ):
+        SingleOwnerChunkBase.__init__(self, identifier, signature, owner)
+        self.data = data
+        self.span = span
+        self.payload = payload
+        self.address = address
+
+    # address: AddressType
 
 
 def recover_chunk_owner(data: bytes) -> AddressType:
@@ -88,7 +110,7 @@ def recover_chunk_owner(data: bytes) -> AddressType:
     return owner_address
 
 
-def make_single_owner_chunk_from_data(data: bytes, address: AddressType) -> dict:
+def make_single_owner_chunk_from_data(data: bytes, address: AddressType) -> SingleOwnerChunk:
     """
     Verifies if the data is a valid single owner chunk.
 
@@ -116,26 +138,36 @@ def span():
     def payload():
         return flex_bytes_at_offset(data, SOC_PAYLOAD_OFFSET, MIN_PAYLOAD_SIZE, MAX_PAYLOAD_SIZE)
 
-    return {
-        "data": data,
-        "identifier": identifier,
-        "signature": signature(),
-        "span": span(),
-        "payload": payload(),
-        "address": soc_address,
-        "owner": owner_address,
-    }
+    # return {
+    #     "data": data,
+    #     "identifier": identifier,
+    #     "signature": signature(),
+    #     "span": span(),
+    #     "payload": payload(),
+    #     "address": soc_address,
+    #     "owner": owner_address,
+    # }
+    return SingleOwnerChunk(
+        data=data,
+        identifier=identifier,
+        signature=signature(),
+        span=span(),
+        payload=payload,
+        address=soc_address,
+        owner=owner_address,
+    )
 
 
 def make_soc_address(identifier: Identifier, address: AddressType) -> bytes:
-    return keccak256_hash(identifier, address)
+    address_bytes = hex_to_bytes(address)
+    return keccak256_hash(identifier, address_bytes)
 
 
 def make_single_owner_chunk(
     chunk: Chunk,
     identifier: Identifier,
     signer: AccountAPI,
-) -> dict:
+) -> SingleOwnerChunk:
     """
     Creates a single owner chunk object.
 
@@ -145,33 +177,43 @@ def make_single_owner_chunk(
         signer: The singer interface for signing the chunk.
 
     Returns:
-        dict: A dictionary representing a single owner chunk.
+        SingleOwnerChunk: SingleOwnerChunk object.
     """
     chunk_address = chunk.address()
-    assert_valid_chunk_data(chunk.data(), chunk_address)
+    assert_valid_chunk_data(chunk.data, chunk_address)
 
     digest = keccak256_hash(identifier, chunk_address)
     signature = sign(account=signer, data=digest)
-    data = serialize_bytes(identifier, signature.encode_vrs(), chunk.span(), chunk.payload())
-    address = make_soc_address(identifier, signer.get("address", ""))
-
-    return {
-        "data": data,
-        "identifier": identifier,
-        "signature": signature,
-        "span": chunk.span(),
-        "payload": chunk.payload(),
-        "address": address,
-        "owner": signer.get("address", ""),
-    }
+    data = serialize_bytes(identifier, signature.encode_vrs(), chunk.span, chunk.payload())
+    address = make_soc_address(identifier, signer.address)
+
+    # return {
+    #     "data": data,
+    #     "identifier": identifier,
+    #     "signature": signature,
+    #     "span": chunk.span,
+    #     "payload": chunk.payload(),
+    #     "address": address,
+    #     "owner": signer.address,
+    # }
+
+    return SingleOwnerChunk(
+        data=data,
+        identifier=identifier,
+        signature=signature.encode_vrs(),
+        span=chunk.span,
+        payload=chunk.payload(),
+        address=address,
+        owner=signer.address,
+    )
 
 
 def upload_single_owner_chunk(
     request_options: BeeRequestOptions,
     chunk: SingleOwnerChunk,
     postage_batch_id: BatchId,
     options: Optional[UploadOptions] = None,
-) -> str:
+) -> Reference:
     """Uploads a Single Owner Chunk (SOC) to the Bee network.
 
     Args:
@@ -183,14 +225,16 @@ def upload_single_owner_chunk(
     Returns:
         A Reference object representing the uploaded chunk.
     """
-
-    # Convert the owner, identifier, and signature to hexadecimal strings
-    owner = bytes_to_hex(chunk.owner)
+    # * Convert the owner, identifier, and signature to hexadecimal strings
+    if isinstance(chunk.owner, bytes):
+        owner = bytes_to_hex(chunk.owner)
+    else:
+        owner = chunk.owner
     identifier = bytes_to_hex(chunk.identifier)
     signature = bytes_to_hex(chunk.signature)
 
     # Serialize the chunk data, including the span and payload
-    data = serialize_bytes(chunk.span(), chunk.payload())
+    data = serialize_bytes(chunk.span, chunk.payload)
 
     # Upload the SOC data using the SOC API's upload method
     return upload(request_options, owner, identifier, signature, data, postage_batch_id, options)

Diff for: src/bee_py/chunk/soc.py

@@ -5,7 +5,7 @@
 from bee_py.utils.headers import extract_upload_headers
 from bee_py.utils.http import http
 
-ENDPOINT = "chunk"
+ENDPOINT = "chunks"
 
 
 def upload(
@@ -22,14 +22,12 @@ def upload(
     Returns:
         The reference of the uploaded data.
     """
-    headers = extract_upload_headers(postage_batch_id, options)
 
     config = {
-        "url": request_options["url"] + f"/{ENDPOINT}",
+        "url": f"/{ENDPOINT}",
         "method": "post",
         "data": data,
-        "headers": headers,
-        "responseType": "json",
+        "headers": {**extract_upload_headers(postage_batch_id, options)},
     }
 
     response = http(request_options, config)
@@ -40,11 +38,10 @@ def upload(
     return response.json()["reference"]
 
 
-def downalod(request_options: BeeRequestOptions, _hash: ReferenceOrENS) -> Data:
+def download(request_options: BeeRequestOptions, _hash: ReferenceOrENS) -> Data:
     config = {
-        "url": f"{request_options['url']}/{ENDPOINT}/{_hash}",
+        "url": f"/{ENDPOINT}/{_hash}",
         "method": "get",
-        "responseType": "arraybuffer",
     }
     response = http(request_options, config)
 

Diff for: src/bee_py/feed/json.py

@@ -24,7 +24,6 @@ def check_if_chunk_exists_locally(
         request_options,
         {
             "url": f"{ENDPOINT}/{address}",
-            "responseType": "json",
         },
     )
     status_code = response.status_code
@@ -54,7 +53,6 @@ def delete_chunk_from_local_storage(
         {
             "method": "delete",
             "url": f"{ENDPOINT}/{address}",
-            "responseType": "json",
         },
     )
     status_code = response.status_code

Diff for: src/bee_py/modules/chunk.py

@@ -95,7 +95,6 @@ def create_feed_manifest(
     """
     config = {
         "method": "post",
-        "responseType": "json",
         "url": f"{FEED_ENDPOINT}/{owner}/{topic}",
         "params": options,
         "headers": extract_upload_headers(postage_batch_id),
@@ -156,7 +155,6 @@ def fetch_latest_feed_update(
     response = http(
         request_options,
         {
-            "responseType": "json",
             "url": f"{FEED_ENDPOINT}/{owner}/{topic}",
             "params": options,
         },

Diff for: src/bee_py/modules/debug/balance.py

@@ -1,11 +1,16 @@
 from typing import Optional
 
+from structlog import get_logger
+
 from bee_py.types.type import BatchId, BeeRequestOptions, Reference, UploadOptions
 from bee_py.utils.headers import extract_upload_headers
+from bee_py.utils.hex import remove_0x_prefix
 from bee_py.utils.http import http
 
 SOC_ENDPOINT = "soc"
 
+logger = get_logger()
+
 
 def upload(
     request_options: BeeRequestOptions,
@@ -31,6 +36,11 @@ def upload(
     Returns:
         Reference: The reference of the uploaded chunk.
     """
+    # https://docs.ethswarm.org/api/#tag/Single-owner-chunk
+    owner = remove_0x_prefix(owner)
+    identifier = remove_0x_prefix(identifier)
+    signature = remove_0x_prefix(signature)
+
     config = {
         "method": "post",
         "url": f"{SOC_ENDPOINT}/{owner}/{identifier}",
@@ -39,10 +49,13 @@ def upload(
             "content-type": "application/octet-stream",
             **extract_upload_headers(postage_batch_id, options),
         },
-        "responseType": "json",
         "params": {"sig": signature},
     }
+    logger.debug(f"\n***********Config***********\n{config}")
+
     response = http(request_options, config)
-    response.raise_for_status()
+    if response.status_code != 200:  # noqa: PLR2004
+        print(response.json())  # noqa: T201
+        logger.error(response.raise_for_status())
 
     return response.json()["reference"]