strideutils 0.8.2__tar.gz → 0.8.4__tar.gz

{strideutils-0.8.2 → strideutils-0.8.4}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.2
+current_version = 0.8.4
 commit = False
 tag = False
 

{strideutils-0.8.2 → strideutils-0.8.4}/.github/workflows/lint.yml

@@ -3,7 +3,7 @@ name: Python Lint
 on: [push]
 
 jobs:
-  flake8-lint:
+  Flake8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -14,7 +14,7 @@ jobs:
         with:
           max-line-length: "120"
           path: "strideutils/ tests strideutils-stubs"
-  black:
+  Black:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
         with:
           options: "--check --verbose --skip-string-normalization --line-length=120"
           src: "strideutils tests strideutils-stubs"
-  isort:
+  Isort:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -32,7 +32,7 @@ jobs:
 
       - name: Run isort on each project
         run: isort --check-only --diff --profile=black strideutils tests strideutils-stubs
-  type-check:
+  Typing:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

{strideutils-0.8.2 → strideutils-0.8.4}/.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  publish:
+  Publish:
     if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     permissions:

{strideutils-0.8.2 → strideutils-0.8.4}/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Strideutils Tests
+name: Unit Tests
 
 on:
   push:
@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
+  Test:
     runs-on: ubuntu-latest
     env:
       ENV: DEV

{strideutils-0.8.2 → strideutils-0.8.4}/.github/workflows/version.yaml

@@ -1,4 +1,4 @@
-name: Bump version
+name: Version
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ on:
           - minor
 
 jobs:
-  version:
+  Bump-Version:
     if: ${{ github.event.label.name == 'version-patch' ||  github.event.label.name == 'version-minor' }} || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     permissions:

{strideutils-0.8.2 → strideutils-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strideutils
-Version: 0.8.2
+Version: 0.8.4
 Summary: Utility functions for monitoring the Stride blockchain
 Author-email: Stride Labs <hello@stridelabs.co>
 License: MIT License

{strideutils-0.8.2 → strideutils-0.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "strideutils"
-version = "0.8.2"
+version = "0.8.4"
 authors = [
     {name = "Stride Labs", email = "hello@stridelabs.co"},
 ]

{strideutils-0.8.2 → strideutils-0.8.4}/strideutils/exec_tx.py

@@ -1,4 +1,5 @@
 import json
+import os
 import subprocess
 import time
 from dataclasses import dataclass
@@ -7,6 +8,8 @@ from typing import Optional
 from strideutils import stride_requests
 from strideutils.stride_config import config
 
+WALLET_SETUP_COMMAND = "echo {mnemonic} | {binary} keys add {wallet_name} --recover --keyring-backend=test"
+
 
 @dataclass
 class TxResponse:
@@ -19,6 +22,17 @@ class TxResponse:
     raw_log: Optional[str] = None
 
 
+def restore_wallet(wallet_name: str = "wallet", mnemonic_var: str = "MNEMONIC", binary: str = "strided"):
+    """
+    Restores a wallet in the keyring, using the mnemonic under the specified environment variable
+    """
+    mnemonic = os.getenv(mnemonic_var)
+    if not mnemonic:
+        raise EnvironmentError(f"{mnemonic_var} must be set")
+
+    os.system(WALLET_SETUP_COMMAND.format(mnemonic=mnemonic, binary=binary, wallet_name=wallet_name))
+
+
 def execute_tx(command: str, api_endpoint: str = config.stride.api_endpoint) -> TxResponse:
     """
     Execute a tx and query the tx hash

{strideutils-0.8.2/strideutils-stubs → strideutils-0.8.4/strideutils}/exec_tx.pyi

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
-
 from strideutils import stride_requests as stride_requests
 from strideutils.stride_config import config as config
 
+WALLET_SETUP_COMMAND: str
+
 @dataclass
 class TxResponse:
     stdout: dict
@@ -13,4 +14,5 @@ class TxResponse:
     tx_response: dict | None = ...
     raw_log: str | None = ...
 
+def restore_wallet(wallet_name: str = 'wallet', mnemonic_var: str = 'MNEMONIC', binary: str = 'strided'): ...
 def execute_tx(command: str, api_endpoint: str = ...) -> TxResponse: ...

{strideutils-0.8.2 → strideutils-0.8.4}/strideutils/stride_requests.py

@@ -100,11 +100,33 @@ def request(
         params = list(params.items())
 
     resp = requests_session.get(url, headers=headers, params=params, data=data)
-    if not resp.ok:  # resp.ok is true if state_code is less than 400
-        print(f"Error fetching {url}: {resp.status_code} {resp.json()}")
-        raise Exception(f"Error fetching {url}: {resp.status_code} {resp.json()}")
 
-    out = resp.json()
+    # Handle non-200 responses.
+    if not resp.ok:
+        error_msg = f"Error fetching {url}: {resp.status_code} {resp.json()}"
+        try:
+            error_details = resp.json()
+            error_msg += f" {error_details}"
+        except requests.exceptions.JSONDecodeError:
+            error_msg += f" {resp.text}"
+
+        print(error_msg)
+        raise Exception(error_msg)
+
+    # Handle empty responses.
+    if not resp.text:
+        error_msg = f"Empty response received from {url}"
+        print(error_msg)
+        raise Exception(error_msg)
+
+    # Try to parse JSON response.
+    try:
+        out = resp.json()
+    except requests.exceptions.JSONDecodeError as e:
+        error_msg = f"Invalid JSON response received from {url}: {resp.text[:200]}..."
+        print(error_msg)
+        raise Exception(error_msg) from e
+
     if cache_response:
         _cache[cache_key] = out
     return out
@@ -458,7 +480,7 @@ def get_redemption_rate_slack() -> pd.DataFrame:
     """
     df_list: List[Dict[str, Any]] = []
 
-    for host_zone in config:
+    for host_zone in config.host_zones:
         slack_data = _get_host_zone_redemption_rate_slack(host_zone.id)
         df_list.append({'host_zone_id': host_zone.id, **slack_data})
 

{strideutils-0.8.2/strideutils → strideutils-0.8.4/strideutils-stubs}/exec_tx.pyi

@@ -1,7 +1,10 @@
 from dataclasses import dataclass
+
 from strideutils import stride_requests as stride_requests
 from strideutils.stride_config import config as config
 
+WALLET_SETUP_COMMAND: str
+
 @dataclass
 class TxResponse:
     stdout: dict
@@ -12,4 +15,5 @@ class TxResponse:
     tx_response: dict | None = ...
     raw_log: str | None = ...
 
+def restore_wallet(wallet_name: str = 'wallet', mnemonic_var: str = 'MNEMONIC', binary: str = 'strided'): ...
 def execute_tx(command: str, api_endpoint: str = ...) -> TxResponse: ...

{strideutils-0.8.2 → strideutils-0.8.4}/strideutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strideutils
-Version: 0.8.2
+Version: 0.8.4
 Summary: Utility functions for monitoring the Stride blockchain
 Author-email: Stride Labs <hello@stridelabs.co>
 License: MIT License

{strideutils-0.8.2 → strideutils-0.8.4}/tests/test_stride_requests.py

@@ -1,5 +1,5 @@
 from typing import Any
-from unittest.mock import patch
+from unittest.mock import PropertyMock, patch
 
 import numpy as np
 import pandas as pd
@@ -83,11 +83,11 @@ def test_get_host_zone_redemption_rate_slack(mock_host_zone_data: dict[str, Any]
 def test_get_redemption_rate_slack(mock_host_zones: list[HostChainConfig], mock_host_zone_data: dict[str, Any]):
     """Test DataFrame output of redemption rate slack"""
     with (
-        patch('strideutils.stride_requests.config') as mock_config,
+        patch('strideutils.stride_requests.config') as mock_config,  # Mock entire config
         patch('strideutils.stride_requests.get_host_zone') as mock_get_host_zone,
     ):
-        # Setup mocks
-        mock_config.__iter__.return_value = mock_host_zones
+        # Set up the host_zones property to return our mock data
+        type(mock_config).host_zones = PropertyMock(return_value=mock_host_zones)
         mock_get_host_zone.side_effect = mock_host_zone_data
 
         result = get_redemption_rate_slack()
@@ -110,7 +110,8 @@ def test_get_redemption_rate_slack_string(mock_host_zones: HostChainConfig, mock
         patch('strideutils.stride_requests.config') as mock_config,
         patch('strideutils.stride_requests.get_host_zone') as mock_get_host_zone,
     ):
-        mock_config.__iter__.return_value = mock_host_zones
+        # Set up the host_zones property
+        type(mock_config).host_zones = PropertyMock(return_value=mock_host_zones)
         mock_get_host_zone.side_effect = mock_host_zone_data
 
         result = get_redemption_rate_slack_string()
@@ -125,7 +126,8 @@ def test_get_redemption_rate_slack_string(mock_host_zones: HostChainConfig, mock
 def test_get_redemption_rate_slack_no_zones():
     """Test behavior when no host zones are available"""
     with patch('strideutils.stride_requests.config') as mock_config:
-        mock_config.__iter__.return_value = []
+        # Set up empty host_zones
+        type(mock_config).host_zones = PropertyMock(return_value=[])
 
         result = get_redemption_rate_slack()