python3-commons 0.8.9__tar.gz → 0.8.11__tar.gz

{python3_commons-0.8.9/src/python3_commons.egg-info → python3_commons-0.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.9
+Version: 0.8.11
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3
@@ -20,9 +20,10 @@ Requires-Dist: lxml~=5.3.1
 Requires-Dist: minio~=7.2.15
 Requires-Dist: msgpack~=1.1.0
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.10.6
+Requires-Dist: pydantic[email]~=2.11.0
 Requires-Dist: pydantic-settings~=2.8.1
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.39
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
+Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"

{python3_commons-0.8.9 → python3_commons-0.8.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-commons"
-version = "0.8.9"
+version = "0.8.11"
 description = "Re-usable Python3 code"
 authors = [
     {name = "Oleg Korsak", email = "kamikaze.is.waiting.you@gmail.com"}
@@ -25,9 +25,10 @@ dependencies = [
     "minio~=7.2.15",
     "msgpack~=1.1.0",
     "msgspec~=0.19.0",
-    "pydantic[email]~=2.10.6",
+    "pydantic[email]~=2.11.0",
     "pydantic-settings~=2.8.1",
-    "SQLAlchemy[asyncio]~=2.0.39",
+    "SQLAlchemy[asyncio]~=2.0.40",
+    "valkey[libvalkey]~=6.1.0",
     "zeep~=4.3.1"
 ]
 requires-python = ">=3.13"

{python3_commons-0.8.9 → python3_commons-0.8.11}/requirements.txt

@@ -6,7 +6,8 @@ lxml~=5.3.1
 minio~=7.2.15
 msgpack~=1.1.0
 msgspec~=0.19.0
-pydantic[email]~=2.10.6
+pydantic[email]~=2.11.0
 pydantic-settings~=2.8.1
-SQLAlchemy[asyncio]~=2.0.39
+SQLAlchemy[asyncio]~=2.0.40
+valkey[libvalkey]~=6.1.0
 zeep~=4.3.1

python3_commons-0.8.11/src/python3_commons/cache.py

@@ -0,0 +1,249 @@
+import logging
+import socket
+from platform import platform
+from typing import Any, Mapping, Sequence
+
+import valkey
+from pydantic import RedisDsn
+from valkey.asyncio import Valkey, StrictValkey, ConnectionPool, Sentinel
+from valkey.asyncio.retry import Retry
+from valkey.backoff import FullJitterBackoff
+
+from python3_commons.conf import valkey_settings
+from python3_commons.helpers import SingletonMeta
+from python3_commons.serializers.msgspec import (
+    serialize_msgpack, deserialize_msgpack, deserialize_msgpack_native, serialize_msgpack_native
+)
+
+logger = logging.getLogger(__name__)
+
+
+class AsyncValkeyClient(metaclass=SingletonMeta):
+    def __init__(self, dsn: RedisDsn, sentinel_dsn: RedisDsn | None):
+        self._valkey_pool = None
+        self._valkey = None
+
+        if sentinel_dsn:
+            self._initialize_sentinel(sentinel_dsn)
+        else:
+            self._initialize_standard_pool(dsn)
+
+    @staticmethod
+    def _get_keepalive_options():
+        if platform == 'linux' or platform == 'darwin':
+            return {
+                socket.TCP_KEEPIDLE: 10,
+                socket.TCP_KEEPINTVL: 5,
+                socket.TCP_KEEPCNT: 5
+            }
+        else:
+            return {}
+
+    def _initialize_sentinel(self, dsn: RedisDsn):
+        sentinel = Sentinel(
+            [(dsn.host, dsn.port)],
+            socket_connect_timeout=10,
+            socket_timeout=60,
+            password=dsn.password,
+            sentinel_kwargs={'password': dsn.password}
+        )
+
+        ka_options = self._get_keepalive_options()
+
+        self._valkey = sentinel.master_for(
+            'myprimary',
+            valkey_class=StrictValkey,
+            socket_connect_timeout=10,
+            socket_timeout=60,
+            health_check_interval=30,
+            retry_on_timeout=True,
+            retry=Retry(FullJitterBackoff(cap=5, base=1), 5),
+            socket_keepalive=True,
+            socket_keepalive_options=ka_options
+        )
+
+    def _initialize_standard_pool(self, dsn: RedisDsn):
+        self._valkey_pool = ConnectionPool.from_url(str(dsn))
+        self._valkey = StrictValkey(connection_pool=self._valkey_pool)
+
+    def get_client(self) -> Valkey:
+        return self._valkey
+
+
+def get_valkey_client() -> Valkey:
+    return AsyncValkeyClient(valkey_settings.dsn, valkey_settings.sentinel_dsn).get_client()
+
+
+async def delete(name: str):
+    await get_valkey_client().delete(name)
+
+
+async def store_bytes(name: str, data: bytes, ttl: int = None, if_not_set: bool = False):
+    r = get_valkey_client()
+
+    return r.set(name, data, ex=ttl, nx=if_not_set)
+
+
+async def get_bytes(name: str) -> bytes | None:
+    r = get_valkey_client()
+
+    return r.get(name)
+
+
+async def store(name: str, obj: Any, ttl: int = None, if_not_set: bool = False):
+    return store_bytes(name, serialize_msgpack_native(obj), ttl, if_not_set)
+
+
+async def get(name: str, default=None, data_type: Any = None) -> Any:
+    if data := await get_bytes(name):
+        return deserialize_msgpack_native(data, data_type)
+
+    return default
+
+
+async def store_string(name: str, data: str, ttl: int = None):
+    await store_bytes(name, data.encode(), ttl)
+
+
+async def get_string(name: str) -> str | None:
+    if data := await get_bytes(name):
+        return data.decode('utf-8')
+
+    return None
+
+
+async def store_sequence(name: str, data: Sequence, ttl: int = None):
+    if data:
+        try:
+            r = get_valkey_client()
+            await r.rpush(name, *map(serialize_msgpack_native, data))
+
+            if ttl:
+                await r.expire(name, ttl)
+        except valkey.exceptions.ConnectionError as e:
+            logger.error(f'Failed to store sequence in cache: {e}')
+
+
+async def get_sequence(name: str, _type: type = list) -> Sequence:
+    r = get_valkey_client()
+
+    return _type(map(deserialize_msgpack_native, r.lrange(name, 0, -1)))
+
+
+async def store_dict(name: str, data: Mapping, ttl: int = None):
+    if data:
+        try:
+            r = get_valkey_client()
+            data = {k: serialize_msgpack_native(v) for k, v in data.items()}
+            await r.hset(name, mapping=data)
+
+            if ttl:
+                await r.expire(name, ttl)
+        except valkey.exceptions.ConnectionError as e:
+            logger.error(f'Failed to store dict in cache: {e}')
+
+
+async def get_dict(name: str, value_data_type=None) -> dict | None:
+    r = get_valkey_client()
+
+    if data := r.hgetall(name):
+        data = {k.decode(): deserialize_msgpack(v, value_data_type) for k, v in data.items()}
+
+        return data
+
+    return None
+
+
+async def set_dict(name: str, mapping: dict, ttl: int = None):
+    if mapping:
+        try:
+            r = get_valkey_client()
+            mapping = {str(k): serialize_msgpack(v) for k, v in mapping.items()}
+            await r.hset(name, mapping=mapping)
+
+            if ttl:
+                await r.expire(name, ttl)
+        except valkey.exceptions.ConnectionError as e:
+            logger.error(f'Failed to set dict in cache: {e}')
+
+
+async def get_dict_item(name: str, key: str, data_type=None, default=None):
+    try:
+        r = get_valkey_client()
+
+        if data := await r.hget(name, key):
+            return deserialize_msgpack_native(data, data_type)
+
+        return default
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to get dict item from cache: {e}')
+
+    return None
+
+
+async def set_dict_item(name: str, key: str, obj: Any):
+    try:
+        r = get_valkey_client()
+        await r.hset(name, key, serialize_msgpack_native(obj))
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to set dict item in cache: {e}')
+
+
+async def delete_dict_item(name: str, *keys):
+    try:
+        r = get_valkey_client()
+        await r.hdel(name, *keys)
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to delete dict item from cache: {e}')
+
+
+async def store_set(name: str, value: set, ttl: int = None):
+    try:
+        r = get_valkey_client()
+        await r.sadd(name, *map(serialize_msgpack_native, value))
+
+        if ttl:
+            await r.expire(name, ttl)
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to store set in cache: {e}')
+
+
+async def has_set_item(name: str, value: str) -> bool:
+    try:
+        r = get_valkey_client()
+
+        return r.sismember(name, serialize_msgpack_native(value)) == 1
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to check if set has item in cache: {e}')
+
+    return False
+
+
+async def add_set_item(name: str, *values: str):
+    try:
+        r = get_valkey_client()
+        await r.sadd(name, *map(serialize_msgpack_native, values))
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to add set item into cache: {e}')
+
+
+async def delete_set_item(name: str, value: str):
+    r = get_valkey_client()
+    await r.srem(name, serialize_msgpack_native(value))
+
+
+async def get_set_members(name: str) -> set[str] | None:
+    try:
+        r = get_valkey_client()
+
+        return set(map(deserialize_msgpack_native, r.smembers(name)))
+    except valkey.exceptions.ConnectionError as e:
+        logger.error(f'Failed to get set members from cache: {e}')
+
+    return None
+
+
+async def exists(name: str) -> bool:
+    r = get_valkey_client()
+
+    return r.exists(name) == 1

{python3_commons-0.8.9 → python3_commons-0.8.11}/src/python3_commons/conf.py

@@ -1,4 +1,4 @@
-from pydantic import SecretStr, PostgresDsn, Field
+from pydantic import SecretStr, PostgresDsn, Field, RedisDsn
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -8,6 +8,13 @@ class CommonSettings(BaseSettings):
     logging_formatter: str = 'default'
 
 
+class ValkeySettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix='VALKEY_')
+
+    dsn: RedisDsn | None = None
+    sentinel_dsn: RedisDsn | None = None
+
+
 class DBSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix='DB_')
 
@@ -31,5 +38,6 @@ class S3Settings(BaseSettings):
 
 
 settings = CommonSettings()
+valkey_settings = ValkeySettings()
 db_settings = DBSettings()
 s3_settings = S3Settings()

{python3_commons-0.8.9 → python3_commons-0.8.11/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.9
+Version: 0.8.11
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License: gpl-3
@@ -20,9 +20,10 @@ Requires-Dist: lxml~=5.3.1
 Requires-Dist: minio~=7.2.15
 Requires-Dist: msgpack~=1.1.0
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.10.6
+Requires-Dist: pydantic[email]~=2.11.0
 Requires-Dist: pydantic-settings~=2.8.1
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.39
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
+Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"

{python3_commons-0.8.9 → python3_commons-0.8.11}/src/python3_commons.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ docs/_static/.gitignore
 src/python3_commons/__init__.py
 src/python3_commons/api_client.py
 src/python3_commons/audit.py
+src/python3_commons/cache.py
 src/python3_commons/conf.py
 src/python3_commons/fs.py
 src/python3_commons/helpers.py

{python3_commons-0.8.9 → python3_commons-0.8.11}/src/python3_commons.egg-info/requires.txt

@@ -6,9 +6,10 @@ lxml~=5.3.1
 minio~=7.2.15
 msgpack~=1.1.0
 msgspec~=0.19.0
-pydantic[email]~=2.10.6
+pydantic[email]~=2.11.0
 pydantic-settings~=2.8.1
-SQLAlchemy[asyncio]~=2.0.39
+SQLAlchemy[asyncio]~=2.0.40
+valkey[libvalkey]~=6.1.0
 zeep~=4.3.1
 
 [testing]