hippius 0.2.7__tar.gz → 0.2.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hippius
-Version: 0.2.7
+Version: 0.2.9
 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.9}/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.9"
 __all__ = [
     "HippiusClient",
     "IPFSClient",

{hippius-0.2.7 → hippius-0.2.9}/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.9}/hippius_sdk/ipfs_core.py

@@ -59,8 +59,14 @@ class AsyncIPFSClient:
             Dict containing the CID and other information
         """
         with open(file_path, "rb") as f:
-            files = {"file": f}
-            response = await self.client.post(f"{self.api_url}/api/v0/add", files=files)
+            file_content = f.read()
+            filename = os.path.basename(file_path)
+            # Specify file with name and content type to ensure consistent handling
+            files = {"file": (filename, file_content, "application/octet-stream")}
+            # Explicitly set wrap-with-directory=false to prevent wrapping in directory
+            response = await self.client.post(
+                f"{self.api_url}/api/v0/add?wrap-with-directory=false", files=files
+            )
             response.raise_for_status()
             return response.json()
 
@@ -75,8 +81,12 @@ class AsyncIPFSClient:
         Returns:
             Dict containing the CID and other information
         """
-        files = {"file": (filename, data)}
-        response = await self.client.post(f"{self.api_url}/api/v0/add", files=files)
+        # Specify file with name and content type to ensure consistent handling
+        files = {"file": (filename, data, "application/octet-stream")}
+        # Explicitly set wrap-with-directory=false to prevent wrapping in directory
+        response = await self.client.post(
+            f"{self.api_url}/api/v0/add?wrap-with-directory=false", files=files
+        )
         response.raise_for_status()
         return response.json()
 
@@ -149,59 +159,30 @@ class AsyncIPFSClient:
             cid: Content Identifier
 
         Returns:
-            Dict with links information and a is_directory flag
+            Dict with links information and is_directory flag
         """
-        try:
-            # Try using the direct IPFS API first (most reliable)
-            response = await self.client.post(f"{self.api_url}/api/v0/ls?arg={cid}")
-            response.raise_for_status()
-            result = response.json()
-
-            # Add a flag to indicate if this is a directory
-            # A directory has Links and typically more than one or has Type=1
-            is_directory = False
-            if "Objects" in result and len(result["Objects"]) > 0:
-                obj = result["Objects"][0]
-                if "Links" in obj and len(obj["Links"]) > 0:
-                    # It has links, likely a directory
-                    is_directory = True
-                    # Check if any links have Type=1 (directory)
-                    for link in obj["Links"]:
-                        if link.get("Type") == 1:
-                            is_directory = True
-                            break
-
-            # Add the flag to the result
-            result["is_directory"] = is_directory
-            return result
+        # Try using the direct IPFS API first (most reliable)
+        response = await self.client.post(f"{self.api_url}/api/v0/ls?arg={cid}")
+        response.raise_for_status()
+        result = response.json()
 
-        except Exception as e:
-            # If the IPFS API fails, try to get info from the gateway
-            try:
-                # Try to get a small sample of the content to check if it's a directory listing
-                content_sample = await self.cat(cid)
-                is_directory = False
-
-                # If it starts with HTML doctype and has IPFS title, it's probably a directory listing
-                if (
-                    content_sample.startswith(b"<!DOCTYPE html>")
-                    and b"<title>/ipfs/" in content_sample
-                ):
-                    is_directory = True
-
-                # Return a simplified result similar to what the ls API would return
-                return {
-                    "is_directory": is_directory,
-                    "Objects": [
-                        {
-                            "Hash": cid,
-                            "Links": [],  # We can't get links from HTML content easily
-                        }
-                    ],
-                }
-            except Exception as fallback_error:
-                # Re-raise the original error
-                raise e
+        # Add a flag to indicate if this is a directory.
+        # A directory has Links and typically more than one or has Type=1
+        is_directory = False
+        if "Objects" in result and len(result["Objects"]) > 0:
+            obj = result["Objects"][0]
+            if "Links" in obj and len(obj["Links"]) > 0:
+                # It has links, likely a directory
+                is_directory = True
+                # Check if any links have Type=1 (directory)
+                for link in obj["Links"]:
+                    if link.get("Type") == 1:
+                        is_directory = True
+                        break
+
+        # Add the flag to the result
+        result["is_directory"] = is_directory
+        return result
 
     async def exists(self, cid: str) -> bool:
         """
@@ -241,7 +222,7 @@ class AsyncIPFSClient:
                 ls_result = await self.ls(cid)
                 if ls_result.get("is_directory", False):
                     # It's a directory, use the get command to download it properly
-                    return await self.download_directory_with_get(cid, output_path)
+                    return await self.download_directory(cid, output_path)
             except Exception:
                 # If ls check fails, continue with regular file download
                 pass
@@ -259,80 +240,13 @@ class AsyncIPFSClient:
             # Only try directory fallback if not skipping directory check
             if not skip_directory_check:
                 try:
-                    return await self.download_directory_with_get(cid, output_path)
+                    return await self.download_directory(cid, output_path)
                 except Exception:
                     pass
             # Raise the original error
             raise e
 
     async def download_directory(self, cid: str, output_path: str) -> str:
-        """
-        Download a directory from IPFS.
-
-        Args:
-            cid: Content identifier of the directory
-            output_path: Path where to save the directory
-
-        Returns:
-            Path to the saved directory
-        """
-        # Try the more reliable get command first
-        try:
-            return await self.download_directory_with_get(cid, output_path)
-        except Exception as e:
-            # If get command fails, fall back to ls/cat method
-            try:
-                # Get directory listing
-                ls_result = await self.ls(cid)
-                if not ls_result.get("is_directory", False):
-                    raise ValueError(f"CID {cid} is not a directory")
-
-                # Create the directory if it doesn't exist
-                os.makedirs(output_path, exist_ok=True)
-
-                # Extract links from the updated response format
-                links = []
-                # The ls result format is: { "Objects": [ { "Hash": "...", "Links": [...] } ] }
-                if "Objects" in ls_result and len(ls_result["Objects"]) > 0:
-                    for obj in ls_result["Objects"]:
-                        if "Links" in obj:
-                            links.extend(obj["Links"])
-
-                # Download each file in the directory
-                for link in links:
-                    file_name = link.get("Name")
-                    file_cid = link.get("Hash")
-                    file_type = link.get("Type")
-
-                    # Skip entries without required data
-                    if not (file_name and file_cid):
-                        continue
-
-                    # Build the path for this file/directory
-                    file_path = os.path.join(output_path, file_name)
-
-                    if file_type == 1 or file_type == "dir":  # Directory type
-                        # Recursively download the subdirectory
-                        await self.download_directory(file_cid, file_path)
-                    else:  # File type
-                        # Download the file
-                        content = await self.cat(file_cid)
-                        os.makedirs(
-                            os.path.dirname(os.path.abspath(file_path)), exist_ok=True
-                        )
-                        with open(file_path, "wb") as f:
-                            f.write(content)
-
-                return output_path
-            except Exception as fallback_error:
-                # If both methods fail, raise a more detailed error
-                raise RuntimeError(
-                    f"Failed to download directory: get error: {e}, ls/cat error: {fallback_error}"
-                )
-
-        return output_path
-
-    async def download_directory_with_get(self, cid: str, output_path: str) -> str:
         """
         Download a directory from IPFS by recursively fetching its contents.
 
@@ -345,6 +259,13 @@ class AsyncIPFSClient:
         """
         # First, get the directory listing to find all contents
         try:
+            import uuid
+
+            # Handle potential file/directory collision
+            if os.path.exists(output_path) and not os.path.isdir(output_path):
+                # Generate unique path by adding a UUID suffix
+                output_path = f"{output_path}_{str(uuid.uuid4())[:8]}"
+
             ls_result = await self.ls(cid)
 
             # Create target directory
@@ -362,7 +283,6 @@ class AsyncIPFSClient:
                 link_name = link.get("Name")
                 link_hash = link.get("Hash")
                 link_type = link.get("Type")
-                link_size = link.get("Size", 0)
 
                 if not (link_name and link_hash):
                     continue  # Skip if missing essential data
@@ -372,7 +292,7 @@ class AsyncIPFSClient:
 
                 if link_type == 1 or str(link_type) == "1" or link_type == "dir":
                     # It's a directory - recursively download
-                    await self.download_directory_with_get(link_hash, target_path)
+                    await self.download_directory(link_hash, target_path)
                 else:
                     # It's a file - download it
                     try:

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

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