strideutils 0.8.0__tar.gz → 0.8.2__tar.gz

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

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

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

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

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

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

{strideutils-0.8.0 → strideutils-0.8.2}/strideutils/stride_config.py

@@ -19,7 +19,7 @@ if ENV not in ["DEV", "PROD"]:
 
 def get_redis_password_env_var(db_name: str) -> str:
     """Generate the environment variable name for a Redis database password"""
-    return f"REDIS_STRIDE_{db_name.upper()}_PASSWORD"
+    return f"REDIS_{db_name.upper()}_PASSWORD"
 
 
 @dataclass(frozen=True)
@@ -176,12 +176,28 @@ class Config(ConfigObj):
 
     # Chain configs
     stride: StrideChainConfig = field(default_factory=StrideChainConfig)
-    host_zones: Dict[str, HostChainConfig] = field(default_factory=dict)
-    app_chains: Dict[str, ChainConfig] = field(default_factory=dict)
+    _host_zones: Dict[str, HostChainConfig] = field(default_factory=dict)
+    _app_chains: Dict[str, ChainConfig] = field(default_factory=dict)
+
+    @property
+    def host_zones(self) -> List[HostChainConfig]:
+        return [host_zone for host_zone in self._host_zones.values()]
 
     @property
     def stakeibc_host_zones(self) -> List[HostChainConfig]:
-        return [host_zone for host_zone in self.host_zones.values() if host_zone.ica_enabled]
+        return [host_zone for host_zone in self._host_zones.values() if host_zone.ica_enabled]
+
+    @property
+    def app_chains(self) -> List[ChainConfig]:
+        return [app_chain for app_chain in self._app_chains.values()]
+
+    @property
+    def host_zone_names(self) -> List[str]:
+        return [host_zone for host_zone in self._host_zones.keys()]
+
+    @property
+    def app_chain_names(self) -> List[str]:
+        return [app_chain for app_chain in self._app_chains.keys()]
 
     def _create_mappings(self) -> None:
         """
@@ -194,7 +210,7 @@ class Config(ConfigObj):
         denom_on_stride_to_zone = ConfigDict()
 
         # Map host zones and app chains.
-        for chain_info in itertools.chain(self.host_zones.values(), self.app_chains.values()):
+        for chain_info in itertools.chain(self._host_zones.values(), self._app_chains.values()):
             try:
                 name_to_zone[chain_info.name] = chain_info
             except AttributeError:
@@ -301,10 +317,6 @@ class Config(ConfigObj):
             raise TypeError(f"Chain {chain_config.name} is not a host zone")
         return chain_config
 
-    def __iter__(self):
-        """Allow iterating over host zones"""
-        return iter(self.host_zones.values())
-
 
 def _load_raw_config() -> dict[str, Any]:
     """
@@ -347,17 +359,19 @@ def _parse_raw_configs(raw_config: dict[str, Any], raw_secrets: dict[str, Option
     app_chain_fields = [field.name for field in fields(cast(Any, ChainConfig))]
     redis_config_fields = [field.name for field in fields(cast(Any, RedisConfig))]
 
-    # Parse Host Chain configs
+    # Parse Host Chain configs into new dict (instead of dict from raw_config)
     host_chain_config = {}
     for name, info in raw_config["host_zones"].items():
         filtered_info = {key: value for key, value in info.items() if key in host_chain_fields}
         host_chain_config[name] = HostChainConfig(**filtered_info)
+    del raw_config["host_zones"]
 
-    # Parse App Chain configs
+    # Parse App Chain configs into new dict (instead of dict from raw_config)
     app_chain_config = {}
     for name, info in raw_config["app_chains"].items():
         filtered_info = {key: value for key, value in info.items() if key in app_chain_fields}
         app_chain_config[name] = ChainConfig(**filtered_info)
+    del raw_config["app_chains"]
 
     # Parse Stride chain config
     stride_chain_config = StrideChainConfig(**raw_config["stride"])
@@ -370,8 +384,8 @@ def _parse_raw_configs(raw_config: dict[str, Any], raw_secrets: dict[str, Option
 
     chain_configs = {
         "stride": stride_chain_config,
-        "host_zones": host_chain_config,
-        "app_chains": app_chain_config,
+        "_host_zones": host_chain_config,
+        "_app_chains": app_chain_config,
         "redis": redis_configs,
     }
 

{strideutils-0.8.0 → strideutils-0.8.2}/strideutils/stride_config.pyi

@@ -73,13 +73,18 @@ class Config(ConfigObj):
     alerts_playbook: str = ...
     slack_channels: ConfigDict = ...
     stride: StrideChainConfig = ...
-    host_zones: dict[str, HostChainConfig] = ...
-    app_chains: dict[str, ChainConfig] = ...
+    @property
+    def host_zones(self) -> list[HostChainConfig]: ...
     @property
     def stakeibc_host_zones(self) -> list[HostChainConfig]: ...
+    @property
+    def app_chains(self) -> list[ChainConfig]: ...
+    @property
+    def host_zone_names(self) -> list[str]: ...
+    @property
+    def app_chain_names(self) -> list[str]: ...
     def __post_init__(self) -> None: ...
     def get_chain(self, name: str | None = None, id: str | None = None, ticker: str | None = None, denom: str | None = None, denom_on_stride: str | None = None) -> ChainConfig | StrideChainConfig | HostChainConfig: ...
     def get_host_chain(self, name: str | None = None, id: str | None = None, ticker: str | None = None, denom: str | None = None, denom_on_stride: str | None = None) -> HostChainConfig: ...
-    def __iter__(self): ...
 
 config: Config

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

@@ -815,7 +815,7 @@ def get_icns_name(address: str) -> str:
     if "osmosis" not in config.host_zones:
         raise KeyError("Osmosis host zone configuration not found")
 
-    osmosis_config = config.host_zones["osmosis"]
+    osmosis_config = config.get_host_chain("osmosis")
     contract_address = "osmo1xk0s8xgktn9x5vwcgtjdxqzadg88fgn33p8u9cnpdxwemvxscvast52cdd"
     query_msg = {"primary_name": {"address": address}}
 

{strideutils-0.8.0 → strideutils-0.8.2}/strideutils-stubs/stride_config.pyi

@@ -72,10 +72,16 @@ class Config(ConfigObj):
     alerts_playbook: str = ...
     slack_channels: ConfigDict = ...
     stride: StrideChainConfig = ...
-    host_zones: dict[str, HostChainConfig] = ...
-    app_chains: dict[str, ChainConfig] = ...
+    @property
+    def host_zones(self) -> list[HostChainConfig]: ...
     @property
     def stakeibc_host_zones(self) -> list[HostChainConfig]: ...
+    @property
+    def app_chains(self) -> list[ChainConfig]: ...
+    @property
+    def host_zone_names(self) -> list[str]: ...
+    @property
+    def app_chain_names(self) -> list[str]: ...
     def __post_init__(self) -> None: ...
     def get_chain(
         self,
@@ -93,6 +99,5 @@ class Config(ConfigObj):
         denom: str | None = None,
         denom_on_stride: str | None = None,
     ) -> HostChainConfig: ...
-    def __iter__(self): ...
 
 config: Config

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

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

{strideutils-0.8.0 → strideutils-0.8.2}/tests/test_config.py

@@ -127,8 +127,8 @@ class TestParseConfig:
 
         # Validate all chains are set
         assert config.stride.name == "stride"
-        assert set(config.host_zones.keys()) == set(self.host_chain_names)
-        assert set(config.app_chains.keys()) == set(self.app_chain_names)
+        assert set(config.host_zone_names) == set(self.host_chain_names)
+        assert set(config.app_chain_names) == set(self.app_chain_names)
 
         # Validate Redis configuration
         assert isinstance(config.redis, dict)
@@ -139,8 +139,8 @@ class TestParseConfig:
         assert config.redis["public"].ssl is False  # Verify SSL setting
 
         # Test iteration over host_zones
-        assert len(list(config.host_zones.values())) == len(self.host_chain_names)
-        assert all(isinstance(zone, HostChainConfig) for zone in config.host_zones.values())
+        assert len(list(config.host_zones)) == len(self.host_chain_names)
+        assert all(isinstance(zone, HostChainConfig) for zone in config.host_zones)
 
     def test_parse_config_missing_stride(self) -> None:
         """Test that parsing fails when stride config is missing"""
@@ -159,7 +159,7 @@ class TestParseConfig:
         raw_config["host_zones"]["cosmoshub"] = {"name": "cosmoshub", "id": "cosmoshub-1", "new_field": "value1"}
 
         config = _parse_raw_configs(raw_config, self.raw_secrets)
-        host_chain = config.host_zones["cosmoshub"]
+        host_chain = config.get_host_chain(name="cosmoshub")
 
         assert isinstance(host_chain, HostChainConfig)
         assert host_chain.name == "cosmoshub"
@@ -178,7 +178,7 @@ class TestParseConfig:
         raw_config["app_chains"]["neutron"] = {"name": "neutron", "id": "neutron-1", "new_field": "value1"}
 
         config = _parse_raw_configs(raw_config, self.raw_secrets)
-        app_chain = config.app_chains["neutron"]
+        app_chain = config.get_chain(name="neutron")
 
         assert isinstance(app_chain, ChainConfig)
         assert app_chain.name == "neutron"