hippius 0.2.7__tar.gz → 0.2.8__tar.gz

{hippius-0.2.7 → hippius-0.2.8}/PKG-INFO

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

{hippius-0.2.7 → hippius-0.2.8}/hippius_sdk/__init__.py

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

{hippius-0.2.7 → hippius-0.2.8}/hippius_sdk/cli_handlers.py

@@ -371,20 +371,22 @@ async def handle_store(
                             "gateway_url"
                         ] = f"{client.ipfs_client.gateway}/ipfs/{result['cid']}"
 
-                    # Store on blockchain if miners are provided
-                    if miner_ids:
-                        # Create a file input for blockchain storage
-                        file_input = FileInput(
-                            file_hash=result["cid"], file_name=file_name
-                        )
+                    # Store on blockchain - miners are optional
+                    # Create a file input for blockchain storage
+                    file_input = FileInput(file_hash=result["cid"], file_name=file_name)
 
-                        # Submit storage request
-                        tx_hash = await client.substrate_client.storage_request(
-                            files=[file_input], miner_ids=miner_id_list
-                        )
+                    # Submit storage request
+                    tx_hash = await client.substrate_client.storage_request(
+                        files=[file_input], miner_ids=miner_id_list
+                    )
 
-                        # Add transaction hash to result
-                        result["transaction_hash"] = tx_hash
+                    # Add transaction hash to result
+                    result["transaction_hash"] = tx_hash
+
+                    # Add a note about the pinning status command
+                    log(
+                        "\n[bold yellow]Note:[/bold yellow] The pinning-status command will show a different CID (metadata) rather than the direct file CID."
+                    )
                 except Exception as e:
                     warning(f"Failed to publish file globally: {str(e)}")
 
@@ -575,12 +577,8 @@ async def handle_store_dir(
                                     f"Failed to publish file {file_info['name']} globally: {str(e)}"
                                 )
 
-                    # Store on blockchain if miners are provided - this is what requires a password
-                    if (
-                        miner_ids
-                        and hasattr(client, "substrate_client")
-                        and client.substrate_client
-                    ):
+                    # Store on blockchain if client is available - miners are optional
+                    if hasattr(client, "substrate_client") and client.substrate_client:
                         # Create a file input for blockchain storage
                         file_input = FileInput(
                             file_hash=result["cid"],
@@ -595,6 +593,11 @@ async def handle_store_dir(
                         # Add transaction hash to result
                         result["transaction_hash"] = tx_hash
 
+                        # Add a note about the pinning status command
+                        log(
+                            "\n[bold yellow]Note:[/bold yellow] The pinning-status command will show a different CID (metadata) rather than the direct directory CID."
+                        )
+
                 except Exception as e:
                     warning(f"Failed to publish directory globally: {str(e)}")
 
@@ -739,20 +742,32 @@ async def handle_files(
     """Handle the files command"""
     # Get the account address we're querying
     if account_address is None:
-        # If no address provided, first try to get from keypair (if available)
+        # If no address provided, try these options in order:
+        # 1. Keypair from the client (if available)
+        # 2. Address from active account
+        # 3. Default address from config
+
+        # Option 1: Try keypair from client
         if (
             hasattr(client.substrate_client, "_keypair")
             and client.substrate_client._keypair is not None
         ):
             account_address = client.substrate_client._keypair.ss58_address
         else:
-            # Try to get the default address
-            default_address = get_default_address()
-            if default_address:
-                account_address = default_address
-            else:
-                has_default = get_default_address() is not None
+            # Option 2: Try to get address from active account
+            active_account = get_active_account()
+            if active_account:
+                account_address = get_account_address(active_account)
+
+            # Option 3: If still not found, try default address
+            if not account_address:
+                default_address = get_default_address()
+                if default_address:
+                    account_address = default_address
 
+            # If we still don't have an address, show error
+            if not account_address:
+                has_default = get_default_address() is not None
                 error("No account address provided, and client has no keypair.")
 
                 if has_default:
@@ -842,7 +857,7 @@ async def handle_pinning_status(
                 cid = pin.get("cid")
 
                 # Display pin information
-                log(f"\n{i}. CID: [bold]{cid}[/bold]")
+                log(f"\n{i}. Metadata CID: [bold]{cid}[/bold]")
                 log(f"   File Name: {pin['file_name']}")
                 status = "Assigned" if pin["is_assigned"] else "Pending"
                 log(f"   Status: {status}")
@@ -861,17 +876,49 @@ async def handle_pinning_status(
 
                 # Show content info if requested
                 if show_contents:
+                    # Add gateway URL
+                    gateway_url = f"{client.ipfs_client.gateway}/ipfs/{cid}"
+                    log(f"   Gateway URL: {gateway_url}")
+
+                    # Try to decode the metadata file to get the original file CID
                     try:
-                        content_info = await client.ipfs_client.get_content_info(cid)
+                        # Fetch the content
+                        cat_result = await client.ipfs_client.cat(cid)
 
-                        if content_info:
-                            if "size_formatted" in content_info:
-                                log(f"   Size: {content_info['size_formatted']}")
-                            if "gateway_url" in content_info:
-                                log(f"   Gateway URL: {content_info['gateway_url']}")
+                        # Try to parse as JSON
+                        try:
+                            # Decode JSON from content
+                            metadata_json = json.loads(
+                                cat_result["content"].decode("utf-8")
+                            )
+
+                            # This should be an array with one or more file entries
+                            if (
+                                isinstance(metadata_json, list)
+                                and len(metadata_json) > 0
+                            ):
+                                log(f"\n   [bold cyan]Contained files:[/bold cyan]")
+                                for idx, file_entry in enumerate(metadata_json, 1):
+                                    if isinstance(file_entry, dict):
+                                        original_cid = file_entry.get("cid")
+                                        original_name = file_entry.get("filename")
+                                        if original_cid:
+                                            log(
+                                                f"   {idx}. Original CID: [bold green]{original_cid}[/bold green]"
+                                            )
+                                            if original_name:
+                                                log(f"      Name: {original_name}")
+                                            log(
+                                                f"      Gateway URL: {client.ipfs_client.gateway}/ipfs/{original_cid}"
+                                            )
+                        except json.JSONDecodeError:
+                            if verbose:
+                                log(
+                                    "   [yellow]Could not parse metadata as JSON[/yellow]"
+                                )
                     except Exception as e:
                         if verbose:
-                            warning(f"   Error getting content info: {e}")
+                            warning(f"   Error getting original file CIDs: {e}")
             except Exception as e:
                 warning(f"Error processing pin {i}: {e}")
                 if verbose:

{hippius-0.2.7 → hippius-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hippius"
-version = "0.2.7"
+version = "0.2.8"
 description = "Python SDK and CLI for Hippius blockchain storage"
 authors = ["Dubs <dubs@dubs.rs>"]
 readme = "README.md"