Compare commits
117 Commits
v4.0.0
...
2bcc1f94f0
Author | SHA1 | Date | |
---|---|---|---|
2bcc1f94f0
|
|||
f0532f9d39
|
|||
97ac53b597
|
|||
e94baabcfe
|
|||
c3b8eca06f
|
|||
d207c564dc
|
|||
e4807e2999
|
|||
540c94c0ed
|
|||
a10c4a8f51
|
|||
9e40f89d67
|
|||
f5db3cb529
|
|||
eca59e4673
|
|||
923bad856b
|
|||
902ccb5947
|
|||
1fea7ea5f8
|
|||
37928baa6f
|
|||
1f28b1771a
|
|||
5b677f6741
|
|||
883cd50fb3
|
|||
403b52042e
|
|||
5ca813b095
|
|||
b8cd7f2316
|
|||
454c80ad6b
|
|||
1bbab5c154
|
|||
6cb7f9b2f3
|
|||
a4c797079e
|
|||
9a9edbc1a8
|
|||
f991d86d4a
|
|||
cea1b087d3
|
|||
19399fe0ac
|
|||
6da6812d1d
|
|||
ec3dc3a42a
|
|||
01dc9f5d87
|
|||
aa38fc5f0f
|
|||
097581bac7
|
|||
b8bbba66ec
|
|||
ef7380ae45
|
|||
727d531d63
|
|||
7d95b1efee
|
|||
03115b4059
|
|||
e4ce5976f2
|
|||
32a9e14d0c
|
|||
3110bb64b1
|
|||
ad38dbdca1
|
|||
edc3e0717d
|
|||
d70fd4f491
|
|||
c4fb1dd5dd
|
|||
38bf43a5e7
|
|||
5dff5fa71d
|
|||
e596658c68
|
|||
1e1b04a8ff
|
|||
69b034c007
|
|||
|
54de950899 | ||
c17a206c44
|
|||
dc05eb0ccb
|
|||
3a7f748d96
|
|||
95abf4265c
|
|||
84e1cf7ce9
|
|||
accd22dd4d
|
|||
e296aaa6b3
|
|||
6de12244ec | |||
e45266a977 | |||
9f1179f330 | |||
0690a0fe22 | |||
74f5d638e3 | |||
809e103aa3 | |||
6171dac7b8 | |||
b7f847752c | |||
cb5e6c7bdb | |||
762c20a213 | |||
e34cb7f4b1 | |||
7908d0b906 | |||
cc41f4aa83 | |||
f29a6e4896 | |||
2bb62373d6 | |||
0ee1c75031 | |||
12f7cb6365
|
|||
76ee24cd9e
|
|||
6d56d9d0f9
|
|||
554b522400
|
|||
e9abed27f8
|
|||
845a69491d
|
|||
df2b5efd88 | |||
6b2be48052
|
|||
ad70648ea2 | |||
09b4d512a6 | |||
1473d34ca1 | |||
5fc8ae6a6e | |||
8562d7e84c | |||
258b46d829 | |||
efec002667 | |||
475eaf9ff3 | |||
0fcd9f2041 | |||
44d07dc56a | |||
c5e83c17d3 | |||
129cbd923b | |||
1ca126829b
|
|||
974aebfd1a
|
|||
ed7fa50dbd
|
|||
82542de0bb
|
|||
9021eac87b
|
|||
651022ab6e
|
|||
f8c6b782a1
|
|||
a1d0b98858
|
|||
fec40b1c44 | |||
|
e9b9fc6ca1 | ||
1da367ccb1 | |||
|
d5e390fe66 | ||
|
ae54bd5cce | ||
|
9ce251d733 | ||
|
5dd873d683 | ||
b47bcbe513 | |||
|
bbbec75f91 | ||
|
94553b602e | ||
|
3cdd6da506 | ||
|
d24e94b57e | ||
95584c0e63
|
@@ -11,14 +11,13 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
sonarcloud:
|
sonarcloud:
|
||||||
name: SonarCloud
|
name: SonarCloud
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
container: catthehacker/ubuntu:act-latest
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: SonarCloud Scan
|
- name: SonarQube Scan
|
||||||
uses: SonarSource/sonarcloud-github-action@master
|
uses: SonarSource/sonarqube-scan-action@v4.2.1
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
67
.gitea/workflows/publish.yml
Normal file
67
.gitea/workflows/publish.yml
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
name: Upload Python Package
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [ published ]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-build:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.x"
|
||||||
|
- name: Build release distributions
|
||||||
|
run: |
|
||||||
|
python -m pip install build
|
||||||
|
python -m build
|
||||||
|
- name: Upload distributions
|
||||||
|
uses: christopherhx/gitea-upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: release-dists
|
||||||
|
path: dist/
|
||||||
|
gitea-publish:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
needs: release-build
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
environment:
|
||||||
|
name: gitea
|
||||||
|
url: https://git.end-play.xyz/profitroll/-/packages/pypi/libbot
|
||||||
|
env:
|
||||||
|
GITHUB_WORKFLOW_REF: ${{ gitea.workflow_ref }}
|
||||||
|
INPUT_REPOSITORY_URL: https://git.end-play.xyz/api/packages/profitroll/pypi
|
||||||
|
steps:
|
||||||
|
- name: Retrieve release distributions
|
||||||
|
uses: christopherhx/gitea-download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: release-dists
|
||||||
|
path: dist/
|
||||||
|
- name: Publish package distributions to TestPyPI
|
||||||
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
with:
|
||||||
|
password: ${{ secrets.PYPI_GITEA_API_TOKEN }}
|
||||||
|
repository-url: https://git.end-play.xyz/api/packages/profitroll/pypi
|
||||||
|
pypi-publish:
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
needs: release-build
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
environment:
|
||||||
|
name: pypi
|
||||||
|
env:
|
||||||
|
GITHUB_WORKFLOW_REF: ${{ gitea.workflow_ref }}
|
||||||
|
steps:
|
||||||
|
- name: Retrieve release distributions
|
||||||
|
uses: christopherhx/gitea-download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: release-dists
|
||||||
|
path: dist/
|
||||||
|
- name: Publish package distributions to TestPyPI
|
||||||
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
with:
|
||||||
|
password: ${{ secrets.PYPI_PYPI_API_TOKEN }}
|
@@ -11,18 +11,18 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: Build and Test
|
name: Build and Test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
container: catthehacker/ubuntu:act-latest
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.9", "3.10", "3.11", "3.12"]
|
python-version: [ "3.11", "3.12", "3.13" ]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python ${{ matrix.python-version }}
|
||||||
uses: actions/setup-python@v3
|
uses: actions/setup-python@v3
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
|
cache: 'pip'
|
||||||
|
cache-dependency-path: './requirements/*'
|
||||||
env:
|
env:
|
||||||
AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache
|
AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
32
README.md
32
README.md
@@ -16,6 +16,7 @@ There are different sub-packages available:
|
|||||||
* pyrogram - Telegram bots with Pyrogram's fork "Pyrofork"
|
* pyrogram - Telegram bots with Pyrogram's fork "Pyrofork"
|
||||||
* pycord - Discord bots with Pycord
|
* pycord - Discord bots with Pycord
|
||||||
* speed - Performance improvements
|
* speed - Performance improvements
|
||||||
|
* cache - Support for Redis and Memcached
|
||||||
* dev - Dependencies for package development purposes
|
* dev - Dependencies for package development purposes
|
||||||
|
|
||||||
You can freely choose any sub-package you want, as well as add multiple (comma-separated) or none at all.
|
You can freely choose any sub-package you want, as well as add multiple (comma-separated) or none at all.
|
||||||
@@ -36,19 +37,20 @@ pip install libbot[pycord,speed]
|
|||||||
### Pyrogram
|
### Pyrogram
|
||||||
|
|
||||||
```python
|
```python
|
||||||
from libbot.pyrogram import PyroClient
|
import sys
|
||||||
|
|
||||||
|
from libbot.pyrogram.classes import PyroClient
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
client = PyroClient(scheduler=scheduler)
|
client: PyroClient = PyroClient()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
client.run()
|
client.run()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
print("Shutting down...")
|
print("Shutting down...")
|
||||||
finally:
|
finally:
|
||||||
if client.scheduler is not None:
|
sys.exit()
|
||||||
client.scheduler.shutdown()
|
|
||||||
exit()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
@@ -58,29 +60,33 @@ if __name__ == "__main__":
|
|||||||
### Pycord
|
### Pycord
|
||||||
|
|
||||||
```python
|
```python
|
||||||
|
import asyncio
|
||||||
|
from asyncio import AbstractEventLoop
|
||||||
|
|
||||||
from discord import Intents
|
from discord import Intents
|
||||||
from libbot import sync
|
from libbot.utils import config_get
|
||||||
from libbot.pycord import PycordBot
|
from libbot.pycord.classes import PycordBot
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
intents = Intents.default()
|
intents: Intents = Intents.default()
|
||||||
bot = PycordBot(intents=intents)
|
bot: PycordBot = PycordBot(intents=intents)
|
||||||
|
|
||||||
bot.load_extension("cogs")
|
bot.load_extension("cogs")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await bot.start(sync.config_get("bot_token", "bot"))
|
await bot.start(config_get("bot_token", "bot"))
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
logger.warning("Shutting down...")
|
print("Shutting down...")
|
||||||
await bot.close()
|
await bot.close()
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
loop = asyncio.get_event_loop()
|
loop: AbstractEventLoop = asyncio.get_event_loop()
|
||||||
loop.run_until_complete(main())
|
loop.run_until_complete(main())
|
||||||
```
|
```
|
||||||
|
|
||||||
## Config examples
|
## Config examples
|
||||||
|
|
||||||
For bot config examples please check the examples directory. Without a valid config file, the bot won't start at all, so you need to make sure the correct config file is used.
|
For bot config examples please check the examples directory. Without a valid config file, the bot won't start at all, so
|
||||||
|
you need to make sure the correct config file is used.
|
||||||
|
4
examples/README.md
Normal file
4
examples/README.md
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
# Examples
|
||||||
|
|
||||||
|
If you're looking for Pyrogram usage examples, please take a look at
|
||||||
|
the [PyrogramBotBase](https://git.end-play.xyz/profitroll/PyrogramBotBase) repository.
|
@@ -1,5 +1,5 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["setuptools>=62.6", "wheel"]
|
requires = ["setuptools>=77.0.3", "wheel"]
|
||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
@@ -9,11 +9,11 @@ authors = [{ name = "Profitroll" }]
|
|||||||
description = "Universal bot library with functions needed for basic Discord/Telegram bot development."
|
description = "Universal bot library with functions needed for basic Discord/Telegram bot development."
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
license = { text = "GPLv3" }
|
license = "GPL-3.0"
|
||||||
|
license-files = ["LICENSE"]
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 3 - Alpha",
|
"Development Status :: 3 - Alpha",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
|
|
||||||
"Operating System :: OS Independent",
|
"Operating System :: OS Independent",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
"Programming Language :: Python :: 3.12",
|
"Programming Language :: Python :: 3.12",
|
||||||
@@ -31,6 +31,7 @@ dev = { file = "requirements/dev.txt" }
|
|||||||
pycord = { file = "requirements/pycord.txt" }
|
pycord = { file = "requirements/pycord.txt" }
|
||||||
pyrogram = { file = "requirements/pyrogram.txt" }
|
pyrogram = { file = "requirements/pyrogram.txt" }
|
||||||
speed = { file = "requirements/speed.txt" }
|
speed = { file = "requirements/speed.txt" }
|
||||||
|
cache = { file = "requirements/cache.txt" }
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Source = "https://git.end-play.xyz/profitroll/LibBotUniversal"
|
Source = "https://git.end-play.xyz/profitroll/LibBotUniversal"
|
||||||
|
@@ -1 +1,2 @@
|
|||||||
aiofiles>=23.0.0
|
aiofiles>=23.0.0
|
||||||
|
typing-extensions~=4.15.0
|
2
requirements/cache.txt
Normal file
2
requirements/cache.txt
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
pymemcache~=4.0.0
|
||||||
|
redis~=6.4.0
|
@@ -1,11 +1,12 @@
|
|||||||
black==24.10.0
|
black==25.1.0
|
||||||
build==1.2.2.post1
|
build==1.3.0
|
||||||
isort==5.13.2
|
isort==5.13.2
|
||||||
mypy==1.14.0
|
mypy==1.17.1
|
||||||
pylint==3.3.3
|
pylint==3.3.8
|
||||||
pytest-asyncio==0.25.0
|
pytest-asyncio==1.1.0
|
||||||
pytest-cov==6.0.0
|
pytest-cov==6.2.1
|
||||||
pytest==8.3.4
|
pytest==8.4.1
|
||||||
tox==4.23.2
|
tox==4.28.4
|
||||||
types-aiofiles==24.1.0.20241221
|
twine==6.1.0
|
||||||
types-ujson==5.10.0.20240515
|
types-aiofiles==24.1.0.20250822
|
||||||
|
types-ujson==5.10.0.20250822
|
@@ -1 +1 @@
|
|||||||
ujson~=5.10.0
|
ujson~=5.11.0
|
@@ -1,4 +1,4 @@
|
|||||||
__version__ = "4.0.0"
|
__version__ = "4.4.0"
|
||||||
__license__ = "GPL3"
|
__license__ = "GPL3"
|
||||||
__author__ = "Profitroll"
|
__author__ = "Profitroll"
|
||||||
|
|
||||||
|
2
src/libbot/cache/__init__.py
vendored
Normal file
2
src/libbot/cache/__init__.py
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# This file is left empty on purpose
|
||||||
|
# Adding imports here will cause import errors when libbot[pycord] is not installed
|
3
src/libbot/cache/classes/__init__.py
vendored
Normal file
3
src/libbot/cache/classes/__init__.py
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from .cache import Cache
|
||||||
|
from .cache_memcached import CacheMemcached
|
||||||
|
from .cache_redis import CacheRedis
|
44
src/libbot/cache/classes/cache.py
vendored
Normal file
44
src/libbot/cache/classes/cache.py
vendored
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
from abc import ABC, abstractmethod
|
||||||
|
from typing import Any, Dict, Optional
|
||||||
|
|
||||||
|
import pymemcache
|
||||||
|
import redis
|
||||||
|
|
||||||
|
|
||||||
|
class Cache(ABC):
|
||||||
|
client: pymemcache.Client | redis.Redis
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
@abstractmethod
|
||||||
|
def from_config(cls, engine_config: Dict[str, Any]) -> Any:
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_json(self, key: str) -> Any | None:
|
||||||
|
# TODO This method must also carry out ObjectId conversion!
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_string(self, key: str) -> str | None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_object(self, key: str) -> Any | None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
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, ttl_seconds: Optional[int] = None) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def delete(self, key: str) -> None:
|
||||||
|
pass
|
112
src/libbot/cache/classes/cache_memcached.py
vendored
Normal file
112
src/libbot/cache/classes/cache_memcached.py
vendored
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
import logging
|
||||||
|
from logging import Logger
|
||||||
|
from typing import Dict, Any, Optional
|
||||||
|
|
||||||
|
from pymemcache import Client
|
||||||
|
|
||||||
|
from .cache import Cache
|
||||||
|
from ..utils._objects import _json_to_string, _string_to_json
|
||||||
|
|
||||||
|
logger: Logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class CacheMemcached(Cache):
|
||||||
|
client: Client
|
||||||
|
|
||||||
|
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 0
|
||||||
|
|
||||||
|
logger.info("Initialized Memcached for caching")
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_config(cls, engine_config: Dict[str, Any], prefix: Optional[str] = None, default_ttl_seconds: Optional[int] = None) -> "CacheMemcached":
|
||||||
|
if "uri" not in engine_config:
|
||||||
|
raise KeyError(
|
||||||
|
"Cache configuration is invalid. Please check if all keys are set (engine: memcached)"
|
||||||
|
)
|
||||||
|
|
||||||
|
return cls(Client(engine_config["uri"], default_noreply=True), prefix=prefix, default_ttl_seconds=default_ttl_seconds)
|
||||||
|
|
||||||
|
def _get_prefixed_key(self, key: str) -> str:
|
||||||
|
return key if self.prefix is None else f"{self.prefix}_{key}"
|
||||||
|
|
||||||
|
def get_json(self, key: str) -> Any | None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result: Any | None = self.client.get(key, None)
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"Got json cache key '%s'%s",
|
||||||
|
key,
|
||||||
|
"" if result is not None else " (not found)",
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not get json cache key '%s' due to: %s", key, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
return None if result is None else _string_to_json(result)
|
||||||
|
|
||||||
|
def get_string(self, key: str) -> str | None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result: str | None = self.client.get(key, None)
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"Got string cache key '%s'%s",
|
||||||
|
key,
|
||||||
|
"" if result is not None else " (not found)",
|
||||||
|
)
|
||||||
|
|
||||||
|
return result
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not get string cache key '%s' due to: %s", key, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# TODO Implement binary deserialization
|
||||||
|
def get_object(self, key: str) -> Any | None:
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
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),
|
||||||
|
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)
|
||||||
|
return 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, 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)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# TODO Implement binary serialization
|
||||||
|
def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None:
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
def delete(self, key: str) -> None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.client.delete(key)
|
||||||
|
logger.debug("Deleted cache key '%s'", key)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not delete cache key '%s' due to: %s", key, exc)
|
110
src/libbot/cache/classes/cache_redis.py
vendored
Normal file
110
src/libbot/cache/classes/cache_redis.py
vendored
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import logging
|
||||||
|
from logging import Logger
|
||||||
|
from typing import Dict, Any, Optional
|
||||||
|
|
||||||
|
from redis import Redis
|
||||||
|
|
||||||
|
from .cache import Cache
|
||||||
|
from ..utils._objects import _json_to_string, _string_to_json
|
||||||
|
|
||||||
|
logger: Logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class CacheRedis(Cache):
|
||||||
|
client: Redis
|
||||||
|
|
||||||
|
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 | None = default_ttl_seconds
|
||||||
|
|
||||||
|
logger.info("Initialized Redis for caching")
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_config(cls, engine_config: Dict[str, Any], prefix: Optional[str] = None, default_ttl_seconds: Optional[int] = None) -> Any:
|
||||||
|
if "uri" not in engine_config:
|
||||||
|
raise KeyError(
|
||||||
|
"Cache configuration is invalid. Please check if all keys are set (engine: memcached)"
|
||||||
|
)
|
||||||
|
|
||||||
|
return cls(Redis.from_url(engine_config["uri"]), prefix=prefix, default_ttl_seconds=default_ttl_seconds)
|
||||||
|
|
||||||
|
def _get_prefixed_key(self, key: str) -> str:
|
||||||
|
return key if self.prefix is None else f"{self.prefix}_{key}"
|
||||||
|
|
||||||
|
def get_json(self, key: str) -> Any | None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result: Any | None = self.client.get(key)
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"Got json cache key '%s'%s",
|
||||||
|
key,
|
||||||
|
"" if result is not None else " (not found)",
|
||||||
|
)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not get json cache key '%s' due to: %s", key, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
return None if result is None else _string_to_json(result)
|
||||||
|
|
||||||
|
def get_string(self, key: str) -> str | None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
result: str | None = self.client.get(key)
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"Got string cache key '%s'%s",
|
||||||
|
key,
|
||||||
|
"" if result is not None else " (not found)",
|
||||||
|
)
|
||||||
|
|
||||||
|
return result
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not get string cache key '%s' due to: %s", key, exc)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# TODO Implement binary deserialization
|
||||||
|
def get_object(self, key: str) -> Any | None:
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
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),
|
||||||
|
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)
|
||||||
|
return 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, 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)
|
||||||
|
return None
|
||||||
|
|
||||||
|
# TODO Implement binary serialization
|
||||||
|
def set_object(self, key: str, value: Any, ttl_seconds: Optional[int] = None) -> None:
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
def delete(self, key: str) -> None:
|
||||||
|
key = self._get_prefixed_key(key)
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.client.delete(key)
|
||||||
|
logger.debug("Deleted cache key '%s'", key)
|
||||||
|
except Exception as exc:
|
||||||
|
logger.error("Could not delete cache key '%s' due to: %s", key, exc)
|
1
src/libbot/cache/manager/__init__.py
vendored
Normal file
1
src/libbot/cache/manager/__init__.py
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from .manager import create_cache_client
|
37
src/libbot/cache/manager/manager.py
vendored
Normal file
37
src/libbot/cache/manager/manager.py
vendored
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
from typing import Dict, Any, Literal, Optional
|
||||||
|
|
||||||
|
from ..classes import CacheMemcached, CacheRedis
|
||||||
|
|
||||||
|
|
||||||
|
def create_cache_client(
|
||||||
|
config: Dict[str, Any],
|
||||||
|
engine: Literal["memcached", "redis"] | None = None,
|
||||||
|
prefix: Optional[str] = None,
|
||||||
|
default_ttl_seconds: Optional[int] = None,
|
||||||
|
) -> CacheMemcached | CacheRedis:
|
||||||
|
"""Create a cache client of a provided type.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
config (Dict[str, Any]): Cache client configuration.
|
||||||
|
engine (Literal["memcached", "redis"] | None): Cache engine to use. Defaults to None.
|
||||||
|
prefix (:obj:`str`, optional): Prefix used for each key-value pair. Defaults to None (no prefix).
|
||||||
|
default_ttl_seconds (:obj:`int`, optional): Default TTL for values (in seconds). Defaults to None (does not expire).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
CacheMemcached | CacheRedis: Cache client.
|
||||||
|
"""
|
||||||
|
if engine not in ["memcached", "redis"] or engine is None:
|
||||||
|
raise KeyError(f"Incorrect cache engine provided. Expected 'memcached' or 'redis', got '{engine}'")
|
||||||
|
|
||||||
|
if "cache" not in config or engine not in config["cache"]:
|
||||||
|
raise KeyError(
|
||||||
|
f"Cache configuration is invalid. Please check if all keys are set (engine: '{engine}')"
|
||||||
|
)
|
||||||
|
|
||||||
|
match engine:
|
||||||
|
case "memcached":
|
||||||
|
return CacheMemcached.from_config(config["cache"][engine], prefix=prefix, default_ttl_seconds=default_ttl_seconds)
|
||||||
|
case "redis":
|
||||||
|
return CacheRedis.from_config(config["cache"][engine], prefix=prefix, default_ttl_seconds=default_ttl_seconds)
|
||||||
|
case _:
|
||||||
|
raise KeyError(f"Cache implementation for the engine '{engine}' is not present.")
|
0
src/libbot/cache/utils/__init__.py
vendored
Normal file
0
src/libbot/cache/utils/__init__.py
vendored
Normal file
42
src/libbot/cache/utils/_objects.py
vendored
Normal file
42
src/libbot/cache/utils/_objects.py
vendored
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
import logging
|
||||||
|
from copy import deepcopy
|
||||||
|
from logging import Logger
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
try:
|
||||||
|
from ujson import dumps, loads
|
||||||
|
except ImportError:
|
||||||
|
from json import dumps, loads
|
||||||
|
|
||||||
|
logger: Logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from bson import ObjectId
|
||||||
|
except ImportError:
|
||||||
|
logger.warning(
|
||||||
|
"Could not import bson.ObjectId. PyMongo conversions will not be supported by the cache. It's safe to ignore this message if you do not use MongoDB."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _json_to_string(json_object: Any) -> str:
|
||||||
|
json_object_copy: Any = deepcopy(json_object)
|
||||||
|
|
||||||
|
if isinstance(json_object_copy, dict) and "_id" in json_object_copy:
|
||||||
|
json_object_copy["_id"] = str(json_object_copy["_id"])
|
||||||
|
|
||||||
|
return dumps(json_object_copy, ensure_ascii=False, indent=0, escape_forward_slashes=False)
|
||||||
|
|
||||||
|
|
||||||
|
def _string_to_json(json_string: str) -> Any:
|
||||||
|
json_object: Any = loads(json_string)
|
||||||
|
|
||||||
|
if "_id" in json_object:
|
||||||
|
try:
|
||||||
|
json_object["_id"] = ObjectId(json_object["_id"])
|
||||||
|
except NameError:
|
||||||
|
logger.debug(
|
||||||
|
"Tried to convert attribute '_id' with value '%s' but bson.ObjectId is not present, skipping the conversion.",
|
||||||
|
json_object["_id"],
|
||||||
|
)
|
||||||
|
|
||||||
|
return json_object
|
@@ -18,16 +18,16 @@ def _(
|
|||||||
locale: str | None = "en",
|
locale: str | None = "en",
|
||||||
locales_root: str | Path = Path("locale"),
|
locales_root: str | Path = Path("locale"),
|
||||||
) -> Any:
|
) -> Any:
|
||||||
"""Get value of locale string
|
"""Get value of locale string.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locale (`str | None`): Locale to looked up in. Defaults to `"en"`.
|
locale (str | None): Locale to looked up in. Defaults to "en".
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to Path("locale").
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`
|
Any: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`.
|
||||||
"""
|
"""
|
||||||
if locale is None:
|
if locale is None:
|
||||||
locale: str = config_get("locale")
|
locale: str = config_get("locale")
|
||||||
@@ -58,16 +58,16 @@ async def _(
|
|||||||
locale: str | None = "en",
|
locale: str | None = "en",
|
||||||
locales_root: str | Path = Path("locale"),
|
locales_root: str | Path = Path("locale"),
|
||||||
) -> Any:
|
) -> Any:
|
||||||
"""Get value of locale string
|
"""Get value of locale string.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locale (`str | None`): Locale to looked up in. Defaults to `"en"`.
|
locale (str | None): Locale to looked up in. Defaults to "en".
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to Path("locale").
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`
|
Any: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`.
|
||||||
"""
|
"""
|
||||||
locale: str = config_get("locale") if locale is None else locale
|
locale: str = config_get("locale") if locale is None else locale
|
||||||
|
|
||||||
@@ -94,15 +94,15 @@ async def _(
|
|||||||
|
|
||||||
@asyncable
|
@asyncable
|
||||||
def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("locale")) -> List[Any]:
|
def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("locale")) -> List[Any]:
|
||||||
"""Get value of the provided key and path in all available locales
|
"""Get value of the provided key and path in all available locales.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to `Path("locale")`.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `List[Any]`: List of values in all locales
|
List[Any]: List of values in all locales.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
output: List[Any] = []
|
output: List[Any] = []
|
||||||
@@ -128,15 +128,15 @@ def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("locale
|
|||||||
|
|
||||||
@in_all_locales.asynchronous
|
@in_all_locales.asynchronous
|
||||||
async def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("locale")) -> List[Any]:
|
async def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("locale")) -> List[Any]:
|
||||||
"""Get value of the provided key and path in all available locales
|
"""Get value of the provided key and path in all available locales.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to Path("locale").
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `List[Any]`: List of values in all locales
|
List[Any]: List of values in all locales.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
output: List[Any] = []
|
output: List[Any] = []
|
||||||
@@ -164,15 +164,15 @@ async def in_all_locales(key: str, *args: str, locales_root: str | Path = Path("
|
|||||||
def in_every_locale(
|
def in_every_locale(
|
||||||
key: str, *args: str, locales_root: str | Path = Path("locale")
|
key: str, *args: str, locales_root: str | Path = Path("locale")
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""Get value of the provided key and path in every available locale with locale tag
|
"""Get value of the provided key and path in every available locale with locale tag.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to Path("locale").
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Dict[str, Any]`: Locale is a key, and it's value from locale file is a value
|
Dict[str, Any]: Locale is a key, and it's value from locale file is a value.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
output: Dict[str, Any] = {}
|
output: Dict[str, Any] = {}
|
||||||
@@ -200,15 +200,15 @@ def in_every_locale(
|
|||||||
async def in_every_locale(
|
async def in_every_locale(
|
||||||
key: str, *args: str, locales_root: str | Path = Path("locale")
|
key: str, *args: str, locales_root: str | Path = Path("locale")
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""Get value of the provided key and path in every available locale with locale tag
|
"""Get value of the provided key and path in every available locale with locale tag.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locales_root (`str | Path`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
|
locales_root (str | Path, optional): Folder where locales are located. Defaults to Path("locale").
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Dict[str, Any]`: Locale is a key, and it's value from locale file is a value
|
Dict[str, Any]: Locale is a key, and it's value from locale file is a value.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
output: Dict[str, Any] = {}
|
output: Dict[str, Any] = {}
|
||||||
|
@@ -14,6 +14,11 @@ class BotLocale:
|
|||||||
default_locale: str | None = "en",
|
default_locale: str | None = "en",
|
||||||
locales_root: str | Path = Path("locale"),
|
locales_root: str | Path = Path("locale"),
|
||||||
) -> None:
|
) -> None:
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
default_locale (str | None, optional): Default locale. Defaults to "en".
|
||||||
|
locales_root (str | Path, optional): Path to a directory with locale files. Defaults to Path("locale").
|
||||||
|
"""
|
||||||
if isinstance(locales_root, str):
|
if isinstance(locales_root, str):
|
||||||
locales_root = Path(locales_root)
|
locales_root = Path(locales_root)
|
||||||
elif not isinstance(locales_root, Path):
|
elif not isinstance(locales_root, Path):
|
||||||
@@ -30,15 +35,15 @@ class BotLocale:
|
|||||||
self.locales[locale] = json_read(Path(f"{locales_root}/{locale}.json"))
|
self.locales[locale] = json_read(Path(f"{locales_root}/{locale}.json"))
|
||||||
|
|
||||||
def _(self, key: str, *args: str, locale: str | None = None) -> Any:
|
def _(self, key: str, *args: str, locale: str | None = None) -> Any:
|
||||||
"""Get value of locale string
|
"""Get value of locale string.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
* locale (`str | None`, *optional*): Locale to looked up in. Defaults to config's `"locale"` value
|
locale (str | None, optional): Locale to looked up in. Defaults to config's `"locale"` value.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`
|
Any: Value of provided locale key. Is usually `str`, `Dict[str, Any]` or `List[Any]`.
|
||||||
"""
|
"""
|
||||||
if locale is None:
|
if locale is None:
|
||||||
locale: str = self.default
|
locale: str = self.default
|
||||||
@@ -64,14 +69,14 @@ class BotLocale:
|
|||||||
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
return f'⚠️ Locale in config is invalid: could not get "{key}" in {args} from locale "{locale}"'
|
||||||
|
|
||||||
def in_all_locales(self, key: str, *args: str) -> List[Any]:
|
def in_all_locales(self, key: str, *args: str) -> List[Any]:
|
||||||
"""Get value of the provided key and path in all available locales
|
"""Get value of the provided key and path in all available locales.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `List[Any]`: List of values in all locales
|
List[Any]: List of values in all locales.
|
||||||
"""
|
"""
|
||||||
output: List[Any] = []
|
output: List[Any] = []
|
||||||
|
|
||||||
@@ -94,14 +99,14 @@ class BotLocale:
|
|||||||
return output
|
return output
|
||||||
|
|
||||||
def in_every_locale(self, key: str, *args: str) -> Dict[str, Any]:
|
def in_every_locale(self, key: str, *args: str) -> Dict[str, Any]:
|
||||||
"""Get value of the provided key and path in every available locale with locale tag
|
"""Get value of the provided key and path in every available locale with locale tag.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): The last key of the locale's keys path.
|
key (str): The last key of the locale's keys path.
|
||||||
* *args (`str`): Path to key like: `dict[args][key]`.
|
*args (str): Path to key like: `dict[args][key]`.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Dict[str, Any]`: Locale is a key, and it's value from locale file is a value
|
Dict[str, Any]: Locale is a key, and it's value from locale file is a value.
|
||||||
"""
|
"""
|
||||||
output: Dict[str, Any] = {}
|
output: Dict[str, Any] = {}
|
||||||
|
|
||||||
|
@@ -0,0 +1,2 @@
|
|||||||
|
# This file is left empty on purpose
|
||||||
|
# Adding imports here will cause import errors when libbot[pycord] is not installed
|
||||||
|
@@ -1,9 +1,13 @@
|
|||||||
import logging
|
import logging
|
||||||
|
from logging import Logger
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
|
|
||||||
from typing_extensions import override
|
from typing_extensions import override
|
||||||
|
|
||||||
|
from ...i18n.classes import BotLocale
|
||||||
|
from ...utils import json_read
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||||
from apscheduler.schedulers.background import BackgroundScheduler
|
from apscheduler.schedulers.background import BackgroundScheduler
|
||||||
@@ -11,14 +15,7 @@ try:
|
|||||||
except ImportError as exc:
|
except ImportError as exc:
|
||||||
raise ImportError("You need to install libbot[pycord] in order to use this class.") from exc
|
raise ImportError("You need to install libbot[pycord] in order to use this class.") from exc
|
||||||
|
|
||||||
try:
|
logger: Logger = logging.getLogger(__name__)
|
||||||
from ujson import loads
|
|
||||||
except ImportError:
|
|
||||||
from json import loads
|
|
||||||
|
|
||||||
from ...i18n.classes import BotLocale
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class PycordBot(Bot):
|
class PycordBot(Bot):
|
||||||
@@ -32,11 +29,7 @@ class PycordBot(Bot):
|
|||||||
scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
|
scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
):
|
):
|
||||||
if config is None:
|
self.config: Dict[str, Any] = config if config is not None else json_read(config_path)
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
self.config: dict = loads(f.read())
|
|
||||||
else:
|
|
||||||
self.config = config
|
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
debug_guilds=(self.config["bot"]["debug_guilds"] if self.config["debug"] else None),
|
debug_guilds=(self.config["bot"]["debug_guilds"] if self.config["debug"] else None),
|
||||||
|
1
src/libbot/pycord/utils/__init__.py
Normal file
1
src/libbot/pycord/utils/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from .color import color_from_hex, hex_from_color
|
35
src/libbot/pycord/utils/color.py
Normal file
35
src/libbot/pycord/utils/color.py
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
from discord import Colour
|
||||||
|
|
||||||
|
|
||||||
|
def _int_from_hex(hex_string: str) -> int:
|
||||||
|
try:
|
||||||
|
return int(hex_string, base=16)
|
||||||
|
except Exception as exc:
|
||||||
|
raise ValueError("Input string must be a valid HEX code.") from exc
|
||||||
|
|
||||||
|
|
||||||
|
def _hex_from_int(color_int: int) -> str:
|
||||||
|
if not 0 <= color_int <= 0xFFFFFF:
|
||||||
|
raise ValueError("Color's value must be in the range 0 to 0xFFFFFF.")
|
||||||
|
|
||||||
|
return f"#{color_int:06x}"
|
||||||
|
|
||||||
|
|
||||||
|
def color_from_hex(hex_string: str) -> Colour:
|
||||||
|
"""Convert valid hexadecimal string to discord.Colour.
|
||||||
|
|
||||||
|
:param hex_string: Hexadecimal string to convert into Colour object
|
||||||
|
:type hex_string: str
|
||||||
|
:return: Colour object
|
||||||
|
"""
|
||||||
|
return Colour(_int_from_hex(hex_string))
|
||||||
|
|
||||||
|
|
||||||
|
def hex_from_color(color: Colour) -> str:
|
||||||
|
"""Convert discord.Colour to hexadecimal string.
|
||||||
|
|
||||||
|
:param color: Colour object to convert into the string
|
||||||
|
:type color: Colour
|
||||||
|
:return: Hexadecimal string in #XXXXXX format
|
||||||
|
"""
|
||||||
|
return _hex_from_int(color.value)
|
@@ -0,0 +1,2 @@
|
|||||||
|
# This file is left empty on purpose
|
||||||
|
# Adding imports here will cause import errors when libbot[pyrogram] is not installed
|
||||||
|
@@ -2,6 +2,7 @@ import asyncio
|
|||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
from logging import Logger
|
||||||
from os import cpu_count, getpid
|
from os import cpu_count, getpid
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from time import time
|
from time import time
|
||||||
@@ -9,6 +10,12 @@ from typing import Any, Dict, List
|
|||||||
|
|
||||||
from typing_extensions import override
|
from typing_extensions import override
|
||||||
|
|
||||||
|
from .command import PyroCommand
|
||||||
|
from .commandset import CommandSet
|
||||||
|
from ...i18n import _
|
||||||
|
from ...i18n.classes import BotLocale
|
||||||
|
from ...utils import json_read
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import pyrogram
|
import pyrogram
|
||||||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||||||
@@ -35,12 +42,7 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
from json import dumps, loads
|
from json import dumps, loads
|
||||||
|
|
||||||
from ...i18n.classes import BotLocale
|
logger: Logger = logging.getLogger(__name__)
|
||||||
from ...i18n import _
|
|
||||||
from .command import PyroCommand
|
|
||||||
from .commandset import CommandSet
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class PyroClient(Client):
|
class PyroClient(Client):
|
||||||
@@ -66,11 +68,7 @@ class PyroClient(Client):
|
|||||||
scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
|
scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
):
|
):
|
||||||
if config is None:
|
self.config: Dict[str, Any] = config if config is not None else json_read(config_path)
|
||||||
with open(config_path, "r", encoding="utf-8") as f:
|
|
||||||
self.config: dict = loads(f.read())
|
|
||||||
else:
|
|
||||||
self.config = config
|
|
||||||
|
|
||||||
super().__init__(
|
super().__init__(
|
||||||
name=name,
|
name=name,
|
||||||
|
@@ -15,34 +15,24 @@ DEFAULT_CONFIG_LOCATION: str = "config.json"
|
|||||||
|
|
||||||
@asyncable
|
@asyncable
|
||||||
def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> Any:
|
def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> Any:
|
||||||
"""Get a value of the config key by its path provided
|
"""Get a value of the config key by its path provided.
|
||||||
For example, `foo.bar.key` has a path of `"foo", "bar"` and the key `"key"`
|
For example, `foo.bar.key` has a path of `"foo", "bar"` and the key `"key"`.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key that contains the value
|
key (str): Key that contains the value
|
||||||
* *path (`str`): Path to the key that contains the value
|
*path (str): Path to the key that contains the value (pass *[] or don't pass anything at all to get on the top/root level)
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: Key's value
|
Any: Key's value
|
||||||
|
|
||||||
### Example:
|
Example:
|
||||||
Get the "salary" of "Pete" from this JSON structure:
|
Get the "salary" of "Pete" from this JSON structure: `{"users": {"Pete": {"salary": 10.0}}}`
|
||||||
```json
|
|
||||||
{
|
|
||||||
"users": {
|
|
||||||
"Pete": {
|
|
||||||
"salary": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
This can be easily done with the following code:
|
This can be easily done with the following code:
|
||||||
```python
|
|
||||||
import libbot
|
>>> import libbot
|
||||||
salary = libbot.sync.config_get("salary", "users", "Pete")
|
salary: float = libbot.sync.config_get("salary", "users", "Pete")
|
||||||
```
|
|
||||||
"""
|
"""
|
||||||
this_key: Dict[str, Any] = json_read(config_file)
|
this_key: Dict[str, Any] = json_read(config_file)
|
||||||
|
|
||||||
@@ -54,34 +44,24 @@ def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CONFIG_LO
|
|||||||
|
|
||||||
@config_get.asynchronous
|
@config_get.asynchronous
|
||||||
async def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> Any:
|
async def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> Any:
|
||||||
"""Get a value of the config key by its path provided
|
"""Get a value of the config key by its path provided.
|
||||||
For example, `foo.bar.key` has a path of `"foo", "bar"` and the key `"key"`
|
For example, `foo.bar.key` has a path of `"foo", "bar"` and the key `"key"`.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key that contains the value
|
key (str): Key that contains the value
|
||||||
* *path (`str`): Path to the key that contains the value
|
*path (str): Path to the key that contains the value (pass *[] or don't pass anything at all to get on the top/root level)
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: Key's value
|
Any: Key's value
|
||||||
|
|
||||||
### Example:
|
Example:
|
||||||
Get the "salary" of "Pete" from this JSON structure:
|
Get the "salary" of "Pete" from this JSON structure: `{"users": {"Pete": {"salary": 10.0}}}`
|
||||||
```json
|
|
||||||
{
|
|
||||||
"users": {
|
|
||||||
"Pete": {
|
|
||||||
"salary": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
This can be easily done with the following code:
|
This can be easily done with the following code:
|
||||||
```python
|
|
||||||
import libbot
|
>>> import libbot
|
||||||
salary = await libbot.config_get("salary", "users", "Pete")
|
salary: float = libbot.sync.config_get("salary", "users", "Pete")
|
||||||
```
|
|
||||||
"""
|
"""
|
||||||
this_key: Dict[str, Any] = await json_read(config_file)
|
this_key: Dict[str, Any] = await json_read(config_file)
|
||||||
|
|
||||||
@@ -93,16 +73,16 @@ async def config_get(key: str, *path: str, config_file: str | Path = DEFAULT_CON
|
|||||||
|
|
||||||
@asyncable
|
@asyncable
|
||||||
def config_set(key: str, value: Any, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> None:
|
def config_set(key: str, value: Any, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION) -> None:
|
||||||
"""Set config's key by its path to the value
|
"""Set config's key by its path to the value.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key that leads to the value
|
key (str): Key that leads to the value.
|
||||||
* value (`Any`): Any JSON serializable data
|
value (Any): Any JSON-serializable data.
|
||||||
* *path (`str`): Path to the key of the target
|
*path (str): Path to the key of the target (pass *[] or don't pass anything at all to set on the top/root level).
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to "config.json".
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided
|
KeyError: Key was not found under the provided path.
|
||||||
"""
|
"""
|
||||||
json_write(nested_set(json_read(config_file), value, *(*path, key)), config_file)
|
json_write(nested_set(json_read(config_file), value, *(*path, key)), config_file)
|
||||||
|
|
||||||
@@ -111,16 +91,16 @@ def config_set(key: str, value: Any, *path: str, config_file: str | Path = DEFAU
|
|||||||
async def config_set(
|
async def config_set(
|
||||||
key: str, value: Any, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION
|
key: str, value: Any, *path: str, config_file: str | Path = DEFAULT_CONFIG_LOCATION
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Set config's key by its path to the value
|
"""Set config's key by its path to the value.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key that leads to the value
|
key (str): Key that leads to the value.
|
||||||
* value (`Any`): Any JSON serializable data
|
value (Any): Any JSON-serializable data.
|
||||||
* *path (`str`): Path to the key of the target
|
*path (str): Path to the key of the target (pass *[] or don't pass anything at all to set on the top/root level).
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to "config.json".
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided
|
KeyError: Key was not found under the provided path.
|
||||||
"""
|
"""
|
||||||
await json_write(nested_set(await json_read(config_file), value, *(*path, key)), config_file)
|
await json_write(nested_set(await json_read(config_file), value, *(*path, key)), config_file)
|
||||||
|
|
||||||
@@ -132,16 +112,16 @@ def config_delete(
|
|||||||
missing_ok: bool = False,
|
missing_ok: bool = False,
|
||||||
config_file: str | Path = DEFAULT_CONFIG_LOCATION,
|
config_file: str | Path = DEFAULT_CONFIG_LOCATION,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Set config's key by its path
|
"""Delete config's key by its path.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key to delete
|
key (str): Key to delete.
|
||||||
* *path (`str`): Path to the key of the target
|
*path (str): Path to the key of the target (pass *[] or don't pass anything at all to delete on the top/root level)
|
||||||
* missing_ok (`bool`): Do not raise an exception if the key is missing. Defaults to `False`
|
missing_ok (bool): Do not raise an exception if the key is missing. Defaults to False.
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to "config.json".
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided and `missing_ok` is `False`
|
KeyError: Key is not found under path provided and `missing_ok` is False.
|
||||||
"""
|
"""
|
||||||
config_data: Dict[str, Any] = json_read(config_file)
|
config_data: Dict[str, Any] = json_read(config_file)
|
||||||
|
|
||||||
@@ -161,16 +141,16 @@ async def config_delete(
|
|||||||
missing_ok: bool = False,
|
missing_ok: bool = False,
|
||||||
config_file: str | Path = DEFAULT_CONFIG_LOCATION,
|
config_file: str | Path = DEFAULT_CONFIG_LOCATION,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Set config's key by its path
|
"""Delete config's key by its path.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* key (`str`): Key to delete
|
key (str): Key to delete.
|
||||||
* *path (`str`): Path to the key of the target
|
*path (str): Path to the key of the target (pass *[] or don't pass anything at all to delete on the top/root level)
|
||||||
* missing_ok (`bool`): Do not raise an exception if the key is missing. Defaults to `False`
|
missing_ok (bool): Do not raise an exception if the key is missing. Defaults to False.
|
||||||
* config_file (`str | Path`, *optional*): Path-like object or path as a string of a location of the config file. Defaults to `"config.json"`
|
config_file (str | Path, optional): Path-like object or path as a string of a location of the config file. Defaults to "config.json".
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided and `missing_ok` is `False`
|
KeyError: Key is not found under path provided and `missing_ok` is False.
|
||||||
"""
|
"""
|
||||||
config_data: Dict[str, Any] = await json_read(config_file)
|
config_data: Dict[str, Any] = await json_read(config_file)
|
||||||
|
|
||||||
|
@@ -14,13 +14,13 @@ except ImportError:
|
|||||||
|
|
||||||
@asyncable
|
@asyncable
|
||||||
def json_read(path: str | Path) -> Any:
|
def json_read(path: str | Path) -> Any:
|
||||||
"""Read contents of a JSON file
|
"""Read contents of a JSON file and return it.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* path (`str | Path`): Path-like object or path as a string
|
path (str | Path): Path-like object or path to the file as a string.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: File contents
|
Any: File contents.
|
||||||
"""
|
"""
|
||||||
with open(str(path), mode="r", encoding="utf-8") as f:
|
with open(str(path), mode="r", encoding="utf-8") as f:
|
||||||
data = f.read()
|
data = f.read()
|
||||||
@@ -30,13 +30,13 @@ def json_read(path: str | Path) -> Any:
|
|||||||
|
|
||||||
@json_read.asynchronous
|
@json_read.asynchronous
|
||||||
async def json_read(path: str | Path) -> Any:
|
async def json_read(path: str | Path) -> Any:
|
||||||
"""Read contents of a JSON file
|
"""Read contents of a JSON file and return it.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* path (`str | Path`): Path-like object or path as a string
|
path (str | Path): Path-like object or path to the file as a string.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Any`: File contents
|
Any: File contents.
|
||||||
"""
|
"""
|
||||||
async with aiofiles.open(str(path), mode="r", encoding="utf-8") as f:
|
async with aiofiles.open(str(path), mode="r", encoding="utf-8") as f:
|
||||||
data = await f.read()
|
data = await f.read()
|
||||||
@@ -46,11 +46,11 @@ async def json_read(path: str | Path) -> Any:
|
|||||||
|
|
||||||
@asyncable
|
@asyncable
|
||||||
def json_write(data: Any, path: str | Path) -> None:
|
def json_write(data: Any, path: str | Path) -> None:
|
||||||
"""Write contents to a JSON file
|
"""Write contents to a JSON file.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* data (`Any`): Contents to write. Must be a JSON serializable
|
data (Any): Contents to write. Must be a JSON-serializable object.
|
||||||
* path (`str | Path`): Path-like object or path as a string of a destination
|
path (str | Path): Path-like object or path to the file as a string.
|
||||||
"""
|
"""
|
||||||
with open(str(path), mode="w", encoding="utf-8") as f:
|
with open(str(path), mode="w", encoding="utf-8") as f:
|
||||||
f.write(
|
f.write(
|
||||||
@@ -62,11 +62,11 @@ def json_write(data: Any, path: str | Path) -> None:
|
|||||||
|
|
||||||
@json_write.asynchronous
|
@json_write.asynchronous
|
||||||
async def json_write(data: Any, path: str | Path) -> None:
|
async def json_write(data: Any, path: str | Path) -> None:
|
||||||
"""Write contents to a JSON file
|
"""Write contents to a JSON file.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* data (`Any`): Contents to write. Must be a JSON serializable
|
data (Any): Contents to write. Must be a JSON-serializable object.
|
||||||
* path (`str | Path`): Path-like object or path as a string of a destination
|
path (str | Path): Path-like object or path to the file as a string.
|
||||||
"""
|
"""
|
||||||
async with aiofiles.open(str(path), mode="w", encoding="utf-8") as f:
|
async with aiofiles.open(str(path), mode="w", encoding="utf-8") as f:
|
||||||
await f.write(
|
await f.write(
|
||||||
|
@@ -3,15 +3,15 @@ from typing import Any, Dict
|
|||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
|
|
||||||
def supports_argument(func: Callable, arg_name: str) -> bool:
|
def supports_argument(func: Callable[..., Any], arg_name: str) -> bool:
|
||||||
"""Check whether a function has a specific argument
|
"""Check whether a function has a specific argument.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* func (`Callable`): Function to be inspected
|
func (Callable[..., Any]): Function to be inspected.
|
||||||
* arg_name (`str`): Argument to be checked
|
arg_name (str): Argument to be checked.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `bool`: `True` if argument is supported and `False` if not
|
bool: True if argument is supported and False if not.
|
||||||
"""
|
"""
|
||||||
if hasattr(func, "__code__"):
|
if hasattr(func, "__code__"):
|
||||||
return arg_name in inspect.signature(func).parameters
|
return arg_name in inspect.signature(func).parameters
|
||||||
@@ -24,61 +24,63 @@ def supports_argument(func: Callable, arg_name: str) -> bool:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def nested_set(target: dict, value: Any, *path: str, create_missing=True) -> Dict[str, Any]:
|
def nested_set(
|
||||||
|
target: Dict[str, Any], value: Any, *path: str, create_missing: bool = True
|
||||||
|
) -> Dict[str, Any]:
|
||||||
"""Set the key by its path to the value
|
"""Set the key by its path to the value
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* target (`dict`): Dictionary to perform modifications on
|
target (Dict[str, Any]): Dictionary to perform the modification on.
|
||||||
* value (`Any`): Any data
|
value (Any): New value.
|
||||||
* *path (`str`): Path to the key of the target
|
*path (str): Path to the key.
|
||||||
* create_missing (`bool`, *optional*): Create keys on the way if they're missing. Defaults to `True`
|
create_missing (:obj:`bool`, optional): Create keys on the way if they're missing. Defaults to True.
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided
|
KeyError: Key is not found under the provided path.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
* `Dict[str, Any]`: Changed dictionary
|
Dict[str, Any]: Modified dictionary.
|
||||||
"""
|
"""
|
||||||
d = target
|
target_copy: Dict[str, Any] = target
|
||||||
|
|
||||||
for key in path[:-1]:
|
for key in path[:-1]:
|
||||||
if key in d:
|
if key in target_copy:
|
||||||
d = d[key]
|
target_copy = target_copy[key]
|
||||||
elif create_missing:
|
elif create_missing:
|
||||||
d = d.setdefault(key, {})
|
target_copy = target_copy.setdefault(key, {})
|
||||||
else:
|
else:
|
||||||
raise KeyError(
|
raise KeyError(
|
||||||
f"Key '{key}' is not found under path provided ({path}) and create_missing is False"
|
f"Key '{key}' is not found under path provided ({path}) and create_missing is False"
|
||||||
)
|
)
|
||||||
|
|
||||||
if path[-1] in d or create_missing:
|
if path[-1] in target_copy or create_missing:
|
||||||
d[path[-1]] = value
|
target_copy[path[-1]] = value
|
||||||
|
|
||||||
return target
|
return target
|
||||||
|
|
||||||
|
|
||||||
def nested_delete(target: dict, *path: str) -> Dict[str, Any]:
|
def nested_delete(target: Dict[str, Any], *path: str) -> Dict[str, Any]:
|
||||||
"""Delete the key by its path
|
"""Delete the key by its path.
|
||||||
|
|
||||||
### Args:
|
Args:
|
||||||
* target (`dict`): Dictionary to perform modifications on
|
target (Dict[str, Any]): Dictionary to perform the modification on.
|
||||||
|
|
||||||
### Raises:
|
Raises:
|
||||||
* `KeyError`: Key is not found under path provided
|
KeyError: Key is not found under the provided path.
|
||||||
|
|
||||||
### Returns:
|
Returns:
|
||||||
`Dict[str, Any]`: Changed dictionary
|
Dict[str, Any]: Modified dictionary.
|
||||||
"""
|
"""
|
||||||
d = target
|
target_copy: Dict[str, Any] = target
|
||||||
|
|
||||||
for key in path[:-1]:
|
for key in path[:-1]:
|
||||||
if key in d:
|
if key in target_copy:
|
||||||
d = d[key]
|
target_copy = target_copy[key]
|
||||||
else:
|
else:
|
||||||
raise KeyError(f"Key '{key}' is not found under path provided ({path})")
|
raise KeyError(f"Key '{key}' is not found under path provided ({path})")
|
||||||
|
|
||||||
if path[-1] in d:
|
if path[-1] in target_copy:
|
||||||
del d[path[-1]]
|
del target_copy[path[-1]]
|
||||||
else:
|
else:
|
||||||
raise KeyError(f"Key '{path[-1]}' is not found under path provided ({path})")
|
raise KeyError(f"Key '{path[-1]}' is not found under path provided ({path})")
|
||||||
|
|
||||||
|
@@ -2,5 +2,14 @@
|
|||||||
"locale": "en",
|
"locale": "en",
|
||||||
"bot": {
|
"bot": {
|
||||||
"bot_token": "sample_token"
|
"bot_token": "sample_token"
|
||||||
|
},
|
||||||
|
"cache": {
|
||||||
|
"type": "memcached",
|
||||||
|
"memcached": {
|
||||||
|
"uri": "127.0.0.1:11211"
|
||||||
|
},
|
||||||
|
"redis": {
|
||||||
|
"uri": "redis://127.0.0.1:6379/0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
28
tests/test_cache.py
Normal file
28
tests/test_cache.py
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from libbot.cache.classes import Cache
|
||||||
|
from libbot.cache.manager import create_cache_client
|
||||||
|
|
||||||
|
try:
|
||||||
|
from ujson import JSONDecodeError, dumps, loads
|
||||||
|
except ImportError:
|
||||||
|
from json import JSONDecodeError, dumps, loads
|
||||||
|
|
||||||
|
from typing import Any, Dict
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"engine",
|
||||||
|
[
|
||||||
|
"memcached",
|
||||||
|
"redis",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_cache_creation(engine: str, location_config: Path):
|
||||||
|
with open(location_config, "r", encoding="utf-8") as file:
|
||||||
|
config: Dict[str, Any] = loads(file.read())
|
||||||
|
|
||||||
|
cache: Cache = create_cache_client(config, engine)
|
||||||
|
assert isinstance(cache, Cache)
|
1
tox.ini
1
tox.ini
@@ -18,5 +18,6 @@ deps =
|
|||||||
-r{toxinidir}/requirements/pycord.txt
|
-r{toxinidir}/requirements/pycord.txt
|
||||||
-r{toxinidir}/requirements/pyrogram.txt
|
-r{toxinidir}/requirements/pyrogram.txt
|
||||||
-r{toxinidir}/requirements/speed.txt
|
-r{toxinidir}/requirements/speed.txt
|
||||||
|
-r{toxinidir}/requirements/cache.txt
|
||||||
commands =
|
commands =
|
||||||
pytest --basetemp={envtmpdir} --cov=libbot
|
pytest --basetemp={envtmpdir} --cov=libbot
|
Reference in New Issue
Block a user