cartha-cli 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

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
+except (ImportError, ModuleNotFoundError):
+    # Use fallback function
+    pool_id_to_name = _fallback_pool_id_to_name
 
 
 def pair_status(

cartha_cli/commands/pools.py

@@ -7,13 +7,27 @@ 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 (
         list_pools,
         pool_id_to_chain_id,
         pool_id_to_vault_address,
     )
-except ImportError:
+except (ImportError, ModuleNotFoundError):
     # Fallback if running from different context
     import sys
     from pathlib import Path
@@ -28,19 +42,16 @@ except ImportError:
                 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
+            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
+    else:
+        # Use fallback functions if testnet directory doesn't exist
+        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/commands/prove_lock.py

@@ -43,6 +43,48 @@ 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 (
         format_pool_id,
@@ -54,7 +96,7 @@ try:
         vault_address_to_chain_id,
         vault_address_to_pool_id,
     )
-except ImportError:
+except (ImportError, ModuleNotFoundError):
     # Fallback if running from different context
     import sys
     from pathlib import Path
@@ -74,47 +116,26 @@ except ImportError:
                 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
+            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
+    else:
+        # Use fallback functions if testnet directory doesn't exist
+        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.1.dist-info → cartha_cli-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartha-cli
-Version: 1.0.1
+Version: 1.0.2
 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.dist-info → cartha_cli-1.0.2.dist-info}/RECORD

@@ -15,14 +15,14 @@ cartha_cli/commands/health.py,sha256=NRwmIultxUzAe7udOOBIdkcdGG5KsE_kuCs43LZObGk
 cartha_cli/commands/help.py,sha256=6ubfWtmjXfCtp6L_PYvn7rR7m5C_pp-iEjtRc6BS0GA,1721
 cartha_cli/commands/miner_password.py,sha256=7cbcyrJ9KzCyJ68_174U_CXjBUt9BaYhgKAycRpv7AE,11078
 cartha_cli/commands/miner_status.py,sha256=tWlCWcuwm9NEd4USuCLp_6qObikX2odc2e7m6Y_vNrU,21873
-cartha_cli/commands/pair_status.py,sha256=Sk6-bIAcgAH3KxGg0Hw3PofLW_4eyonLUmJOkJ8gem0,19821
-cartha_cli/commands/pools.py,sha256=LkFJlur1T5lxV2qz7DeYYj9GbyRiy0wjb1mUNsV1zQg,4104
-cartha_cli/commands/prove_lock.py,sha256=xN87_lXmL-dao9GsLpalUsmlun8nLpBc7GIPaRLg8ig,60621
+cartha_cli/commands/pair_status.py,sha256=Q_CTi-7vrvpe0XYiuf_RFdFNXiBcs84xLcTYguxb4ho,19979
+cartha_cli/commands/pools.py,sha256=hXtqRmBLfcMe_FJiW_rcVcttyt7jMX37n0mZAXSnmOU,4661
+cartha_cli/commands/prove_lock.py,sha256=A5AZkfqCLbDio4idud4XV-ktYRhYVOA22WhqPojyFc8,61480
 cartha_cli/commands/register.py,sha256=sxbYO0V4NucOKLZpaFoVnhFDHLSLDHREoMtN9DjyLsM,10227
 cartha_cli/commands/shared_options.py,sha256=itHzJSgxuKQxUVOh1_jVTcMQXjI3PPzexQyhqIbabxc,5874
 cartha_cli/commands/version.py,sha256=u5oeccQzK0LLcCbgZm0U8-Vslk5vB_lVvW3xT5HPeTg,456
-cartha_cli-1.0.1.dist-info/METADATA,sha256=kNbcljoI3DNOQDvKkCKS_CPeKO8F5DR9dsI9gbN9Qk4,5794
-cartha_cli-1.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-cartha_cli-1.0.1.dist-info/entry_points.txt,sha256=sTYVMgb9l0fuJibUtWpGnIoDmgHinne97G4Y_cCwC-U,43
-cartha_cli-1.0.1.dist-info/licenses/LICENSE,sha256=B4UCiDn13m4xYwIl4TMKfbuKw7kh9pg4c81rJecxHSo,1076
-cartha_cli-1.0.1.dist-info/RECORD,,
+cartha_cli-1.0.2.dist-info/METADATA,sha256=oCfBEiLZfg8QSFW-Ml9smIh0WNPG-vQ2QKbC4oKZG6c,5794
+cartha_cli-1.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cartha_cli-1.0.2.dist-info/entry_points.txt,sha256=sTYVMgb9l0fuJibUtWpGnIoDmgHinne97G4Y_cCwC-U,43
+cartha_cli-1.0.2.dist-info/licenses/LICENSE,sha256=B4UCiDn13m4xYwIl4TMKfbuKw7kh9pg4c81rJecxHSo,1076
+cartha_cli-1.0.2.dist-info/RECORD,,