From 3a7f748d96f0a5c3fadeb1c737b430a27af372f0 Mon Sep 17 00:00:00 2001 From: profitroll Date: Sun, 18 May 2025 17:44:18 +0200 Subject: [PATCH 01/16] Updated the license specification to comply with PEP 639 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9fc3893..68c44e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,11 +9,11 @@ authors = [{ name = "Profitroll" }] description = "Universal bot library with functions needed for basic Discord/Telegram bot development." readme = "README.md" requires-python = ">=3.11" -license = { text = "GPLv3" } +license = "GPL-3.0" +license-files = ["LICENSE"] classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", From dc05eb0ccba7635dc1e785c7c75dc55311619966 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 26 May 2025 08:33:47 +0300 Subject: [PATCH 02/16] Update dependency pytest-asyncio to v1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 54f12e3..ad87bac 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -3,7 +3,7 @@ build==1.2.2.post1 isort==5.13.2 mypy==1.15.0 pylint==3.3.7 -pytest-asyncio==0.26.0 +pytest-asyncio==1.0.0 pytest-cov==6.1.1 pytest==8.3.5 tox==4.26.0 From c17a206c44dcfbd1666cfda95503f285d4697ff8 Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 28 May 2025 08:54:30 +0300 Subject: [PATCH 03/16] Update dependency redis to ~=6.2.0 --- requirements/cache.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/cache.txt b/requirements/cache.txt index 6c3d33f..31034da 100644 --- a/requirements/cache.txt +++ b/requirements/cache.txt @@ -1,2 +1,2 @@ pymemcache~=4.0.0 -redis~=6.1.0 \ No newline at end of file +redis~=6.2.0 \ No newline at end of file From 54de9508996d159f77fab1739f47da6eae447f20 Mon Sep 17 00:00:00 2001 From: kku Date: Wed, 28 May 2025 10:05:30 +0200 Subject: [PATCH 04/16] Fixed compatibility issue with PEP 639 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 68c44e7..5420649 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=62.6", "wheel"] +requires = ["setuptools>=77.0.3", "wheel"] build-backend = "setuptools.build_meta" [project] From 69b034c0078481e1e868a5dc3ae10fd0e3397179 Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 29 May 2025 16:49:31 +0300 Subject: [PATCH 05/16] Update dependency mypy to v1.16.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index ad87bac..b2e6d92 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,7 +1,7 @@ black==25.1.0 build==1.2.2.post1 isort==5.13.2 -mypy==1.15.0 +mypy==1.16.0 pylint==3.3.7 pytest-asyncio==1.0.0 pytest-cov==6.1.1 From 1e1b04a8ffa2f1eefbaf67ee7a8133760b97cff8 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 2 Jun 2025 18:39:15 +0300 Subject: [PATCH 06/16] Update dependency typing-extensions to ~=4.14.0 --- requirements/_.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/_.txt b/requirements/_.txt index aa412d5..da0b621 100644 --- a/requirements/_.txt +++ b/requirements/_.txt @@ -1,2 +1,2 @@ aiofiles>=23.0.0 -typing-extensions~=4.13.0 \ No newline at end of file +typing-extensions~=4.14.0 \ No newline at end of file From e596658c688f1c784d6f65fc95b5c0c65c237001 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 2 Jun 2025 20:43:25 +0300 Subject: [PATCH 07/16] Update dependency pytest to v8.4.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index b2e6d92..cff0f54 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -5,7 +5,7 @@ mypy==1.16.0 pylint==3.3.7 pytest-asyncio==1.0.0 pytest-cov==6.1.1 -pytest==8.3.5 +pytest==8.4.0 tox==4.26.0 twine==6.1.0 types-aiofiles==24.1.0.20250516 From 5dff5fa71d804abd458f9fef973899c3c775162e Mon Sep 17 00:00:00 2001 From: Renovate Date: Fri, 6 Jun 2025 06:11:29 +0300 Subject: [PATCH 08/16] Update dependency types-aiofiles to v24.1.0.20250606 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index cff0f54..8fc8c48 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,5 +8,5 @@ pytest-cov==6.1.1 pytest==8.4.0 tox==4.26.0 twine==6.1.0 -types-aiofiles==24.1.0.20250516 +types-aiofiles==24.1.0.20250606 types-ujson==5.10.0.20250326 \ No newline at end of file From 38bf43a5e777624ca0543c83e3c8d7ade3e906ba Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 12 Jun 2025 01:32:32 +0300 Subject: [PATCH 09/16] Update dependency pytest-cov to v6.2.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 8fc8c48..4b7a25e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ isort==5.13.2 mypy==1.16.0 pylint==3.3.7 pytest-asyncio==1.0.0 -pytest-cov==6.1.1 +pytest-cov==6.2.0 pytest==8.4.0 tox==4.26.0 twine==6.1.0 From c4fb1dd5dd7d08aeb72d64422ed89c5f0b1132ab Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 12 Jun 2025 13:57:08 +0300 Subject: [PATCH 10/16] Update dependency pytest-cov to v6.2.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 4b7a25e..0f349ae 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ isort==5.13.2 mypy==1.16.0 pylint==3.3.7 pytest-asyncio==1.0.0 -pytest-cov==6.2.0 +pytest-cov==6.2.1 pytest==8.4.0 tox==4.26.0 twine==6.1.0 From d70fd4f49135be76713539da8a66dacfc2360e0f Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 16 Jun 2025 20:06:16 +0300 Subject: [PATCH 11/16] Update dependency mypy to v1.16.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 0f349ae..e6877fb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,7 +1,7 @@ black==25.1.0 build==1.2.2.post1 isort==5.13.2 -mypy==1.16.0 +mypy==1.16.1 pylint==3.3.7 pytest-asyncio==1.0.0 pytest-cov==6.2.1 From edc3e0717d0cb61f728dbb1e867b63fbe1efe316 Mon Sep 17 00:00:00 2001 From: Renovate Date: Tue, 17 Jun 2025 18:51:05 +0300 Subject: [PATCH 12/16] Update dependency tox to v4.27.0 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index e6877fb..45aba32 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,7 +6,7 @@ pylint==3.3.7 pytest-asyncio==1.0.0 pytest-cov==6.2.1 pytest==8.4.0 -tox==4.26.0 +tox==4.27.0 twine==6.1.0 types-aiofiles==24.1.0.20250606 types-ujson==5.10.0.20250326 \ No newline at end of file From ad38dbdca13d0f685f2fe1b3063e9805d6af2a9a Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 18 Jun 2025 09:21:02 +0300 Subject: [PATCH 13/16] Update dependency pytest to v8.4.1 --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 45aba32..7d23cf9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -5,7 +5,7 @@ mypy==1.16.1 pylint==3.3.7 pytest-asyncio==1.0.0 pytest-cov==6.2.1 -pytest==8.4.0 +pytest==8.4.1 tox==4.27.0 twine==6.1.0 types-aiofiles==24.1.0.20250606 From 3110bb64b1e6583b4a7758ce4007c81d1f87de54 Mon Sep 17 00:00:00 2001 From: profitroll Date: Mon, 7 Jul 2025 23:35:21 +0200 Subject: [PATCH 14/16] Closes #219 --- src/libbot/__init__.py | 2 +- src/libbot/cache/classes/cache.py | 8 ++++---- src/libbot/cache/classes/cache_memcached.py | 10 +++++----- src/libbot/cache/classes/cache_redis.py | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libbot/__init__.py b/src/libbot/__init__.py index fcb6220..6604090 100644 --- a/src/libbot/__init__.py +++ b/src/libbot/__init__.py @@ -1,4 +1,4 @@ -__version__ = "4.2.0" +__version__ = "4.3.0" __license__ = "GPL3" __author__ = "Profitroll" diff --git a/src/libbot/cache/classes/cache.py b/src/libbot/cache/classes/cache.py index 8b0f617..5f9846c 100644 --- a/src/libbot/cache/classes/cache.py +++ b/src/libbot/cache/classes/cache.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import Any, Dict +from typing import Any, Dict, Optional import pymemcache import redis @@ -27,16 +27,16 @@ class Cache(ABC): pass @abstractmethod - def set_json(self, key: str, value: Any) -> None: + def set_json(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: # TODO This method must also carry out ObjectId conversion! pass @abstractmethod - def set_string(self, key: str, value: str) -> None: + def set_string(self, key: str, value: str, ttl_seconds: Optional[int] = None) -> None: pass @abstractmethod - def set_object(self, key: str, value: Any) -> None: + def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: pass @abstractmethod diff --git a/src/libbot/cache/classes/cache_memcached.py b/src/libbot/cache/classes/cache_memcached.py index f592b1d..a88c476 100644 --- a/src/libbot/cache/classes/cache_memcached.py +++ b/src/libbot/cache/classes/cache_memcached.py @@ -69,28 +69,28 @@ class CacheMemcached(Cache): def get_object(self, key: str) -> Any | None: raise NotImplementedError() - def set_json(self, key: str, value: Any) -> None: + def set_json(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: key = self._get_prefixed_key(key) try: - self.client.set(key, _json_to_string(value)) + self.client.set(key, _json_to_string(value), expire=0 if ttl_seconds is None else ttl_seconds) logger.debug("Set json cache key '%s'", key) except Exception as exc: logger.error("Could not set json cache key '%s' due to: %s", key, exc) return None - def set_string(self, key: str, value: str) -> None: + def set_string(self, key: str, value: str, ttl_seconds: Optional[int] = None) -> None: key = self._get_prefixed_key(key) try: - self.client.set(key, value) + self.client.set(key, value, expire=0 if ttl_seconds is None else ttl_seconds) logger.debug("Set string cache key '%s'", key) except Exception as exc: logger.error("Could not set string cache key '%s' due to: %s", key, exc) return None # TODO Implement binary serialization - def set_object(self, key: str, value: Any) -> None: + def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: raise NotImplementedError() def delete(self, key: str) -> None: diff --git a/src/libbot/cache/classes/cache_redis.py b/src/libbot/cache/classes/cache_redis.py index 797a866..d70076a 100644 --- a/src/libbot/cache/classes/cache_redis.py +++ b/src/libbot/cache/classes/cache_redis.py @@ -69,28 +69,28 @@ class CacheRedis(Cache): def get_object(self, key: str) -> Any | None: raise NotImplementedError() - def set_json(self, key: str, value: Any) -> None: + def set_json(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: key = self._get_prefixed_key(key) try: - self.client.set(key, _json_to_string(value)) + self.client.set(key, _json_to_string(value), ex=ttl_seconds) logger.debug("Set json cache key '%s'", key) except Exception as exc: logger.error("Could not set json cache key '%s' due to: %s", key, exc) return None - def set_string(self, key: str, value: str) -> None: + def set_string(self, key: str, value: str, ttl_seconds: Optional[int] = None) -> None: key = self._get_prefixed_key(key) try: - self.client.set(key, value) + self.client.set(key, value, ex=ttl_seconds) logger.debug("Set string cache key '%s'", key) except Exception as exc: logger.error("Could not set string cache key '%s' due to: %s", key, exc) return None # TODO Implement binary serialization - def set_object(self, key: str, value: Any) -> None: + def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None: raise NotImplementedError() def delete(self, key: str) -> None: From 32a9e14d0ce80aa675f45e3bdeb0c7bb2518df5b Mon Sep 17 00:00:00 2001 From: profitroll Date: Mon, 7 Jul 2025 23:47:55 +0200 Subject: [PATCH 15/16] Added a default TTL of 300 seconds for cache entries (#219) --- src/libbot/cache/classes/cache_memcached.py | 19 ++++++++++++++++--- src/libbot/cache/classes/cache_redis.py | 19 +++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/libbot/cache/classes/cache_memcached.py b/src/libbot/cache/classes/cache_memcached.py index a88c476..e2d4666 100644 --- a/src/libbot/cache/classes/cache_memcached.py +++ b/src/libbot/cache/classes/cache_memcached.py @@ -7,15 +7,22 @@ from pymemcache import Client from .cache import Cache from ..utils._objects import _json_to_string, _string_to_json +DEFAULT_TTS_SECONDS: int = 300 + logger: Logger = logging.getLogger(__name__) class CacheMemcached(Cache): client: Client - def __init__(self, client: Client, prefix: Optional[str] = None): + def __init__( + self, client: Client, prefix: Optional[str] = None, default_ttl_seconds: Optional[int] = None + ) -> None: self.client: Client = client self.prefix: str | None = prefix + self.default_ttl_seconds: int = ( + default_ttl_seconds if default_ttl_seconds is not None else DEFAULT_TTS_SECONDS + ) logger.info("Initialized Memcached for caching") @@ -73,7 +80,11 @@ class CacheMemcached(Cache): key = self._get_prefixed_key(key) try: - self.client.set(key, _json_to_string(value), expire=0 if ttl_seconds is None else ttl_seconds) + self.client.set( + key, + _json_to_string(value), + expire=self.default_ttl_seconds if ttl_seconds is None else ttl_seconds, + ) logger.debug("Set json cache key '%s'", key) except Exception as exc: logger.error("Could not set json cache key '%s' due to: %s", key, exc) @@ -83,7 +94,9 @@ class CacheMemcached(Cache): key = self._get_prefixed_key(key) try: - self.client.set(key, value, expire=0 if ttl_seconds is None else ttl_seconds) + self.client.set( + key, value, expire=self.default_ttl_seconds if ttl_seconds is None else ttl_seconds + ) logger.debug("Set string cache key '%s'", key) except Exception as exc: logger.error("Could not set string cache key '%s' due to: %s", key, exc) diff --git a/src/libbot/cache/classes/cache_redis.py b/src/libbot/cache/classes/cache_redis.py index d70076a..5aad925 100644 --- a/src/libbot/cache/classes/cache_redis.py +++ b/src/libbot/cache/classes/cache_redis.py @@ -5,7 +5,9 @@ from typing import Dict, Any, Optional from redis import Redis from .cache import Cache -from ..utils._objects import _string_to_json, _json_to_string +from ..utils._objects import _json_to_string, _string_to_json + +DEFAULT_TTS_SECONDS: int = 300 logger: Logger = logging.getLogger(__name__) @@ -13,9 +15,14 @@ logger: Logger = logging.getLogger(__name__) class CacheRedis(Cache): client: Redis - def __init__(self, client: Redis, prefix: Optional[str] = None): + def __init__( + self, client: Redis, prefix: Optional[str] = None, default_ttl_seconds: Optional[int] = None + ) -> None: self.client: Redis = client self.prefix: str | None = prefix + self.default_ttl_seconds: int = ( + default_ttl_seconds if default_ttl_seconds is not None else DEFAULT_TTS_SECONDS + ) logger.info("Initialized Redis for caching") @@ -73,7 +80,11 @@ class CacheRedis(Cache): key = self._get_prefixed_key(key) try: - self.client.set(key, _json_to_string(value), ex=ttl_seconds) + self.client.set( + key, + _json_to_string(value), + ex=self.default_ttl_seconds if ttl_seconds is None else ttl_seconds, + ) logger.debug("Set json cache key '%s'", key) except Exception as exc: logger.error("Could not set json cache key '%s' due to: %s", key, exc) @@ -83,7 +94,7 @@ class CacheRedis(Cache): key = self._get_prefixed_key(key) try: - self.client.set(key, value, ex=ttl_seconds) + self.client.set(key, value, ex=self.default_ttl_seconds if ttl_seconds is None else ttl_seconds) logger.debug("Set string cache key '%s'", key) except Exception as exc: logger.error("Could not set string cache key '%s' due to: %s", key, exc) From e4ce5976f205d1fc11d7512aa6aaf69bf38157b7 Mon Sep 17 00:00:00 2001 From: profitroll Date: Tue, 8 Jul 2025 00:01:14 +0200 Subject: [PATCH 16/16] Changed default cache TTL to 0 and None for memcached and redis respectively --- src/libbot/cache/classes/cache_memcached.py | 6 +----- src/libbot/cache/classes/cache_redis.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libbot/cache/classes/cache_memcached.py b/src/libbot/cache/classes/cache_memcached.py index e2d4666..4c74453 100644 --- a/src/libbot/cache/classes/cache_memcached.py +++ b/src/libbot/cache/classes/cache_memcached.py @@ -7,8 +7,6 @@ from pymemcache import Client from .cache import Cache from ..utils._objects import _json_to_string, _string_to_json -DEFAULT_TTS_SECONDS: int = 300 - logger: Logger = logging.getLogger(__name__) @@ -20,9 +18,7 @@ class CacheMemcached(Cache): ) -> None: self.client: Client = client self.prefix: str | None = prefix - self.default_ttl_seconds: int = ( - default_ttl_seconds if default_ttl_seconds is not None else DEFAULT_TTS_SECONDS - ) + self.default_ttl_seconds: int = default_ttl_seconds if default_ttl_seconds is not None else 0 logger.info("Initialized Memcached for caching") diff --git a/src/libbot/cache/classes/cache_redis.py b/src/libbot/cache/classes/cache_redis.py index 5aad925..c5d0ad9 100644 --- a/src/libbot/cache/classes/cache_redis.py +++ b/src/libbot/cache/classes/cache_redis.py @@ -7,8 +7,6 @@ from redis import Redis from .cache import Cache from ..utils._objects import _json_to_string, _string_to_json -DEFAULT_TTS_SECONDS: int = 300 - logger: Logger = logging.getLogger(__name__) @@ -20,9 +18,7 @@ class CacheRedis(Cache): ) -> None: self.client: Redis = client self.prefix: str | None = prefix - self.default_ttl_seconds: int = ( - default_ttl_seconds if default_ttl_seconds is not None else DEFAULT_TTS_SECONDS - ) + self.default_ttl_seconds: int | None = default_ttl_seconds logger.info("Initialized Redis for caching")