strideutils 0.7.4__tar.gz → 0.7.5__tar.gz

{strideutils-0.7.4 → strideutils-0.7.5}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.4
+current_version = 0.7.5
 commit = False
 tag = False
 

{strideutils-0.7.4 → strideutils-0.7.5}/PKG-INFO

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

{strideutils-0.7.4 → strideutils-0.7.5}/pyproject.toml

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

{strideutils-0.7.4 → strideutils-0.7.5}/strideutils/redis_connector.py

@@ -14,22 +14,44 @@ import redis
 from strideutils.stride_config import Environment as e
 from strideutils.stride_config import get_env_or_raise
 
+# TODO: Remove and use from environment variables
+DATABASE_HOSTS = {
+    "public": "usw1-certain-beagle-33773.upstash.io",
+    "frontend": "usw1-hot-bat-33320.upstash.io",
+    "backend": "usw1-mutual-mule-33971.upstash.io",
+    "dydx": "us1-diverse-dog-39216.upstash.io",
+    "dydx_airdrop": "pleasant-pipefish-54904.upstash.io",
+    "saga_airdrop": "super-gnu-55216.upstash.io",
+    "milestones": "adapting-snail-56076.upstash.io",
+}
+
+# TODO: Remove and use from environment variables
+DATABASE_PORTS = {
+    "public": 33773,
+    "frontend": 33320,
+    "backend": 33971,
+    "dydx": 39216,
+    "dydx_airdrop": 6379,
+    "saga_airdrop": 6379,
+    "milestones": 6379,
+}
+
 DATABASE_ENVIRONMENT_CONFIGS = {
-    'public': (e.UPSTASH_PUBLIC_HOST, e.UPSTASH_PUBLIC_PORT, e.UPSTASH_PUBLIC_PASSWORD),
-    'frontend': (e.UPSTASH_STRIDE_FRONTEND_HOST, e.UPSTASH_STRIDE_FRONTEND_PORT, e.UPSTASH_STRIDE_FRONTEND_PASSWORD),
-    'backend': (e.UPSTASH_STRIDE_BACKEND_HOST, e.UPSTASH_STRIDE_BACKEND_PORT, e.UPSTASH_STRIDE_BACKEND_PASSWORD),
-    'dydx': (e.UPSTASH_STRIDE_DYDX_HOST, e.UPSTASH_STRIDE_DYDX_PORT, e.UPSTASH_STRIDE_DYDX_PASSWORD),
-    'dydx_airdrop': (
+    "public": (e.UPSTASH_PUBLIC_HOST, e.UPSTASH_PUBLIC_PORT, e.UPSTASH_PUBLIC_PASSWORD),
+    "frontend": (e.UPSTASH_STRIDE_FRONTEND_HOST, e.UPSTASH_STRIDE_FRONTEND_PORT, e.UPSTASH_STRIDE_FRONTEND_PASSWORD),
+    "backend": (e.UPSTASH_STRIDE_BACKEND_HOST, e.UPSTASH_STRIDE_BACKEND_PORT, e.UPSTASH_STRIDE_BACKEND_PASSWORD),
+    "dydx": (e.UPSTASH_STRIDE_DYDX_HOST, e.UPSTASH_STRIDE_DYDX_PORT, e.UPSTASH_STRIDE_DYDX_PASSWORD),
+    "dydx_airdrop": (
         e.UPSTASH_STRIDE_DYDX_AIRDROP_HOST,
         e.UPSTASH_STRIDE_DYDX_AIRDROP_PORT,
         e.UPSTASH_STRIDE_DYDX_AIRDROP_PASSWORD,
     ),
-    'saga_airdrop': (
+    "saga_airdrop": (
         e.UPSTASH_STRIDE_SAGA_AIRDROP_HOST,
         e.UPSTASH_STRIDE_SAGA_AIRDROP_PORT,
         e.UPSTASH_STRIDE_SAGA_AIRDROP_PASSWORD,
     ),
-    'milestones': (
+    "milestones": (
         e.UPSTASH_STRIDE_MILESTONES_HOST,
         e.UPSTASH_STRIDE_MILESTONES_PORT,
         e.UPSTASH_STRIDE_MILESTONES_PASSWORD,
@@ -90,14 +112,23 @@ class RedisClient:
         Returns:
             redis.Redis: Initialized Redis client.
         """
-        host_env, port_env, password_env = DATABASE_ENVIRONMENT_CONFIGS[database_name]
+        # TODO: Use host and port from environment variables
+        _, _, password_env = DATABASE_ENVIRONMENT_CONFIGS[database_name]
+        host = DATABASE_ENVIRONMENT_CONFIGS.get(database_name)
+        port = DATABASE_ENVIRONMENT_CONFIGS.get(database_name)
+        password = get_env_or_raise(password_env)
+
+        if not host or not port:
+            raise ValueError(f"Host or port not known for database {database_name}")
+
         db_config = {
-            'host': get_env_or_raise(host_env),
-            'port': int(get_env_or_raise(port_env)),
-            'password': get_env_or_raise(password_env),
-            'ssl': True,
-            'decode_responses': True,
+            "host": host,
+            "port": port,
+            "password": password,
+            "ssl": True,
+            "decode_responses": True,
         }
+
         return redis.Redis(**db_config)
 
     def get_db(self, name: Optional[str] = None) -> redis.Redis:

{strideutils-0.7.4 → strideutils-0.7.5}/strideutils.egg-info/PKG-INFO

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

{strideutils-0.7.4 → strideutils-0.7.5}/strideutils.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ strideutils/slack_connector.py
 strideutils/stride_alerts.py
 strideutils/stride_config.py
 strideutils/stride_requests.py
-strideutils/stride_upstash.py
 strideutils/twilio_connector.py
 strideutils/types.py
 strideutils.egg-info/PKG-INFO

strideutils-0.7.4/strideutils/stride_upstash.py

@@ -1,134 +0,0 @@
-from typing import Dict, List, Optional
-
-import redis
-
-from strideutils.stride_config import config
-
-redis_dbs = {}  # stores the redis dbs so we don't have to keep reconnecting
-
-
-def get_redis_db(redis_db_name: str) -> redis.Redis:
-    """
-    Returns the redis db specified by redis_db_name.
-
-    Currently supports 'public', 'frontend', and 'backend' dbs.
-    """
-    if redis_db_name not in redis_dbs:
-        if redis_db_name == 'public':
-            r = redis.Redis(
-                host='usw1-certain-beagle-33773.upstash.io',
-                port=33773,
-                password=config.UPSTASH_PUBLIC_PASSWORD,
-            )
-
-        elif redis_db_name == 'frontend':
-            r = redis.Redis(
-                host='usw1-hot-bat-33320.upstash.io',
-                port=33320,
-                password=config.UPSTASH_STRIDE_FRONTEND_PASSWORD,
-                ssl=True,
-            )
-
-        elif redis_db_name == 'backend':
-            r = redis.Redis(
-                host='usw1-mutual-mule-33971.upstash.io',
-                port=33971,
-                password=config.UPSTASH_STRIDE_BACKEND_PASSWORD,
-                ssl=True,
-            )
-        elif redis_db_name == 'dydx':
-            r = redis.Redis(
-                host='us1-diverse-dog-39216.upstash.io',
-                port=39216,
-                password=config.UPSTASH_STRIDE_DYDX_PUBLIC_PASSWORD,
-                ssl=True,
-            )
-        elif redis_db_name == 'dydx_airdrop':
-            r = redis.Redis(
-                host='pleasant-pipefish-54904.upstash.io',
-                port=6379,
-                password=config.UPSTASH_STRIDE_DYDX_AIRDROP_PASSWORD,
-                ssl=True,
-            )
-        elif redis_db_name == 'saga_airdrop':
-            r = redis.Redis(
-                host='super-gnu-55216.upstash.io',
-                port=6379,
-                password='AdewAAIjcDE5YjhhNjg3ZmIxMWQ0YTEwYmNlMzgwNzA5ODZmN2FhZnAxMA',
-                ssl=True,
-            )
-        elif redis_db_name == "milestones":
-            r = redis.Redis(
-                host='adapting-snail-56076.upstash.io',
-                port=6379,
-                password=config.UPSTASH_STRIDE_MILESTONES_PASSWORD,
-                ssl=True,
-            )
-        else:
-            raise ValueError(f'Invalid Redis DB: {redis_db_name}')
-
-        redis_dbs[redis_db_name] = r
-
-    return redis_dbs[redis_db_name]
-
-
-def get(redis_key: str, db_name='frontend') -> Optional[str]:
-    """
-    This function will read the given Redis key and return the value.
-
-    Pulls from the specified redis db.
-    """
-    db = get_redis_db(db_name)
-    value = db.get(redis_key)
-
-    return value.decode('utf-8') if value is not None else None
-
-
-def get_multiple_keys(redis_keys: List[str], db_name='frontend') -> List[Optional[str]]:
-    """
-    This function will read multiple keys in at once.
-    Value will be "None" if the key does not exist.
-
-    Pulls from the specified redis db.
-    """
-    db = get_redis_db(db_name)
-    values = db.mget(redis_keys)
-
-    return [value.decode('utf-8') if value is not None else None for value in values]
-
-
-def get_all_keys(db_name='dydx_airdrop') -> List[str]:
-    """
-    This function will return all keys in the redis db specified.
-    """
-    db = get_redis_db(db_name)
-
-    out = []
-
-    cursor = '0'
-    while cursor != 0:
-        cursor, keys = db.scan(cursor, count=1000)
-        if keys:
-            out.extend(keys)
-    return [key.decode('utf-8') for key in out]
-
-
-def set(redis_key: str, redis_val: str, db_name='frontend'):
-    """
-    This function will set the given key to value in the redis_db specified.
-    """
-    db = get_redis_db(db_name)
-    db.set(redis_key, redis_val)
-
-
-def set_keys(dict_to_upload: Dict[str, str], db_name='frontend', prefix=''):
-    """
-    Loops through all values in dict_to_upload and sets the keys+values in the redis db
-
-    Will append "prefix" to all keys in the dict.
-    """
-    db = get_redis_db(db_name)
-    pipe = db.pipeline()
-    for k, v in dict_to_upload.items():
-        pipe.set(prefix + k, v)
-    pipe.execute()