author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
718,838 |
22.12.2020 14:28:32
| -10,800 |
23e7d44d252a402a916e6d82d74c4130bce2947c
|
fix token type for bot
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -2,7 +2,7 @@ from asyncio import AbstractEventLoop, get_event_loop\nfrom typing import Optional, NoReturn\nfrom typing import Union\n-from vkbottle.api import ABCAPI, API\n+from vkbottle.api import ABCAPI, API, Token\nfrom vkbottle.dispatch import ABCRouter, BotRouter, BuiltinStateDispenser\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle.framework.abc import ABCFramework\n@@ -15,7 +15,7 @@ from .labeler import ABCBotLabeler, BotLabeler\nclass Bot(ABCFramework):\ndef __init__(\nself,\n- token: Optional[str] = None,\n+ token: Optional[Token] = None,\napi: Optional[ABCAPI] = None,\npolling: Optional[ABCPolling] = None,\nloop: Optional[AbstractEventLoop] = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix token type for bot
|
718,838 |
26.12.2020 16:26:51
| -10,800 |
d16f7dfe22bfb2f724750da795185cdd10a96d63
|
add kwargs to answer and message.get_user shortcut
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -70,7 +70,7 @@ async def test_bot_polling():\nelif \"!SERVER!\" in data[\"url\"]:\nreturn EXAMPLE_EVENT\nelif \"messages.send\" in data[\"url\"]:\n- return json.dumps({\"response\": 100})\n+ return json.dumps({\"response\": {**data, **{\"r\": 1}}})\nbot = Bot(\"token\")\nset_http_callback(bot.api, callback)\n@@ -84,7 +84,10 @@ async def test_bot_polling():\nasync def message_handler(message: Message):\nassert message.id == 100\nassert message.from_id == 1\n- assert await message.answer() == 100\n+ assert await message.answer() == {\"peer_id\": message.peer_id, \"r\": 1}\n+ assert await message.answer(some_unsigned_param=\"test\") == {\"peer_id\": message.peer_id,\n+ \"some_unsigned_param\": \"test\",\n+ \"r\": 1}\nasync for event in bot.polling.listen():\nassert event.get(\"updates\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"diff": "@@ -2,7 +2,7 @@ from typing import Optional, Any, List, Union\nfrom vkbottle_types import StatePeer\nfrom vkbottle_types.events.bot_events import MessageNew\n-from vkbottle_types.objects import MessagesMessage, MessagesClientInfo\n+from vkbottle_types.objects import MessagesMessage, MessagesClientInfo, UsersUser\nfrom vkbottle.api import ABCAPI, API\n@@ -17,6 +17,11 @@ class MessageMin(MessagesMessage):\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n+ async def get_user(self) -> \"UsersUser\":\n+ return UsersUser(\n+ **(await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id}))[\"response\"][0]\n+ )\n+\nasync def answer(\nself,\nmessage: Optional[str] = None,\n@@ -39,7 +44,10 @@ class MessageMin(MessagesMessage):\ndisable_mentions: Optional[bool] = None,\ntemplate: Optional[str] = None,\nintent: Optional[str] = None,\n+ **kwargs,\n) -> int:\n+ locals().update(kwargs)\n+ locals().pop(\"kwargs\")\ndata = {k: v for k, v in locals().items() if k != \"self\" and v is not None}\ndata[\"peer_id\"] = self.peer_id\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add kwargs to answer and message.get_user shortcut
|
718,838 |
26.12.2020 16:46:21
| -10,800 |
61bbef6c044b0e0fce3a953d4031ed72cdfd5551
|
add kwargs to get_user shortcut
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"diff": "@@ -17,9 +17,12 @@ class MessageMin(MessagesMessage):\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n- async def get_user(self) -> \"UsersUser\":\n+ async def get_user(self, **kwargs) -> \"UsersUser\":\nreturn UsersUser(\n- **(await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id}))[\"response\"][0]\n+ **(await self.ctx_api.request(\n+ \"users.get\",\n+ {\"user_ids\": self.from_id, **kwargs}\n+ ))[\"response\"][0]\n)\nasync def answer(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add kwargs to get_user shortcut
|
718,848 |
27.12.2020 20:07:20
| -18,000 |
3bae5377336f5a6bbb53f781916b7d6af8346a8e
|
fix ConsistentTokenGenerator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/consistent.py",
"new_path": "vkbottle/api/token_generator/consistent.py",
"diff": "@@ -9,5 +9,5 @@ class ConsistentTokenGenerator(ABCTokenGenerator):\nasync def get_token(self) -> str:\ni = self.index\n- self.index = i + 1 if i < len(self.tokens) + 1 else 0\n+ self.index = i + 1 if i + 1 < len(self.tokens) else 0\nreturn self.tokens[i]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix ConsistentTokenGenerator (#295)
|
718,838 |
28.12.2020 23:28:40
| -10,800 |
9d5ef8780aca5f6dc1d64bf1ef5af5f3a25055c1
|
improve PayloadMapRule
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -45,7 +45,7 @@ EXAMPLE_EVENT = {\n\"carousel\": False,\n\"lang_id\": 0,\n},\n- \"message\": {\"id\": 100, \"from_id\": 1,},\n+ \"message\": {\"id\": 100, \"from_id\": 1},\n},\n},\n],\n@@ -134,6 +134,12 @@ async def test_rules(api: API):\nassert await rules.PayloadMapRule([(\"a\", int), (\"b\", str)]).check(\nfake_message(api, payload=json.dumps({\"a\": 1, \"b\": \"\"}))\n)\n+ assert await rules.PayloadMapRule([(\"a\", int), (\"b\", [(\"c\", str), (\"d\", dict)])]).check(\n+ fake_message(api, payload=json.dumps({\"a\": 1, \"b\": {\"c\": \"\", \"d\": {}}}))\n+ )\n+ assert await rules.PayloadMapRule({\"a\": int, \"b\": {\"c\": str, \"d\": dict}}).check(\n+ fake_message(api, payload=json.dumps({\"a\": 1, \"b\": {\"c\": \"\", \"d\": {}}}))\n+ )\nassert await rules.StickerRule(sticker_ids=[1, 2]).check(\nfake_message(api, attachments=[{\"type\": \"sticker\", \"sticker\": {\"sticker_id\": 2}}])\n)\n@@ -159,6 +165,9 @@ async def test_rules(api: API):\nassert not await rules.RegexRule(r\"Hi .*?\").check(fake_message(api, text=\"Hi\")) == {\n\"match\": ()\n}\n+ assert rules.PayloadMapRule.transform_to_map({\"a\": int, \"b\": {\"c\": str, \"d\": dict}}) == [\n+ (\"a\", int), (\"b\", [(\"c\", str), (\"d\", dict)])\n+ ]\nlabeler = BotLabeler()\nlabeler.vbml_ignore_case = True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "-import inspect\nfrom abc import abstractmethod\n-from typing import List, Optional, Union, Tuple, Callable, Awaitable, Coroutine, Type\n+from typing import List, Optional, Union, Tuple, Callable, Awaitable, Coroutine, Type, Dict\nimport typing\n+import types\n+import inspect\nimport vbml\nimport re\nfrom vkbottle_types import BaseStateGroup\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\n+from vkbottle.tools.validator import (\n+ ABCValidator,\n+ IsInstanceValidator,\n+ EqualsValidator,\n+ CallableValidator,\n+)\nfrom .abc import ABCRule\nDEFAULT_PREFIXES = [\"!\", \"/\"]\nMessage = MessageMin\n+PayloadMap = List[Tuple[str, Union[type, Callable[[typing.Any], bool], ABCValidator, typing.Any]]]\n+PayloadMapStrict = List[Tuple[str, ABCValidator]]\n+PayloadMapDict = Dict[str, Union[dict, type]]\nclass ABCMessageRule(ABCRule):\n@@ -240,18 +250,55 @@ class PayloadContainsRule(ABCMessageRule):\nclass PayloadMapRule(ABCMessageRule):\n- def __init__(self, payload_map: List[Tuple[str, type]]):\n- self.payload_map = payload_map\n-\n- async def check(self, message: Message) -> bool:\n- payload = message.get_payload_json(unpack_failure=lambda p: {})\n- for (k, v_type) in self.payload_map:\n+ def __init__(self, payload_map: Union[PayloadMap, PayloadMapDict]):\n+ if isinstance(payload_map, dict):\n+ payload_map = self.transform_to_map(payload_map)\n+ self.payload_map = self.transform_to_callbacks(payload_map)\n+\n+ @classmethod\n+ def transform_to_map(cls, payload_map_dict: PayloadMapDict) -> PayloadMap:\n+ \"\"\" Transforms PayloadMapDict to PayloadMap \"\"\"\n+ payload_map = []\n+ for (k, v) in payload_map_dict.items():\n+ if isinstance(v, dict):\n+ v = cls.transform_to_map(v) # type: ignore\n+ payload_map.append((k, v))\n+ return payload_map # type: ignore\n+\n+ @classmethod\n+ def transform_to_callbacks(cls, payload_map: PayloadMap) -> PayloadMapStrict:\n+ \"\"\" Transforms PayloadMap to PayloadMapStrict \"\"\"\n+ for i, (key, value) in enumerate(payload_map):\n+ if isinstance(value, type):\n+ value = IsInstanceValidator(value)\n+ elif isinstance(value, list):\n+ value = cls.transform_to_callbacks(value)\n+ elif isinstance(value, types.FunctionType):\n+ value = CallableValidator(value)\n+ elif not isinstance(value, ABCValidator):\n+ value = EqualsValidator(value)\n+ payload_map[i] = (key, value)\n+ return payload_map # type: ignore\n+\n+ @classmethod\n+ async def match(cls, payload: dict, payload_map: PayloadMapStrict):\n+ \"\"\" Matches payload with payload_map recursively \"\"\"\n+ for (k, validator) in payload_map:\nif k not in payload:\nreturn False\n- elif not isinstance(payload[k], v_type):\n+ elif isinstance(validator, list):\n+ if not isinstance(payload[k], dict):\n+ return False\n+ elif not await cls.match(payload[k], validator):\n+ return False\n+ elif not await validator.check(payload[k]):\nreturn False\nreturn True\n+ async def check(self, message: Message) -> bool:\n+ payload = message.get_payload_json(unpack_failure=lambda p: {})\n+ return await self.match(payload, self.payload_map)\n+\nclass FromUserRule(ABCMessageRule):\ndef __init__(self, from_user: bool = True):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "from .dev_tools import *\nfrom .production_tools import *\n+from .validator import ABCValidator, IsInstanceValidator, EqualsValidator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev_tools/mini_types/bot/message.py",
"diff": "@@ -17,13 +17,11 @@ class MessageMin(MessagesMessage):\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n- async def get_user(self, **kwargs) -> \"UsersUser\":\n- return UsersUser(\n- **(await self.ctx_api.request(\n- \"users.get\",\n- {\"user_ids\": self.from_id, **kwargs}\n- ))[\"response\"][0]\n- )\n+ async def get_user(self, raw_mode: bool = False, **kwargs) -> Union[\"UsersUser\", dict]:\n+ raw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n+ \"response\"\n+ ][0]\n+ return raw_user if raw_mode else UsersUser(**raw_user)\nasync def answer(\nself,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/validator.py",
"diff": "+from abc import ABC, abstractmethod\n+from typing import Any, Union, Tuple, Callable\n+\n+\n+class ABCValidator(ABC):\n+ @abstractmethod\n+ async def check(self, value: Any) -> bool:\n+ pass\n+\n+\n+class IsInstanceValidator(ABCValidator):\n+ def __init__(self, t: Union[type, Tuple[type, ...]]):\n+ self.t = t\n+\n+ async def check(self, value: Any) -> bool:\n+ return isinstance(value, self.t)\n+\n+\n+class EqualsValidator(ABCValidator):\n+ def __init__(self, primary_value: Any):\n+ self.primary_value = primary_value\n+\n+ async def check(self, value: Any) -> bool:\n+ return value == self.primary_value\n+\n+\n+class CallableValidator(ABCValidator):\n+ def __init__(self, call: Callable[[Any], bool]):\n+ self.call = call\n+\n+ async def check(self, value: Any) -> bool:\n+ return self.call(value)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
improve PayloadMapRule
|
718,844 |
30.12.2020 21:46:16
| -10,800 |
a026ead7737ece6221d9bd842f4d77dbcf624074
|
Add context manager for clients
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/client/abc.py",
"new_path": "vkbottle/http/client/abc.py",
"diff": "@@ -37,3 +37,9 @@ class ABCHTTPClient(ABC):\n@abstractmethod\nasync def close(self) -> typing.NoReturn:\npass\n+\n+ async def __aenter__(self) -> \"ABCHTTPClient\":\n+ pass\n+\n+ async def __aexit__(self, exc_type, exc_val, exc_tb) -> typing.NoReturn:\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/client/aiohttp.py",
"new_path": "vkbottle/http/client/aiohttp.py",
"diff": "@@ -57,3 +57,9 @@ class AiohttpClient(ABCHTTPClient):\nasync def close(self) -> typing.NoReturn:\nawait self.session.close()\n+\n+ async def __aenter__(self) -> \"AiohttpClient\":\n+ return self\n+\n+ async def __aexit__(self, exc_type, exc_val, exc_tb) -> typing.NoReturn:\n+ await self.close()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add context manager for clients (#299)
|
718,838 |
04.02.2021 12:57:20
| -10,800 |
1558f9bf46f4d1d39f1bcbe828948dacf2fa4e0f
|
cleanup; some tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -87,9 +87,11 @@ async def test_bot_polling():\nassert message.id == 100\nassert message.from_id == 1\nassert await message.answer() == {\"peer_id\": message.peer_id, \"r\": 1}\n- assert await message.answer(some_unsigned_param=\"test\") == {\"peer_id\": message.peer_id,\n+ assert await message.answer(some_unsigned_param=\"test\") == {\n+ \"peer_id\": message.peer_id,\n\"some_unsigned_param\": \"test\",\n- \"r\": 1}\n+ \"r\": 1,\n+ }\nasync for event in bot.polling.listen():\nassert event.get(\"updates\")\n@@ -168,7 +170,8 @@ async def test_rules(api: API):\n\"match\": ()\n}\nassert rules.PayloadMapRule.transform_to_map({\"a\": int, \"b\": {\"c\": str, \"d\": dict}}) == [\n- (\"a\", int), (\"b\", [(\"c\", str), (\"d\", dict)])\n+ (\"a\", int),\n+ (\"b\", [(\"c\", str), (\"d\", dict)]),\n]\nlabeler = BotLabeler()\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/tools_test.py",
"new_path": "tests/tools_test.py",
"diff": "+import os\n+import pytest\n+from io import StringIO\n+\n+from pytest_mock import MockerFixture\n+\nfrom vkbottle.modules import json\nfrom vkbottle.tools import (\nCallback,\n@@ -7,8 +13,18 @@ from vkbottle.tools import (\nLoopWrapper,\nTemplateElement,\nText,\n+ load_blueprints_from_package,\ntemplate_gen,\n+ EqualsValidator,\n+ IsInstanceValidator,\n+ CallableValidator,\n+ keyboard_gen,\n+ run_in_task,\n+ convert_shorten_filter,\n)\n+from vkbottle.dispatch import ABCRule, OrFilter, AndFilter\n+from vkbottle.bot import run_multibot, Bot\n+from vkbottle import API\nKEYBOARD_JSON = json.dumps(\n{\n@@ -57,6 +73,10 @@ TEMPLATE_DICT = {\nctx_storage = CtxStorage()\n+def assert_rule(res, rev=False):\n+ assert (res is not False) is not rev\n+\n+\nclass MockedLoop:\n@staticmethod\ndef create_task(task):\n@@ -94,6 +114,59 @@ def test_keyboard_builder():\n) == KEYBOARD_JSON\n+def test_keyboard_generator():\n+ assert json.loads(\n+ keyboard_gen(\n+ [\n+ [{\"label\": \"I love nuggets\", \"payload\": {\"love\": \"nuggets\"}}],\n+ [\n+ {\n+ \"type\": \"callback\",\n+ \"label\": \"Eat nuggets\",\n+ \"payload\": {\"eat\": \"nuggets\"},\n+ \"color\": \"positive\",\n+ }\n+ ],\n+ ],\n+ one_time=True,\n+ )\n+ ) == json.loads(KEYBOARD_JSON)\n+\n+\n+def test_bp_importer(mocker: MockerFixture):\n+ required_files = [\"bp1.py\", \"bp2.py\", \"bp3.py\", \"bp4.py\"]\n+ main_package = os.path.join(\"src\", \"folder\")\n+ main_files = {\n+ os.path.join(main_package, \"bp1.py\"): \"bp = Blueprint('blup')\",\n+ os.path.join(main_package, \"bp2.py\"): \"\\n#\\nbp = Blueprint('blup2')\",\n+ os.path.join(\n+ main_package, \"__init__.py\"\n+ ): \"from . import bp1, bp2\\nfrom .bps import bp3, bp4\",\n+ }\n+ bps_files = {\n+ os.path.join(main_package, \"bps\", \"bp3.py\"): \"blueprint = Blueprint('blup')\",\n+ os.path.join(main_package, \"bps\", \"bp4.py\"): \"bp = BotBlueprint()\",\n+ }\n+ mocker.patch(\n+ \"os.listdir\",\n+ lambda f: [\"bp1.py\", \"__init__.py\", \"bp2.py\", \"bps\"]\n+ if \"bps\" not in f\n+ else [\"bp3.py\", \"bp4.py\", \"__init__.py\"],\n+ )\n+ mocker.patch(\n+ \"builtins.open\", lambda fln: StringIO((main_files if \"bps\" not in fln else bps_files)[fln])\n+ )\n+ mocker.patch(\n+ \"importlib.import_module\",\n+ lambda pn: type(\"A\", (object,), {\"__getattr__\": lambda x, y: pn})(),\n+ )\n+\n+ for bp in load_blueprints_from_package(main_package):\n+ required_files.pop(required_files.index(str(bp).split(\".\")[-1] + \".py\"))\n+\n+ assert not len(required_files)\n+\n+\ndef test_template_generator():\nassert (\njson.loads(\n@@ -114,6 +187,13 @@ def test_template_generator():\n)\n+@pytest.mark.asyncio\n+async def test_validators():\n+ assert await IsInstanceValidator((int, str)).check(\"foo\")\n+ assert not await EqualsValidator(\"foo\").check(\"bar\")\n+ assert await CallableValidator(lambda _: True).check(0)\n+\n+\ndef test_loop_wrapper():\nasync def task1():\npass\n@@ -136,3 +216,40 @@ def test_loop_wrapper():\ntask3.__name__,\n]\nassert ctx_storage.get(\"checked-test-lw-run-forever\")\n+\n+\n+@pytest.mark.asyncio\n+async def test_utils(mocker: MockerFixture):\n+ async def task_to_run(s, y: int):\n+ return s.x == y\n+\n+ mocker.patch(\"asyncio.get_running_loop\", lambda: MockedLoop())\n+ run_in_task(task_to_run(1, 1))\n+\n+ assert ctx_storage.get(\"checked-test-lw-create-task\") == \"task_to_run\"\n+\n+ c_rule = type(\n+ \"c_rule\", (ABCRule,), {\"check\": task_to_run, \"__init__\": lambda s, i: setattr(s, \"x\", i)}\n+ )\n+\n+ assert convert_shorten_filter((c_rule(None),)).__class__ == OrFilter(c_rule(None),).__class__\n+ assert convert_shorten_filter({c_rule(None)}).__class__ == AndFilter(c_rule(None),).__class__\n+\n+ assert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(2))\n+ assert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(4), True)\n+ assert_rule(await convert_shorten_filter({c_rule(4), c_rule(4)}).check(4))\n+ assert_rule(await convert_shorten_filter({c_rule(2), c_rule(4)}).check(4), True)\n+\n+\n+def test_run_multibot(mocker: MockerFixture):\n+ bot_apis = []\n+\n+ mocker.patch(\"vkbottle.bot.Bot.run_polling\", lambda s, custom_polling: s.api)\n+ mocker.patch(\"asyncio.iscoroutine\", lambda _: True)\n+ mocker.patch(\n+ \"vkbottle.tools.dev_tools.loop_wrapper.LoopWrapper.run_forever\",\n+ lambda s, l: bot_apis.extend(s.tasks),\n+ )\n+\n+ run_multibot(Bot(), (API(\"1\"), API(\"2\"), API(\"3\")))\n+ assert len(bot_apis) == 3\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/vkscript_converter_test.py",
"new_path": "tests/vkscript_converter_test.py",
"diff": "@@ -17,6 +17,20 @@ def types(api):\na = 5.1\nb = 5 * a\nresults = [b, b - 2]\n+ _ = {\"a\": 1, \"b\": 2}\n+ _ = True\n+ _ = 3 - 3.3 + 3.0 * 0.3 / 33 % 3\n+ _ = \"string\"\n+\n+ if a < 5:\n+ pass\n+ elif b > 25:\n+ a += 1\n+ a -= 1\n+ else:\n+ while a < b:\n+ a *= 1.1\n+\nfor i in results:\nresults.append(i ** 2)\nresults.pop()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "from .dev_tools import *\nfrom .production_tools import *\n-from .validator import ABCValidator, EqualsValidator, IsInstanceValidator\n+from .validator import ABCValidator, EqualsValidator, IsInstanceValidator, CallableValidator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "@@ -2,7 +2,7 @@ import importlib\nimport os\nimport re\nimport typing\n-from asyncio import get_running_loop\n+import asyncio\nfrom vkbottle.api.token_generator.consistent import ConsistentTokenGenerator\nfrom vkbottle.api.token_generator.single import SingleTokenGenerator\n@@ -19,7 +19,7 @@ if typing.TYPE_CHECKING:\n# purposes\ndef run_in_task(coroutine: typing.Coroutine) -> typing.NoReturn:\n\"\"\" Gets loop and runs add makes task from the given coroutine \"\"\"\n- loop = get_running_loop()\n+ loop = asyncio.get_running_loop()\nloop.create_task(coroutine)\n@@ -43,7 +43,10 @@ def load_blueprints_from_package(package_name: str) -> typing.Iterator[\"ABCBluep\n\"\"\"\nbp_paths = []\nfor filename in os.listdir(package_name):\n- if not filename.endswith(\".py\") or filename.startswith(\"__\"):\n+ if filename.startswith(\"__\"):\n+ continue\n+ elif not filename.endswith(\".py\"):\n+ yield from load_blueprints_from_package(os.path.join(package_name, filename))\ncontinue\nwith open(os.path.join(package_name, filename)) as file:\n@@ -55,5 +58,6 @@ def load_blueprints_from_package(package_name: str) -> typing.Iterator[\"ABCBluep\nfor bp_path in bp_paths:\nmodule, bp_name = bp_path\n- bp_module = importlib.import_module(package_name + \".\" + module)\n+ module_name = package_name.replace(\".\" + os.sep, \".\").replace(os.sep, \".\")\n+ bp_module = importlib.import_module(module_name + \".\" + module)\nyield getattr(bp_module, bp_name)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/production_tools/legacies/keyboard_generator.py",
"new_path": "vkbottle/tools/production_tools/legacies/keyboard_generator.py",
"diff": "@@ -31,7 +31,9 @@ def keyboard_gen(pattern: List[List[dict]], one_time: bool = False, inline: bool\nif action[\"type\"] == \"text\":\naction[\"label\"] = button.get(\"text\", button.get(\"label\"))\n- fields[\"color\"] = button.get(\"color\", \"default\")\n+\n+ if button.get(\"color\"):\n+ fields[\"color\"] = button[\"color\"]\nrow_button = {\"action\": action, **fields}\n@@ -39,7 +41,7 @@ def keyboard_gen(pattern: List[List[dict]], one_time: bool = False, inline: bool\nbuttons.append(row_buttons)\nkeyboard = str(\n- json.dumps(dict(one_time=one_time, buttons=buttons, inline=inline))\n+ json.dumps(dict(one_time=one_time, inline=inline, buttons=buttons))\n.encode(\"utf-8\")\n.decode(\"utf-8\")\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
cleanup; some tests
|
718,844 |
21.03.2021 16:25:27
| -10,800 |
86024acee10254a7f945c40ebc6f30c64ed08fb4
|
Update error handlers
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/abc.py",
"new_path": "vkbottle/exception_factory/abc.py",
"diff": "@@ -2,7 +2,7 @@ import typing\nfrom abc import ABC, abstractmethod\n-class ABCExceptionFactory(ABC, BaseException):\n+class ABCExceptionFactory(ABC, Exception):\n\"\"\" Abstract Exception Factory\nDocumentation: \\\nhttps://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "@@ -37,5 +37,5 @@ class ABCErrorHandler(ABC):\n@abstractmethod\ndef handling_exceptions(\nself,\n- ) -> typing.Union[typing.Type[BaseException], typing.Tuple[typing.Type[BaseException], ...]]:\n+ ) -> typing.Union[str, typing.Tuple[str, ...]]:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"new_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"diff": "@@ -8,7 +8,7 @@ from .abc import ABCErrorHandler, ExceptionHandler\nclass ErrorHandler(ABCErrorHandler):\ndef __init__(self, redirect_arguments: bool = False):\n- self.error_handlers: typing.Dict[typing.Type[BaseException], ExceptionHandler] = {}\n+ self.error_handlers: typing.Dict[str, ExceptionHandler] = {}\nself.undefined_error_handler: typing.Optional[ExceptionHandler] = None\nself.redirect_arguments = redirect_arguments\n@@ -19,11 +19,11 @@ class ErrorHandler(ABCErrorHandler):\n) -> typing.Optional[typing.Callable[[ExceptionHandler], typing.Any]]:\nif exception_handler:\n- self.error_handlers[exception_type] = exception_handler\n+ self.error_handlers[exception_type.__name__] = exception_handler\nreturn None\ndef decorator(func: ExceptionHandler):\n- self.error_handlers[exception_type] = func\n+ self.error_handlers[exception_type.__name__] = func\nreturn func\nreturn decorator\n@@ -66,8 +66,10 @@ class ErrorHandler(ABCErrorHandler):\nreturn decorator\nasync def handle(self, e: BaseException, *args, **kwargs) -> typing.Any:\n- if e.__class__ in self.error_handlers:\n- return await self.call_handler(self.error_handlers[e.__class__], e, *args, **kwargs)\n+ if e.__class__.__name__ in self.error_handlers:\n+ return await self.call_handler(\n+ self.error_handlers[e.__class__.__name__], e, *args, **kwargs\n+ )\nelif self.undefined_error_handler:\nreturn await self.call_handler(self.undefined_error_handler, e, *args, **kwargs)\nlogger.error(\"\\n\" + traceback.format_exc())\n@@ -75,5 +77,5 @@ class ErrorHandler(ABCErrorHandler):\n@property\ndef handling_exceptions(\nself,\n- ) -> typing.Union[typing.Type[BaseException], typing.Tuple[typing.Type[BaseException], ...]]:\n- return tuple(k for k, _ in self.error_handlers.items())\n+ ) -> typing.Union[str, typing.Tuple[str, ...]]:\n+ return tuple(k for k in self.error_handlers.keys())\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update error handlers (#317)
|
718,859 |
23.03.2021 01:35:38
| -18,000 |
0c07140ac34963d4d62ec56ddb6c2429bc87522b
|
Change list to itertools.cycle close
`itertools.cycle` gives you an option not to calculate the index
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/consistent.py",
"new_path": "vkbottle/api/token_generator/consistent.py",
"diff": "+import itertools\nfrom typing import List\nfrom .abc import ABCTokenGenerator\n@@ -5,10 +6,7 @@ from .abc import ABCTokenGenerator\nclass ConsistentTokenGenerator(ABCTokenGenerator):\ndef __init__(self, tokens: List[str]):\n- self.tokens = tokens\n- self.index = 0\n+ self.tokens = itertools.cycle(tokens)\nasync def get_token(self) -> str:\n- i = self.index\n- self.index = i + 1 if i + 1 < len(self.tokens) else 0\n- return self.tokens[i]\n+ return next(self.tokens)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change list to itertools.cycle (#318 close #315)
`itertools.cycle` gives you an option not to calculate the index
|
718,838 |
11.04.2021 11:40:20
| -10,800 |
8a48da259f921f6ff298a836ed18b423fd57f376
|
start tutorial
pt.1 First bot
|
[
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "* [VKScript](tools/vkscript.md)\n* [Loop Wrapper](tools/loop-wrapper.md)\n* [Auth Flows](tools/auth.md)\n+\n+# [Tutorial](tutorial/index.md)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": "docs/tutorial/assets/api-highlighting.png",
"new_path": "docs/tutorial/assets/api-highlighting.png",
"diff": "Binary files /dev/null and b/docs/tutorial/assets/api-highlighting.png differ\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
start tutorial
pt.1 First bot
|
718,838 |
11.04.2021 17:13:54
| -10,800 |
cdbc05b066de00cb52a33d3e14db1bf8594f4815
|
rules tutorial; improve CommandRule
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -173,6 +173,15 @@ async def test_rules(api: API):\n(\"a\", int),\n(\"b\", [(\"c\", str), (\"d\", dict)]),\n]\n+ assert await rules.CommandRule(\"cmd\", [\"!\", \".\"], 2).check(fake_message(api, text=\"!cmd test bar\")) == {\n+ \"args\": (\"test\", \"bar\")\n+ }\n+ assert await rules.CommandRule(\"cmd\", [\"!\", \".\"], 2).check(fake_message(api, text=\"cmd test bar\")) is False\n+\n+ # todo: if args are more than args_count do join excess args with last\n+ assert await rules.CommandRule(\"cmd\", [\"!\", \".\"], 1).check(fake_message(api, text=\"cmd test bar\")) is False\n+\n+ assert await rules.CommandRule(\"cmd\", [\"!\", \".\"], 3).check(fake_message(api, text=\"cmd test bar\")) is False\nlabeler = BotLabeler()\nlabeler.vbml_ignore_case = True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -40,14 +40,23 @@ class PeerRule(ABCMessageRule):\nclass CommandRule(ABCMessageRule):\n- def __init__(self, command_text: str, prefixes: Optional[List[str]] = None):\n+ def __init__(self, command_text: Union[str, Tuple[str, int]], prefixes: Optional[List[str]] = None, args_count: int = 0, sep: str = \" \"):\nself.prefixes = prefixes or DEFAULT_PREFIXES\n- self.command_text = command_text\n+ self.command_text = command_text if isinstance(command_text, str) else command_text[0]\n+ self.args_count = args_count if isinstance(command_text, str) else command_text[1]\n+ self.sep = sep\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nfor prefix in self.prefixes:\n- if message.text == prefix + self.command_text:\n+ if self.args_count == 0 and message.text == prefix + self.command_text:\nreturn True\n+ if self.args_count > 0 and message.text.startswith(prefix + self.command_text + \" \"):\n+ args = message.text[len(prefix + self.command_text) + 1:].split(self.sep)\n+ if len(args) != self.args_count:\n+ return False\n+ elif any(len(arg) == 0 for arg in args):\n+ return False\n+ return {\"args\": tuple(args)}\nreturn False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
rules tutorial; improve CommandRule
|
718,838 |
11.04.2021 18:35:12
| -10,800 |
9ad5138fefdb13ff1ae453b0347746f1d56faea3
|
code separation tutorial
|
[
{
"change_type": "MODIFY",
"old_path": "docs/tutorial/rules.md",
"new_path": "docs/tutorial/rules.md",
"diff": "@@ -55,7 +55,7 @@ from vkbottle.bot import rules\nfrom typing import Union\nclass MyRule(rules.ABCMessageRule):\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nreturn len(message.text) < 100\n```\n@@ -73,7 +73,7 @@ class MyRule(rules.ABCMessageRule):\ndef __init__(self, lt: int = 100):\nself.lt = lt\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nreturn len(message.text) < self.lt\n```\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
code separation tutorial
|
718,838 |
13.04.2021 10:22:07
| -10,800 |
a742a68597b9f160d37d186e4b89be5b18eaeb83
|
Uploaders feature
|
[
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "* [VKScript](tools/vkscript.md)\n* [Loop Wrapper](tools/loop-wrapper.md)\n* [Auth Flows](tools/auth.md)\n+* [Uploaders](tools/uploaders.md)\n# [Tutorial](tutorial/index.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "from . import auth\nfrom .ctx_tool import BaseContext\nfrom .keyboard import *\n+from .uploader import *\n+from .template import TemplateElement, template_gen\nfrom .loop_wrapper import DelayedTask, LoopWrapper\nfrom .mini_types import BotTypes, message_min\nfrom .storage import ABCStorage, CtxStorage\n-from .template import TemplateElement, template_gen\nfrom .utils import convert_shorten_filter, load_blueprints_from_package, run_in_task\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/__init__.py",
"diff": "+from .audio import *\n+from .base import BaseUploader\n+from .doc import *\n+from .photo import *\n+from .video import *\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/audio.py",
"diff": "+from typing import Union\n+\n+from .base import BaseUploader, Bytes\n+\n+\n+class AudioUploader(BaseUploader):\n+ NAME = \"audio.mp3\"\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"audio.getUploadServer\", {}))[\"response\"]\n+\n+ async def upload(\n+ self, artist: str, title: str, path_like: Union[str, Bytes], **params\n+ ) -> Union[str, dict]:\n+ server = await self.get_server()\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n+\n+ audio = (\n+ await self.api.request(\n+ \"audio.save\",\n+ {\"artist\": artist, \"title\": title, **uploader, **params},\n+ )\n+ )[\"response\"]\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\n+ \"audio\", await self.get_owner_id(params), audio[\"id\"]\n+ )\n+ return audio\n+\n+ @property\n+ def attachment_name(self) -> str:\n+ return self.NAME\n+\n+\n+__all__ = (\"AudioUploader\",)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/base.py",
"diff": "+from abc import ABC, abstractmethod\n+from io import BytesIO\n+from typing import Callable, Optional, Union\n+\n+from vkbottle.api import ABCAPI\n+from vkbottle.modules import json\n+\n+try:\n+ import aiofiles\n+except ImportError:\n+ aiofiles = None\n+\n+\n+Bytes = Union[bytes, BytesIO]\n+\n+\n+class BaseUploader(ABC):\n+ def __init__(\n+ self,\n+ api: Optional[ABCAPI] = None,\n+ api_getter: Optional[Callable[[], ABCAPI]] = None,\n+ generate_attachment_strings: bool = True,\n+ ):\n+ assert api_getter is not None or api is not None, \"api or api_getter should be set\"\n+ self._get_api = api_getter or (lambda: api) # type: ignore\n+ self.generate_attachment_strings = generate_attachment_strings\n+\n+ @abstractmethod\n+ async def get_server(self, **kwargs) -> dict:\n+ pass\n+\n+ @property\n+ @abstractmethod\n+ def attachment_name(self) -> str:\n+ pass\n+\n+ @property\n+ def api(self) -> ABCAPI:\n+ return self._get_api() # type: ignore\n+\n+ async def upload_files(self, upload_url: str, files: dict) -> dict:\n+ async with self.api.http as session:\n+ raw_response = await session.request_text(\"POST\", upload_url, data=files)\n+ response = json.loads(raw_response)\n+ return response\n+\n+ def get_bytes_io(self, data: Bytes, name: str = None) -> BytesIO:\n+ bytes_io = data if isinstance(data, BytesIO) else BytesIO(data)\n+ bytes_io.seek(0) # To avoid errors with image generators (such as pillow)\n+ bytes_io.name = (\n+ name or self.attachment_name\n+ ) # To guarantee VK API file extension recognition\n+ return bytes_io\n+\n+ async def get_owner_id(self, upload_params: dict) -> int:\n+ if \"group_id\" in upload_params:\n+ return upload_params[\"group_id\"]\n+ return (await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\n+\n+ @staticmethod\n+ def generate_attachment_string(attachment_type: str, owner_id: int, item_id: int) -> str:\n+ return f\"{attachment_type}{owner_id}_{item_id}\"\n+\n+ @staticmethod\n+ async def read(path_like: Union[str, Bytes]) -> Bytes:\n+ if isinstance(path_like, str):\n+ assert aiofiles is not None, \"to use default files opener aiofiles should be installed\"\n+ async with aiofiles.open(path_like, \"rb\") as file:\n+ return await file.read()\n+ return path_like\n+\n+ def __repr__(self) -> str:\n+ return f\"<Uploader {self.__class__.__name__} with api {self.api!r}\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"diff": "+from abc import ABC\n+from typing import Union\n+\n+from .base import BaseUploader, Bytes\n+\n+\n+class DocUploader(BaseUploader, ABC):\n+ NAME = \"doc.txt\"\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"docs.getUploadServer\", kwargs))[\"response\"]\n+\n+ async def upload(self, title: str, path_like: Union[str, Bytes], **params) -> Union[str, dict]:\n+ server = await self.get_server(**params)\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data, name=title)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n+\n+ doc = (\n+ await self.api.request(\n+ \"docs.save\",\n+ {\"title\": title, **uploader, **params},\n+ )\n+ )[\"response\"]\n+ doc_type = doc[\"type\"]\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\n+ doc_type, doc[doc_type][\"owner_id\"], doc[doc_type][\"id\"]\n+ )\n+ return doc\n+\n+ @property\n+ def attachment_name(self) -> str:\n+ return self.NAME\n+\n+\n+class DocWallUploader(DocUploader):\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"docs.getWallUploadServer\", kwargs))[\"response\"]\n+\n+\n+class DocMessagesUploader(DocUploader):\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"docs.getMessagesUploadServer\", kwargs))[\"response\"]\n+\n+\n+class VoiceMessageUploader(DocUploader):\n+ async def get_server(self, **kwargs) -> dict:\n+ return (\n+ await self.api.request(\n+ \"docs.getMessagesUploadServer\", {\"type\": \"audio_message\", **kwargs}\n+ )\n+ )[\"response\"]\n+\n+\n+class GraffitiUploader(DocUploader):\n+ async def get_server(self, **kwargs) -> dict:\n+ return (\n+ await self.api.request(\"docs.getMessagesUploadServer\", {\"type\": \"graffiti\", **kwargs})\n+ )[\"response\"]\n+\n+\n+__all__ = (\n+ \"DocUploader\",\n+ \"DocWallUploader\",\n+ \"DocMessagesUploader\",\n+ \"VoiceMessageUploader\",\n+ \"GraffitiUploader\",\n+)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/photo.py",
"diff": "+from abc import ABC\n+from typing import List, Union\n+\n+from .base import BaseUploader, Bytes\n+\n+\n+class PhotoUploader(BaseUploader, ABC):\n+ NAME = \"picture.jpg\"\n+\n+ @property\n+ def attachment_name(self) -> str:\n+ return self.NAME\n+\n+\n+class PhotoToAlbumUploader(PhotoUploader):\n+ async def upload(\n+ self, album_id: int, paths_like: Union[List[Union[str, Bytes]], str, Bytes], **params\n+ ) -> Union[str, List[Union[str, dict]]]:\n+ if not isinstance(paths_like, list):\n+ paths_like = [paths_like]\n+\n+ server = await self.get_server(album_id=album_id, **params)\n+ files = dict()\n+\n+ for i, path_like in enumerate(paths_like):\n+ data = await self.read(path_like)\n+ files[f\"file{i+1}\"] = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], files)\n+ photos = (\n+ await self.api.request(\"photos.save\", {\"album_id\": album_id, **uploader, **params})\n+ )[\"response\"]\n+\n+ if self.generate_attachment_strings:\n+ return [\n+ self.generate_attachment_string(\"photo\", photo[\"owner_id\"], photo[\"id\"])\n+ for photo in photos\n+ ]\n+ return photos\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getUploadServer\", kwargs))[\"response\"]\n+\n+\n+class PhotoWallUploader(PhotoUploader):\n+ async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, List[dict]]:\n+ server = await self.get_server(**params)\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n+ photos = (await self.api.request(\"photos.saveWallPhoto\", {**uploader, **params}))[\n+ \"response\"\n+ ]\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\"photo\", photos[0][\"owner_id\"], photos[0][\"id\"])\n+ return photos\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getWallUploadServer\", {}))[\"response\"]\n+\n+\n+class PhotoFaviconUploader(PhotoUploader):\n+ async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, dict]:\n+ server = await self.get_server(owner_id=await self.get_owner_id(params))\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n+ photo = (await self.api.request(\"photos.saveOwnerPhoto\", {**uploader, **params}))[\n+ \"response\"\n+ ]\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\"photo\", photo[\"owner_id\"], photo[\"id\"])\n+ return photo\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getOwnerPhotoUploadServer\", kwargs))[\"response\"]\n+\n+\n+class PhotoMessageUploader(PhotoUploader):\n+ async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, List[dict]]:\n+ server = await self.get_server(**params)\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n+ photo = (await self.api.request(\"photos.saveMessagesPhoto\", {**uploader, **params}))[\n+ \"response\"\n+ ]\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\"photo\", photo[0][\"owner_id\"], photo[0][\"id\"])\n+ return photo\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getMessagesUploadServer\", kwargs))[\"response\"]\n+\n+\n+class PhotoChatFaviconUploader(PhotoUploader):\n+ async def upload(self, chat_id: int, path_like: Union[str, Bytes], **params) -> str:\n+ server = await self.get_server(chat_id=chat_id, **params)\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n+ return uploader[\"response\"]\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getChatUploadServer\", kwargs))[\"response\"]\n+\n+\n+class PhotoMarketUploader(PhotoUploader):\n+ async def upload(self, path_like: Union[str, Bytes], **params) -> dict:\n+ server = await self.get_server(**params)\n+ data = await self.read(path_like)\n+ file = self.get_bytes_io(data)\n+\n+ uploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n+ photo = (await self.api.request(\"photos.saveMarketPhoto\", {**uploader, **params}))[\n+ \"response\"\n+ ]\n+ return photo\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"photos.getMarketUploadServer\", kwargs))[\"response\"]\n+\n+\n+__all__ = (\n+ \"PhotoUploader\",\n+ \"PhotoToAlbumUploader\",\n+ \"PhotoWallUploader\",\n+ \"PhotoFaviconUploader\",\n+ \"PhotoMessageUploader\",\n+ \"PhotoChatFaviconUploader\",\n+ \"PhotoMarketUploader\",\n+)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/uploader/video.py",
"diff": "+import json\n+from typing import Union, List, Optional\n+\n+from .base import BaseUploader\n+\n+\n+class VideoUploader(BaseUploader):\n+ NAME = \"video.mp4\"\n+\n+ @property\n+ def attachment_name(self) -> str:\n+ return self.NAME\n+\n+ async def upload(\n+ self, path_like: Optional[Union[str, bytes]] = None, **params\n+ ) -> Union[str, List[dict], dict]:\n+ server = await self.get_server()\n+ assert path_like is not None or \"link\" in params, \"path_like or link to video must be set\"\n+\n+ if \"link\" in params and not path_like:\n+ async with self.api.http as session:\n+ raw_response = await session.request_text(\n+ \"GET\", server[\"upload_url\"], params=params\n+ )\n+ return json.loads(raw_response)\n+\n+ data = await self.read(path_like) # type: ignore\n+ file = self.get_bytes_io(data)\n+ video = await self.upload_files(server[\"upload_url\"], {\"video_file\": file})\n+\n+ if self.generate_attachment_strings:\n+ return self.generate_attachment_string(\"video\", video[\"owner_id\"], video[\"id\"])\n+ return video\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"video.save\", kwargs))[\"response\"]\n+\n+\n+__all__ = (\"VideoUploader\",)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Uploaders feature (#255)
Co-authored-by: Ne0shka <neosha.73@gmail.com>
Co-authored-by: Polina <54182599+nomilkinmyhome@users.noreply.github.com>
Co-authored-by: Michael Mironov <60360956+krilifon@users.noreply.github.com>
Co-authored-by: FeeeeK <krmrclemens@gmail.com>
|
718,838 |
13.04.2021 11:24:09
| -10,800 |
6cb2ce1b199eed7832ded08477a0f6c3fae4cf39
|
integrate `macro`: add `MacroRule`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -360,6 +360,28 @@ class StateGroupRule(ABCMessageRule):\nreturn type(message.state_peer.state) in self.state_group\n+try:\n+ import macro\n+except ImportError:\n+ macro = None\n+\n+class MacroRule(ABCMessageRule):\n+ def __init__(self, pattern: Union[str, List[str]]):\n+ if macro is None:\n+ raise RuntimeError(\"macro must be installed to use MacroRule\")\n+\n+ if isinstance(pattern, str):\n+ pattern = [pattern]\n+ self.patterns = list(map(macro.Pattern, pattern))\n+\n+ async def check(self, message: Message) -> Union[dict, bool]:\n+ for pattern in self.patterns:\n+ result = pattern.check(message.text)\n+ if result is not None:\n+ return result\n+ return False\n+\n+\n__all__ = (\n\"ABCMessageRule\",\n\"PeerRule\",\n@@ -380,4 +402,5 @@ __all__ = (\n\"StateRule\",\n\"StateGroupRule\",\n\"RegexRule\",\n+ \"MacroRule\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -23,6 +23,7 @@ from vkbottle.dispatch.rules.bot import (\nStateGroupRule,\nStateRule,\nStickerRule,\n+ MacroRule,\nVBMLRule,\n)\nfrom vkbottle.dispatch.views import ABCView, HandlerBasement, MessageView, RawEventView\n@@ -51,6 +52,7 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"state\": StateRule,\n\"state_group\": StateGroupRule,\n\"regexp\": RegexRule,\n+ \"macro\": MacroRule,\n\"text\": VBMLRule,\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
integrate `macro`: add `MacroRule`
|
718,838 |
13.04.2021 13:20:42
| -10,800 |
c602020865deee3204072e07fbfaf8ca0261dfa4
|
add middleware tutorial
and blank line 0_0
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -365,6 +365,7 @@ try:\nexcept ImportError:\nmacro = None\n+\nclass MacroRule(ABCMessageRule):\ndef __init__(self, pattern: Union[str, List[str]]):\nif macro is None:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add middleware tutorial
and blank line 0_0
|
718,842 |
13.04.2021 18:33:38
| -10,800 |
6b5cc40fa5bcad9cb5eff2be17fb13c85a131e21
|
Refactored Makfile and pre-commit config
Formatted examples with black to follow flake8
Updated contribution guide
Removed autoflake and unused autopep8 and reorder-python-imports
Added .vscode to .gitignore
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -139,3 +139,5 @@ dmypy.json\n# poetry lock files\npoetry.lock\n+\n+.vscode\n"
},
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "repos:\n# Use pre-commit repo, v3.2.0\n- repo: https://github.com/pre-commit/pre-commit-hooks\n- rev: \"v3.2.0\"\n+ rev: \"v3.4.0\"\nhooks:\n# Check for files that contain merge conflict strings.\n- id: check-merge-conflict\n@@ -16,45 +16,38 @@ repos:\nhooks:\n- id: black\nname: black\n- entry: black\n+ entry: poetry run black\nlanguage: system\ntypes: [ python ]\nstages: [ commit ]\n# Black should use the config from the pyproject.toml file\n- - id: autoflake\n- name: autoflake\n- entry: autoflake\n+ - id: isort\n+ name: isort\n+ entry: poetry run isort\nlanguage: system\ntypes: [ python ]\n- args:\n- - --in-place\n- - --exclude=__init__.py,bot.py,venv\n- - --remove-all-unused-imports\n- - --remove-duplicate-keys\nstages: [ commit ]\n+ # Isort should use the config from the pyproject.toml file\n- id: mypy\nname: mypy check\n- entry: mypy\n+ entry: poetry run mypy vkbottle\nlanguage: system\n- always_run: true\npass_filenames: false\n- args: [ vkbottle ]\nstages: [ commit ]\n- id: pytest\nname: pytest\n- entry: pytest\n+ entry: poetry run pytest vkbottle tests\nlanguage: system\n- always_run: true\n+ always_run: false\npass_filenames: false\nstages: [ push ]\n- id: flake8\nname: flake8 check\n- entry: flake8\n+ entry: poetry run flake8\nlanguage: system\n- always_run: true\n- pass_filenames: false\n+ types: [ python ]\nstages: [ push ]\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "# Treat these arguments not as files, but as recipes\n-.PHONY: help minimal init check fix publish\n+.PHONY: venv venv-no-dev githooks check fix publish\n# Used to execute all in one shell\n.ONESHELL:\n# Default recipe\n-.DEFAULT: help\n+DEFAULT: help\nhelp:\n- @echo \"make minimal\"\n- @echo \" install minimal dependencies\"\n- @echo \"make init\"\n- @echo \" install all dependencies and dev hooks\"\n- @echo \"make check\"\n- @echo \" run tests and linters\"\n- @echo \"make fix\"\n- @echo \" fix code with black and autoflake\"\n- @echo \"make publish\"\n- @echo \" publish to PyPi using PYPI_TOKEN\"\n+ @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = \":.*?## \"}; {printf \"\\033[36m%-30s\\033[0m %s\\n\", $$1, $$2}'\n-# Define canned (reusable) recipe for installing poetry and virtualenv\n-define install =\n- @echo;\n- @echo \"Installing poetry\"\n- @echo \"=================\";\n- @pip install poetry\n- @echo;\n- @echo \"Installing virtualenv\"\n- @echo \"=====================\";\n- @pip install virtualenv --use-feature=2020-resolver\n-endef\n+# Use poetry or activated venv\n+interpreter := $(shell poetry env info --path > /dev/null 2>&1 && echo \"poetry run\")\n-minimal:\n- $(install)\n- @echo;\n- @echo \"Installing dependencies\"\n- @echo \"=======================\";\n- @poetry install --no-dev\n+check-venv:\n+ $(if $(interpreter),, $(error No poetry environment found, either run \"make venv\"))\n-init:\n- $(install)\n- @echo;\n- @echo \"Installing dependencies\"\n- @echo \"=======================\";\n- @poetry install\n- @echo;\n- @echo \"Installing pre-commit and pre-push hooks\"\n- @echo \"========================================\";\n- @pre-commit install -t=pre-commit -t=pre-push\n+venv: ## Create virtual environment and install all dependencies\n+ @python3 -m pip install poetry\n+ @poetry install && \\\n+ echo; echo \"Poetry created virtual environment and installed all dependencies\"\n-check:\n- @poetry run mypy vkbottle\n- @poetry run flake8\n- @poetry run pytest --cov vkbottle tests\n+venv-no-dev: ## Create virtual environment and install only prod dependencies\n+ @python3 -m pip install poetry\n+ @poetry install --no-dev && \\\n+ echo; echo \"Poetry created virtual environment and installed only prod dependencies\"\n-fix:\n- @black .\n- @autoflake --recursive --in-place --exclude=__init__.py,bot.py,venv --remove-all-unused-imports --remove-duplicate-keys .\n+githooks: check-venv ## Install git hooks\n+ @$(interpreter) pre-commit install -t=pre-commit -t=pre-push\n-publish:\n+check: check-venv ## Run tests and linters\n+ @$(interpreter) mypy vkbottle\n+ @$(interpreter) flake8\n+ @$(interpreter) pytest --cov vkbottle tests\n+\n+fix: check-venv ## Fix code with black and autoflake\n+ @$(interpreter) black .\n+ @$(interpreter) isort .\n+\n+publish: ## Publish to PyPi using PYPI_TOKEN\npoetry build\n- poetry config pypi-token.pypi ${PYPI_TOKEN}\n- poetry publish; true # \"; true\" is used to ignore command exit code so that rm -rf can execute anyway\n+ @poetry config pypi-token.pypi ${PYPI_TOKEN}\n+ @# \"; true\" is used to ignore command exit code so that rm -rf can execute anyway\n+ poetry publish; true\nrm -rf dist/\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/high-level/filters_shortcuts.py",
"new_path": "examples/high-level/filters_shortcuts.py",
"diff": "@@ -9,6 +9,7 @@ from vkbottle.bot import Bot, Message, rules\nbot = Bot(os.environ[\"token\"])\n+\n# (1) StickerRule() handles all stickers. (2) MessageLengthRule\n# handles all messages longer than or equal to 5 symbols. (3)\n# FromUserRule handles messages sent from users.\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/high-level/labeler_setup.py",
"new_path": "examples/high-level/labeler_setup.py",
"diff": "@@ -48,6 +48,7 @@ bot.labeler.load(BotLabeler()) # Labeler can be loaded in another labeler\n# Patcher for vbml rule shortcut can be set:\n# <bot.labeler.patcher = ...>\n+\n# We will add some states\n# The comments for states are skipped because\n# we have another topic of the example\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/high-level/state_dispenser.py",
"new_path": "examples/high-level/state_dispenser.py",
"diff": "@@ -9,6 +9,7 @@ bot = Bot(os.environ[\"token\"])\n# StateDispenser can be accessed / set with\n# bot.state_dispenser\n+\n# Lets make a group of states\n# State group is IntEnum\nclass MenuState(BaseStateGroup):\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -7,7 +7,18 @@ license = \"MIT\"\nreadme = \"README.md\"\nhomepage = \"https://github.com/timoniq/vkbottle\"\nrepository = \"https://github.com/timoniq/vkbottle\"\n-keywords = [\"vk\", \"vk-api\", \"vkbottle\", \"user-longpoll\", \"async\", \"asyncio\", \"bot\", \"longpoll-api\", \"callback\", \"middleware\"]\n+keywords = [\n+ \"vk\",\n+ \"vk-api\",\n+ \"vkbottle\",\n+ \"user-longpoll\",\n+ \"async\",\n+ \"asyncio\",\n+ \"bot\",\n+ \"longpoll-api\",\n+ \"callback\",\n+ \"middleware\",\n+]\nclassifiers = [\n\"Environment :: Console\",\n\"Intended Audience :: Developers\",\n@@ -50,10 +61,7 @@ mkdocs = \"^1.1.2\"\nmkdocs-material = \"^7.0.0\"\n# Pre-commit\n-pre-commit = \"^2.7.1\"\n-autoflake = \"^1.4\"\n-autopep8 = \"^1.5.4\"\n-reorder-python-imports = \"^2.3.5\"\n+pre-commit = \"^2.12.0\"\n[tool.black]\nline-length = 99\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Refactored Makfile and pre-commit config (#321)
Formatted examples with black to follow flake8
Updated contribution guide
Removed autoflake and unused autopep8 and reorder-python-imports
Added .vscode to .gitignore
|
718,838 |
21.04.2021 15:45:36
| -10,800 |
1fb55b4ffa1f23c8b7f6f6e3e7ba7e3a24a831a8
|
add `VKAPIError.raw_error`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -28,4 +28,4 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nif ctx_api.ignore_errors:\nreturn None\n- raise VKAPIError(code, msg)\n+ raise VKAPIError(code, msg, response)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -40,7 +40,13 @@ class PeerRule(ABCMessageRule):\nclass CommandRule(ABCMessageRule):\n- def __init__(self, command_text: Union[str, Tuple[str, int]], prefixes: Optional[List[str]] = None, args_count: int = 0, sep: str = \" \"):\n+ def __init__(\n+ self,\n+ command_text: Union[str, Tuple[str, int]],\n+ prefixes: Optional[List[str]] = None,\n+ args_count: int = 0,\n+ sep: str = \" \",\n+ ):\nself.prefixes = prefixes or DEFAULT_PREFIXES\nself.command_text = command_text if isinstance(command_text, str) else command_text[0]\nself.args_count = args_count if isinstance(command_text, str) else command_text[1]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_error.py",
"new_path": "vkbottle/exception_factory/code_error.py",
"diff": "@@ -11,29 +11,36 @@ class CodeErrorFactory(ABCExceptionFactory):\n\"\"\"\ndef __init__(\n- self, code: typing.Optional[int] = None, error_description: typing.Optional[str] = None\n+ self,\n+ code: typing.Optional[int] = None,\n+ error_description: typing.Optional[str] = None,\n+ raw_error: typing.Optional[dict] = None,\n):\nself.code = code\nself.error_description = error_description\n+ self.raw_error = raw_error\n@classmethod\ndef __call__( # type: ignore\n- cls, code: typing.Optional[int] = None, error_description: typing.Optional[str] = None\n+ cls,\n+ code: typing.Optional[int] = None,\n+ error_description: typing.Optional[str] = None,\n+ raw_error: typing.Optional[dict] = None,\n) -> typing.Union[\"ABCExceptionFactory\", typing.Type[\"ABCExceptionFactory\"]]:\n\"\"\" Interactively chooses the factory was called for: if error_description\n\"\"\"\nif error_description is not None:\n- return cls.exception_to_raise(code, error_description) # type: ignore\n+ return cls.exception_to_raise(code, error_description, raw_error) # type: ignore\nreturn cls.exception_to_handle(code)\n@classmethod\ndef exception_to_raise( # type: ignore\n- cls, code: int, error_description: str\n+ cls, code: int, error_description: str, raw_error: dict\n) -> \"ABCExceptionFactory\":\n\"\"\" Returns an error with error code and error_description\n\"\"\"\nexception_type = type(cls.generate_exc_classname(code), (cls,), {})\n- return exception_type(code, error_description)\n+ return exception_type(code, error_description, raw_error)\n@classmethod\ndef exception_to_handle( # type: ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "@@ -35,7 +35,5 @@ class ABCErrorHandler(ABC):\n@property\n@abstractmethod\n- def handling_exceptions(\n- self,\n- ) -> typing.Union[str, typing.Tuple[str, ...]]:\n+ def handling_exceptions(self,) -> typing.Union[str, typing.Tuple[str, ...]]:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"new_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"diff": "@@ -75,7 +75,5 @@ class ErrorHandler(ABCErrorHandler):\nlogger.error(\"\\n\" + traceback.format_exc())\n@property\n- def handling_exceptions(\n- self,\n- ) -> typing.Union[str, typing.Tuple[str, ...]]:\n+ def handling_exceptions(self,) -> typing.Union[str, typing.Tuple[str, ...]]:\nreturn tuple(k for k in self.error_handlers.keys())\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/audio.py",
"new_path": "vkbottle/tools/dev_tools/uploader/audio.py",
"diff": "@@ -20,8 +20,7 @@ class AudioUploader(BaseUploader):\naudio = (\nawait self.api.request(\n- \"audio.save\",\n- {\"artist\": artist, \"title\": title, **uploader, **params},\n+ \"audio.save\", {\"artist\": artist, \"title\": title, **uploader, **params},\n)\n)[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"new_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"diff": "@@ -17,12 +17,9 @@ class DocUploader(BaseUploader, ABC):\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n- doc = (\n- await self.api.request(\n- \"docs.save\",\n- {\"title\": title, **uploader, **params},\n- )\n- )[\"response\"]\n+ doc = (await self.api.request(\"docs.save\", {\"title\": title, **uploader, **params},))[\n+ \"response\"\n+ ]\ndoc_type = doc[\"type\"]\nif self.generate_attachment_strings:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add `VKAPIError.raw_error`
|
718,838 |
25.04.2021 16:49:19
| -10,800 |
d31acde8cc66fc1633645fc24e426af1d5138981
|
rename `path_like`-> `file_source`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/audio.py",
"new_path": "vkbottle/tools/dev_tools/uploader/audio.py",
"diff": "@@ -10,10 +10,10 @@ class AudioUploader(BaseUploader):\nreturn (await self.api.request(\"audio.getUploadServer\", {}))[\"response\"]\nasync def upload(\n- self, artist: str, title: str, path_like: Union[str, Bytes], **params\n+ self, artist: str, title: str, file_source: Union[str, Bytes], **params\n) -> Union[str, dict]:\nserver = await self.get_server()\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/base.py",
"new_path": "vkbottle/tools/dev_tools/uploader/base.py",
"diff": "@@ -64,12 +64,12 @@ class BaseUploader(ABC):\nreturn f\"{attachment_type}{owner_id}_{item_id}\"\n@staticmethod\n- async def read(path_like: Union[str, Bytes]) -> Bytes:\n- if isinstance(path_like, str):\n+ async def read(file_source: Union[str, Bytes]) -> Bytes:\n+ if isinstance(file_source, str):\nassert aiofiles is not None, \"to use default files opener aiofiles should be installed\"\n- async with aiofiles.open(path_like, \"rb\") as file:\n+ async with aiofiles.open(file_source, \"rb\") as file:\nreturn await file.read()\n- return path_like\n+ return file_source\ndef __repr__(self) -> str:\nreturn f\"<Uploader {self.__class__.__name__} with api {self.api!r}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"new_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"diff": "@@ -10,9 +10,9 @@ class DocUploader(BaseUploader, ABC):\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"docs.getUploadServer\", kwargs))[\"response\"]\n- async def upload(self, title: str, path_like: Union[str, Bytes], **params) -> Union[str, dict]:\n+ async def upload(self, title: str, file_source: Union[str, Bytes], **params) -> Union[str, dict]:\nserver = await self.get_server(**params)\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data, name=title)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/photo.py",
"new_path": "vkbottle/tools/dev_tools/uploader/photo.py",
"diff": "@@ -22,8 +22,8 @@ class PhotoToAlbumUploader(PhotoUploader):\nserver = await self.get_server(album_id=album_id, **params)\nfiles = dict()\n- for i, path_like in enumerate(paths_like):\n- data = await self.read(path_like)\n+ for i, file_source in enumerate(paths_like):\n+ data = await self.read(file_source)\nfiles[f\"file{i+1}\"] = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], files)\n@@ -43,9 +43,9 @@ class PhotoToAlbumUploader(PhotoUploader):\nclass PhotoWallUploader(PhotoUploader):\n- async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, List[dict]]:\n+ async def upload(self, file_source: Union[str, Bytes], **params) -> Union[str, List[dict]]:\nserver = await self.get_server(**params)\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n@@ -62,9 +62,9 @@ class PhotoWallUploader(PhotoUploader):\nclass PhotoFaviconUploader(PhotoUploader):\n- async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, dict]:\n+ async def upload(self, file_source: Union[str, Bytes], **params) -> Union[str, dict]:\nserver = await self.get_server(owner_id=await self.get_owner_id(params))\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n@@ -81,9 +81,9 @@ class PhotoFaviconUploader(PhotoUploader):\nclass PhotoMessageUploader(PhotoUploader):\n- async def upload(self, path_like: Union[str, Bytes], **params) -> Union[str, List[dict]]:\n+ async def upload(self, file_source: Union[str, Bytes], **params) -> Union[str, List[dict]]:\nserver = await self.get_server(**params)\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n@@ -100,9 +100,9 @@ class PhotoMessageUploader(PhotoUploader):\nclass PhotoChatFaviconUploader(PhotoUploader):\n- async def upload(self, chat_id: int, path_like: Union[str, Bytes], **params) -> str:\n+ async def upload(self, chat_id: int, file_source: Union[str, Bytes], **params) -> str:\nserver = await self.get_server(chat_id=chat_id, **params)\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n@@ -113,9 +113,9 @@ class PhotoChatFaviconUploader(PhotoUploader):\nclass PhotoMarketUploader(PhotoUploader):\n- async def upload(self, path_like: Union[str, Bytes], **params) -> dict:\n+ async def upload(self, file_source: Union[str, Bytes], **params) -> dict:\nserver = await self.get_server(**params)\n- data = await self.read(path_like)\n+ data = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/video.py",
"new_path": "vkbottle/tools/dev_tools/uploader/video.py",
"diff": "@@ -12,19 +12,19 @@ class VideoUploader(BaseUploader):\nreturn self.with_name or self.NAME\nasync def upload(\n- self, path_like: Optional[Union[str, bytes]] = None, **params\n+ self, file_source: Optional[Union[str, bytes]] = None, **params\n) -> Union[str, List[dict], dict]:\nserver = await self.get_server()\n- assert path_like is not None or \"link\" in params, \"path_like or link to video must be set\"\n+ assert file_source is not None or \"link\" in params, \"file_source or link to video must be set\"\n- if \"link\" in params and not path_like:\n+ if \"link\" in params and not file_source:\nasync with self.api.http as session:\nraw_response = await session.request_text(\n\"GET\", server[\"upload_url\"], params=params\n)\nreturn json.loads(raw_response)\n- data = await self.read(path_like) # type: ignore\n+ data = await self.read(file_source) # type: ignore\nfile = self.get_bytes_io(data)\nvideo = await self.upload_files(server[\"upload_url\"], {\"video_file\": file})\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
rename `path_like`-> `file_source`
|
718,838 |
29.04.2021 15:50:48
| -10,800 |
7bb1073725d7a96f2505da6844e6ddabdcec448f
|
mkdocs appearance changes
|
[
{
"change_type": "DELETE",
"old_path": "docs/migration.md",
"new_path": null,
"diff": "-# Migrate from VKBottle v2\n-\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
mkdocs appearance changes
|
718,842 |
01.05.2021 20:26:46
| -10,800 |
0fb2487b4cc8112d6e349ee031f974928fd2fdf0
|
Fixed fixed usage of set `.middlewares`
Updated examples
Fixed flake8 issues
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -32,16 +32,16 @@ check: check-venv ## Run tests and linters\n@echo \"flake8\"\n@echo \"======\"\n@$(interpreter) flake8\n- @echo \"\\nblack\"\n+ @echo -e \"\\nblack\"\n@echo \"=====\"\n@$(interpreter) black --check .\n- @echo \"\\nisort\"\n+ @echo -e \"\\nisort\"\n@echo \"=====\"\n@$(interpreter) isort --check-only .\n- @echo \"\\nmypy\"\n+ @echo -e \"\\nmypy\"\n@echo \"====\"\n@$(interpreter) mypy vkbottle\n- @echo \"\\npytest\"\n+ @echo -e \"\\npytest\"\n@echo \"======\"\n@$(interpreter) pytest --cov vkbottle tests\n@@ -49,7 +49,7 @@ fix: check-venv ## Fix code with black and autoflake\n@echo \"black\"\n@echo \"=====\"\n@$(interpreter) black .\n- @echo \"\\nisort\"\n+ @echo -e \"\\nisort\"\n@echo \"=====\"\n@$(interpreter) isort .\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/low-level/exception_manager.py",
"new_path": "examples/low-level/exception_manager.py",
"diff": "@@ -2,9 +2,9 @@ from vkbottle.exception_factory import VKAPIError\ntry:\nraise VKAPIError(2, \"Some exception occurred\")\n-except VKAPIError(3) as e:\n+except VKAPIError(3):\nprint(\"Oh, third exception.\")\n-except VKAPIError(2) as e:\n+except VKAPIError(2):\nprint(\"Oh, second exception.\")\nexcept VKAPIError():\nprint(\"Unknown vk error\")\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/middlewares_test.py",
"new_path": "tests/middlewares_test.py",
"diff": "import pytest\nfrom vkbottle.dispatch.middlewares.abc import BaseMiddleware, MiddlewareError\n+from vkbottle.dispatch.views.bot.message import MessageView\ndef test_middleware_send(empty_middleware_instance: BaseMiddleware):\n@@ -56,3 +57,10 @@ async def test_cant_forward_on_error(empty_middleware_class, empty_event):\nawait middleware.pre()\nassert middleware.can_forward is False\n+\n+\n+@pytest.mark.asyncio\n+async def test_view_middleware_utils_run(empty_event):\n+ view = MessageView()\n+ await view.pre_middleware(empty_event, {})\n+ await view.post_middleware(empty_event, [], [])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -22,7 +22,8 @@ class ABCMessageView(ABCDispenseView, ABC):\nsuper().__init__()\nself.state_source_key = DEFAULT_STATE_KEY\nself.handlers: List[\"ABCHandler\"] = []\n- self.middlewares: Set[Type[\"BaseMiddleware\"]] = []\n+ self.middlewares: Set[Type[\"BaseMiddleware\"]] = set()\n+ self.middleware_instances: List[\"BaseMiddleware\"] = []\nself.default_text_approximators: List[Callable[[MessageMin], str]] = []\nself.handler_return_manager = BotMessageReturnHandler()\nself.middleware_instances = []\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "@@ -20,7 +20,8 @@ class RawEventView(ABCView):\ndef __init__(self):\nsuper().__init__()\nself.handlers: Dict[GroupEventType, HandlerBasement] = {}\n- self.middlewares: Set[Type[\"BaseMiddleware\"]] = []\n+ self.middlewares: Set[Type[\"BaseMiddleware\"]] = set()\n+ self.middleware_instances: List[\"BaseMiddleware\"] = []\nself.handler_return_manager = BotMessageReturnHandler()\nself.middleware_instances = []\n@@ -60,7 +61,10 @@ class RawEventView(ABCView):\nreturn_handler = self.handler_return_manager.get_handler(handler_response)\nif return_handler is not None:\nawait return_handler(\n- self.handler_return_manager, handler_response, event_model, context_variables,\n+ self.handler_return_manager,\n+ handler_response,\n+ event_model,\n+ context_variables,\n)\nawait self.post_middleware(self, [handler_response], [handler_basement.handler])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -91,8 +91,7 @@ class BotLabeler(ABCBotLabeler):\n@vbml_ignore_case.setter\ndef vbml_ignore_case(self, ignore_case: bool):\n- \"\"\" Adds ignore case flag to rule config flags or removes it\n- \"\"\"\n+ \"\"\"Adds ignore case flag to rule config flags or removes it\"\"\"\nif not ignore_case:\nself.rule_config[\"vbml_flags\"] ^= re.IGNORECASE\nelse:\n@@ -195,9 +194,9 @@ class BotLabeler(ABCBotLabeler):\ndef load(self, labeler: \"BotLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\n- self.message_view.middlewares.extend(labeler.message_view.middlewares)\n+ self.message_view.middlewares.update(labeler.message_view.middlewares)\nself.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\n- self.raw_event_view.middlewares.extend(labeler.raw_event_view.middlewares)\n+ self.raw_event_view.middlewares.update(labeler.raw_event_view.middlewares)\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\nreturn [self.custom_rules[k].with_config(self.rule_config)(v) for k, v in custom_rules.items()] # type: ignore\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fixed #335, fixed usage of set `.middlewares` (#336)
Updated examples
Fixed flake8 issues
|
718,838 |
03.05.2021 08:23:38
| -10,800 |
b607df9b115f32a85cfb6f862b62f43ed18ba844
|
middleware: and are optional
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/middlewares/abc.py",
"new_path": "vkbottle/dispatch/middlewares/abc.py",
"diff": "@@ -53,11 +53,9 @@ class BaseMiddleware(ABC):\nraise ValueError(\"Context update value should be an instance of dict\")\nself._new_context.update(context_update)\n- @abstractmethod\nasync def pre(self) -> None:\n...\n- @abstractmethod\nasync def post(\nself, view: \"ABCView\", handle_responses: List[Any], handlers: List[\"ABCHandler\"]\n):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
middleware: and are optional
|
718,839 |
12.05.2021 08:09:43
| -10,800 |
d96fe42dbe489461baa92945b22c6936698a8f03
|
Fix typos, update example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/middleware_example.py",
"new_path": "examples/high-level/middleware_example.py",
"diff": "@@ -21,7 +21,7 @@ class RegistrationMiddleware(BaseMiddleware):\nif user is None:\nuser = (await bot.api.users.get(self.event.from_id))[0]\ndummy_db.set(self.event.from_id, user)\n- return {\"info\": user}\n+ self.send({\"info\": user})\nclass InfoMiddleware(BaseMiddleware):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typos, update example (#340)
Co-authored-by: A. Timoniq <timonik.ch@gmail.com>
|
718,838 |
12.05.2021 17:50:52
| -10,800 |
ffaaa25577d3c499b29648c318ec305fb27de0f0
|
update middleware example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/middleware_example.py",
"new_path": "examples/high-level/middleware_example.py",
"diff": "@@ -12,7 +12,8 @@ dummy_db = CtxStorage()\nclass NoBotMiddleware(BaseMiddleware):\nasync def pre(self):\n- return self.event.from_id > 0 # True / False\n+ if self.event.from_id < 0:\n+ self.stop(\"Groups are not allowed to use bot\")\nclass RegistrationMiddleware(BaseMiddleware):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
update middleware example
|
718,838 |
13.05.2021 15:22:11
| -10,800 |
73c402dc21ba5ddc51dc76f3c2fc344ceba1d576
|
`dataclass` may take str
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "-from typing import Any, Dict, List, NamedTuple, Type\n+from typing import Any, Dict, List, NamedTuple, Callable\n-from vkbottle_types.events import BaseGroupEvent, GroupEventType\n+from vkbottle_types.events import GroupEventType\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.dispatch.dispenser.abc import ABCStateDispenser\n@@ -11,9 +11,7 @@ from vkbottle.modules import logger\nfrom ..abc import ABCView\n-HandlerBasement = NamedTuple(\n- \"HandlerBasement\", [(\"dataclass\", Type[BaseGroupEvent]), (\"handler\", ABCHandler)]\n-)\n+HandlerBasement = NamedTuple(\"HandlerBasement\", [(\"dataclass\", Callable), (\"handler\", ABCHandler)])\nclass RawEventView(ABCView):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/abc.py",
"new_path": "vkbottle/framework/bot/labeler/abc.py",
"diff": "from abc import ABC, abstractmethod\nfrom typing import Any, Callable, Dict, List, Union\n+from vkbottle_types.events import GroupEventType\n+\nfrom vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views import ABCView\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\nLabeledMessageHandler = Callable[..., Callable[[MessageMin], Any]]\nLabeledHandler = Callable[..., Callable[[Any], Any]]\n+EventName = Union[GroupEventType, str]\nclass ABCBotLabeler(ABC):\n@@ -25,7 +28,7 @@ class ABCBotLabeler(ABC):\n@abstractmethod\ndef raw_event(\nself,\n- event: Union[str, List[str]],\n+ event: Union[EventName, List[EventName]],\ndataclass: Callable = dict,\n*rules: \"ABCRule\",\n**custom_rules,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -2,6 +2,7 @@ import re\nfrom typing import Any, Callable, Dict, List, Set, Tuple, Type, Union\nimport vbml\n+from vkbottle_types.events import GroupEventType\nfrom vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule\n@@ -29,7 +30,7 @@ from vkbottle.dispatch.rules.bot import (\nfrom vkbottle.dispatch.views import ABCView, HandlerBasement, MessageView, RawEventView\nfrom vkbottle.tools.dev_tools.utils import convert_shorten_filter\n-from .abc import ABCBotLabeler, LabeledHandler, LabeledMessageHandler\n+from .abc import ABCBotLabeler, LabeledHandler, LabeledMessageHandler, EventName\nShortenRule = Union[ABCRule, Tuple[ABCRule, ...], Set[ABCRule]]\nDEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n@@ -169,7 +170,7 @@ class BotLabeler(ABCBotLabeler):\ndef raw_event(\nself,\n- event: Union[str, List[str]],\n+ event: Union[EventName, List[EventName]],\ndataclass: Callable = dict,\n*rules: ShortenRule,\n**custom_rules,\n@@ -180,6 +181,10 @@ class BotLabeler(ABCBotLabeler):\ndef decorator(func):\nfor e in event:\n+\n+ if isinstance(e, str):\n+ e = GroupEventType(e)\n+\nself.raw_event_view.handlers[e] = HandlerBasement(\ndataclass,\nFromFuncHandler(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"new_path": "vkbottle/tools/dev_tools/uploader/doc.py",
"diff": "@@ -10,7 +10,9 @@ class DocUploader(BaseUploader, ABC):\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"docs.getUploadServer\", kwargs))[\"response\"]\n- async def upload(self, title: str, file_source: Union[str, Bytes], **params) -> Union[str, dict]:\n+ async def upload(\n+ self, title: str, file_source: Union[str, Bytes], **params\n+ ) -> Union[str, dict]:\nserver = await self.get_server(**params)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data, name=title)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/video.py",
"new_path": "vkbottle/tools/dev_tools/uploader/video.py",
"diff": "@@ -15,7 +15,9 @@ class VideoUploader(BaseUploader):\nself, file_source: Optional[Union[str, bytes]] = None, **params\n) -> Union[str, List[dict], dict]:\nserver = await self.get_server()\n- assert file_source is not None or \"link\" in params, \"file_source or link to video must be set\"\n+ assert (\n+ file_source is not None or \"link\" in params\n+ ), \"file_source or link to video must be set\"\nif \"link\" in params and not file_source:\nasync with self.api.http as session:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
`dataclass` may take str
|
718,838 |
13.05.2021 20:58:11
| -10,800 |
078ffb957500a5e0c0ab71294e6c44db01cdcd8c
|
add docs for view
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -44,7 +44,7 @@ class ABCMessageView(ABCDispenseView, ABC):\nfor middleware in self.middlewares:\nresponse = await middleware.pre(message)\nif response == MiddlewareResponse(False):\n- return []\n+ return\nelif isinstance(response, dict):\ncontext_variables.update(response)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add docs for view
|
718,838 |
30.05.2021 20:54:12
| -10,800 |
f758c992c3d4ed466daf1d7e7748617ee4454437
|
task_each_event is default to True
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -23,7 +23,7 @@ class Bot(ABCFramework):\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCBotLabeler\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n- task_each_event: bool = False,\n+ task_each_event: bool = True,\n):\nself.api: Union[ABCAPI, API] = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
task_each_event is default to True
|
718,838 |
31.05.2021 08:35:13
| -10,800 |
e4828646a84cccf332920b2e19d8f7f74d933038
|
fix event id unwrap
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -25,7 +25,7 @@ class ABCMessageView(ABCDispenseView, ABC):\nself.handler_return_manager = UserMessageReturnHandler()\nasync def process_event(self, event: int) -> bool:\n- return UserEventType(event) == UserEventType.NEW_MESSAGE\n+ return UserEventType(event[0]) == UserEventType.NEW_MESSAGE\nasync def handle_event(\nself, event: list, ctx_api: \"ABCAPI\", state_dispenser: \"ABCStateDispenser\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/raw.py",
"new_path": "vkbottle/dispatch/views/user/raw.py",
"diff": "@@ -23,7 +23,7 @@ class RawEventView(ABCView):\nself.handler_return_manager = UserMessageReturnHandler()\nasync def process_event(self, event: int) -> bool:\n- if UserEventType(event) in self.handlers:\n+ if UserEventType(event[0]) in self.handlers:\nreturn True\nasync def handle_event(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix event id unwrap
|
718,838 |
31.05.2021 08:35:44
| -10,800 |
9d67ea91ddc3a5e678ad92bb9fd2c2b166d69928
|
fix task_each_event defaults
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -23,7 +23,7 @@ class Bot(ABCFramework):\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCBotLabeler\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n- task_each_event: bool = False,\n+ task_each_event: bool = True,\n):\nself.api: Union[ABCAPI, API] = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -23,7 +23,7 @@ class User(ABCFramework):\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCUserLabeler\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n- task_each_event: bool = False,\n+ task_each_event: bool = True,\n):\nself.api: Union[ABCAPI, API] = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix task_each_event defaults
|
718,842 |
03.06.2021 19:26:04
| -10,800 |
625e00954923e8f485b49cbfb3ef392d0be79437
|
fixed `BotMessageView.get_state_key`
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -13,8 +13,6 @@ help:\ninterpreter := $(shell poetry env info --path > /dev/null 2>&1 && echo \"poetry run\")\nextract_ignores = $(shell awk '/.*.py/{split($$1,a,\":\"); print a[1]}' .flake8 | tr '\\n' ',')\n-flake_ignores:\n- @echo -n $(extract_ignores)\ncheck-venv:\n$(if $(interpreter),, $(error No poetry environment found, either run \"make venv\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle_types.events import GroupEventType\nfrom vkbottle.dispatch.return_manager.bot import BotMessageReturnHandler\nfrom vkbottle.dispatch.views.abc import ABCMessageView\n-from vkbottle.tools.dev.mini_types.bot import message_min\n+from vkbottle.tools.dev.mini_types.bot import MessageMin, message_min\nclass ABCBotMessageView(ABCMessageView, ABC):\n@@ -26,5 +26,5 @@ class ABCBotMessageView(ABCMessageView, ABC):\nclass BotMessageView(ABCBotMessageView):\n- def get_state_key(self, event: dict) -> Optional[int]:\n- return event[\"object\"][\"message\"].get(self.state_source_key)\n+ def get_state_key(self, message: MessageMin) -> Optional[int]:\n+ return getattr(message, self.state_source_key, None)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/user.py",
"new_path": "vkbottle/user.py",
"diff": "from .dispatch.rules import user as rules\nfrom .dispatch.views import user as views\nfrom .framework.user import ABCUserLabeler, User, UserBlueprint, UserLabeler, run_multibot\n-from .tools.dev_tools.mini_types.bot import MessageMin\n+from .tools.dev.mini_types.bot import MessageMin\nMessage = MessageMin\nBlueprint = UserBlueprint\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fixed `BotMessageView.get_state_key` (#352)
|
718,850 |
05.06.2021 17:24:26
| -10,800 |
ede92e7571d41a2aa91eb15886ad7088a40be74a
|
fix blueprints load
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -171,9 +171,9 @@ class UserLabeler(ABCUserLabeler):\ndef load(self, labeler: \"UserLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\n- self.message_view.middlewares.extend(labeler.message_view.middlewares)\n+ self.message_view.middlewares.update(labeler.message_view.middlewares)\nself.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\n- self.raw_event_view.middlewares.extend(labeler.raw_event_view.middlewares)\n+ self.raw_event_view.middlewares.update(labeler.raw_event_view.middlewares)\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\nreturn [self.custom_rules[k].with_config(self.rule_config)(v) for k, v in custom_rules.items()] # type: ignore\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix blueprints load (#353)
|
718,876 |
15.06.2021 20:35:48
| -18,000 |
3d8b6fa850b644e6bf3b65262874aec60991d2b1
|
Fix misspelling in `generate_keyboard.py` example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/generate_keyboard.py",
"new_path": "examples/high-level/generate_keyboard.py",
"diff": "from vkbottle import Keyboard, KeyboardButtonColor, Text\n# Simplest way of generating keyboard is non-builder interface\n-# Use <.raw()> to add raw\n-# Use <.add(Action(...), COLOR)> to add button to the last raw\n+# Use <.row()> to add row\n+# Use <.add(Action(...), COLOR)> to add button to the last row\n# Use <.get_json()> to make keyboard sendable\nKEYBOARD_STANDARD = Keyboard(one_time=True, inline=False)\nKEYBOARD_STANDARD.add(Text(\"Button 1\"), color=KeyboardButtonColor.POSITIVE)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix misspelling in `generate_keyboard.py` example (#358)
|
718,842 |
23.06.2021 19:01:31
| -10,800 |
c605c9de3de3d7b5ce330315d050375121899221
|
Fix isort skips, same as black's force-exclude
|
[
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -30,7 +30,7 @@ repos:\n- id: isort\nname: isort\n- entry: poetry run isort\n+ entry: poetry run isort --filter-files\nlanguage: system\ntypes: [ python ]\nstages: [ commit ]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix isort skips, same as black's force-exclude (#360)
|
718,838 |
25.06.2021 12:37:48
| -10,800 |
e6a56fa8916a9da0714be46b20d668451d36e497
|
readable exception for deprecated longpoll versions
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -60,6 +60,10 @@ MessageMin.update_forward_refs()\ndef message_min(event: dict, ctx_api: \"ABCAPI\") -> \"MessageMin\":\nupdate = MessageNew(**event)\n+\n+ if update.object.message is None:\n+ raise RuntimeError(\"Please set longpoll to latest version\")\n+\nmessage = MessageMin(\n**update.object.message.dict(),\nclient_info=update.object.client_info.dict(),\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
readable exception for deprecated longpoll versions
|
718,844 |
28.06.2021 11:51:28
| -10,800 |
51e934154abd3784dc1b47d874c30f5113de6f2a
|
Some changes in default bot labeler
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -53,6 +53,7 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"state\": StateRule,\n\"state_group\": StateGroupRule,\n\"regexp\": RegexRule,\n+ \"regex\": RegexRule,\n\"macro\": MacroRule,\n\"text\": VBMLRule,\n}\n@@ -81,7 +82,7 @@ class BotLabeler(ABCBotLabeler):\n# Rule config is accessible from every single custom rule\nself.rule_config: Dict[str, Any] = {\n- \"vbml_flags\": re.MULTILINE, # Flags for VBMLRule\n+ \"vbml_flags\": re.MULTILINE | re.DOTALL, # Flags for VBMLRule\n\"vbml_patcher\": vbml.Patcher(), # Patcher for VBMLRule\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some changes in default bot labeler (#362)
|
718,844 |
28.06.2021 11:53:22
| -10,800 |
f5946b6ceadc48ea362c49243c201cde2f748b8d
|
Added overload for `&` and `|` in the rules close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/__init__.py",
"new_path": "vkbottle/dispatch/__init__.py",
"diff": "from .abc import ABCRouter\nfrom .bot_router import BotRouter\nfrom .dispenser import ABCStateDispenser, BuiltinStateDispenser\n-from .filter import ABCFilter, AndFilter, OrFilter\nfrom .handlers import ABCHandler\nfrom .middlewares import BaseMiddleware, MiddlewareResponse\nfrom .return_manager import BaseReturnManager\n-from .rules import ABCRule\n+from .rules import ABCRule, ABCFilter, AndFilter, OrFilter\nfrom .views import ABCView, ABCDispenseView, ABCMessageView, MessageView, RawEventView\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/dispatch/filter/__init__.py",
"new_path": null,
"diff": "-from .abc import ABCFilter\n-from .builtin import AndFilter, OrFilter\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/dispatch/filter/abc.py",
"new_path": null,
"diff": "-import typing\n-from abc import abstractmethod\n-\n-from vkbottle.dispatch.rules import ABCRule\n-\n-\n-class ABCFilter(ABCRule):\n- @property\n- @abstractmethod\n- def rules(self) -> typing.Iterable[ABCRule]:\n- pass\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/dispatch/filter/builtin.py",
"new_path": null,
"diff": "-import typing\n-\n-from .abc import ABCFilter, ABCRule\n-\n-\n-class AndFilter(ABCFilter):\n- def __init__(self, *rules: ABCRule):\n- self._rules = rules\n-\n- async def check(self, event: typing.Any):\n- context = {}\n-\n- for rule in self.rules:\n- check_response = await rule.check(event)\n- if check_response is False:\n- return False\n- elif isinstance(check_response, dict):\n- context.update(check_response)\n-\n- return context\n-\n- @property\n- def rules(self) -> typing.Iterable[ABCRule]:\n- return self._rules\n-\n-\n-class OrFilter(ABCFilter):\n- def __init__(self, *rules: ABCRule):\n- self._rules = rules\n-\n- async def check(self, event: typing.Any):\n- for rule in self.rules:\n- check_response = await rule.check(event)\n- if check_response is not False:\n- return check_response\n- return False\n-\n- @property\n- def rules(self) -> typing.Iterable[ABCRule]:\n- return self._rules\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/__init__.py",
"new_path": "vkbottle/dispatch/rules/__init__.py",
"diff": "-from .abc import ABCRule\n+from .abc import ABCFilter, ABCRule, AndFilter, OrFilter\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/abc.py",
"new_path": "vkbottle/dispatch/rules/abc.py",
"diff": "from abc import ABC, abstractmethod\n-from typing import Type, Union\n+from typing import Type, Union, Iterable, Any\nfrom vkbottle_types.events import BaseGroupEvent, BaseUserEvent\n@@ -16,5 +16,55 @@ class ABCRule(ABC):\nasync def check(self, event: Union[BaseUserEvent, BaseGroupEvent]):\npass\n+ def __and__(self, other: \"ABCRule\") -> \"ABCFilter\":\n+ return AndFilter(self, other)\n+\n+ def __or__(self, other: \"ABCRule\") -> \"ABCFilter\":\n+ return OrFilter(self, other)\n+\ndef __repr__(self):\nreturn f\"<{self.__class__.__qualname__}>\"\n+\n+\n+class ABCFilter(ABCRule):\n+ @property\n+ @abstractmethod\n+ def rules(self) -> Iterable[ABCRule]:\n+ pass\n+\n+\n+class AndFilter(ABCFilter):\n+ def __init__(self, *rules: ABCRule):\n+ self._rules = rules\n+\n+ async def check(self, event: Any):\n+ context = {}\n+\n+ for rule in self.rules:\n+ check_response = await rule.check(event)\n+ if check_response is False:\n+ return False\n+ elif isinstance(check_response, dict):\n+ context.update(check_response)\n+\n+ return context\n+\n+ @property\n+ def rules(self) -> Iterable[ABCRule]:\n+ return self._rules\n+\n+\n+class OrFilter(ABCFilter):\n+ def __init__(self, *rules: ABCRule):\n+ self._rules = rules\n+\n+ async def check(self, event: Any):\n+ for rule in self.rules:\n+ check_response = await rule.check(event)\n+ if check_response is not False:\n+ return check_response\n+ return False\n+\n+ @property\n+ def rules(self) -> Iterable[ABCRule]:\n+ return self._rules\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "@@ -4,10 +4,7 @@ import re\nimport typing\nimport asyncio\n-from vkbottle.api.token_generator.consistent import ConsistentTokenGenerator\n-from vkbottle.api.token_generator.single import SingleTokenGenerator\n-from vkbottle.dispatch.filter import AndFilter, OrFilter\n-from vkbottle.dispatch.rules import ABCRule\n+from vkbottle.dispatch.rules import ABCRule, AndFilter, OrFilter\nif typing.TYPE_CHECKING:\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added overload for `&` and `|` in the rules close #361 (#363)
|
718,838 |
15.07.2021 17:58:51
| -10,800 |
bcc3ec25700567d052282e698e3af67cc1f286e4
|
fix video upload for groups
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/video.py",
"new_path": "vkbottle/tools/dev_tools/uploader/video.py",
"diff": "@@ -12,9 +12,12 @@ class VideoUploader(BaseUploader):\nreturn self.with_name or self.NAME\nasync def upload(\n- self, file_source: Optional[Union[str, bytes]] = None, **params\n+ self,\n+ file_source: Optional[Union[str, bytes]] = None,\n+ group_id: Optional[int] = None,\n+ **params\n) -> Union[str, List[dict], dict]:\n- server = await self.get_server()\n+ server = await self.get_server(group_id=group_id)\nassert (\nfile_source is not None or \"link\" in params\n), \"file_source or link to video must be set\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix video upload for groups
|
718,886 |
16.07.2021 00:45:13
| -25,200 |
6811891871236017ef5855d8ae480e7810dfc89a
|
fix attachment strings for video uploader
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/uploader/video.py",
"new_path": "vkbottle/tools/dev_tools/uploader/video.py",
"diff": "@@ -34,7 +34,7 @@ class VideoUploader(BaseUploader):\nvideo = await self.upload_files(server[\"upload_url\"], {\"video_file\": file})\nif self.generate_attachment_strings:\n- return self.generate_attachment_string(\"video\", video[\"owner_id\"], video[\"id\"])\n+ return self.generate_attachment_string(\"video\", video[\"owner_id\"], video[\"video_id\"])\nreturn video\nasync def get_server(self, **kwargs) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix attachment strings for video uploader (#370)
|
718,844 |
06.08.2021 12:28:50
| -10,800 |
d2d55b5766e7d927f8362a2f4df12b841a167a73
|
Some cosmetic rule changes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -169,32 +169,24 @@ class AttachmentTypeRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\nif not message.attachments:\nreturn False\n- for attachment in message.attachments:\n- if attachment.type.value not in self.attachment_types:\n- return False\n- return True\n+ return all(\n+ attachment.type.value in self.attachment_types for attachment in message.attachments\n+ )\nclass ForwardMessagesRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\n- if not message.fwd_messages:\n- return False\n-\n- return True\n+ return bool(message.fwd_messages)\nclass ReplyMessageRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\n- if not message.reply_message:\n- return False\n- return True\n+ return bool(message.reply_message)\nclass GeoRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\n- if not message.geo:\n- return False\n- return True\n+ return bool(message.geo)\nclass LevensteinRule(ABCMessageRule[Message], Generic[Message]):\n@@ -227,10 +219,10 @@ class LevensteinRule(ABCMessageRule[Message], Generic[Message]):\nreturn current_row[n]\nasync def check(self, message: Message) -> bool:\n- for levenstein_text in self.levenstein_texts:\n- if self.distance(message.text, levenstein_text) <= self.max_distance:\n- return True\n- return False\n+ return any(\n+ self.distance(message.text, levenstein_text) <= self.max_distance\n+ for levenstein_text in self.levenstein_texts\n+ )\nclass MessageLengthRule(ABCMessageRule[Message], Generic[Message]):\n@@ -271,10 +263,7 @@ class PayloadContainsRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\npayload = message.get_payload_json(unpack_failure=lambda p: {})\n- for k, v in self.payload_particular_part.items():\n- if payload.get(k) != v:\n- return False\n- return True\n+ return all(payload.get(k) == v for k, v in self.payload_particular_part.items())\nclass PayloadMapRule(ABCMessageRule[Message], Generic[Message]):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some cosmetic rule changes
|
718,844 |
07.08.2021 03:35:56
| -10,800 |
5f964e81c51517979c49da24a297702450d8013b
|
Add `state_dispenser` param for Bot and User init
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -2,7 +2,7 @@ from asyncio import AbstractEventLoop, get_event_loop\nfrom typing import NoReturn, Optional, Union\nfrom vkbottle.api import ABCAPI, API, Token\n-from vkbottle.dispatch import ABCRouter, BuiltinStateDispenser, Router\n+from vkbottle.dispatch import ABCRouter, ABCStateDispenser, BuiltinStateDispenser, Router\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle.framework.abc import ABCFramework\nfrom vkbottle.modules import logger\n@@ -22,6 +22,7 @@ class Bot(ABCFramework):\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCBotLabeler\"] = None,\n+ state_dispenser: Optional[\"ABCStateDispenser\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\ntask_each_event: bool = True,\n):\n@@ -29,7 +30,7 @@ class Bot(ABCFramework):\nself.error_handler = error_handler or ErrorHandler()\nself.loop_wrapper = loop_wrapper or LoopWrapper()\nself.labeler = labeler or BotLabeler()\n- self.state_dispenser = BuiltinStateDispenser()\n+ self.state_dispenser = state_dispenser or BuiltinStateDispenser()\nself._polling = polling or BotPolling(self.api)\nself._router = router or Router()\nself._loop = loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -2,7 +2,7 @@ from asyncio import AbstractEventLoop, get_event_loop\nfrom typing import NoReturn, Optional, Union\nfrom vkbottle.api import ABCAPI, API, Token\n-from vkbottle.dispatch import ABCRouter, BuiltinStateDispenser, Router\n+from vkbottle.dispatch import ABCRouter, ABCStateDispenser, BuiltinStateDispenser, Router\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle.framework.abc import ABCFramework\nfrom vkbottle.modules import logger\n@@ -22,6 +22,7 @@ class User(ABCFramework):\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCUserLabeler\"] = None,\n+ state_dispenser: Optional[\"ABCStateDispenser\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\ntask_each_event: bool = True,\n):\n@@ -29,7 +30,7 @@ class User(ABCFramework):\nself.error_handler = error_handler or ErrorHandler()\nself.loop_wrapper = loop_wrapper or LoopWrapper()\nself.labeler = labeler or UserLabeler()\n- self.state_dispenser = BuiltinStateDispenser()\n+ self.state_dispenser = state_dispenser or BuiltinStateDispenser()\nself._polling = polling or UserPolling(self.api)\nself._router = router or Router()\nself._loop = loop\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `state_dispenser` param for Bot and User init
|
718,844 |
14.08.2021 09:39:06
| -10,800 |
62737fa97f1c7865c05ab30ade95042d5da0d80b
|
Fixed a bug with overriding raw_event handlers for the same events.
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/raw.py",
"new_path": "vkbottle/dispatch/views/abc/raw.py",
"diff": "@@ -10,7 +10,7 @@ from .view import ABCView\nclass ABCRawEventView(ABCView):\n@abstractmethod\n- def get_handler_basement(self, event):\n+ def get_handler_basements(self, event):\n...\n@abstractmethod\n@@ -27,9 +27,16 @@ class ABCRawEventView(ABCView):\n) -> Any:\nlogger.debug(\"Handling event ({}) with message view\".format(self.get_event_type(event)))\n- handler_basement = self.get_handler_basement(event)\ncontext_variables: dict = {}\n+ handle_responses = []\n+ handlers = []\n+ mw_instances = await self.pre_middleware(event, context_variables)\n+ if mw_instances is None:\n+ logger.info(\"Handling stopped, pre_middleware returned error\")\n+ return\n+\n+ for handler_basement in self.get_handler_basements(event):\nevent_model = self.get_event_model(handler_basement, event)\nif isinstance(event_model, dict):\n@@ -37,10 +44,6 @@ class ABCRawEventView(ABCView):\nelse:\nsetattr(event_model, \"unprepared_ctx_api\", ctx_api)\n- mw_instances = await self.pre_middleware(event_model, context_variables)\n- if mw_instances is None:\n- return logger.info(\"Handling stopped, pre_middleware returned error\")\n-\nresult = await handler_basement.handler.filter(event_model)\nlogger.debug(\"Handler {} returned {}\".format(handler_basement.handler, result))\n@@ -50,12 +53,22 @@ class ABCRawEventView(ABCView):\nelif isinstance(result, dict):\ncontext_variables.update(result)\n- handler_response = await handler_basement.handler.handle(event_model, **context_variables)\n+ handler_response = await handler_basement.handler.handle(\n+ event_model, **context_variables\n+ )\n+ handle_responses.append(handler_response)\n+ handlers.append(handler_basement.handler)\nreturn_handler = self.handler_return_manager.get_handler(handler_response)\nif return_handler is not None:\nawait return_handler(\n- self.handler_return_manager, handler_response, event_model, context_variables,\n+ self.handler_return_manager,\n+ handler_response,\n+ event_model,\n+ context_variables,\n)\n- await self.post_middleware(mw_instances, [handler_response], [handler_basement.handler])\n+ if handler_basement.handler.blocking:\n+ break\n+\n+ await self.post_middleware(mw_instances, handle_responses, handlers)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -14,15 +14,15 @@ class ABCBotMessageView(ABCMessageView, ABC):\nself.handler_return_manager = BotMessageReturnHandler()\n@staticmethod\n- def get_event_type(event):\n- return event.get(\"event_id\")\n+ def get_event_type(event: dict) -> str:\n+ return event[\"type\"]\n@staticmethod\n- async def get_message(event, ctx_api):\n+ async def get_message(event, ctx_api) -> MessageMin:\nreturn message_min(event, ctx_api)\nasync def process_event(self, event: dict) -> bool:\n- return GroupEventType(event[\"type\"]) == GroupEventType.MESSAGE_NEW\n+ return GroupEventType(self.get_event_type(event)) == GroupEventType.MESSAGE_NEW\nclass BotMessageView(ABCBotMessageView):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "-from typing import Callable, Dict, NamedTuple\n+from typing import Dict, List, NamedTuple, Type, Union\n-from vkbottle_types.events import GroupEventType\n+from vkbottle_types.events import BaseGroupEvent, GroupEventType\nfrom vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.return_manager.bot import BotMessageReturnHandler\nfrom vkbottle.dispatch.views.abc import ABCRawEventView\n-HandlerBasement = NamedTuple(\"HandlerBasement\", [(\"dataclass\", Callable), (\"handler\", ABCHandler)])\n+\n+class HandlerBasement(NamedTuple):\n+ dataclass: Union[dict, Type[BaseGroupEvent]]\n+ handler: ABCHandler\nclass RawBotEventView(ABCRawEventView):\ndef __init__(self):\nsuper().__init__()\n- self.handlers: Dict[GroupEventType, HandlerBasement] = {}\n+ self.handlers: Dict[GroupEventType, List[HandlerBasement]] = {}\nself.handler_return_manager = BotMessageReturnHandler()\n- def get_handler_basement(self, event):\n+ def get_handler_basements(self, event):\nreturn self.handlers[GroupEventType(self.get_event_type(event))]\ndef get_event_model(self, handler_basement, event):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -14,11 +14,11 @@ class ABCUserMessageView(ABCMessageView, ABC):\nself.handler_return_manager = UserMessageReturnHandler()\n@staticmethod\n- def get_event_type(event):\n+ def get_event_type(event: list) -> int:\nreturn event[0]\n@staticmethod\n- async def get_message(event, ctx_api):\n+ async def get_message(event, ctx_api) -> MessageMin:\nreturn await message_min(event[1], ctx_api)\nasync def process_event(self, event: list) -> bool:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/raw.py",
"new_path": "vkbottle/dispatch/views/user/raw.py",
"diff": "-from typing import Dict, NamedTuple, Type\n+from typing import Dict, List, NamedTuple, Type, Union\nfrom vkbottle_types.events import BaseUserEvent, UserEventType\n@@ -6,21 +6,22 @@ from vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.return_manager.user import UserMessageReturnHandler\nfrom vkbottle.dispatch.views.abc import ABCRawEventView\n-HandlerBasement = NamedTuple(\n- \"HandlerBasement\", [(\"dataclass\", Type[BaseUserEvent]), (\"handler\", ABCHandler)]\n-)\n+\n+class HandlerBasement(NamedTuple):\n+ dataclass: Union[dict, Type[BaseUserEvent]]\n+ handler: ABCHandler\nclass RawUserEventView(ABCRawEventView):\ndef __init__(self):\nsuper().__init__()\n- self.handlers: Dict[UserEventType, HandlerBasement] = {}\n+ self.handlers: Dict[UserEventType, List[HandlerBasement]] = {}\nself.handler_return_manager = UserMessageReturnHandler()\n- def get_handler_basement(self, event):\n+ def get_handler_basements(self, event) -> List[HandlerBasement]:\nreturn self.handlers[UserEventType(self.get_event_type(event))]\n- def get_event_model(self, handler_basement, event):\n+ def get_event_model(self, handler_basement, event) -> Union[dict, Type[BaseUserEvent]]:\nreturn handler_basement.dataclass(event[1])\n@staticmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -152,6 +152,7 @@ class BotLabeler(ABCBotLabeler):\nevent: Union[EventName, List[EventName]],\ndataclass: Callable = dict,\n*rules: ShortenRule,\n+ blocking: bool = True,\n**custom_rules,\n) -> LabeledHandler:\n@@ -164,15 +165,21 @@ class BotLabeler(ABCBotLabeler):\nif isinstance(e, str):\ne = GroupEventType(e)\n- self.raw_event_view.handlers[e] = HandlerBasement(\n+ event_handlers = self.raw_event_view.handlers.get(e)\n+ handler_basement = HandlerBasement(\ndataclass,\nFromFuncHandler(\nfunc,\n*map(convert_shorten_filter, rules),\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\n+ blocking=blocking,\n),\n)\n+ if not event_handlers:\n+ self.raw_event_view.handlers[e] = [handler_basement]\n+ else:\n+ self.raw_event_view.handlers[e].append(handler_basement)\nreturn func\nreturn decorator\n@@ -180,7 +187,12 @@ class BotLabeler(ABCBotLabeler):\ndef load(self, labeler: \"BotLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.update(labeler.message_view.middlewares)\n- self.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\n+ for event, handler_basements in labeler.raw_event_view.handlers:\n+ event_handlers = self.raw_event_view.handlers.get(event)\n+ if event_handlers:\n+ event_handlers.extend(handler_basements)\n+ else:\n+ self.raw_event_view.handlers[event] = handler_basements\nself.raw_event_view.middlewares.update(labeler.raw_event_view.middlewares)\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -148,6 +148,7 @@ class UserLabeler(ABCUserLabeler):\nevent: Union[str, List[str]],\ndataclass: Callable = dict,\n*rules: ShortenRule,\n+ blocking: bool = True,\n**custom_rules,\n) -> LabeledHandler:\n@@ -156,15 +157,21 @@ class UserLabeler(ABCUserLabeler):\ndef decorator(func):\nfor e in event:\n- self.raw_event_view.handlers[e] = HandlerBasement(\n+ event_handlers = self.raw_event_view.handlers.get(e)\n+ handler_basement = HandlerBasement(\ndataclass,\nFromFuncHandler(\nfunc,\n*map(convert_shorten_filter, rules),\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\n+ blocking=blocking,\n),\n)\n+ if not event_handlers:\n+ self.raw_event_view.handlers[e] = [handler_basement]\n+ else:\n+ self.raw_event_view.handlers[e].append(handler_basement)\nreturn func\nreturn decorator\n@@ -172,7 +179,12 @@ class UserLabeler(ABCUserLabeler):\ndef load(self, labeler: \"UserLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.update(labeler.message_view.middlewares)\n- self.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\n+ for event, handler_basements in labeler.raw_event_view.handlers:\n+ event_handlers = self.raw_event_view.handlers.get(event)\n+ if event_handlers:\n+ event_handlers.extend(handler_basements)\n+ else:\n+ self.raw_event_view.handlers[event] = handler_basements\nself.raw_event_view.middlewares.update(labeler.raw_event_view.middlewares)\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fixed a bug with overriding raw_event handlers for the same events. (#382)
|
718,866 |
27.08.2021 01:55:27
| -10,800 |
fef4a6584f104772b71f447845f02afb99a2c22f
|
style: format code with `black`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/view.py",
"new_path": "vkbottle/dispatch/views/abc/view.py",
"diff": "@@ -30,7 +30,9 @@ class ABCView(ABC):\npass\nasync def pre_middleware(\n- self, event: \"Event\", context_variables: Optional[dict] = None,\n+ self,\n+ event: \"Event\",\n+ context_variables: Optional[dict] = None,\n) -> Optional[List[BaseMiddleware]]:\n\"\"\"Run all of the pre middleware methods and return an exception if any error occurs\"\"\"\nmw_instances = []\n@@ -67,7 +69,10 @@ class ABCView(ABC):\n@abstractmethod\nasync def handle_event(\n- self, event: \"Event\", ctx_api: \"ABCAPI\", state_dispenser: \"ABCStateDispenser\",\n+ self,\n+ event: \"Event\",\n+ ctx_api: \"ABCAPI\",\n+ state_dispenser: \"ABCStateDispenser\",\n) -> None:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "@@ -33,7 +33,11 @@ class BotPolling(ABCPolling):\nreturn await session.request_json(\n\"POST\",\n\"{}?act=a_check&key={}&ts={}&wait={}&rps_delay={}\".format(\n- server[\"server\"], server[\"key\"], server[\"ts\"], self.wait, self.rps_delay,\n+ server[\"server\"],\n+ server[\"key\"],\n+ server[\"ts\"],\n+ self.wait,\n+ self.rps_delay,\n),\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "@@ -33,7 +33,11 @@ class UserPolling(ABCPolling):\nreturn await session.request_json(\n\"POST\",\n\"https://{}?act=a_check&key={}&ts={}&wait={}&rps_delay={}\".format(\n- server[\"server\"], server[\"key\"], server[\"ts\"], self.wait, self.rps_delay,\n+ server[\"server\"],\n+ server[\"key\"],\n+ server[\"ts\"],\n+ self.wait,\n+ self.rps_delay,\n),\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/button.py",
"new_path": "vkbottle/tools/dev/keyboard/button.py",
"diff": "@@ -6,7 +6,10 @@ from .color import KeyboardButtonColor\nclass KeyboardButton:\ndef __init__(\n- self, action: ABCAction, color: KeyboardButtonColor, data: dict,\n+ self,\n+ action: ABCAction,\n+ color: KeyboardButtonColor,\n+ data: dict,\n):\nself.action = action\nself.color = color\n@@ -30,6 +33,13 @@ class KeyboardButton:\nreturn self.data\ndata = {\"action\": self.action.get_data()}\n- if self.action.type in (\"text\", \"callback\",) and self.color:\n+ if (\n+ self.action.type\n+ in (\n+ \"text\",\n+ \"callback\",\n+ )\n+ and self.color\n+ ):\ndata[\"color\"] = self.color.value\nreturn data\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/storage/ctx_storage.py",
"new_path": "vkbottle/tools/dev/storage/ctx_storage.py",
"diff": "@@ -13,7 +13,9 @@ class CtxStorage(ABCStorage, BaseContext):\nstorage: dict = {}\ndef __init__(\n- self, default: dict = None, force_reset: bool = False,\n+ self,\n+ default: dict = None,\n+ force_reset: bool = False,\n):\ndefault = default or {}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/audio.py",
"new_path": "vkbottle/tools/dev/uploader/audio.py",
"diff": "@@ -20,7 +20,8 @@ class AudioUploader(BaseUploader):\naudio = (\nawait self.api.request(\n- \"audio.save\", {\"artist\": artist, \"title\": title, **uploader, **params},\n+ \"audio.save\",\n+ {\"artist\": artist, \"title\": title, **uploader, **params},\n)\n)[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/doc.py",
"new_path": "vkbottle/tools/dev/uploader/doc.py",
"diff": "@@ -19,9 +19,12 @@ class DocUploader(BaseUploader, ABC):\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n- doc = (await self.api.request(\"docs.save\", {\"title\": title, **uploader, **params},))[\n- \"response\"\n- ]\n+ doc = (\n+ await self.api.request(\n+ \"docs.save\",\n+ {\"title\": title, **uploader, **params},\n+ )\n+ )[\"response\"]\ndoc_type = doc[\"type\"]\nif self.generate_attachment_strings:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -116,7 +116,8 @@ def test_keyboard_builder():\ndef test_keyboard_generator():\nwith pytest.deprecated_call():\n- assert json.loads(\n+ assert (\n+ json.loads(\nkeyboard_gen(\n[\n[{\"label\": \"I love nuggets\", \"payload\": {\"love\": \"nuggets\"}}],\n@@ -131,7 +132,9 @@ def test_keyboard_generator():\n],\none_time=True,\n)\n- ) == json.loads(KEYBOARD_JSON)\n+ )\n+ == json.loads(KEYBOARD_JSON)\n+ )\ndef test_bp_importer(mocker: MockerFixture):\n@@ -234,8 +237,18 @@ async def test_utils(mocker: MockerFixture):\n\"c_rule\", (ABCRule,), {\"check\": task_to_run, \"__init__\": lambda s, i: setattr(s, \"x\", i)}\n)\n- assert convert_shorten_filter((c_rule(None),)).__class__ == OrFilter(c_rule(None),).__class__\n- assert convert_shorten_filter({c_rule(None)}).__class__ == AndFilter(c_rule(None),).__class__\n+ assert (\n+ convert_shorten_filter((c_rule(None),)).__class__\n+ == OrFilter(\n+ c_rule(None),\n+ ).__class__\n+ )\n+ assert (\n+ convert_shorten_filter({c_rule(None)}).__class__\n+ == AndFilter(\n+ c_rule(None),\n+ ).__class__\n+ )\nassert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(2))\nassert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(4), True)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
style: format code with `black`
|
718,866 |
27.08.2021 13:05:03
| -10,800 |
09f0b6c22ac11f4dba442fd3f4bd7b36a3ddbf2d
|
docs: fix `ErrorHandler` example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/low-level/error_handler_example.py",
"new_path": "examples/low-level/error_handler_example.py",
"diff": "@@ -11,14 +11,14 @@ error_handler = ErrorHandler()\n# async def exc_h(exc: RuntimeError, a, b): ...\n+@error_handler.register_error_handler(RuntimeError)\nasync def exc_handler(exc: RuntimeError):\nprint(\"Oops error:\", exc)\n-@error_handler.wraps_error_handler()\n+@error_handler.catch\nasync def main():\nraise RuntimeError(\"Oh my god i am an exception\")\n-error_handler.register_error_handler(RuntimeError, exception_handler=exc_handler)\nasyncio.run(main())\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
docs: fix `ErrorHandler` example
|
718,838 |
01.09.2021 15:25:11
| -10,800 |
d20019eb7ddcfef2293a4bdbddc29f2b9e729f68
|
fix failure event crash
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -62,7 +62,7 @@ class User(ABCFramework):\nasync for event in polling.listen(): # type: ignore\nlogger.debug(f\"New event was received: {event}\")\n- for update in event[\"updates\"]:\n+ for update in event.get(\"updates\", []):\nif not self.task_each_event:\nawait self.router.route(update, polling.api)\nelse:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix failure event crash
|
718,838 |
09.09.2021 15:55:39
| -10,800 |
8010c3069e1d977f3ffe88bda1767ea2a68065da
|
fix blueprint load
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -187,7 +187,7 @@ class BotLabeler(ABCBotLabeler):\ndef load(self, labeler: \"BotLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.update(labeler.message_view.middlewares)\n- for event, handler_basements in labeler.raw_event_view.handlers:\n+ for event, handler_basements in labeler.raw_event_view.handlers.items():\nevent_handlers = self.raw_event_view.handlers.get(event)\nif event_handlers:\nevent_handlers.extend(handler_basements)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -179,7 +179,7 @@ class UserLabeler(ABCUserLabeler):\ndef load(self, labeler: \"UserLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.update(labeler.message_view.middlewares)\n- for event, handler_basements in labeler.raw_event_view.handlers:\n+ for event, handler_basements in labeler.raw_event_view.handlers.items():\nevent_handlers = self.raw_event_view.handlers.get(event)\nif event_handlers:\nevent_handlers.extend(handler_basements)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix blueprint load
|
718,838 |
09.09.2021 16:21:43
| -10,800 |
9c486473b9a3373d9ccef7eef183ed1fda31e83f
|
fix raw event view
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/raw.py",
"new_path": "vkbottle/dispatch/views/abc/raw.py",
"diff": "@@ -48,7 +48,7 @@ class ABCRawEventView(ABCView):\nlogger.debug(\"Handler {} returned {}\".format(handler_basement.handler, result))\nif result is False:\n- return\n+ continue\nelif isinstance(result, dict):\ncontext_variables.update(result)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix raw event view
|
718,844 |
23.09.2021 21:09:51
| -10,800 |
6b1a604b85c1037d6acd0d974874b81eab8a7a71
|
Remove old filter converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "import re\n-from typing import Any, Callable, Dict, List, Set, Tuple, Type, Union\n+from typing import Any, Callable, Dict, List, Type, Union\nimport vbml\nfrom vkbottle_types.events import GroupEventType\n@@ -8,11 +8,8 @@ from vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule, bot\nfrom vkbottle.dispatch.views import ABCView\nfrom vkbottle.dispatch.views.bot import BotMessageView, HandlerBasement, RawBotEventView\n-from vkbottle.tools.dev.utils import convert_shorten_filter\n-\nfrom .abc import ABCBotLabeler, EventName, LabeledHandler, LabeledMessageHandler\n-ShortenRule = Union[ABCRule, Tuple[ABCRule, ...], Set[ABCRule]]\nDEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"from_chat\": bot.PeerRule,\n\"command\": bot.CommandRule,\n@@ -96,13 +93,13 @@ class BotLabeler(ABCBotLabeler):\nself.rule_config[\"vbml_flags\"] = flags\ndef message(\n- self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n+ self, *rules: ABCRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -113,14 +110,14 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef chat_message(\n- self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n+ self, *rules: ABCRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\nbot.PeerRule(True),\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -131,14 +128,14 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef private_message(\n- self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n+ self, *rules: ABCRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\nbot.PeerRule(False),\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -152,7 +149,7 @@ class BotLabeler(ABCBotLabeler):\nself,\nevent: Union[EventName, List[EventName]],\ndataclass: Callable = dict,\n- *rules: ShortenRule,\n+ *rules: ABCRule,\nblocking: bool = True,\n**custom_rules,\n) -> LabeledHandler:\n@@ -171,7 +168,7 @@ class BotLabeler(ABCBotLabeler):\ndataclass,\nFromFuncHandler(\nfunc,\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -7,7 +7,6 @@ from vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule, user\nfrom vkbottle.dispatch.views import ABCView\nfrom vkbottle.dispatch.views.user import HandlerBasement, RawUserEventView, UserMessageView\n-from vkbottle.tools.dev.utils import convert_shorten_filter\nfrom .abc import ABCUserLabeler, LabeledHandler, LabeledMessageHandler\n@@ -98,7 +97,7 @@ class UserLabeler(ABCUserLabeler):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -116,7 +115,7 @@ class UserLabeler(ABCUserLabeler):\nFromFuncHandler(\nfunc,\nuser.PeerRule(True),\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -134,7 +133,7 @@ class UserLabeler(ABCUserLabeler):\nFromFuncHandler(\nfunc,\nuser.PeerRule(False),\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n@@ -163,7 +162,7 @@ class UserLabeler(ABCUserLabeler):\ndataclass,\nFromFuncHandler(\nfunc,\n- *map(convert_shorten_filter, rules),\n+ *rules,\n*self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/__init__.py",
"new_path": "vkbottle/tools/dev/__init__.py",
"diff": "@@ -7,5 +7,5 @@ from .mini_types import BotTypes, UserTypes\nfrom .storage import ABCStorage, CtxStorage\nfrom .template import TemplateElement, template_gen\nfrom .uploader import *\n-from .utils import convert_shorten_filter, load_blueprints_from_package, run_in_task\n+from .utils import load_blueprints_from_package, run_in_task\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/utils.py",
"new_path": "vkbottle/tools/dev/utils.py",
"diff": "@@ -4,8 +4,6 @@ import os\nimport re\nimport typing\n-from vkbottle.dispatch.rules import ABCRule, AndFilter, OrFilter\n-\nif typing.TYPE_CHECKING:\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\n@@ -19,19 +17,6 @@ def run_in_task(coroutine: typing.Coroutine) -> None:\nloop.create_task(coroutine)\n-def convert_shorten_filter(\n- shorten: typing.Union[ABCRule, typing.Tuple[ABCRule, ...], typing.Set[ABCRule]]\n-) -> \"ABCRule\":\n- \"\"\"Shortener. Converts tuple/list of rules to OrFilter and set of rules to AndFilter\n- :param shorten: list/tuple/set of rules or a single rule\n- \"\"\"\n- if isinstance(shorten, set):\n- return AndFilter(*shorten)\n- elif isinstance(shorten, tuple):\n- return OrFilter(*shorten)\n- return shorten\n-\n-\ndef load_blueprints_from_package(package_name: str) -> typing.Iterator[\"ABCBlueprint\"]:\n\"\"\"Gets blueprints from package\n>>> for bp in load_blueprints_from_package(\"blueprints\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -19,7 +19,6 @@ from vkbottle.tools import (\nLoopWrapper,\nTemplateElement,\nText,\n- convert_shorten_filter,\nkeyboard_gen,\nload_blueprints_from_package,\nrun_in_task,\n@@ -237,23 +236,17 @@ async def test_utils(mocker: MockerFixture):\n\"c_rule\", (ABCRule,), {\"check\": task_to_run, \"__init__\": lambda s, i: setattr(s, \"x\", i)}\n)\n- assert (\n- convert_shorten_filter((c_rule(None),)).__class__\n- == OrFilter(\n+ assert (c_rule(None) | c_rule(None)).__class__ == OrFilter(\nc_rule(None),\n).__class__\n- )\n- assert (\n- convert_shorten_filter({c_rule(None)}).__class__\n- == AndFilter(\n+ assert (c_rule(None) & c_rule(None)).__class__ == AndFilter(\nc_rule(None),\n).__class__\n- )\n- assert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(2))\n- assert_rule(await convert_shorten_filter((c_rule(1), c_rule(2))).check(4), True)\n- assert_rule(await convert_shorten_filter({c_rule(4), c_rule(4)}).check(4))\n- assert_rule(await convert_shorten_filter({c_rule(2), c_rule(4)}).check(4), True)\n+ assert_rule(await (c_rule(1) | c_rule(2)).check(2))\n+ assert_rule(await (c_rule(1) | c_rule(2)).check(4), True)\n+ assert_rule(await (c_rule(4) & c_rule(4)).check(4))\n+ assert_rule(await (c_rule(2) & c_rule(4)).check(4), True)\ndef test_run_multibot(mocker: MockerFixture):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove old filter converter
|
718,844 |
23.09.2021 21:36:30
| -10,800 |
b5329f8028e2c09b4e4141e04663eebfa425e1ac
|
Add NotFilter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/__init__.py",
"new_path": "vkbottle/dispatch/__init__.py",
"diff": "@@ -4,5 +4,5 @@ from .dispenser import ABCStateDispenser, BuiltinStateDispenser\nfrom .handlers import ABCHandler\nfrom .middlewares import BaseMiddleware, MiddlewareError\nfrom .return_manager import BaseReturnManager\n-from .rules import ABCFilter, ABCRule, AndFilter, OrFilter\n+from .rules import ABCFilter, ABCRule, AndFilter, NotFilter, OrFilter\nfrom .views import ABCDispenseView, ABCView\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/__init__.py",
"new_path": "vkbottle/dispatch/rules/__init__.py",
"diff": "-from .abc import ABCFilter, ABCRule, AndFilter, OrFilter\n+from .abc import ABCFilter, ABCRule, AndFilter, NotFilter, OrFilter\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/abc.py",
"new_path": "vkbottle/dispatch/rules/abc.py",
"diff": "@@ -20,6 +20,9 @@ class ABCRule(ABC):\ndef __and__(self, other: \"ABCRule\") -> \"ABCFilter\":\nreturn AndFilter(self, other)\n+ def __invert__(self) -> \"ABCFilter\":\n+ return NotFilter(self)\n+\ndef __or__(self, other: \"ABCRule\") -> \"ABCFilter\":\nreturn OrFilter(self, other)\n@@ -55,6 +58,22 @@ class AndFilter(ABCFilter):\nreturn self._rules\n+class NotFilter(ABCFilter):\n+ def __init__(self, *rules: ABCRule):\n+ self._rules = rules\n+\n+ async def check(self, event: Any):\n+ for rule in self.rules:\n+ check_response = await rule.check(event)\n+ if check_response is False:\n+ return True\n+ return False\n+\n+ @property\n+ def rules(self) -> Iterable[ABCRule]:\n+ return self._rules\n+\n+\nclass OrFilter(ABCFilter):\ndef __init__(self, *rules: ABCRule):\nself._rules = rules\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -6,7 +6,7 @@ from pytest_mock import MockerFixture\nfrom vkbottle import API\nfrom vkbottle.bot import Bot, run_multibot\n-from vkbottle.dispatch import ABCRule, AndFilter, OrFilter\n+from vkbottle.dispatch import ABCRule, AndFilter, NotFilter, OrFilter\nfrom vkbottle.modules import json\nfrom vkbottle.tools import (\nCallableValidator,\n@@ -242,11 +242,16 @@ async def test_utils(mocker: MockerFixture):\nassert (c_rule(None) & c_rule(None)).__class__ == AndFilter(\nc_rule(None),\n).__class__\n+ assert (~c_rule(None)).__class__ == NotFilter(\n+ c_rule(None),\n+ ).__class__\nassert_rule(await (c_rule(1) | c_rule(2)).check(2))\nassert_rule(await (c_rule(1) | c_rule(2)).check(4), True)\nassert_rule(await (c_rule(4) & c_rule(4)).check(4))\nassert_rule(await (c_rule(2) & c_rule(4)).check(4), True)\n+ assert_rule(await (~c_rule(1)).check(2))\n+ assert_rule(await (~c_rule(2)).check(2), True)\ndef test_run_multibot(mocker: MockerFixture):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add NotFilter
|
718,844 |
02.10.2021 13:50:47
| -10,800 |
fa6dae7cb0a70695f7d2366eedc8c4eb1cb1a1a5
|
Add message splitter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "+from io import StringIO\nfrom typing import TYPE_CHECKING, Any, List, Optional, Union\nfrom vkbottle_types import StatePeer\n@@ -60,7 +61,15 @@ class MessageMin(MessagesMessage):\nif not any(data.get(param) for param in required_params):\ndata[\"peer_id\"] = self.peer_id\n- return (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ stream = StringIO(message)\n+ response = None\n+ while True:\n+ data[\"message\"] = stream.read(4096)\n+ if not (data[\"message\"] or data.get(\"attachment\")):\n+ break\n+ response = (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ data.pop(\"attachment\", None)\n+ return response\nasync def reply(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "+from io import StringIO\nfrom typing import TYPE_CHECKING, Any, List, Optional, Union\nfrom vkbottle_types import StatePeer\n@@ -53,9 +54,19 @@ class MessageMin(MessagesMessage):\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n+ required_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n+ if not any(data.get(param) for param in required_params):\ndata[\"peer_id\"] = self.peer_id\n- return (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ stream = StringIO(message)\n+ response = None\n+ while True:\n+ data[\"message\"] = stream.read(4096)\n+ if not (data[\"message\"] or data.get(\"attachment\")):\n+ break\n+ response = (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ data.pop(\"attachment\", None)\n+ return response\nasync def reply(\nself,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add message splitter
|
718,844 |
10.10.2021 20:16:33
| -10,800 |
7c85d5e30c1a1debe41c6c1f8c0801c9de97b6cf
|
Add user direct auth
|
[
{
"change_type": "MODIFY",
"old_path": "examples/low-level/exception_manager.py",
"new_path": "examples/low-level/exception_manager.py",
"diff": "-import os\nimport asyncio\n+import os\n-from vkbottle.exception_factory import VKAPIError\nfrom vkbottle.api import API\n+from vkbottle.exception_factory import VKAPIError\napi = API(os.environ[\"token\"])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "-from asyncio import AbstractEventLoop, get_event_loop\n-from typing import TYPE_CHECKING, NoReturn, Optional, Union\n+from asyncio import get_event_loop\n+from typing import TYPE_CHECKING, NoReturn, Optional, Type, Union\nfrom vkbottle.api import API\nfrom vkbottle.dispatch import BuiltinStateDispenser, Router\n@@ -7,11 +7,13 @@ from vkbottle.exception_factory import ErrorHandler\nfrom vkbottle.framework.abc import ABCFramework\nfrom vkbottle.modules import logger\nfrom vkbottle.polling import UserPolling\n-from vkbottle.tools import LoopWrapper\n+from vkbottle.tools import LoopWrapper, UserAuth\nfrom .labeler import UserLabeler\nif TYPE_CHECKING:\n+ from asyncio import AbstractEventLoop\n+\nfrom vkbottle.api import ABCAPI, Token\nfrom vkbottle.dispatch import ABCRouter, ABCStateDispenser\nfrom vkbottle.exception_factory import ABCErrorHandler\n@@ -26,7 +28,7 @@ class User(ABCFramework):\ntoken: Optional[\"Token\"] = None,\napi: Optional[\"ABCAPI\"] = None,\npolling: Optional[\"ABCPolling\"] = None,\n- loop: Optional[AbstractEventLoop] = None,\n+ loop: Optional[\"AbstractEventLoop\"] = None,\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCUserLabeler\"] = None,\n@@ -64,6 +66,39 @@ class User(ABCFramework):\ndef on(self) -> \"ABCUserLabeler\":\nreturn self.labeler\n+ @classmethod\n+ def direct_auth_sync(\n+ cls: Type[\"User\"],\n+ login: str,\n+ password: str,\n+ client_id: int = None,\n+ client_secret: str = None,\n+ **kwargs,\n+ ):\n+ loop = get_event_loop()\n+ assert not loop.is_running(), \"Event loop is already running, use direct_auth instead\"\n+ return loop.run_until_complete(\n+ cls.direct_auth(\n+ login=login,\n+ password=password,\n+ client_id=client_id,\n+ client_secret=client_secret,\n+ **kwargs,\n+ )\n+ )\n+\n+ @classmethod\n+ async def direct_auth(\n+ cls: Type[\"User\"],\n+ login: str,\n+ password: str,\n+ client_id: int = None,\n+ client_secret: str = None,\n+ **kwargs,\n+ ):\n+ token = await UserAuth(client_id, client_secret).get_token(login, password)\n+ return cls(token=token, **kwargs)\n+\nasync def run_polling(self, custom_polling: Optional[\"ABCPolling\"] = None) -> NoReturn:\npolling = custom_polling or self.polling\nlogger.info(f\"Starting polling for {polling.api!r}\")\n@@ -82,11 +117,11 @@ class User(ABCFramework):\nself.loop_wrapper.run_forever(self.loop)\n@property\n- def loop(self) -> AbstractEventLoop:\n+ def loop(self) -> \"AbstractEventLoop\":\nif self._loop is None:\nself._loop = get_event_loop()\nreturn self._loop\n@loop.setter\n- def loop(self, new_loop: AbstractEventLoop):\n+ def loop(self, new_loop: \"AbstractEventLoop\"):\nself._loop = new_loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/__init__.py",
"new_path": "vkbottle/tools/dev/__init__.py",
"diff": "-from .auth import UserAuth, AuthError\n+from .auth import AuthError, UserAuth\nfrom .ctx_tool import BaseContext\nfrom .event_data import *\nfrom .keyboard import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/auth.py",
"new_path": "vkbottle/tools/dev/auth.py",
"diff": "@@ -2,7 +2,6 @@ from typing import Optional\nfrom vkbottle.http import AiohttpClient\n-\nMOBILE_APP_ID = 2274003\nMOBILE_APP_SECRET = \"hHbZxrka2uZ6jB1inYsH\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add user direct auth (#403)
|
718,844 |
10.10.2021 21:11:15
| -10,800 |
157e858e745d0af322bee8f5318bf246623cf112
|
Fix for undefined user_lp events
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -40,7 +40,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131\"\n+vkbottle-types = \"^5.131.119.2\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -25,7 +25,11 @@ class ABCUserMessageView(ABCMessageView, ABC):\nreturn await message_min(event[1], ctx_api)\nasync def process_event(self, event: list) -> bool:\n- return UserEventType(self.get_event_type(event)) == UserEventType.NEW_MESSAGE\n+ try:\n+ event_type = UserEventType(self.get_event_type(event))\n+ except ValueError:\n+ event_type = UserEventType.UNDEFINED_EVENT\n+ return event_type == UserEventType.NEW_MESSAGE\nclass UserMessageView(ABCUserMessageView):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/raw.py",
"new_path": "vkbottle/dispatch/views/user/raw.py",
"diff": "@@ -33,4 +33,8 @@ class RawUserEventView(ABCRawEventView):\nreturn event[0]\nasync def process_event(self, event: list) -> bool:\n- return UserEventType(self.get_event_type(event)) in self.handlers\n+ try:\n+ event_type = UserEventType(self.get_event_type(event))\n+ except ValueError:\n+ event_type = UserEventType.UNDEFINED_EVENT\n+ return event_type in self.handlers\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix for undefined user_lp events (#408)
|
718,844 |
15.10.2021 09:47:01
| -10,800 |
afa02587e8d0e2b030e90b13ae0a00bbe44cc7c4
|
Fix blueprints load on windows
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/utils.py",
"new_path": "vkbottle/tools/dev/utils.py",
"diff": "@@ -30,7 +30,7 @@ def load_blueprints_from_package(package_name: str) -> Iterator[\"ABCBlueprint\"]:\nyield from load_blueprints_from_package(os.path.join(package_name, filename))\ncontinue\n- with open(os.path.join(package_name, filename)) as file:\n+ with open(os.path.join(package_name, filename), encoding=\"utf-8\") as file:\nbp_names = re.findall(\nr\"^(\\w+) = (?:Bot|User|)Blueprint\\(\", file.read(), flags=re.MULTILINE\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix blueprints load on windows
|
718,844 |
15.10.2021 09:59:03
| -10,800 |
dbc5a1608daaaae72b1d521504a232ae22edb94e
|
Fix bp_importer test
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -157,7 +157,7 @@ def test_bp_importer(mocker: MockerFixture):\nelse [\"bp3.py\", \"bp4.py\", \"__init__.py\"],\n)\nmocker.patch(\n- \"builtins.open\", lambda fln: StringIO((main_files if \"bps\" not in fln else bps_files)[fln])\n+ \"builtins.open\", lambda fln, encoding: StringIO((main_files if \"bps\" not in fln else bps_files)[fln])\n)\nmocker.patch(\n\"importlib.import_module\",\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix bp_importer test
|
718,844 |
21.10.2021 20:41:10
| -10,800 |
6695dcde32eb7416c49c6009610d7749f671c093
|
Fix message view event processing without handlers
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -25,6 +25,8 @@ class ABCUserMessageView(ABCMessageView, ABC):\nreturn await message_min(event[1], ctx_api)\nasync def process_event(self, event: list) -> bool:\n+ if not (self.handlers or self.middlewares):\n+ return False\ntry:\nevent_type = UserEventType(self.get_event_type(event))\nexcept ValueError:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix message view event processing without handlers
|
718,844 |
24.10.2021 11:59:41
| -10,800 |
d293d3301f39427260328c1b6d6164d9d24776de
|
Fix request error with wrong mimetype
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -61,7 +61,7 @@ class API(ABCAPI, APICategories):\ndata = await self.validate_request(data)\nasync with self.token_generator as token:\n- response = await self.http_client.request_json(\n+ response = await self.http_client.request_text(\nself.API_URL + method,\nmethod=\"POST\",\ndata=data, # type: ignore\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix request error with wrong mimetype
|
718,844 |
24.10.2021 20:13:55
| -10,800 |
031e1950cdfae53ac81cc4d019cff2cb19b08074
|
Another fix for wrong mimetype
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -2,6 +2,8 @@ from abc import ABC, abstractmethod\nfrom io import BytesIO\nfrom typing import TYPE_CHECKING, Callable, Optional, Union\n+from vkbottle.modules import json\n+\nif TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI\n@@ -40,7 +42,10 @@ class BaseUploader(ABC):\nreturn self._get_api() # type: ignore\nasync def upload_files(self, upload_url: str, files: dict) -> dict:\n- return await self.api.http_client.request_json(upload_url, method=\"POST\", data=files)\n+ raw_response = await self.api.http_client.request_text(\n+ upload_url, method=\"POST\", data=files\n+ )\n+ return json.loads(raw_response)\ndef get_bytes_io(self, data: \"Bytes\", name: str = None) -> BytesIO:\nbytes_io = data if isinstance(data, BytesIO) else BytesIO(data)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Another fix for wrong mimetype
|
718,844 |
27.10.2021 18:28:44
| -10,800 |
f760fe1ce6a2fbe5c1a1bf50c4b9a210067438fd
|
Fix for new vkbottle-types
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131.119.2\"\n+vkbottle-types = \"^5.131.119.3\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -31,7 +31,7 @@ class ABCUserMessageView(ABCMessageView, ABC):\nevent_type = UserEventType(self.get_event_type(event))\nexcept ValueError:\nevent_type = UserEventType.UNDEFINED_EVENT\n- return event_type == UserEventType.NEW_MESSAGE\n+ return event_type == UserEventType.MESSAGE_NEW\nclass UserMessageView(ABCUserMessageView):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix for new vkbottle-types
|
718,844 |
28.10.2021 03:03:07
| -10,800 |
886d61cbcb34f111c69b73523a2ab6cef8606a50
|
Fix wrong user raw_event dataclass
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/raw.py",
"new_path": "vkbottle/dispatch/views/user/raw.py",
"diff": "@@ -26,7 +26,7 @@ class RawUserEventView(ABCRawEventView):\nreturn self.handlers[UserEventType(self.get_event_type(event))]\ndef get_event_model(self, handler_basement, event) -> Union[dict, Type[\"BaseUserEvent\"]]:\n- return handler_basement.dataclass(event[1])\n+ return handler_basement.dataclass(event)\n@staticmethod\ndef get_event_type(event: list) -> int:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/abc.py",
"new_path": "vkbottle/framework/user/labeler/abc.py",
"diff": "@@ -27,7 +27,7 @@ class ABCUserLabeler(ABC):\ndef raw_event(\nself,\nevent: Union[str, List[str]],\n- dataclass: Callable = dict,\n+ dataclass: Callable = list,\n*rules: \"ABCRule\",\n**custom_rules,\n) -> \"LabeledHandler\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -158,7 +158,7 @@ class UserLabeler(ABCUserLabeler):\ndef raw_event(\nself,\nevent: Union[str, List[str]],\n- dataclass: Callable = dict,\n+ dataclass: Callable = list,\n*rules: \"ABCRule\",\nblocking: bool = True,\n**custom_rules,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix wrong user raw_event dataclass
|
718,844 |
29.10.2021 02:51:03
| -10,800 |
9f0dcf55e11f3c04b4c8a2ecf4aa4d5a233738fb
|
Fix wrong user raw_event dataclass (again)
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131.119.3\"\n+vkbottle-types = \"^5.131.119.4\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/raw.py",
"new_path": "vkbottle/dispatch/views/user/raw.py",
"diff": "-from typing import TYPE_CHECKING, Dict, List, NamedTuple, Type, Union\n+from typing import TYPE_CHECKING, Dict, List, NamedTuple, Type\nfrom vkbottle_types.events import UserEventType\n@@ -12,7 +12,7 @@ if TYPE_CHECKING:\nclass HandlerBasement(NamedTuple):\n- dataclass: Union[dict, Type[\"BaseUserEvent\"]]\n+ dataclass: Type[\"BaseUserEvent\"]\nhandler: \"ABCHandler\"\n@@ -22,11 +22,13 @@ class RawUserEventView(ABCRawEventView):\nself.handlers: Dict[UserEventType, List[HandlerBasement]] = {}\nself.handler_return_manager = UserMessageReturnHandler()\n- def get_handler_basements(self, event) -> List[HandlerBasement]:\n+ def get_handler_basements(self, event: list) -> List[HandlerBasement]:\nreturn self.handlers[UserEventType(self.get_event_type(event))]\n- def get_event_model(self, handler_basement, event) -> Union[dict, Type[\"BaseUserEvent\"]]:\n- return handler_basement.dataclass(event)\n+ def get_event_model(\n+ self, handler_basement: HandlerBasement, event: list\n+ ) -> Type[\"BaseUserEvent\"]:\n+ return handler_basement.dataclass(*event)\n@staticmethod\ndef get_event_type(event: list) -> int:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/abc.py",
"new_path": "vkbottle/framework/user/labeler/abc.py",
"diff": "from abc import ABC, abstractmethod\nfrom typing import TYPE_CHECKING, Any, Callable, Dict, List, Union\n+from vkbottle_types.events.user_events import RawUserEvent\n+\nif TYPE_CHECKING:\nfrom vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views import ABCView\n@@ -27,7 +29,7 @@ class ABCUserLabeler(ABC):\ndef raw_event(\nself,\nevent: Union[str, List[str]],\n- dataclass: Callable = list,\n+ dataclass: Callable = RawUserEvent,\n*rules: \"ABCRule\",\n**custom_rules,\n) -> \"LabeledHandler\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/labeler/default.py",
"new_path": "vkbottle/framework/user/labeler/default.py",
"diff": "@@ -2,6 +2,7 @@ import re\nfrom typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Type, Union\nimport vbml\n+from vkbottle_types.events.user_events import RawUserEvent\nfrom vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import user\n@@ -158,7 +159,7 @@ class UserLabeler(ABCUserLabeler):\ndef raw_event(\nself,\nevent: Union[str, List[str]],\n- dataclass: Callable = list,\n+ dataclass: Callable = RawUserEvent,\n*rules: \"ABCRule\",\nblocking: bool = True,\n**custom_rules,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix wrong user raw_event dataclass (again)
|
718,844 |
29.10.2021 03:45:07
| -10,800 |
37808c9292cc056c4d6c21f1a050ee6b8c0a299c
|
Added `mode` for user polling
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "@@ -20,6 +20,7 @@ class UserPolling(ABCPolling):\napi: Optional[\"ABCAPI\"] = None,\nuser_id: Optional[int] = None,\nwait: Optional[int] = None,\n+ mode: Optional[int] = None,\nrps_delay: Optional[int] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n):\n@@ -27,17 +28,19 @@ class UserPolling(ABCPolling):\nself.error_handler = error_handler or ErrorHandler()\nself.user_id = user_id\nself.wait = wait or 15\n+ self.mode = mode or 234\nself.rps_delay = rps_delay or 0\nself.stop = False\nasync def get_event(self, server: dict) -> dict:\nlogger.debug(\"Making long request to get event with longpoll...\")\nreturn await self.api.http_client.request_json(\n- \"https://{}?act=a_check&key={}&ts={}&wait={}&rps_delay={}\".format(\n+ \"https://{}?act=a_check&key={}&ts={}&wait={}&mode={}&rps_delay={}\".format(\nserver[\"server\"],\nserver[\"key\"],\nserver[\"ts\"],\nself.wait,\n+ self.mode,\nself.rps_delay,\n),\nmethod=\"POST\",\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added `mode` for user polling
|
718,844 |
31.10.2021 13:29:30
| -10,800 |
145fa7bf23e983e50152fef76b36421a5eec218b
|
Generalize `ConsistentTokenGenerator` checkup
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/util.py",
"new_path": "vkbottle/api/token_generator/util.py",
"diff": "+from typing import Iterable\nfrom .abc import ABCTokenGenerator, Token\nfrom .consistent import ConsistentTokenGenerator\nfrom .single import SingleTokenGenerator\n@@ -11,6 +12,6 @@ def get_token_generator(token: \"Token\") -> \"ABCTokenGenerator\":\n\"\"\"\nif isinstance(token, str):\nreturn SingleTokenGenerator(token)\n- elif isinstance(token, list):\n+ elif isinstance(token, Iterable):\nreturn ConsistentTokenGenerator(token)\nreturn token\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Generalize `ConsistentTokenGenerator` checkup
|
718,844 |
31.10.2021 13:40:41
| -10,800 |
84ec0ef3bee299df58713eeccd1156e3bd399c23
|
Fix typing in `ConsistentTokenGenerator`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/consistent.py",
"new_path": "vkbottle/api/token_generator/consistent.py",
"diff": "import itertools\n-from typing import List\n+from typing import Iterable\nfrom .abc import ABCTokenGenerator\nclass ConsistentTokenGenerator(ABCTokenGenerator):\n- def __init__(self, tokens: List[str]):\n+ def __init__(self, tokens: Iterable[str]):\nself.tokens = itertools.cycle(tokens)\nasync def get_token(self) -> str:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typing in `ConsistentTokenGenerator`
|
718,844 |
31.10.2021 14:24:50
| -10,800 |
39e59c614556078434b379f58b4412e2f369ef9a
|
Fix `VBMLRule` init without config
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -10,6 +10,7 @@ from typing import (\nCoroutine,\nDict,\nGeneric,\n+ Iterable,\nList,\nOptional,\nPattern,\n@@ -85,26 +86,23 @@ class CommandRule(ABCMessageRule[Message], Generic[Message]):\nclass VBMLRule(ABCMessageRule[Message], Generic[Message]):\ndef __init__(\nself,\n- pattern: Union[str, \"vbml.Pattern\", List[Union[str, \"vbml.Pattern\"]]],\n+ pattern: Union[str, \"vbml.Pattern\", Iterable[Union[str, \"vbml.Pattern\"]]],\npatcher: Optional[\"vbml.Patcher\"] = None,\nflags: Optional[re.RegexFlag] = None,\n):\n- flags = flags or self.config.get(\"vbml_flags\")\n+ flags = flags or self.config.get(\"vbml_flags\") or (re.MULTILINE | re.DOTALL)\nif isinstance(pattern, str):\npattern = [vbml.Pattern(pattern, flags=flags or self.config.get(\"vbml_flags\"))]\nelif isinstance(pattern, vbml.Pattern):\npattern = [pattern]\n- elif isinstance(pattern, list):\n+ elif isinstance(pattern, Iterable):\npattern = [\n- p\n- if isinstance(p, vbml.Pattern)\n- else vbml.Pattern(p, flags=flags or self.config.get(\"vbml_flags\"))\n- for p in pattern\n+ p if isinstance(p, vbml.Pattern) else vbml.Pattern(p, flags=flags) for p in pattern\n]\nself.patterns = pattern\n- self.patcher = patcher or self.config[\"vbml_patcher\"]\n+ self.patcher = patcher or self.config.get(\"vbml_patcher\") or vbml.Patcher()\nasync def check(self, message: Message) -> Union[dict, bool]:\nfor pattern in self.patterns:\n@@ -330,7 +328,7 @@ class FromUserRule(ABCMessageRule[Message], Generic[Message]):\nclass FuncRule(ABCMessageRule[Message], Generic[Message]):\n- def __init__(self, func: Union[Callable[[Message], Union[bool, Awaitable]]]):\n+ def __init__(self, func: Callable[[Message], Union[bool, Awaitable]]):\nself.func = func\nasync def check(self, message: Message) -> Union[dict, bool]:\n@@ -372,7 +370,7 @@ class StateGroupRule(ABCMessageRule[Message], Generic[Message]):\ntry:\n- import macro\n+ import macro # type: ignore\nexcept ImportError:\nmacro = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `VBMLRule` init without config
|
718,873 |
03.11.2021 22:17:58
| -10,800 |
da5553623a1591e5bf9d4df77c42395c08430bb2
|
Add `state_dispenser` param for Bot
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -3,6 +3,7 @@ from typing import NoReturn, Optional, Union\nfrom vkbottle.api import ABCAPI, API, Token\nfrom vkbottle.dispatch import ABCRouter, BotRouter, BuiltinStateDispenser\n+from vkbottle.dispatch import ABCStateDispenser\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle.framework.abc import ABCFramework\nfrom vkbottle.modules import logger\n@@ -22,6 +23,7 @@ class Bot(ABCFramework):\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCBotLabeler\"] = None,\n+ state_dispenser: Optional[\"ABCStateDispenser\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\ntask_each_event: bool = True,\n):\n@@ -29,7 +31,7 @@ class Bot(ABCFramework):\nself.error_handler = error_handler or ErrorHandler()\nself.loop_wrapper = loop_wrapper or LoopWrapper()\nself.labeler = labeler or BotLabeler()\n- self.state_dispenser = BuiltinStateDispenser()\n+ self.state_dispenser = state_dispenser or BuiltinStateDispenser()\nself._polling = polling or BotPolling(self.api)\nself._router = router or BotRouter()\nself._loop = loop\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `state_dispenser` param for Bot (#422)
|
718,844 |
06.11.2021 21:27:07
| -10,800 |
c7fc029f606c0a8c0515fff240a95088f96f7bfc
|
Some fixes in rules
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -3,6 +3,7 @@ import re\nimport types\nfrom abc import abstractmethod\nfrom typing import (\n+ TYPE_CHECKING,\nAny,\nAwaitable,\nCallable,\n@@ -21,7 +22,7 @@ from typing import (\nimport vbml\n-from vkbottle.dispatch.dispenser import BaseStateGroup, get_state_repr\n+from vkbottle.dispatch.dispenser import get_state_repr\nfrom vkbottle.tools.validator import (\nABCValidator,\nCallableValidator,\n@@ -29,6 +30,9 @@ from vkbottle.tools.validator import (\nIsInstanceValidator,\n)\n+if TYPE_CHECKING:\n+ from vkbottle_types import BaseStateGroup\n+\nfrom .abc import ABCRule\nDEFAULT_PREFIXES = [\"!\", \"/\"]\n@@ -363,7 +367,7 @@ class StateGroupRule(ABCMessageRule[Message], Generic[Message]):\nasync def check(self, message: Message) -> bool:\nif message.state_peer is None:\nreturn not self.state_group\n- group_name, *_ = message.state_peer.state.split(\":\", maxsplit=1)\n+ group_name = message.state_peer.state.split(\":\", maxsplit=1)[0]\nreturn group_name in self.state_group\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some fixes in rules
|
718,844 |
08.11.2021 21:33:58
| -10,800 |
dd4ab3d750b7ca20ec048433a4a2a9cfd9ecae6b
|
Fix noqa comments
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -48,6 +48,6 @@ from .exception_factory import (\nfrom .framework import ABCBlueprint, ABCFramework, Bot, BotBlueprint\nfrom .http import ABCHTTPClient, AiohttpClient, SingleAiohttpClient\nfrom .polling import ABCPolling, BotPolling\n-from .tools import * # noqa # noqa\n+from .tools import * # noqa: F403\nevent_types = GroupTypes\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "-from .dev import * # noqa\n-from .production import * # noqa\n+from .dev import * # noqa: F403\n+from .production import * # noqa: F403\nfrom .validator import ABCValidator, CallableValidator, EqualsValidator, IsInstanceValidator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/__init__.py",
"new_path": "vkbottle/tools/dev/__init__.py",
"diff": "from .auth import AuthError, UserAuth\nfrom .ctx_tool import BaseContext\n-from .event_data import * # noqa\n-from .keyboard import * # noqa\n+from .event_data import * # noqa: F403\n+from .keyboard import * # noqa: F403\nfrom .loop_wrapper import DelayedTask, LoopWrapper\nfrom .mini_types import BotTypes, UserTypes\nfrom .singleton import Singleton\nfrom .storage import ABCStorage, CtxStorage\nfrom .template import TemplateElement, template_gen\n-from .uploader import * # noqa\n+from .uploader import * # noqa: F403\nfrom .utils import load_blueprints_from_package, run_in_task, run_sync\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/__init__.py",
"new_path": "vkbottle/tools/dev/keyboard/__init__.py",
"diff": "-from .action import * # noqa\n+from .action import * # noqa: F403\nfrom .color import KeyboardButtonColor\nfrom .keyboard import Keyboard\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/__init__.py",
"new_path": "vkbottle/tools/dev/uploader/__init__.py",
"diff": "-from .audio import * # noqa\n+from .audio import * # noqa: F403\nfrom .base import BaseUploader\n-from .doc import * # noqa\n-from .photo import * # noqa\n-from .video import * # noqa\n+from .doc import * # noqa: F403\n+from .photo import * # noqa: F403\n+from .video import * # noqa: F403\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix noqa comments
|
718,844 |
22.11.2021 16:26:32
| -10,800 |
0a18d4ccc85c7e561ab8f25308934f0d3660d72d
|
Add rules to bot and user
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/bot.py",
"new_path": "vkbottle/bot.py",
"diff": "+from .dispatch.rules import base as rules\nfrom .dispatch.views import bot as views\nfrom .framework.bot import ABCBotLabeler, Bot, BotBlueprint, BotLabeler, run_multibot\nfrom .tools.dev.mini_types.bot import MessageMin\nMessage = MessageMin\nBlueprint = BotBlueprint\n+\n+__all__ = (\n+ \"Bot\",\n+ \"BotBlueprint\",\n+ \"BotLabeler\",\n+ \"ABCBotLabeler\",\n+ \"run_multibot\",\n+ \"rules\",\n+ \"views\",\n+)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/user.py",
"new_path": "vkbottle/user.py",
"diff": "+from .dispatch.rules import base as rules\nfrom .dispatch.views import user as views\nfrom .framework.user import ABCUserLabeler, User, UserBlueprint, UserLabeler, run_multibot\nfrom .tools.dev.mini_types.bot import MessageMin\nMessage = MessageMin\nBlueprint = UserBlueprint\n+\n+__all__ = (\n+ \"User\",\n+ \"UserBlueprint\",\n+ \"UserLabeler\",\n+ \"ABCUserLabeler\",\n+ \"run_multibot\",\n+ \"rules\",\n+ \"views\",\n+)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add rules to bot and user
|
718,844 |
23.11.2021 18:02:20
| -10,800 |
782de84fc8c89bf6b84e72a70c9718100ab638c2
|
Fix uploaders for User
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -2,6 +2,8 @@ from abc import ABC, abstractmethod\nfrom io import BytesIO\nfrom typing import TYPE_CHECKING, Callable, Optional, Union\n+from vkbottle.exception_factory.base_exceptions import VKAPIError\n+\nfrom vkbottle.modules import json\nif TYPE_CHECKING:\n@@ -58,7 +60,14 @@ class BaseUploader(ABC):\nasync def get_owner_id(self, upload_params: dict) -> int:\nif \"group_id\" in upload_params:\nreturn upload_params[\"group_id\"]\n+ if \"user_id\" in upload_params:\n+ return upload_params[\"user_id\"]\n+ if \"owner_id\" in upload_params:\n+ return upload_params[\"owner_id\"]\n+ try:\nreturn (await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\n+ except VKAPIError:\n+ return (await self.api.request(\"users.get\", {}))[\"response\"][0][\"id\"]\n@staticmethod\ndef generate_attachment_string(attachment_type: str, owner_id: int, item_id: int) -> str:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix uploaders for User
|
718,844 |
23.11.2021 19:34:42
| -10,800 |
967adffb626d8ab548fa392e29d9bb357e97d0f0
|
fix photo favicon uploader
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "@@ -66,7 +66,8 @@ class PhotoWallUploader(PhotoUploader):\nclass PhotoFaviconUploader(PhotoUploader):\nasync def upload(self, file_source: Union[str, \"Bytes\"], **params) -> Union[str, dict]:\n- server = await self.get_server(owner_id=await self.get_owner_id(params))\n+ owner_id = await self.get_owner_id(params)\n+ server = await self.get_server(owner_id=owner_id)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\n@@ -76,7 +77,7 @@ class PhotoFaviconUploader(PhotoUploader):\n]\nif self.generate_attachment_strings:\n- return self.generate_attachment_string(\"photo\", photo[\"owner_id\"], photo[\"id\"])\n+ return self.generate_attachment_string(\"wall\", owner_id, photo[\"post_id\"])\nreturn photo\nasync def get_server(self, **kwargs) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix photo favicon uploader
|
718,844 |
04.12.2021 20:59:26
| -10,800 |
f59d562113883c595b408090703f849962a9eaed
|
Just some fixes
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -36,7 +36,7 @@ exclude = [\"**/tests/*\", \"**/test_*\"]\n\"Bug Tracker\" = \"https://github.com/vkbottle/vkbottle/issues\"\n[tool.poetry.dependencies]\n-python = \"^3.7\"\n+python = \"^3.7.2\"\naiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/conftest.py",
"new_path": "vkbottle/tests/conftest.py",
"diff": "@@ -3,3 +3,5 @@ from vkbottle.tests.fixtures.middlewares import (\nempty_middleware_class,\nempty_middleware_instance,\n)\n+\n+__all__ = (\"empty_event\", \"empty_middleware_class\", \"empty_middleware_instance\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Just some fixes
|
718,844 |
06.12.2021 00:35:35
| -10,800 |
dfc7979f102d541c62c250f16d17bdbd504e802c
|
Update docs; fix `request_json` method
|
[
{
"change_type": "DELETE",
"old_path": "docs/logo.jpg",
"new_path": "docs/logo.jpg",
"diff": "Binary files a/docs/logo.jpg and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": "docs/logo.png",
"new_path": "docs/logo.png",
"diff": "Binary files /dev/null and b/docs/logo.png differ\n"
},
{
"change_type": "DELETE",
"old_path": "docs/logo_docs.png",
"new_path": "docs/logo_docs.png",
"diff": "Binary files a/docs/logo_docs.png and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/low-level/index.md",
"new_path": "docs/low-level/index.md",
"diff": "+ [Error Handler](exception_handling/error-handler.md)\n* [Http Client](http/index.md)\n+ [Accessing Http Client](http/http-client.md)\n- + [Http Middleware](http/http-middleware.md)\n- + [Accessing Http Session Manager](http/http-session-manager.md)\n* [Polling](polling/index.md)\n+ [Accessing Polling](polling/polling.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.0.0\"\n+version = \"4.0.1\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "@@ -48,7 +48,9 @@ class AiohttpClient(ABCHTTPClient):\nself, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n) -> dict:\nresponse = await self.request_raw(url, method, data, **kwargs)\n- return await response.json(encoding=\"utf-8\", loads=self.json_processing_module.loads)\n+ return await response.json(\n+ encoding=\"utf-8\", loads=self.json_processing_module.loads, content_type=None\n+ )\nasync def request_text(\nself, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update docs; fix `request_json` method
|
718,838 |
09.12.2021 00:56:00
| -10,800 |
c48821492f261d88cb5880449c353955166fbc07
|
add captcha handler
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "+import typing\nfrom typing import (\nTYPE_CHECKING,\n- Any,\nAsyncIterator,\nIterable,\nList,\n@@ -15,6 +15,7 @@ from vkbottle_types.categories import APICategories\nfrom vkbottle.http import SingleAiohttpClient\nfrom vkbottle.modules import logger\n+from vkbottle.exception_factory import CaptchaError\nfrom .abc import ABCAPI\nfrom .request_rescheduler import BlockingRequestRescheduler\n@@ -31,6 +32,7 @@ if TYPE_CHECKING:\nfrom .token_generator import Token\nAPIRequest = NamedTuple(\"APIRequest\", [(\"method\", str), (\"data\", dict)])\n+CaptchaHandler = typing.Callable[[CaptchaError], typing.Awaitable]\nclass API(ABCAPI, APICategories):\n@@ -55,6 +57,7 @@ class API(ABCAPI, APICategories):\nself.request_rescheduler = request_rescheduler or BlockingRequestRescheduler()\nself.response_validators: List[\"ABCResponseValidator\"] = DEFAULT_RESPONSE_VALIDATORS\nself.request_validators: List[\"ABCRequestValidator\"] = DEFAULT_REQUEST_VALIDATORS # type: ignore\n+ self.captcha_handler: Optional[CaptchaHandler] = None\nasync def request(self, method: str, data: dict) -> dict:\n\"\"\"Makes a single request opening a session\"\"\"\n@@ -88,7 +91,7 @@ class API(ABCAPI, APICategories):\nasync def validate_response(\nself, method: str, data: dict, response: Union[dict, str]\n- ) -> Union[Any, NoReturn]:\n+ ) -> Union[None, dict, NoReturn]:\n\"\"\"Validates response from VK,\nto change validations change API.response_validators (list of ResponseValidator's)\"\"\"\nfor validator in self.response_validators:\n@@ -104,6 +107,9 @@ class API(ABCAPI, APICategories):\nlogger.debug(\"API request was validated\")\nreturn request # type: ignore\n+ def add_captcha_handler(self, handler: CaptchaHandler):\n+ self.captcha_handler = handler\n+\n@property\ndef api_instance(self) -> \"API\":\nreturn self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -22,7 +22,7 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\ndata: dict,\nresponse: Any,\nctx_api: Union[\"ABCAPI\", \"API\"],\n- ) -> Union[Any, NoReturn]:\n+ ) -> Union[None, dict, NoReturn]:\nif \"error\" not in response:\nreturn response\n@@ -33,4 +33,11 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\ncode = error.pop(\"error_code\")\nexception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\n+\n+ if isinstance(exception, CaptchaError) and ctx_api.captcha_handler:\n+ key = await ctx_api.captcha_handler(exception)\n+ return await ctx_api.request(\n+ method, {**data, \"captcha_sid\": exception.sid, \"captcha_key\": key}\n+ )\n+\nraise exception(**error)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add captcha handler
|
718,838 |
09.12.2021 01:56:31
| -10,800 |
dc7eb28034954ae76c6f49f6e28e072f8fb8ce33
|
add classy jpg logo for old md pages
|
[
{
"change_type": "ADD",
"old_path": "docs/logo.jpg",
"new_path": "docs/logo.jpg",
"diff": "Binary files /dev/null and b/docs/logo.jpg differ\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -34,7 +34,7 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nexception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\n- if isinstance(exception, CaptchaError) and getattr(ctx_api, \"captcha_handler\"):\n+ if exception == CaptchaError and getattr(ctx_api, \"captcha_handler\"):\nkey = await ctx_api.captcha_handler(exception) # type: ignore\nreturn await ctx_api.request(\nmethod, {**data, \"captcha_sid\": exception.sid, \"captcha_key\": key}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add classy jpg logo for old md pages
|
718,844 |
13.12.2021 22:46:46
| -10,800 |
936e9b8719ce4d29c927cef40257802a5e6d2a2f
|
Fix vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/base_converter.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/base_converter.py",
"diff": "@@ -30,8 +30,8 @@ class Converter:\ndef scriptify(self, func: Callable, **values) -> str:\n\"\"\"Translate function to VKScript\"\"\"\nsource = getsource(func)\n- code = ast.parse(source).body[0]\n- args = [a.arg for a in code.args.args] # type: ignore\n+ code: ast.FunctionDef = ast.parse(source).body[0] # type: ignore\n+ args = [a.arg for a in code.args.args]\nargs.pop(0)\nif any(v not in values for v in args):\nraise ConverterError(\n@@ -39,5 +39,5 @@ class Converter:\n)\nvalues_assignments = [f\"var {k}={v!r};\" for k, v in values.items()]\nreturn \"\".join(values_assignments) + \"\".join(\n- self.find_definition(line) for line in code.body # type: ignore\n+ self.find_definition(line) for line in code.body\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "import ast\nimport random\nimport string\n-from typing import Callable\n+from typing import Callable, Iterable\nfrom .base_converter import Converter, ConverterError\n@@ -15,7 +15,7 @@ converter = Converter()\nfind = converter.find_definition\n-def dispatch_keywords(keywords: dict, assigner: str = \":\", sep: str = \",\"):\n+def dispatch_keywords(keywords: Iterable, assigner: str = \":\", sep: str = \",\"):\nreturn sep.join(f\"{param.arg}{assigner}{find(param.value)}\" for param in keywords)\n@@ -23,6 +23,11 @@ def random_string(length: int) -> str:\nreturn \"\".join(random.choice(string.ascii_lowercase) for _ in range(length))\n+def to_camel_case(snake_str: str) -> str:\n+ components = snake_str.split(\"_\")\n+ return components[0].lower() + \"\".join(x.title() for x in components[1:])\n+\n+\n@converter(ast.Assign)\ndef assign(d: ast.Assign):\nleft = d.targets\n@@ -174,12 +179,12 @@ def if_statement(d: ast.If):\n@converter(ast.Call)\ndef call(d: ast.Call):\n- func = d.func\n+ func: ast.Attribute = d.func # type: ignore\ncalls = []\nwhile isinstance(func, ast.Attribute):\ncalls.append(func.attr)\n- func = func.value\n+ func = func.value # type: ignore\nif func.__class__ == ast.Str:\nif calls[0] in CALL_STRING:\nreturn str(find(d.args[0])) + \".\" + calls[0] + \"(\" + find(func) + \")\"\n@@ -187,14 +192,14 @@ def call(d: ast.Call):\nraise ConverterError(\"Use f-strings instead of str.format\")\nraise ConverterError(\"String formatter\")\n- if func.id.lower() == \"api\": # type: ignore\n- params = dispatch_keywords(d.keywords) # type: ignore\n- return \"API.\" + \".\".join(calls[::-1]) + \"({\" + params + \"})\"\n- elif func.id == \"len\": # type: ignore\n+ if func.id.lower() == \"api\":\n+ params = dispatch_keywords(d.keywords)\n+ return \"API.\" + \".\".join(map(to_camel_case, calls[::-1])) + \"({\" + params + \"})\"\n+ elif func.id == \"len\":\nreturn f\"{find(d.args[0])}.length\"\nelif calls and calls[0] in CALL_REPLACEMENTS:\nargs = \",\".join(find(arg) for arg in d.args)\n- return find(d.func.value) + \".\" + CALL_REPLACEMENTS[calls[0]] + \"(\" + args + \")\" # type: ignore\n+ return find(d.func.value) + \".\" + CALL_REPLACEMENTS[calls[0]] + \"(\" + args + \")\"\nelif calls[0] in CALL_STRING:\nreturn find(func) + \".\" + calls[0] + \"(\" + find(d.args[0]) + \")\"\nraise ConverterError(f\"Call for {getattr(d.func, 'attr', d.func.__dict__)} is not referenced\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"new_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"diff": "from vkbottle import vkscript\nBASIC_CYCLE = \"var a=%A%;var some_list=[];while(a<100){API.users.get({user_id:a});a = a + 1;some_list.push(a);};return some_list;\"\n+API_REQUEST = \"var group_id=1;return API.groups.getById({group_id:group_id});\"\n@vkscript\n@@ -13,6 +14,11 @@ def basic_cycle(api, a: int = 10):\nreturn some_list\n+@vkscript\n+def api_request(api, group_id):\n+ return api.groups.get_by_id(group_id=group_id)\n+\n+\n@vkscript\ndef types(api):\na = 5.1\n@@ -41,4 +47,5 @@ def types(api):\ndef test_vkscript():\nassert basic_cycle(a=10) == BASIC_CYCLE.replace(\"%A%\", \"10\")\nassert basic_cycle(a=94) == BASIC_CYCLE.replace(\"%A%\", \"94\")\n+ assert api_request(group_id=1) == API_REQUEST\nassert types()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix vkscript converter
|
718,844 |
13.12.2021 22:49:22
| -10,800 |
d41e409a98ca2f1b33af2e201ee0b35fb181d9e9
|
Fix test for vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"new_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"diff": "from vkbottle import vkscript\nBASIC_CYCLE = \"var a=%A%;var some_list=[];while(a<100){API.users.get({user_id:a});a = a + 1;some_list.push(a);};return some_list;\"\n-API_REQUEST = \"var group_id=1;return API.groups.getById({group_id:group_id});\"\n+API_REQUEST = \"var group_id=%A%;return API.groups.getById({group_id:group_id});\"\n@vkscript\n@@ -47,5 +47,5 @@ def types(api):\ndef test_vkscript():\nassert basic_cycle(a=10) == BASIC_CYCLE.replace(\"%A%\", \"10\")\nassert basic_cycle(a=94) == BASIC_CYCLE.replace(\"%A%\", \"94\")\n- assert api_request(group_id=1) == API_REQUEST\n+ assert api_request(group_id=1) == API_REQUEST.replace(\"%A%\", \"1\")\nassert types()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix test for vkscript converter
|
718,844 |
13.12.2021 23:00:40
| -10,800 |
a946048aa243564ba82d0ee98994a82814e1ef68
|
Add access_key to attachment strings
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/audio.py",
"new_path": "vkbottle/tools/dev/uploader/audio.py",
"diff": "@@ -30,7 +30,7 @@ class AudioUploader(BaseUploader):\nif self.generate_attachment_strings:\nreturn self.generate_attachment_string(\n- \"audio\", await self.get_owner_id(params), audio[\"id\"]\n+ \"audio\", await self.get_owner_id(params), audio[\"id\"], audio.get(\"access_key\")\n)\nreturn audio\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -69,8 +69,10 @@ class BaseUploader(ABC):\nreturn (await self.api.request(\"users.get\", {}))[\"response\"][0][\"id\"]\n@staticmethod\n- def generate_attachment_string(attachment_type: str, owner_id: int, item_id: int) -> str:\n- return f\"{attachment_type}{owner_id}_{item_id}\"\n+ def generate_attachment_string(\n+ attachment_type: str, owner_id: int, item_id: int, access_key: Optional[str] = None\n+ ) -> str:\n+ return f\"{attachment_type}{owner_id}_{item_id}{('_' + access_key) if access_key else ''}\"\n@staticmethod\nasync def read(file_source: Union[str, \"Bytes\"]) -> \"Bytes\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/doc.py",
"new_path": "vkbottle/tools/dev/uploader/doc.py",
"diff": "@@ -32,7 +32,10 @@ class DocUploader(BaseUploader, ABC):\nif self.generate_attachment_strings:\nreturn self.generate_attachment_string(\n- doc_type, doc[doc_type][\"owner_id\"], doc[doc_type][\"id\"]\n+ doc_type,\n+ doc[doc_type][\"owner_id\"],\n+ doc[doc_type][\"id\"],\n+ doc[doc_type].get(\"access_key\"),\n)\nreturn doc\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "@@ -36,7 +36,9 @@ class PhotoToAlbumUploader(PhotoUploader):\nif self.generate_attachment_strings:\nreturn [\n- self.generate_attachment_string(\"photo\", photo[\"owner_id\"], photo[\"id\"])\n+ self.generate_attachment_string(\n+ \"photo\", photo[\"owner_id\"], photo[\"id\"], photo.get(\"access_key\")\n+ )\nfor photo in photos\n]\nreturn photos\n@@ -57,7 +59,9 @@ class PhotoWallUploader(PhotoUploader):\n]\nif self.generate_attachment_strings:\n- return self.generate_attachment_string(\"photo\", photos[0][\"owner_id\"], photos[0][\"id\"])\n+ return self.generate_attachment_string(\n+ \"photo\", photos[0][\"owner_id\"], photos[0][\"id\"], photos[0].get(\"access_key\")\n+ )\nreturn photos\nasync def get_server(self, **kwargs) -> dict:\n@@ -77,7 +81,9 @@ class PhotoFaviconUploader(PhotoUploader):\n]\nif self.generate_attachment_strings:\n- return self.generate_attachment_string(\"wall\", owner_id, photo[\"post_id\"])\n+ return self.generate_attachment_string(\n+ \"wall\", owner_id, photo[\"post_id\"], photo.get(\"access_key\")\n+ )\nreturn photo\nasync def get_server(self, **kwargs) -> dict:\n@@ -96,7 +102,9 @@ class PhotoMessageUploader(PhotoUploader):\n]\nif self.generate_attachment_strings:\n- return self.generate_attachment_string(\"photo\", photo[0][\"owner_id\"], photo[0][\"id\"])\n+ return self.generate_attachment_string(\n+ \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"], photo.get(\"access_key\")\n+ )\nreturn photo\nasync def get_server(self, **kwargs) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add access_key to attachment strings
|
718,844 |
14.12.2021 20:34:03
| -10,800 |
2789a8a9f2e03eb4b48883fabee366858f7cd3b0
|
Fix error when VK is dead
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "+import asyncio\nfrom typing import TYPE_CHECKING, AsyncIterator, Optional\nfrom vkbottle.exception_factory import ErrorHandler\n@@ -52,16 +53,24 @@ class BotPolling(ABCPolling):\n]\nasync def listen(self) -> AsyncIterator[dict]: # type: ignore\n- server = await self.get_server()\nlogger.debug(\"Starting listening to longpoll\")\n+ server: Optional[dict] = None\nwhile not self.stop:\ntry:\n+ if not server:\n+ server = await self.get_server()\nevent = await self.get_event(server)\nif not event.get(\"ts\"):\nserver = await self.get_server()\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n+ except (TimeoutError, asyncio.exceptions.TimeoutError):\n+ logger.error(\n+ f\"Looks like VK are dead, sleeping {self.wait} seconds and trying again...\"\n+ )\n+ await asyncio.sleep(self.wait)\n+ server = None\nexcept BaseException as e:\nawait self.error_handler.handle(e)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "+import asyncio\nfrom typing import TYPE_CHECKING, AsyncIterator, Optional\nfrom vkbottle.exception_factory import ErrorHandler\n@@ -53,16 +54,24 @@ class UserPolling(ABCPolling):\nreturn (await self.api.request(\"messages.getLongPollServer\", {}))[\"response\"]\nasync def listen(self) -> AsyncIterator[dict]: # type: ignore\n- server = await self.get_server()\nlogger.debug(\"Starting listening to longpoll\")\n+ server: Optional[dict] = None\nwhile not self.stop:\ntry:\n+ if not server:\n+ server = await self.get_server()\nevent = await self.get_event(server)\nif not event.get(\"ts\"):\nserver = await self.get_server()\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n+ except (TimeoutError, asyncio.exceptions.TimeoutError):\n+ logger.error(\n+ f\"Looks like VK are dead, sleeping {self.wait} seconds and trying again...\"\n+ )\n+ await asyncio.sleep(self.wait)\n+ server = None\nexcept BaseException as e:\nawait self.error_handler.handle(e)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix error when VK is dead
|
718,860 |
15.12.2021 20:56:26
| -18,000 |
70c225faea4fd5d0cfdd586aa4f0bc442d74d9f9
|
Add index to access_key response
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "@@ -103,7 +103,7 @@ class PhotoMessageUploader(PhotoUploader):\nif self.generate_attachment_strings:\nreturn self.generate_attachment_string(\n- \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"], photo.get(\"access_key\")\n+ \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"], photo[0].get(\"access_key\")\n)\nreturn photo\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add index to access_key response (#450)
|
718,844 |
16.12.2021 22:46:09
| -10,800 |
88776599071176ff98870290ea6fa09412fcf41e
|
Fix template generator (close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/template/element.py",
"new_path": "vkbottle/tools/dev/template/element.py",
"diff": "@@ -20,7 +20,7 @@ class TemplateElement:\nif isinstance(buttons, str):\nbuttons = json.loads(buttons)\n- elif isinstance(buttons, dict):\n+ if isinstance(buttons, dict):\nbuttons = buttons.get(\"buttons\")[0] # taking only first row\nself.raw: dict = {k: v for k, v in locals().items() if v is not None and k != \"self\"}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix template generator (close #449)
|
718,844 |
17.12.2021 20:24:35
| -10,800 |
7e71dfe31572961a2bd5f15a8f89c2560d31fe35
|
Added `mention` property for `MessageMin`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -35,6 +35,7 @@ from .abc import ABCRule\n__all__ = (\n\"PeerRule\",\n+ \"MentionRule\",\n\"CommandRule\",\n\"VBMLRule\",\n\"StickerRule\",\n@@ -70,6 +71,14 @@ class PeerRule(ABCRule[BaseMessageMin]):\nreturn self.from_chat is (event.peer_id != event.from_id)\n+class MentionRule(ABCRule[BaseMessageMin]):\n+ def __init__(self, mention_only: bool = True):\n+ self.mention_only = mention_only\n+\n+ async def check(self, event: BaseMessageMin) -> bool:\n+ return self.mention_only == event.is_mentioned\n+\n+\nclass CommandRule(ABCRule[BaseMessageMin]):\ndef __init__(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/base.py",
"new_path": "vkbottle/framework/labeler/base.py",
"diff": "@@ -19,6 +19,7 @@ if TYPE_CHECKING:\nDEFAULT_CUSTOM_RULES: Dict[str, Type[\"ABCRule\"]] = {\n\"from_chat\": base.PeerRule,\n+ \"mention\": base.MentionRule,\n\"command\": base.CommandRule,\n\"from_user\": base.FromUserRule,\n\"peer_ids\": base.FromPeerRule,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "+import re\n+from abc import ABC, abstractmethod\nfrom io import StringIO\nfrom typing import TYPE_CHECKING, Any, List, Optional, Union\n+from pydantic import BaseModel, root_validator\nfrom vkbottle_types import StatePeer\nfrom vkbottle_types.objects import MessagesMessage, UsersUser\nif TYPE_CHECKING:\n-\nfrom vkbottle.api import ABCAPI, API\n-class BaseMessageMin(MessagesMessage):\n+class Mention(BaseModel):\n+ \"\"\"Mention object\n+\n+ :param id: Identifier of the user that was mentioned (negative if it is a community)\n+ :param text: Mention text\n+ \"\"\"\n+\n+ id: int\n+ text: str\n+\n+\n+class BaseMessageMin(MessagesMessage, ABC):\nunprepared_ctx_api: Optional[Any] = None\nstate_peer: Optional[\"StatePeer\"] = None\n+ _mention: Optional[Mention] = None\n+\n+ @root_validator\n+ def __replace_mention(cls, values):\n+ if \"text\" not in values:\n+ return values\n+ message_text = values[\"text\"]\n+ mention_pattern = r\"\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\"\n+ match = re.search(mention_pattern, message_text)\n+ if not match:\n+ return values\n+ values[\"text\"] = message_text.replace(match.group(0), \"\", 1)\n+ mention_id = int(match.group(\"id\"))\n+ if match.group(\"type\") in (\"club\", \"public\"):\n+ mention_id = -mention_id\n+ values[\"_mention\"] = Mention(id=mention_id, text=match.group(\"text\"))\n+ return values\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n+ @property\n+ def mention(self) -> Optional[Mention]:\n+ \"\"\"Returns `Mention` object if message contains mention,\n+ eg if message is `@username text` returns `Mention(id=123, text=\"text\")`,\n+ also mention is automatically removes from message text\"\"\"\n+ return self._mention\n+\n+ @property\n+ @abstractmethod\n+ def is_mentioned(self) -> bool:\n+ \"\"\"Returns True if current bot is mentioned in message\"\"\"\n+ pass\n+\nasync def get_user(self, raw_mode: bool = False, **kwargs) -> Union[\"UsersUser\", dict]:\nraw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n\"response\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -14,6 +14,12 @@ class MessageMin(BaseMessageMin):\ngroup_id: Optional[int] = None\nclient_info: Optional[\"ClientInfoForBots\"] = None\n+ @property\n+ def is_mentioned(self) -> bool:\n+ if not self.mention:\n+ return False\n+ return self.mention.id == -self.group_id\n+\nasync def reply(\nself,\nmessage: Optional[str] = None,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "@@ -9,6 +9,12 @@ if TYPE_CHECKING:\nclass MessageMin(BaseMessageMin):\nuser_id: Optional[int] = None\n+ @property\n+ async def is_mentioned(self) -> bool:\n+ if not self.mention:\n+ return False\n+ return self.mention.id == self.user_id\n+\nasync def reply(\nself,\nmessage: Optional[str] = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added `mention` property for `MessageMin`
|
718,844 |
17.12.2021 21:05:19
| -10,800 |
13d168ee881f56a0e2089c6b5ccde5be41b7599f
|
v4.1 release
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.0.1\"\n+version = \"4.1.0\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v4.1 release
|
718,844 |
17.12.2021 21:51:01
| -10,800 |
2b926afbde8f64cfaec6c6bed6231df09a927e23
|
Fix `MentionRule`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -76,7 +76,10 @@ class MentionRule(ABCRule[BaseMessageMin]):\nself.mention_only = mention_only\nasync def check(self, event: BaseMessageMin) -> bool:\n- return self.mention_only == event.is_mentioned\n+ if self.mention_only:\n+ return event.is_mentioned and not event.text\n+ else:\n+ return event.is_mentioned\nclass CommandRule(ABCRule[BaseMessageMin]):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `MentionRule`
|
718,844 |
18.12.2021 20:33:13
| -10,800 |
29abfb0796d6e1b33ab3b1d844504a298f98e342
|
Fixed states and changed get_user response object
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.1\"\n+version = \"4.1.2\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -4,8 +4,9 @@ from io import StringIO\nfrom typing import TYPE_CHECKING, Any, List, Optional, Union\nfrom pydantic import BaseModel, root_validator\n-from vkbottle_types import StatePeer\n-from vkbottle_types.objects import MessagesMessage, UsersUser\n+from vkbottle_types.objects import MessagesMessage, UsersUserFull\n+\n+from vkbottle.dispatch.dispenser.base import StatePeer\nif TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI, API\n@@ -60,11 +61,11 @@ class BaseMessageMin(MessagesMessage, ABC):\n\"\"\"Returns True if current bot is mentioned in message\"\"\"\npass\n- async def get_user(self, raw_mode: bool = False, **kwargs) -> Union[\"UsersUser\", dict]:\n+ async def get_user(self, raw_mode: bool = False, **kwargs) -> Union[UsersUserFull, dict]:\nraw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n\"response\"\n][0]\n- return raw_user if raw_mode else UsersUser(**raw_user)\n+ return raw_user if raw_mode else UsersUserFull(**raw_user)\nasync def answer(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Any, List, Optional, Union\nfrom vkbottle_types.events.objects.group_event_objects import MessageEventObject\n-from vkbottle import StatePeer\n+from vkbottle.dispatch.dispenser.base import StatePeer\nfrom vkbottle.tools.dev.event_data import OpenAppEvent, OpenLinkEvent, ShowSnackbarEvent\nif TYPE_CHECKING:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fixed states and changed get_user response object
|
718,844 |
18.12.2021 22:47:42
| -10,800 |
c9bad3c7907a8af71066eb93c7078cfe0df86585
|
Fix `request_content` method in `AiohttpClient`
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.2\"\n+version = \"4.1.3\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131.131.2\"\n+vkbottle-types = \"^5.131.131.5\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "@@ -62,7 +62,7 @@ class AiohttpClient(ABCHTTPClient):\nself, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n) -> bytes:\nresponse = await self.request_raw(url, method, data, **kwargs)\n- return await response.content.read()\n+ return response._body\nasync def close(self) -> None:\nif self.session and not self.session.closed:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `request_content` method in `AiohttpClient`
|
718,844 |
19.12.2021 15:40:58
| -10,800 |
00b720c2a09faa45b23c1aad7117da85d7f661de
|
Fix request validators
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.3\"\n+version = \"4.1.4\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/request_validator/abc.py",
"new_path": "vkbottle/api/request_validator/abc.py",
"diff": "from abc import ABC, abstractmethod\n-from typing import Any, NoReturn, Union\n+from typing import NoReturn, Union\nclass ABCRequestValidator(ABC):\n- \"\"\"Abstract Response Validator class\n- Documentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/response-validator.md\n+ \"\"\"Abstract Request Validator class\n+ Documentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/request_validator.md\n\"\"\"\n@abstractmethod\n- async def validate(self, response: Any) -> Union[Any, NoReturn]:\n+ async def validate(self, request: dict) -> Union[dict, NoReturn]:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/request_validator/translate_friendly_types_validator.py",
"new_path": "vkbottle/api/request_validator/translate_friendly_types_validator.py",
"diff": "+from pydantic import BaseModel\n+\nfrom .abc import ABCRequestValidator\n+from vkbottle.modules import json\nclass TranslateFriendlyTypesRequestValidator(ABCRequestValidator):\n- async def validate(self, response: dict) -> dict:\n- for k, v in response.items():\n+ async def validate(self, request: dict) -> dict:\n+ for k, v in request.items():\n# translate python-list to vk array-like type\nif isinstance(v, list):\n- response[k] = \",\".join(str(e) for e in v)\n- return response\n+ request[k] = \",\".join(str(e) for e in v)\n+ elif isinstance(v, bool):\n+ request[k] = int(v)\n+ elif isinstance(v, BaseModel):\n+ request[k] = v.json(exclude_none=True, encoder=json.dumps)\n+ return request\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix request validators
|
718,844 |
19.12.2021 17:05:50
| -10,800 |
95a1624405335710f92d415a78547197393664a8
|
Another update for the default request validator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/request_validator/translate_friendly_types_validator.py",
"new_path": "vkbottle/api/request_validator/translate_friendly_types_validator.py",
"diff": "@@ -6,12 +6,15 @@ from vkbottle.modules import json\nclass TranslateFriendlyTypesRequestValidator(ABCRequestValidator):\nasync def validate(self, request: dict) -> dict:\n- for k, v in request.items():\n- # translate python-list to vk array-like type\n+ for k, v in request.copy().items():\nif isinstance(v, list):\nrequest[k] = \",\".join(str(e) for e in v)\nelif isinstance(v, bool):\nrequest[k] = int(v)\nelif isinstance(v, BaseModel):\nrequest[k] = v.json(exclude_none=True, encoder=json.dumps)\n+ elif isinstance(v, dict):\n+ request[k] = json.dumps(await self.validate(v))\n+ elif v is None:\n+ del request[k]\nreturn request\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Another update for the default request validator
|
718,844 |
22.12.2021 22:33:15
| -10,800 |
b027b8b8d53c55e127f0e3786e145cbfd0128c2a
|
Added exception logs for error_handler
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.4\"\n+version = \"4.1.5\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"new_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"diff": "@@ -5,6 +5,7 @@ from .abc import ABCErrorHandler\nif TYPE_CHECKING:\nfrom .abc import AsyncFunc\n+from vkbottle.modules import logger\nclass ErrorHandler(ABCErrorHandler):\n@@ -39,6 +40,7 @@ class ErrorHandler(ABCErrorHandler):\nif not handler:\nif self.raise_exceptions:\nraise error\n+ logger.exception(error)\nreturn\nif self.redirect_arguments:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added exception logs for error_handler
|
718,844 |
27.12.2021 13:00:54
| -10,800 |
7e6b802e0a75e3295bfa146b19ee7e78eae21f6d
|
Fix wrong mention regex
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.5\"\n+version = \"4.1.6\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -11,6 +11,8 @@ from vkbottle.dispatch.dispenser.base import StatePeer\nif TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI, API\n+MENTION_PATTERN = re.compile(r\"^\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\")\n+\nclass Mention(BaseModel):\n\"\"\"Mention object\n@@ -33,8 +35,7 @@ class BaseMessageMin(MessagesMessage, ABC):\nmessage_text = values.get(\"text\")\nif not message_text:\nreturn values\n- mention_pattern = r\"\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\"\n- match = re.search(mention_pattern, message_text)\n+ match = MENTION_PATTERN.search(message_text)\nif not match:\nreturn values\nvalues[\"text\"] = message_text.replace(match.group(0), \"\", 1)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix wrong mention regex
|
718,884 |
30.12.2021 17:34:12
| -7,200 |
9759e8e799c2e336f44c78bc92cc8b8029da73aa
|
Update vk api docs links
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/message.py",
"new_path": "vkbottle/dispatch/views/abc/message.py",
"diff": "@@ -42,7 +42,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\nself, event: T_contra, ctx_api: \"ABCAPI\", state_dispenser: \"ABCStateDispenser\"\n) -> None:\n# For user event mapping, consider checking out\n- # https://vk.com/dev/using_longpoll?f=3.%20Event%20Structure\n+ # https://dev.vk.com/api/user-long-poll/getting-started\nlogger.debug(\"Handling event ({}) with message view\".format(self.get_event_type(event)))\ncontext_variables: dict = {}\nmessage = await self.get_message(event, ctx_api)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update vk api docs links (#456)
|
718,844 |
04.01.2022 07:05:40
| -10,800 |
6d98931b9b6adb1a929c19d1fab4a633c61b6f8c
|
Add api categories to `ABCAPI`
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.6\"\n+version = \"4.1.7\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131.131.6\"\n+vkbottle-types = \"^5.131.131.7\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "from abc import ABC, abstractmethod\nfrom typing import TYPE_CHECKING, Any\n+from vkbottle_types.categories import APICategories\nif TYPE_CHECKING:\nfrom vkbottle.http import ABCHTTPClient\n@@ -7,7 +8,7 @@ if TYPE_CHECKING:\nfrom .request_rescheduler import ABCRequestRescheduler\n-class ABCAPI(ABC):\n+class ABCAPI(APICategories, ABC):\n\"\"\"Abstract API class\nDocumentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/api.md\n\"\"\"\n@@ -27,3 +28,7 @@ class ABCAPI(ABC):\n@abstractmethod\nasync def validate_request(self, request: Any) -> Any:\npass\n+\n+ @property\n+ def api_instance(self) -> \"ABCAPI\":\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -12,11 +12,10 @@ from typing import (\n)\nimport vkbottle_types\n-from vkbottle_types.categories import APICategories\n+from vkbottle.exception_factory import CaptchaError\nfrom vkbottle.http import SingleAiohttpClient\nfrom vkbottle.modules import logger\n-from vkbottle.exception_factory import CaptchaError\nfrom .abc import ABCAPI\nfrom .request_rescheduler import BlockingRequestRescheduler\n@@ -36,7 +35,7 @@ APIRequest = NamedTuple(\"APIRequest\", [(\"method\", str), (\"data\", dict)])\nCaptchaHandler = typing.Callable[[CaptchaError], typing.Awaitable]\n-class API(ABCAPI, APICategories):\n+class API(ABCAPI):\n\"\"\"Default API instance\nDocumentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/api.md\n\"\"\"\n@@ -112,9 +111,5 @@ class API(ABCAPI, APICategories):\nself.captcha_handler = handler\nreturn handler\n- @property\n- def api_instance(self) -> \"API\":\n- return self\n-\ndef __repr__(self) -> str:\nreturn f\"<API token_generator={self.token_generator}...>\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add api categories to `ABCAPI`
|
718,844 |
06.01.2022 03:54:45
| -10,800 |
4088137db257bd07bc49276b370f8afe87e37ca9
|
Update docs for states
|
[
{
"change_type": "MODIFY",
"old_path": "docs/high-level/handling/state-dispenser.md",
"new_path": "docs/high-level/handling/state-dispenser.md",
"diff": "@@ -31,9 +31,9 @@ from vkbottle.bot import Message, Bot\nbot = Bot(\"t\")\nclass SuperStates(BaseStateGroup):\n- AWKWARD_STATE = 0\n- CONFIDENT_STATE = 1\n- TERRIFYING_STATE = 2\n+ AWKWARD_STATE = \"awkward\"\n+ CONFIDENT_STATE = \"confident\"\n+ TERRIFYING_STATE = \"terrifying\"\n@bot.on.message(state=SuperStates.AWKWARD_STATE) # StateRule(SuperStates.AWKWARD_STATE)\nasync def awkward_handler(message: Message):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update docs for states
|
718,844 |
06.01.2022 03:59:29
| -10,800 |
5d5519466c0da02bb25c57e07c5b4ebae88433bc
|
Change `BaseStateGroup` enum type
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/dispenser/base.py",
"new_path": "vkbottle/dispatch/dispenser/base.py",
"diff": "-from enum import IntEnum\n+from enum import Enum\nfrom typing import Union\nfrom pydantic import BaseModel, validator\n-class BaseStateGroup(IntEnum):\n+class BaseStateGroup(Enum):\npass\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change `BaseStateGroup` enum type
|
718,844 |
08.01.2022 05:26:47
| -10,800 |
72ff31176a62335c65a6a01dcbf2996c86f70da8
|
Fix error validation for list responses
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.8\"\n+version = \"4.1.9\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.1\"\npydantic = \"^1.8.2\"\nvbml = \"^1.0\"\n-vkbottle-types = \"^5.131.131.10\"\n+vkbottle-types = \"^5.131.131.12\"\nwatchgod = \"^0.7\"\n[tool.poetry.dev-dependencies]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -23,21 +23,27 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nresponse: Any,\nctx_api: Union[\"ABCAPI\", \"API\"],\n) -> Union[Any, NoReturn]:\n- if \"error\" not in response:\n+ if (\n+ isinstance(response.get(\"response\"), list)\n+ and not any(item.get(\"error\") for item in response[\"response\"])\n+ or not response.get(\"error\")\n+ ):\nreturn response\nif ctx_api.ignore_errors:\nreturn None\n-\n+ if isinstance(response.get(\"response\"), list):\n+ error = next(item for item in response[\"response\"] if item.get(\"error\"))\n+ else:\nerror = response[\"error\"]\n- code = error.pop(\"error_code\")\n-\n+ code = error.pop(\"error_code\") if \"error_code\" in error else error.pop(\"code\")\nexception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\nif exception == CaptchaError and getattr(ctx_api, \"captcha_handler\"):\nkey = await ctx_api.captcha_handler(exception(**error)) # type: ignore\nreturn await ctx_api.request(\n- method, {**data, \"captcha_sid\": error[\"captcha_sid\"], \"captcha_key\": key}\n+ method,\n+ {**data, \"captcha_sid\": error[\"captcha_sid\"], \"captcha_key\": key},\n)\nraise exception(**error)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix error validation for list responses
|
718,844 |
08.01.2022 05:46:51
| -10,800 |
0c504fa5c86d510cea8b4d2ec3ad89933d59902a
|
Another fix for response validator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -24,19 +24,22 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nctx_api: Union[\"ABCAPI\", \"API\"],\n) -> Union[Any, NoReturn]:\nif (\n- isinstance(response.get(\"response\"), list)\n+ not response.get(\"error\")\n+ and isinstance(response.get(\"response\"), list)\nand not any(item.get(\"error\") for item in response[\"response\"])\n- or not response.get(\"error\")\n):\nreturn response\nif ctx_api.ignore_errors:\nreturn None\nif isinstance(response.get(\"response\"), list):\n- error = next(item for item in response[\"response\"] if item.get(\"error\"))\n+ error = next(item[\"error\"] for item in response[\"response\"] if item.get(\"error\"))\nelse:\nerror = response[\"error\"]\ncode = error.pop(\"error_code\") if \"error_code\" in error else error.pop(\"code\")\n+ if error.get(\"description\"):\n+ error[\"error_msg\"] = error.pop(\"description\")\n+ error[\"request_params\"] = [{\"key\": key, \"value\": value} for key, value in data.items()]\nexception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\nif exception == CaptchaError and getattr(ctx_api, \"captcha_handler\"):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Another fix for response validator
|
718,844 |
08.01.2022 17:25:28
| -10,800 |
681619fdde845569586a227efd40d2d3ae6c9c9b
|
just another one fix for error validator and tests
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.9\"\n+version = \"4.1.10\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -23,19 +23,27 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nresponse: Any,\nctx_api: Union[\"ABCAPI\", \"API\"],\n) -> Union[Any, NoReturn]:\n- if (\n- not response.get(\"error\")\n- and isinstance(response.get(\"response\"), list)\n- and not any(item.get(\"error\") for item in response[\"response\"])\n+ if \"error\" not in response:\n+ if \"response\" not in response:\n+ # invalid response, just igrnore it\n+ return response\n+ elif not (\n+ (\n+ isinstance(response.get(\"response\"), list)\n+ and any(item.get(\"error\") for item in response[\"response\"])\n+ )\n):\n+ # response is not a list of errors\nreturn response\nif ctx_api.ignore_errors:\nreturn None\nif isinstance(response.get(\"response\"), list):\n+ # find first error in list\nerror = next(item[\"error\"] for item in response[\"response\"] if item.get(\"error\"))\nelse:\nerror = response[\"error\"]\n+ # list of errors has a special error object with description and code instead of error_msg and error_code\ncode = error.pop(\"error_code\") if \"error_code\" in error else error.pop(\"code\")\nif error.get(\"description\"):\nerror[\"error_msg\"] = error.pop(\"description\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
just another one fix for error validator and tests
|
718,844 |
09.01.2022 09:53:17
| -10,800 |
b26dd95a0d373e99ca772097a4008f093833035a
|
Remove useless re.MULTILINE flag
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -116,7 +116,7 @@ class VBMLRule(ABCRule[BaseMessageMin]):\npatcher: Optional[\"vbml.Patcher\"] = None,\nflags: Optional[re.RegexFlag] = None,\n):\n- flags = flags or self.config.get(\"vbml_flags\") or (re.MULTILINE | re.DOTALL)\n+ flags = flags or self.config.get(\"vbml_flags\") or re.DOTALL\nif isinstance(pattern, str):\npattern = [vbml.Pattern(pattern, flags=flags or self.config.get(\"vbml_flags\"))]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/base.py",
"new_path": "vkbottle/framework/labeler/base.py",
"diff": "@@ -60,7 +60,7 @@ class BaseLabeler(ABCLabeler):\n# Rule config is accessible from every single custom rule\nself.rule_config: Dict[str, Any] = {\n- \"vbml_flags\": re.MULTILINE | re.DOTALL, # Flags for VBMLRule\n+ \"vbml_flags\": re.DOTALL, # Flags for VBMLRule\n\"vbml_patcher\": vbml.Patcher(), # Patcher for VBMLRule\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove useless re.MULTILINE flag
|
718,844 |
27.01.2022 20:09:26
| -10,800 |
f90dfa56a41c0e2b3f45ae156690bbe3b4414fc2
|
Add aiofiles to dependencies
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -43,13 +43,14 @@ pydantic = \"^1.8.2\"\nvbml = \"^1.0\"\nvkbottle-types = \"^5.131.131.12\"\nwatchgod = \"^0.7\"\n+aiofiles = \"^0.8.0\"\n[tool.poetry.dev-dependencies]\n# Lint\nblack = {version = \"^21.4b0\", allow-prereleases = true}\nflake8 = \"^4.0.1\"\n-isort = \"^5.7\"\n-lxml = \"^4.5.0\"\n+isort = \"^5.10.1\"\n+lxml = \"^4.7.1\"\nmypy = \"^0.931\"\nmypy_extensions = \"^0.4.3\"\n@@ -57,18 +58,19 @@ mypy_extensions = \"^0.4.3\"\ntypes-aiofiles = \"^0.8.0\"\n# Tests\n-pytest = \"^6.2\"\n+pytest = \"^6.2.5\"\npytest-asyncio = \"^0.17.2\"\npytest-cov = \"^3.0.0\"\n-pytest-mock = \"^3.3.1\"\n+pytest-mock = \"^3.6.1\"\n# Docs\n-mkdocs = \"^1.1.2\"\n-mkdocs-material = \"^8.0.2\"\n+mkdocs = \"^1.2.3\"\n+mkdocs-material = \"^8.1.8\"\n# Pre-commit\nautoflake = \"^1.4\"\n-pre-commit = \"^2.12.0\"\n+pre-commit = \"^2.17.0\"\n+mypy-extensions = \"^0.4.3\"\n[tool.mypy]\npython_version = 3.8\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -2,6 +2,8 @@ from abc import ABC, abstractmethod\nfrom io import BytesIO\nfrom typing import TYPE_CHECKING, Callable, Optional, Union\n+import aiofiles\n+\nfrom vkbottle.exception_factory.base_exceptions import VKAPIError\nfrom vkbottle.modules import json\n@@ -10,11 +12,6 @@ if TYPE_CHECKING:\nBytes = Union[bytes, BytesIO]\n-try:\n- import aiofiles\n-except ImportError:\n- aiofiles = None # type: ignore\n-\nclass BaseUploader(ABC):\ndef __init__(\n@@ -77,7 +74,6 @@ class BaseUploader(ABC):\n@staticmethod\nasync def read(file_source: Union[str, \"Bytes\"]) -> \"Bytes\":\nif isinstance(file_source, str):\n- assert aiofiles is not None, \"to use default files opener aiofiles should be installed\"\nasync with aiofiles.open(file_source, \"rb\") as file:\nreturn await file.read()\nreturn file_source\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add aiofiles to dependencies
|
718,844 |
27.01.2022 20:46:20
| -10,800 |
3076dd4e9e0a93d6b3ac1691f553fc7d12d2f168
|
Fix payload rule; fix typing in state rules
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -29,7 +29,7 @@ from vkbottle.tools.validator import (\n)\nif TYPE_CHECKING:\n- from vkbottle_types import BaseStateGroup\n+ from vkbottle.dispatch.dispenser.base import BaseStateGroup\nfrom .abc import ABCRule\n@@ -130,7 +130,7 @@ class VBMLRule(ABCRule[BaseMessageMin]):\nself.patterns = pattern\nself.patcher = patcher or self.config.get(\"vbml_patcher\") or vbml.Patcher()\n- async def check(self, event: BaseMessageMin) -> Union[dict, bool]:\n+ async def check(self, event: BaseMessageMin) -> Union[Optional[dict], bool]:\nfor pattern in self.patterns:\nresult = self.patcher.check(pattern, event.text)\nif result not in (None, False):\n@@ -290,7 +290,11 @@ class PayloadContainsRule(ABCRule[BaseMessageMin]):\nself.payload_particular_part = payload_particular_part\nasync def check(self, event: BaseMessageMin) -> bool:\n- payload = event.get_payload_json(unpack_failure=lambda p: {})\n+ if event.payload is None:\n+ return False\n+ payload = event.get_payload_json()\n+ if not isinstance(payload, dict):\n+ return False\nreturn all(payload.get(k) == v for k, v in self.payload_particular_part.items())\n@@ -341,7 +345,9 @@ class PayloadMapRule(ABCRule[BaseMessageMin]):\nreturn True\nasync def check(self, event: BaseMessageMin) -> bool:\n- payload = event.get_payload_json(unpack_failure=lambda p: {})\n+ payload = event.get_payload_json()\n+ if not isinstance(payload, dict):\n+ return False\nreturn await self.match(payload, self.payload_map)\n@@ -372,7 +378,10 @@ class CoroutineRule(ABCRule[BaseMessageMin]):\nclass StateRule(ABCRule[BaseMessageMin]):\n- def __init__(self, state: Union[List[\"BaseStateGroup\"], \"BaseStateGroup\"]):\n+ def __init__(\n+ self,\n+ state: Optional[Union[List[\"BaseStateGroup\"], \"BaseStateGroup\"]] = None,\n+ ):\nif not isinstance(state, list):\nstate = [] if state is None else [state]\nself.state = [get_state_repr(s) for s in state]\n@@ -384,7 +393,10 @@ class StateRule(ABCRule[BaseMessageMin]):\nclass StateGroupRule(ABCRule[BaseMessageMin]):\n- def __init__(self, state_group: Union[List[Type[\"BaseStateGroup\"]], Type[\"BaseStateGroup\"]]):\n+ def __init__(\n+ self,\n+ state_group: Optional[Union[List[Type[\"BaseStateGroup\"]], Type[\"BaseStateGroup\"]]] = None,\n+ ):\nif not isinstance(state_group, list):\nstate_group = [] if state_group is None else [state_group]\nself.state_group = [group.__name__ for group in state_group]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix payload rule; fix typing in state rules
|
718,844 |
27.01.2022 20:57:44
| -10,800 |
fe399bcc1538411be2d9e68fbecf10350f6a8f26
|
Deprecate params like `user_id` or `peer_id` in `Message.answer()`, closes closes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -7,7 +7,7 @@ from pydantic import BaseModel, root_validator\nfrom vkbottle_types.objects import MessagesMessage, UsersUserFull\nfrom vkbottle.dispatch.dispenser.base import StatePeer\n-\n+from vkbottle.modules import logger\nif TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI, API\n@@ -72,20 +72,13 @@ class BaseMessageMin(MessagesMessage, ABC):\nself,\nmessage: Optional[str] = None,\nattachment: Optional[str] = None,\n- user_id: Optional[int] = None,\nrandom_id: Optional[int] = 0,\n- peer_id: Optional[int] = None,\n- peer_ids: Optional[List[int]] = None,\n- domain: Optional[str] = None,\n- chat_id: Optional[int] = None,\n- user_ids: Optional[List[int]] = None,\nlat: Optional[float] = None,\nlong: Optional[float] = None,\nreply_to: Optional[int] = None,\nforward_messages: Optional[List[int]] = None,\nforward: Optional[str] = None,\nsticker_id: Optional[int] = None,\n- group_id: Optional[int] = None,\nkeyboard: Optional[str] = None,\ntemplate: Optional[str] = None,\npayload: Optional[str] = None,\n@@ -99,9 +92,13 @@ class BaseMessageMin(MessagesMessage, ABC):\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- required_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n- if not any(data.get(param) for param in required_params):\ndata[\"peer_id\"] = self.peer_id\n+ required_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n+ if any(data.get(param) for param in required_params):\n+ logger.warning(\n+ \"Params like peer_id or user_id is deprecated in Message.answer().\"\n+ \"Use API.messages.send() instead\"\n+ )\nstream = StringIO(message)\nwhile True:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Any, List, Optional, Union\nfrom vkbottle_types.events.objects.group_event_objects import MessageEventObject\nfrom vkbottle.dispatch.dispenser.base import StatePeer\n+from vkbottle.modules import logger\nfrom vkbottle.tools.dev.event_data import OpenAppEvent, OpenLinkEvent, ShowSnackbarEvent\nif TYPE_CHECKING:\n@@ -72,20 +73,13 @@ class MessageEventMin(MessageEventObject):\nself,\nmessage: Optional[str] = None,\nattachment: Optional[str] = None,\n- user_id: Optional[int] = None,\nrandom_id: Optional[int] = 0,\n- peer_id: Optional[int] = None,\n- peer_ids: Optional[List[int]] = None,\n- domain: Optional[str] = None,\n- chat_id: Optional[int] = None,\n- user_ids: Optional[List[int]] = None,\nlat: Optional[float] = None,\nlong: Optional[float] = None,\nreply_to: Optional[int] = None,\nforward_messages: Optional[List[int]] = None,\nforward: Optional[str] = None,\nsticker_id: Optional[int] = None,\n- group_id: Optional[int] = None,\nkeyboard: Optional[str] = None,\ntemplate: Optional[str] = None,\npayload: Optional[str] = None,\n@@ -100,9 +94,12 @@ class MessageEventMin(MessageEventObject):\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\nrequired_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n- if not any(data.get(param) for param in required_params):\ndata[\"peer_id\"] = self.peer_id\n-\n+ if any(data.get(param) for param in required_params):\n+ logger.warning(\n+ \"Params like peer_id or user_id is deprecated in MessageEvent.send_message().\"\n+ \"Use API.messages.send() instead\"\n+ )\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Deprecate params like `user_id` or `peer_id` in `Message.answer()`, closes #469, closes #468
|
718,844 |
29.01.2022 17:27:24
| -10,800 |
6050ccabab75bb740b7f256d26f6468e9af72394
|
Fix typing.Protocol compatibility with python3.7
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -44,6 +44,7 @@ vbml = \"^1.0\"\nvkbottle-types = \"^5.131.134\"\nwatchgod = \"^0.7\"\naiofiles = \"^0.8.0\"\n+typing-extensions = \"^4.0.1\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "import logging\n-from typing import Protocol\nfrom choicelib import choice_in_order\n+from typing_extensions import Protocol\nclass JSONModule(Protocol):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "import ast\nimport random\nimport string\n-from typing import Callable, Iterable, Protocol\n+from typing import Callable, Iterable\n+\n+from typing_extensions import Protocol\nfrom .base_converter import Converter, ConverterError\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typing.Protocol compatibility with python3.7
|
718,844 |
29.01.2022 18:37:29
| -10,800 |
c7c7243b488825a481fd12a498e7fe7f214e918e
|
Update requirements; small fix in MessageEvent
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.1.12\"\n+version = \"4.1.13\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n@@ -38,9 +38,9 @@ exclude = [\"**/tests/*\", \"**/test_*\"]\n[tool.poetry.dependencies]\npython = \"^3.7.2\"\naiohttp = \"^3.6.2\"\n-choicelib = \"^0.1.1\"\n+choicelib = \"^0.1.5\"\npydantic = \"^1.8.2\"\n-vbml = \"^1.0\"\n+vbml = \"^1.1.post1\"\nvkbottle-types = \"^5.131.134\"\nwatchgod = \"^0.7\"\naiofiles = \"^0.8.0\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -94,12 +94,12 @@ class MessageEventMin(MessageEventObject):\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\nrequired_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n- data[\"peer_id\"] = self.peer_id\nif any(data.get(param) for param in required_params):\nlogger.warning(\n\"Params like peer_id or user_id is deprecated in MessageEvent.send_message().\"\n\"Use API.messages.send() instead\"\n)\n+ data[\"peer_id\"] = self.peer_id\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update requirements; small fix in MessageEvent
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.