hippius 0.2.41__py3-none-any.whl → 0.2.42__py3-none-any.whl

{hippius-0.2.41.dist-info → hippius-0.2.42.dist-info}/METADATA

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

{hippius-0.2.41.dist-info → hippius-0.2.42.dist-info}/RECORD

@@ -1,10 +1,10 @@
-hippius_sdk/__init__.py,sha256=0Xf8Fnc93-TuSh6wLqELTb2OV2h1tfOmTnMDfe4i2RM,1474
+hippius_sdk/__init__.py,sha256=69XR6atYPkJPYLkUd6NHE15X_4eNNnaKQAy9yIGA4dc,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
 hippius_sdk/cli_parser.py,sha256=z7UvgWvvy04ey-R56qZiCqYc_9RaNq1rVDkQyXoK3JU,21100
 hippius_sdk/cli_rich.py,sha256=_jTBYMdHi2--fIVwoeNi-EtkdOb6Zy_O2TUiGvU3O7s,7324
-hippius_sdk/client.py,sha256=n7QwLneWZym_eKN1fEAJWEi98nSJjdSpZJeEcFjZsqQ,24197
+hippius_sdk/client.py,sha256=6W50r7-WcMyZNI1j3NOKMpcSMlB819AMKM9w06YqMx0,24302
 hippius_sdk/config.py,sha256=Hf_aUYzG9ylzqauA_ABUSSB5mBTYbp-VtB36VQt2XDw,21981
 hippius_sdk/db/README.md,sha256=okDeI1qgkaZqXSlJ8L0xIE4UpuxO-qEGPIbXUvSHQjU,2030
 hippius_sdk/db/env.db.template,sha256=_6hEC3IvkzCDOAzG1_yJUKRUfCTMciNaJUicZpMCat4,217
@@ -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=uBqjXzF8chKoFcyx9Jmuw9XCINf9qJ3Os1UBPdBsucc,100667
+hippius_sdk/ipfs.py,sha256=CpVSEKVrHrZAXrhJsCPPZcADSx2tpE_ktA1TLlMiUQc,103749
 hippius_sdk/ipfs_core.py,sha256=WG7bGLk-threOvmumizwh1dnd5zqbIkTXy1y-BRGayI,12789
 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.41.dist-info/METADATA,sha256=SSSssIaVQf94BZRTCMotY-zQGwUuByoPwA6svR7ufQE,30088
-hippius-0.2.41.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-hippius-0.2.41.dist-info/entry_points.txt,sha256=bFAZjW3vndretf9-8s587jA2ebMVI7puhn_lVs8jPc8,149
-hippius-0.2.41.dist-info/RECORD,,
+hippius-0.2.42.dist-info/METADATA,sha256=kSv4QdslPlxwgECpO3_UAq8-CAQGhtK8JEZ-zi7xKgU,30088
+hippius-0.2.42.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+hippius-0.2.42.dist-info/entry_points.txt,sha256=bFAZjW3vndretf9-8s587jA2ebMVI7puhn_lVs8jPc8,149
+hippius-0.2.42.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.41"
+__version__ = "0.2.42"
 __all__ = [
     "HippiusClient",
     "IPFSClient",

hippius_sdk/client.py

@@ -600,12 +600,12 @@ class HippiusClient:
             auto_decrypt: Whether to attempt automatic decryption (default: True)
             download_node: IPFS node URL for download (default: local node)
             return_bytes: If True, return bytes instead of saving to file
-            streaming: If True, return raw streaming iterator from IPFS (no decryption)
+            streaming: If True, return decrypted bytes when auto_decrypt=True, or raw streaming iterator when auto_decrypt=False
 
         Returns:
             S3DownloadResult: Download info and decryption status (default)
-            bytes: Raw decrypted content when return_bytes=True
-            AsyncIterator[bytes]: Raw streaming iterator when streaming=True
+            bytes: Raw decrypted content when return_bytes=True or streaming=True with auto_decrypt=True
+            AsyncIterator[bytes]: Raw streaming iterator when streaming=True and auto_decrypt=False
 
         Raises:
             HippiusIPFSError: If IPFS download fails

hippius_sdk/ipfs.py

@@ -69,6 +69,7 @@ class S3PublishPin(BaseModel):
     cid: str
     subaccount: str
     file_path: str
+    file_name: str
     pin_node: str
     substrate_url: str
 
@@ -2181,6 +2182,7 @@ class IPFSClient:
                 cid=cid,
                 subaccount=subaccount_id,
                 file_path=filename,
+                file_name=filename,
                 pin_node=pin_node,
                 substrate_url=substrate_url,
             )
@@ -2202,7 +2204,7 @@ class IPFSClient:
         This method provides multiple output modes:
         1. File output: Downloads to specified path (default mode)
         2. Bytes output: Returns decrypted bytes in memory (return_bytes=True)
-        3. Streaming output: Returns raw streaming iterator from IPFS node (streaming=True)
+        3. Streaming output: Returns decrypted bytes or raw iterator based on auto_decrypt (streaming=True)
 
         Args:
             cid: Content Identifier (CID) of the file to download
@@ -2212,12 +2214,12 @@ class IPFSClient:
             auto_decrypt: Whether to attempt automatic decryption (default: True)
             download_node: IPFS node URL for download (default: local node)
             return_bytes: If True, return bytes instead of saving to file
-            streaming: If True, return raw streaming iterator from IPFS (no decryption)
+            streaming: If True, return decrypted bytes when auto_decrypt=True, or raw streaming iterator when auto_decrypt=False
 
         Returns:
             S3DownloadResult: Download info and decryption status (default)
-            bytes: Raw decrypted content when return_bytes=True
-            AsyncIterator[bytes]: Raw streaming iterator when streaming=True
+            bytes: Raw decrypted content when return_bytes=True or streaming=True with auto_decrypt=True
+            AsyncIterator[bytes]: Raw streaming iterator when streaming=True and auto_decrypt=False
 
         Raises:
             HippiusIPFSError: If IPFS download fails
@@ -2228,18 +2230,80 @@ class IPFSClient:
         if streaming and return_bytes:
             raise ValueError("Cannot specify both streaming and return_bytes")
 
-        if streaming and (auto_decrypt or subaccount_id or bucket_name):
-            logger.warning(
-                "streaming=True ignores decryption parameters - returns raw encrypted stream"
-            )
-
         if streaming:
-            # Return raw streaming iterator from IPFS node - no processing
-            # _get_ipfs_stream is an async generator, return it directly
-            async def streaming_wrapper():
+            # Validate required parameters for decryption if auto_decrypt is True
+            if auto_decrypt and (not subaccount_id or not bucket_name):
+                raise ValueError(
+                    "subaccount_id and bucket_name are required for streaming decryption"
+                )
+
+            if auto_decrypt:
+                # Return decrypted bytes directly (not streaming)
+                try:
+                    key_storage_available = is_key_storage_enabled()
+                except ImportError:
+                    key_storage_available = False
+
+                encryption_key_bytes = None
+
+                if key_storage_available:
+                    # Create combined key identifier from account+bucket
+                    account_bucket_key = f"{subaccount_id}:{bucket_name}"
+
+                    try:
+                        existing_key_b64 = await get_key_for_subaccount(
+                            account_bucket_key
+                        )
+                        if existing_key_b64:
+                            encryption_key_bytes = base64.b64decode(existing_key_b64)
+                    except Exception as e:
+                        logger.debug(f"Failed to get encryption key: {e}")
+
+                # If key storage decryption failed or wasn't available, try client encryption key
+                if not encryption_key_bytes and self.encryption_available:
+                    logger.debug("Using client encryption key for streaming decryption")
+                    encryption_key_bytes = self.encryption_key
+
+                if not encryption_key_bytes:
+                    logger.warning(
+                        "No encryption key found - downloading raw encrypted data as bytes"
+                    )
+                    # Return raw encrypted data as bytes
+                    encrypted_data = b""
+                    async for chunk in self._get_ipfs_stream(cid, download_node):
+                        encrypted_data += chunk
+                    return encrypted_data
+
+                # Stream and decrypt the content using hybrid buffered approach
+                import nacl.secret
+
+                # Collect all encrypted data first
+                logger.debug("Buffering encrypted content for decryption")
+                encrypted_data = b""
                 async for chunk in self._get_ipfs_stream(cid, download_node):
-                    yield chunk
-            return streaming_wrapper()
+                    encrypted_data += chunk
+
+                # Decrypt the complete buffered content and return as bytes
+                try:
+                    box = nacl.secret.SecretBox(encryption_key_bytes)
+                    decrypted_data = box.decrypt(encrypted_data)
+                    logger.info(f"Successfully decrypted {len(decrypted_data)} bytes")
+
+                    # Return all decrypted data as bytes
+                    return decrypted_data
+
+                except Exception as decrypt_error:
+                    logger.error(f"Streaming decryption failed: {decrypt_error}")
+                    raise ValueError(
+                        f"Failed to decrypt streaming content: {decrypt_error}"
+                    )
+            else:
+                # Return raw streaming iterator from IPFS node - no processing
+                async def streaming_wrapper():
+                    async for chunk in self._get_ipfs_stream(cid, download_node):
+                        yield chunk
+
+                return streaming_wrapper()
 
         start_time = time.time()
 
@@ -2256,7 +2320,9 @@ class IPFSClient:
         try:
             # Create parent directories if they don't exist (only for file output mode)
             if not return_bytes:
-                os.makedirs(os.path.dirname(os.path.abspath(output_path)), exist_ok=True)
+                os.makedirs(
+                    os.path.dirname(os.path.abspath(output_path)), exist_ok=True
+                )
 
             download_client = AsyncIPFSClient(api_url=download_node)