Fixed imports

libbot/__init__.py

@@ -1,5 +1,5 @@
 __name__ = "libbot"
-__version__ = "1.7"
+__version__ = "1.9"
 __license__ = "GPL3"
 __author__ = "Profitroll"
 

libbot/__main__.py

@@ -35,6 +35,8 @@ async def json_write(data: Any, path: Union[str, Path]) -> None:
     async with aiofiles.open(str(path), mode="w", encoding="utf-8") as f:
         await f.write(
             dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
+            if hasattr(dumps, "escape_forward_slashes")
+            else dumps(data, ensure_ascii=False, indent=4)
         )
 
 

libbot/i18n/__init__.py

@@ -9,7 +9,7 @@ from libbot.i18n.classes.bot_locale import BotLocale
 async def _(
     key: str,
     *args: str,
-    locale: str = sync.config_get("locale"),
+    locale: str = "en",
     locales_root: Union[str, Path] = Path("locale"),
 ) -> Any:
     """Get value of locale string
@@ -17,7 +17,7 @@ async def _(
     ### Args:
         * key (`str`): The last key of the locale's keys path.
         * *args (`list`): Path to key like: `dict[args][key]`.
-        * locale (`str`): Locale to looked up in. Defaults to config's `"locale"` value.
+        * locale (`str`): Locale to looked up in. Defaults to `"en"`.
         * locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
 
     ### Returns:

libbot/i18n/sync/__init__.py

@@ -9,7 +9,7 @@ from libbot.sync import config_get, json_read
 def _(
     key: str,
     *args: str,
-    locale: str = sync.config_get("locale"),
+    locale: str = "en",
     locales_root: Union[str, Path] = Path("locale"),
 ) -> Any:
     """Get value of locale string
@@ -17,7 +17,7 @@ def _(
     ### Args:
         * key (`str`): The last key of the locale's keys path.
         * *args (`list`): Path to key like: `dict[args][key]`.
-        * locale (`str`): Locale to looked up in. Defaults to config's `"locale"` value.
+        * locale (`str`): Locale to looked up in. Defaults to `"en"`.
         * locales_root (`Union[str, Path]`, *optional*): Folder where locales are located. Defaults to `Path("locale")`.
 
     ### Returns:

libbot/pyrogram/classes/client.py

@@ -59,6 +59,7 @@ class PyroClient(Client):
         max_concurrent_transmissions: int = 1,
         commands_source: Union[Dict[str, dict], None] = None,
         scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None,
+        **kwargs,
     ):
         if config is None:
             with open(config_path, "r", encoding="utf-8") as f:
@@ -90,6 +91,7 @@ class PyroClient(Client):
             ]
             if "max_concurrent_transmissions" in self.config["bot"]
             else max_concurrent_transmissions,
+            **kwargs,
         )
         self.owner: int = self.config["bot"]["owner"]
         self.commands: List[PyroCommand] = []
@@ -128,7 +130,9 @@ class PyroClient(Client):
 
         try:
             await self.send_message(
-                chat_id=self.config["reports"]["chat_id"],
+                chat_id=self.owner
+                if self.config["reports"]["chat_id"] == "owner"
+                else self.config["reports"]["chat_id"],
                 text=f"Bot started PID `{getpid()}`",
             )
 
@@ -150,7 +154,9 @@ class PyroClient(Client):
     async def stop(self, exit_completely: bool = True):
         try:
             await self.send_message(
-                chat_id=self.config["reports"]["chat_id"],
+                chat_id=self.owner
+                if self.config["reports"]["chat_id"] == "owner"
+                else self.config["reports"]["chat_id"],
                 text=f"Bot stopped with PID `{getpid()}`",
             )
             await asyncio.sleep(0.5)

libbot/sync/__init__.py

@@ -29,7 +29,11 @@ def json_write(data: Any, path: Union[str, Path]) -> None:
         * path (`Union[str, Path]`): Path-like object or path as a string of a destination
     """
     with open(str(path), mode="w", encoding="utf-8") as f:
-        f.write(dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4))
+        f.write(
+            dumps(data, ensure_ascii=False, escape_forward_slashes=False, indent=4)
+            if hasattr(dumps, "escape_forward_slashes")
+            else dumps(data, ensure_ascii=False, indent=4)
+        )
 
 
 def nested_set(target: dict, value: Any, *path: str, create_missing=True) -> dict:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "libbot"
-version = "1.7"
+version = "1.9"
 authors = [{ name = "Profitroll" }]
 description = "Universal bot library with functions needed for basic Discord/Telegram bot development."
 readme = "README.md"
@@ -52,3 +52,9 @@ target-version = ['py38', 'py39', 'py310', 'py311']
 
 [tool.isort]
 profile = "black"
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+python_files = ["test_*.py"]
+pythonpath = "."
+testpaths = ["tests"]

tests/config.json

@@ -0,0 +1,6 @@
+{
+    "locale": "en",
+    "bot": {
+        "bot_token": "sample_token"
+    }
+}

tests/data/empty.json

@@ -0,0 +1 @@
+{}

tests/data/invalid.json

@@ -0,0 +1,3 @@
+{
+    "foo": 'bar'
+}

tests/data/test.json

@@ -0,0 +1,15 @@
+{
+    "foo": "bar",
+    "abcdefg": [
+        "higklmnop",
+        {
+            "lol": {
+                "kek": [
+                    1.0000035,
+                    0.2542,
+                    1337
+                ]
+            }
+        }
+    ]
+}

tests/test_config_async.py

@@ -0,0 +1,49 @@
+from pathlib import Path
+from typing import Any, List
+
+import pytest
+
+from libbot import config_get, config_set
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (["locale"], "en"),
+        (["bot_token", "bot"], "sample_token"),
+    ],
+)
+async def test_config_get_valid(args: List[str], expected: str):
+    assert (
+        await config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
+        == expected
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (["bot_stonks", "bot"], pytest.raises(KeyError)),
+    ],
+)
+async def test_config_get_invalid(args: List[str], expected: Any):
+    with expected:
+        assert (
+            await config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
+            == expected
+        )
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "key, path, value",
+    [
+        ("locale", [], "en"),
+        ("bot_token", ["bot"], "sample_token"),
+    ],
+)
+async def test_config_set(key: str, path: List[str], value: Any):
+    await config_set(key, value, *path, config_file=Path("tests/config.json"))
+    assert await config_get(key, *path, config_file=Path("tests/config.json")) == value

tests/test_config_sync.py

@@ -0,0 +1,46 @@
+from pathlib import Path
+from typing import Any, List
+
+import pytest
+
+from libbot import sync
+
+
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (["locale"], "en"),
+        (["bot_token", "bot"], "sample_token"),
+    ],
+)
+def test_config_get_valid(args: List[str], expected: str):
+    assert (
+        sync.config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
+        == expected
+    )
+
+
+@pytest.mark.parametrize(
+    "args, expected",
+    [
+        (["bot_stonks", "bot"], pytest.raises(KeyError)),
+    ],
+)
+def test_config_get_invalid(args: List[str], expected: Any):
+    with expected:
+        assert (
+            sync.config_get(args[0], *args[1:], config_file=Path("tests/config.json"))
+            == expected
+        )
+
+
+@pytest.mark.parametrize(
+    "key, path, value",
+    [
+        ("locale", [], "en"),
+        ("bot_token", ["bot"], "sample_token"),
+    ],
+)
+def test_config_set(key: str, path: List[str], value: Any):
+    sync.config_set(key, value, *path, config_file=Path("tests/config.json"))
+    assert sync.config_get(key, *path, config_file=Path("tests/config.json")) == value

tests/test_json_async.py

@@ -0,0 +1,64 @@
+try:
+    from ujson import JSONDecodeError, dumps
+except ImportError:
+    from json import dumps, JSONDecodeError
+
+from pathlib import Path
+from typing import Any, Union
+
+import pytest
+
+from libbot import json_read, json_write
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        (
+            "tests/data/test.json",
+            {
+                "foo": "bar",
+                "abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
+            },
+        ),
+        ("tests/data/empty.json", {}),
+    ],
+)
+async def test_json_read_valid(path: Union[str, Path], expected: Any):
+    assert await json_read(path) == expected
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        ("tests/data/invalid.json", JSONDecodeError),
+        ("tests/data/nonexistent.json", FileNotFoundError),
+    ],
+)
+async def test_json_read_invalid(path: Union[str, Path], expected: Any):
+    with pytest.raises(expected):
+        await json_read(path)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "data, path",
+    [
+        (
+            {
+                "foo": "bar",
+                "abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
+            },
+            "tests/data/test.json",
+        ),
+        ({}, "tests/data/empty.json"),
+    ],
+)
+async def test_json_write(data: Any, path: Union[str, Path]):
+    await json_write(data, path)
+
+    assert Path(path).is_file()
+    with open(path, "r", encoding="utf-8") as f:
+        assert f.read() == dumps(data, ensure_ascii=False, indent=4)

tests/test_json_sync.py

@@ -0,0 +1,61 @@
+try:
+    from ujson import JSONDecodeError, dumps
+except ImportError:
+    from json import dumps, JSONDecodeError
+
+from pathlib import Path
+from typing import Any, Union
+
+import pytest
+
+from libbot import sync
+
+
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        (
+            "tests/data/test.json",
+            {
+                "foo": "bar",
+                "abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
+            },
+        ),
+        ("tests/data/empty.json", {}),
+    ],
+)
+def test_json_read_valid(path: Union[str, Path], expected: Any):
+    assert sync.json_read(path) == expected
+
+
+@pytest.mark.parametrize(
+    "path, expected",
+    [
+        ("tests/data/invalid.json", JSONDecodeError),
+        ("tests/data/nonexistent.json", FileNotFoundError),
+    ],
+)
+def test_json_read_invalid(path: Union[str, Path], expected: Any):
+    with pytest.raises(expected):
+        assert sync.json_read(path) == expected
+
+
+@pytest.mark.parametrize(
+    "data, path",
+    [
+        (
+            {
+                "foo": "bar",
+                "abcdefg": ["higklmnop", {"lol": {"kek": [1.0000035, 0.2542, 1337]}}],
+            },
+            "tests/data/test.json",
+        ),
+        ({}, "tests/data/empty.json"),
+    ],
+)
+def test_json_write(data: Any, path: Union[str, Path]):
+    sync.json_write(data, path)
+
+    assert Path(path).is_file()
+    with open(path, "r", encoding="utf-8") as f:
+        assert f.read() == dumps(data, ensure_ascii=False, indent=4)