hippius 0.2.8__py3-none-any.whl → 0.2.9__py3-none-any.whl

{hippius-0.2.8.dist-info → hippius-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hippius
-Version: 0.2.8
+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.8.dist-info → hippius-0.2.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hippius_sdk/__init__.py,sha256=qXKCaurObaxcmP718Q9X2nSROm3ZYaetT3sR69fPcSI,1391
+hippius_sdk/__init__.py,sha256=fqaCct4J_4JlfpFmTtc2TrG3fqQaiDU9Yl4tsgvqcBI,1391
 hippius_sdk/cli.py,sha256=pzwoa-X5cwdA_pM-fqUyXZKHgcZODrLe4qHZuCqQMtQ,18210
 hippius_sdk/cli_assets.py,sha256=V3MX63QTiex6mCp0VDXQJ7cagm5v1s4xtsu8c1O4G_k,371
 hippius_sdk/cli_handlers.py,sha256=LUS-BPPMfvXCLsHiN225nMTlBEHXKxZmUf1YpC-Xyqc,127905
@@ -8,10 +8,10 @@ hippius_sdk/client.py,sha256=eYURsq_so3WlEt_JY_u7J0iECFVOKDf5vsnGyR9Kngw,16974
 hippius_sdk/config.py,sha256=sCWD2remLa-FodvxC2O45tiNSJD7gzv9idIStX9sF_k,21240
 hippius_sdk/errors.py,sha256=LScJJmawVAx7aRzqqQguYSkf9iazSjEQEBNlD_GXZ6Y,1589
 hippius_sdk/ipfs.py,sha256=xq0y87dyKvbwf52OjEAlqFNrl4Ej1Zp5g2rZa75qfN8,71706
-hippius_sdk/ipfs_core.py,sha256=Lxu2-AWEpE-kiJDcP-cOBEeuboK7i9eNZdjgJWPa4sI,16028
+hippius_sdk/ipfs_core.py,sha256=Dzfmty7SzHW1GNjjLpp9u0JSf0f2g2FB-78nDtTUt3I,12820
 hippius_sdk/substrate.py,sha256=HqR2-_9njZZ5UCKgiaGr5L5TGQ_wtj7oyA3sA5sGGyE,47525
 hippius_sdk/utils.py,sha256=Ur7P_7iVnXXYvbg7a0aVrdN_8NkVxjhdngn8NzR_zpc,7066
-hippius-0.2.8.dist-info/METADATA,sha256=8XQCTdk2Yw6HGik6V3GSj6S1qt_-yqM00PT5Q5EcBV8,29992
-hippius-0.2.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-hippius-0.2.8.dist-info/entry_points.txt,sha256=b1lo60zRXmv1ud-c5BC-cJcAfGE5FD4qM_nia6XeQtM,98
-hippius-0.2.8.dist-info/RECORD,,
+hippius-0.2.9.dist-info/METADATA,sha256=Br0pN49dYq3fhG3bjl5lVj-yOjPAHM1pFk7PGxF7wYk,29992
+hippius-0.2.9.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+hippius-0.2.9.dist-info/entry_points.txt,sha256=b1lo60zRXmv1ud-c5BC-cJcAfGE5FD4qM_nia6XeQtM,98
+hippius-0.2.9.dist-info/RECORD,,

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.8"
+__version__ = "0.2.9"
 __all__ = [
     "HippiusClient",
     "IPFSClient",

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: