cartha-cli 1.0.1__tar.gz → 1.0.3__tar.gz

{cartha_cli-1.0.1 → cartha_cli-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartha-cli
-Version: 1.0.1
+Version: 1.0.3
 Summary: CLI utilities for Cartha subnet miners.
 Project-URL: Homepage, https://cartha.finance
 Project-URL: Repository, https://github.com/General-Tao-Ventures/cartha-cli

{cartha_cli-1.0.1 → cartha_cli-1.0.3}/cartha_cli/commands/pair_status.py

@@ -35,21 +35,25 @@ from .shared_options import (
 )
 
 # Import pool name helper
+# Initialize fallback function first to ensure it's always defined
+def _fallback_pool_id_to_name(pool_id: str) -> str | None:
+    """Simple fallback to decode pool ID."""
+    try:
+        hex_str = pool_id.lower().removeprefix("0x")
+        pool_bytes = bytes.fromhex(hex_str)
+        name = pool_bytes.rstrip(b"\x00").decode("utf-8", errors="ignore")
+        if name and name.isprintable():
+            return name
+    except Exception:
+        pass
+    return None
+
+# Try to import from testnet module, fallback to default if not available
 try:
-    from ...testnet.pool_ids import pool_id_to_name
-except ImportError:
-    # Fallback if running from different context
-    def pool_id_to_name(pool_id: str) -> str | None:
-        """Simple fallback to decode pool ID."""
-        try:
-            hex_str = pool_id.lower().removeprefix("0x")
-            pool_bytes = bytes.fromhex(hex_str)
-            name = pool_bytes.rstrip(b"\x00").decode("utf-8", errors="ignore")
-            if name and name.isprintable():
-                return name
-        except Exception:
-            pass
-        return None
+    from ..testnet.pool_ids import pool_id_to_name
+except (ImportError, ModuleNotFoundError):
+    # Use fallback function
+    pool_id_to_name = _fallback_pool_id_to_name
 
 
 def pair_status(

{cartha_cli-1.0.1 → cartha_cli-1.0.3}/cartha_cli/commands/pools.py

@@ -7,40 +7,31 @@ import typer
 from .common import console
 
 # Import pool helpers for pool_id conversion
+# Initialize fallback functions first to ensure they're always defined
+def _fallback_list_pools() -> dict[str, str]:
+    """Fallback: return empty dict."""
+    return {}
+
+def _fallback_pool_id_to_vault_address(pool_id: str) -> str | None:
+    """Fallback: return None."""
+    return None
+
+def _fallback_pool_id_to_chain_id(pool_id: str) -> int | None:
+    """Fallback: return None."""
+    return None
+
+# Try to import from testnet module, fallback to defaults if not available
 try:
-    from ...testnet.pool_ids import (
+    from ..testnet.pool_ids import (
         list_pools,
         pool_id_to_chain_id,
         pool_id_to_vault_address,
     )
-except ImportError:
-    # Fallback if running from different context
-    import sys
-    from pathlib import Path
-
-    # Try adding parent directory to path
-    testnet_dir = Path(__file__).parent.parent.parent / "testnet"
-    if testnet_dir.exists():
-        sys.path.insert(0, str(testnet_dir.parent))
-        try:
-            from testnet.pool_ids import (
-                list_pools,
-                pool_id_to_chain_id,
-                pool_id_to_vault_address,
-            )
-        except ImportError:
-            # Final fallback
-            def list_pools() -> dict[str, str]:
-                """Fallback: return empty dict."""
-                return {}
-
-            def pool_id_to_vault_address(pool_id: str) -> str | None:
-                """Fallback: return None."""
-                return None
-
-            def pool_id_to_chain_id(pool_id: str) -> int | None:
-                """Fallback: return None."""
-                return None
+except (ImportError, ModuleNotFoundError):
+    # Use fallback functions if import failed
+    list_pools = _fallback_list_pools
+    pool_id_to_vault_address = _fallback_pool_id_to_vault_address
+    pool_id_to_chain_id = _fallback_pool_id_to_chain_id
 
 
 def pools(

{cartha_cli-1.0.1 → cartha_cli-1.0.3}/cartha_cli/commands/prove_lock.py

@@ -43,8 +43,51 @@ from .shared_options import (
 )
 
 # Import pool helpers for pool_id conversion
+# Initialize fallback functions first to ensure they're always defined
+def _fallback_pool_name_to_id(pool_name: str) -> str:
+    """Fallback: encode pool name as hex."""
+    name_bytes = pool_name.encode("utf-8")
+    padded = name_bytes.ljust(32, b"\x00")
+    return "0x" + padded.hex()
+
+def _fallback_pool_id_to_name(pool_id: str) -> str | None:
+    """Fallback: try to decode."""
+    try:
+        hex_str = pool_id.lower().removeprefix("0x")
+        pool_bytes = bytes.fromhex(hex_str)
+        name = pool_bytes.rstrip(b"\x00").decode("utf-8", errors="ignore")
+        return name if name and name.isprintable() else None
+    except Exception:
+        return None
+
+def _fallback_format_pool_id(pool_id: str) -> str:
+    """Fallback: return pool_id as-is."""
+    return pool_id
+
+def _fallback_list_pools() -> dict[str, str]:
+    """Fallback: return empty dict."""
+    return {}
+
+def _fallback_pool_id_to_vault_address(pool_id: str) -> str | None:
+    """Fallback: return None."""
+    return None
+
+def _fallback_vault_address_to_pool_id(vault_address: str) -> str | None:
+    """Fallback: return None."""
+    return None
+
+def _fallback_pool_id_to_chain_id(pool_id: str) -> int | None:
+    """Fallback: return None."""
+    return None
+
+def _fallback_vault_address_to_chain_id(vault_address: str) -> int | None:
+    """Fallback: return None."""
+    return None
+
+# Try to import from testnet module, fallback to defaults if not available
 try:
-    from ...testnet.pool_ids import (
+    # Import from cartha_cli.testnet (works both in development and when installed)
+    from ..testnet.pool_ids import (
         format_pool_id,
         list_pools,
         pool_id_to_chain_id,
@@ -54,67 +97,16 @@ try:
         vault_address_to_chain_id,
         vault_address_to_pool_id,
     )
-except ImportError:
-    # Fallback if running from different context
-    import sys
-    from pathlib import Path
-
-    # Try adding parent directory to path
-    testnet_dir = Path(__file__).parent.parent.parent / "testnet"
-    if testnet_dir.exists():
-        sys.path.insert(0, str(testnet_dir.parent))
-        try:
-            from testnet.pool_ids import (
-                format_pool_id,
-                list_pools,
-                pool_id_to_chain_id,
-                pool_id_to_name,
-                pool_id_to_vault_address,
-                pool_name_to_id,
-                vault_address_to_chain_id,
-                vault_address_to_pool_id,
-            )
-        except ImportError:
-            # Final fallback
-            def pool_name_to_id(pool_name: str) -> str:
-                """Fallback: encode pool name as hex."""
-                name_bytes = pool_name.encode("utf-8")
-                padded = name_bytes.ljust(32, b"\x00")
-                return "0x" + padded.hex()
-            
-            def pool_id_to_name(pool_id: str) -> str | None:
-                """Fallback: try to decode."""
-                try:
-                    hex_str = pool_id.lower().removeprefix("0x")
-                    pool_bytes = bytes.fromhex(hex_str)
-                    name = pool_bytes.rstrip(b"\x00").decode("utf-8", errors="ignore")
-                    return name if name and name.isprintable() else None
-                except Exception:
-                    return None
-            
-            def format_pool_id(pool_id: str) -> str:
-                """Fallback: return pool_id as-is."""
-                return pool_id
-            
-            def list_pools() -> dict[str, str]:
-                """Fallback: return empty dict."""
-                return {}
-            
-            def pool_id_to_vault_address(pool_id: str) -> str | None:
-                """Fallback: return None."""
-                return None
-            
-            def vault_address_to_pool_id(vault_address: str) -> str | None:
-                """Fallback: return None."""
-                return None
-            
-            def pool_id_to_chain_id(pool_id: str) -> int | None:
-                """Fallback: return None."""
-                return None
-            
-            def vault_address_to_chain_id(vault_address: str) -> int | None:
-                """Fallback: return None."""
-                return None
+except (ImportError, ModuleNotFoundError):
+    # Use fallback functions if import failed
+    pool_name_to_id = _fallback_pool_name_to_id
+    pool_id_to_name = _fallback_pool_id_to_name
+    format_pool_id = _fallback_format_pool_id
+    list_pools = _fallback_list_pools
+    pool_id_to_vault_address = _fallback_pool_id_to_vault_address
+    vault_address_to_pool_id = _fallback_vault_address_to_pool_id
+    pool_id_to_chain_id = _fallback_pool_id_to_chain_id
+    vault_address_to_chain_id = _fallback_vault_address_to_chain_id
 
 
 def prove_lock(

cartha_cli-1.0.3/cartha_cli/testnet/__init__.py

@@ -0,0 +1,2 @@
+"""Testnet utilities for Cartha CLI."""
+

{cartha_cli-1.0.1 → cartha_cli-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cartha-cli"
-version = "1.0.1"
+version = "1.0.3"
 description = "CLI utilities for Cartha subnet miners."
 readme = "README.md"
 requires-python = ">=3.11,<3.12"
@@ -50,3 +50,4 @@ cartha = "cartha_cli:main"
 [tool.pytest.ini_options]
 addopts = "-ra"
 testpaths = ["tests"]
+