hippius 0.2.44__py3-none-any.whl → 0.2.45__py3-none-any.whl

{hippius-0.2.44.dist-info → hippius-0.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hippius
-Version: 0.2.44
+Version: 0.2.45
 Summary: Python SDK and CLI for Hippius blockchain storage
 Home-page: https://github.com/thenervelab/hippius-sdk
 Author: Dubs

{hippius-0.2.44.dist-info → hippius-0.2.45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hippius_sdk/__init__.py,sha256=mk5TY1tFuEOZimiH4ju6fTc0ug3fw_oVhK-sEmVfSV4,1474
+hippius_sdk/__init__.py,sha256=Lp4uoDcZsX1k_MRVxSoC85xZIPvJDc9mYTeOy60EHqk,1474
 hippius_sdk/cli.py,sha256=aqKOYSBSWt7UhcpFt7wf9yIPJ3bznpsJ6ehOnuZ4usI,18235
 hippius_sdk/cli_assets.py,sha256=rjH3Z5A1CQr2d5CIAAAb0WMCjoZZlMWcdo0f93KqluE,635
 hippius_sdk/cli_handlers.py,sha256=HkZldE8ZDS6WHu8aSoeS_rYZ4kp3F-Kdzu-weY1c0vU,128258
@@ -13,12 +13,12 @@ hippius_sdk/db/migrations/20241202000001_switch_to_subaccount_encryption.sql,sha
 hippius_sdk/db/setup_database.sh,sha256=STp03qxkp2RmIVr6YZIcvQQm-_LLUOb6Jobh-52HWmg,3115
 hippius_sdk/db_utils.py,sha256=-x0rbN0as7Tn3PJPZBYCgreZe52FLH40ppA1TLxsg90,1851
 hippius_sdk/errors.py,sha256=LScJJmawVAx7aRzqqQguYSkf9iazSjEQEBNlD_GXZ6Y,1589
-hippius_sdk/ipfs.py,sha256=los32BjKuVMX9v4GWT-mXUQuxAm2Quc8GjKOMqH42LU,103808
-hippius_sdk/ipfs_core.py,sha256=0gzR5zucWoetrKb_bG0O9inGiZxHfuWvFeDMv8qrCi4,13108
+hippius_sdk/ipfs.py,sha256=IhdPmiIAWs7REYxd0MzVW1xD-_ZJQx8tXu6ONWXiNuI,104558
+hippius_sdk/ipfs_core.py,sha256=xsY0Ox6anmrkbrxkRr2RXzEukB-EEaW_oMvO0Va3vjQ,13148
 hippius_sdk/key_storage.py,sha256=SXFd6aGQw9MDLGX2vSBuAY7rdX-k5EvFm63z7_n-8yQ,8148
 hippius_sdk/substrate.py,sha256=4a7UIE4UqGcDW7luKTBgSDqfb2OIZusB39G1UiRs_YU,50158
 hippius_sdk/utils.py,sha256=rJ611yvwKSyiBpYU3w-SuyQxoghMGU-ePuslrPv5H5g,7388
-hippius-0.2.44.dist-info/METADATA,sha256=JKOmVfvlchci0FLqYagWtn7v9isPoTJVhbZrBD9aAHU,30088
-hippius-0.2.44.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-hippius-0.2.44.dist-info/entry_points.txt,sha256=bFAZjW3vndretf9-8s587jA2ebMVI7puhn_lVs8jPc8,149
-hippius-0.2.44.dist-info/RECORD,,
+hippius-0.2.45.dist-info/METADATA,sha256=af35m2atfppmNg4WkmIImTGkPtpp8cF0jgCiFtQeN-M,30088
+hippius-0.2.45.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+hippius-0.2.45.dist-info/entry_points.txt,sha256=bFAZjW3vndretf9-8s587jA2ebMVI7puhn_lVs8jPc8,149
+hippius-0.2.45.dist-info/RECORD,,

hippius_sdk/__init__.py

@@ -26,7 +26,7 @@ from hippius_sdk.config import (
 from hippius_sdk.ipfs import IPFSClient, S3PublishResult, S3DownloadResult
 from hippius_sdk.utils import format_cid, format_size, hex_to_ipfs_cid
 
-__version__ = "0.2.44"
+__version__ = "0.2.45"
 __all__ = [
     "HippiusClient",
     "IPFSClient",

hippius_sdk/ipfs.py

@@ -2109,7 +2109,23 @@ class IPFSClient:
                 content_bytes,
                 filename=filename,
             )
-            cid = result["Hash"]
+            if isinstance(result, bytes):  # must be multiple json lines
+                lines = result.decode("utf-8").strip().split("\n")
+                objects = [json.loads(line) for line in lines if line.strip()]
+
+                logger.info(f"Got {len(objects)=} from {store_node=}")
+                # filter out just the one file cid, ignore dirs, it's usually the first item,
+                # but hey let's not risk it
+                for o in objects:
+                    if o["Name"] == file_name:
+                        cid = o[0]["Hash"]
+                        break
+                else:
+                    raise KeyError(
+                        f"Store call failed, {file_name=} not found in {objects=}"
+                    )
+            else:
+                cid = result["Hash"]
             logger.info(f"Content uploaded to store node {store_node} with CID: {cid}")
         except Exception as e:
             raise HippiusIPFSError(
@@ -2120,10 +2136,10 @@ class IPFSClient:
         try:
             pin_client = AsyncIPFSClient(api_url=pin_node)
             await pin_client.pin(cid)
-            logger.info(f"File pinned to backup node {pin_node}")
+            logger.info(f"File pinned to {pin_node=}")
         except Exception as e:
             raise HippiusIPFSError(
-                f"Failed to pin content to pin node {pin_node}: {str(e)}"
+                f"Failed to pin content to {pin_node=}: {str(e)}"
             ) from e
 
         # Conditionally publish to substrate marketplace based on publish flag
@@ -2135,7 +2151,7 @@ class IPFSClient:
                     url=substrate_url,
                 )
                 logger.info(
-                    f"Submitting storage request to substrate for file: {filename}, CID: {cid}"
+                    f"Submitting storage request to substrate for file: {file_name}, CID: {cid}"
                 )
 
                 tx_hash = await substrate_client.storage_request(

hippius_sdk/ipfs_core.py

@@ -80,7 +80,9 @@ class AsyncIPFSClient:
             response.raise_for_status()
             return response.json()
 
-    async def add_bytes(self, data: bytes, filename: str = "file") -> Dict[str, Any]:
+    async def add_bytes(
+        self, data: bytes, filename: str = "file"
+    ) -> Dict[str, Any] | bytes:
         """
         Add bytes to IPFS.
 
@@ -106,7 +108,7 @@ class AsyncIPFSClient:
             logger.warning(
                 f"Corrupted response returned from {url=} {filename=} ({len(data)=}) {response.content=}"
             )
-            raise
+            return response.content
 
     async def add_str(self, content: str, filename: str = "file") -> Dict[str, Any]:
         """