cartha-cli 1.0.2__tar.gz → 1.0.4__tar.gz

{cartha_cli-1.0.2 → cartha_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartha-cli
-Version: 1.0.2
+Version: 1.0.4
 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.2 → cartha_cli-1.0.4}/cartha_cli/commands/pair_status.py

@@ -50,7 +50,7 @@ def _fallback_pool_id_to_name(pool_id: str) -> str | None:
 
 # Try to import from testnet module, fallback to default if not available
 try:
-    from ...testnet.pool_ids import pool_id_to_name
+    from ..testnet.pool_ids import pool_id_to_name
 except (ImportError, ModuleNotFoundError):
     # Use fallback function
     pool_id_to_name = _fallback_pool_id_to_name

{cartha_cli-1.0.2 → cartha_cli-1.0.4}/cartha_cli/commands/pools.py

@@ -22,36 +22,16 @@ def _fallback_pool_id_to_chain_id(pool_id: str) -> int | 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, ModuleNotFoundError):
-    # 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, 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
+    # 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.2 → cartha_cli-1.0.4}/cartha_cli/commands/prove_lock.py

@@ -86,7 +86,8 @@ def _fallback_vault_address_to_chain_id(vault_address: str) -> int | 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,
@@ -97,45 +98,15 @@ try:
         vault_address_to_pool_id,
     )
 except (ImportError, ModuleNotFoundError):
-    # 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, 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
+    # 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(
@@ -412,24 +383,24 @@ def prove_lock(
             auto_chain_id = None
             try:
                 auto_chain_id = pool_id_to_chain_id(pool_id)
-            except NameError:
+            except (NameError, AttributeError):
                 # Function not available - this shouldn't happen if imports worked
                 # But handle gracefully by trying to import it
                 try:
-                    from testnet.pool_ids import pool_id_to_chain_id
+                    from ..testnet.pool_ids import pool_id_to_chain_id
                     auto_chain_id = pool_id_to_chain_id(pool_id)
-                except ImportError:
+                except (ImportError, ModuleNotFoundError):
                     pass
             
             if not auto_chain_id:
                 # Fallback: try to get from vault address
                 try:
                     auto_chain_id = vault_address_to_chain_id(vault)
-                except NameError:
+                except (NameError, AttributeError):
                     try:
-                        from testnet.pool_ids import vault_address_to_chain_id
+                        from ..testnet.pool_ids import vault_address_to_chain_id
                         auto_chain_id = vault_address_to_chain_id(vault)
-                    except ImportError:
+                    except (ImportError, ModuleNotFoundError):
                         pass
             
             if auto_chain_id:
@@ -460,11 +431,11 @@ def prove_lock(
             expected_chain_id = None
             try:
                 expected_chain_id = vault_address_to_chain_id(vault)
-            except NameError:
+            except (NameError, AttributeError):
                 try:
-                    from testnet.pool_ids import vault_address_to_chain_id
+                    from ..testnet.pool_ids import vault_address_to_chain_id
                     expected_chain_id = vault_address_to_chain_id(vault)
-                except ImportError:
+                except (ImportError, ModuleNotFoundError):
                     pass
             
             if expected_chain_id and expected_chain_id != chain:

{cartha_cli-1.0.2 → cartha_cli-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cartha-cli"
-version = "1.0.2"
+version = "1.0.4"
 description = "CLI utilities for Cartha subnet miners."
 readme = "README.md"
 requires-python = ">=3.11,<3.12"
@@ -51,5 +51,3 @@ cartha = "cartha_cli:main"
 addopts = "-ra"
 testpaths = ["tests"]
 
-[tool.hatchling.build.targets.wheel]
-packages = ["cartha_cli", "testnet"]