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 |
23.06.2020 21:56:00
| -10,800 |
2e2b206a7f91e77fa86b84d6993e56c07a458a8a
|
v2.7.6 Fix keyboard generator (rewrite and fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/generator.py",
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "@@ -16,24 +16,25 @@ def keyboard_gen(\nfor row in rows:\nrow_buttons = list()\nfor button in row:\n- row_buttons.append(\n- dict(\n- action=dict(\n- type=button.get(\"type\", \"text\"),\n- label=button.get(\"text\", button.get(\"label\")),\n- **{\n+ action = dict()\n+ fields = dict()\n+\n+ action[\"type\"] = button.get(\"type\", \"text\")\n+ action.update(\n+ {\nk: v\nfor k, v in button.items()\n- if k not in [\"type\", \"text\", \"label\", \"color\"]\n+ if k not in (\"type\", \"text\", \"label\", \"color\")\n}\n- ),\n- **(\n- {\"color\": button.get(\"color\", \"default\")}\n- if button.get(\"type\", \"text\") == \"text\"\n- else {}\n- )\n- )\n)\n+\n+ if action[\"type\"] == \"text\":\n+ action[\"label\"] = button.get(\"text\", button.get(\"label\"))\n+ fields[\"color\"] = button.get(\"color\", \"default\")\n+\n+ row_button = {\"action\": action, **fields}\n+\n+ row_buttons.append(row_button)\nbuttons.append(row_buttons)\nkeyboard = str(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Fix keyboard generator (rewrite and fix #138)
|
718,838 |
24.06.2020 01:23:49
| -10,800 |
800787c730e75c70030627dba2270d81ca9b7623
|
v2.7.6 tokens field can take string value
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -24,10 +24,13 @@ class API(ContextInstanceMixin, Categories, Constructor):\ndef __init__(\nself,\n- tokens: typing.List[str] = None,\n+ tokens: typing.Union[str, typing.List[str]] = None,\ngenerator: typing.Union[str] = \"consistent\",\nthrow_errors: bool = True,\n):\n+ if isinstance(tokens, str):\n+ tokens = [tokens]\n+\nself.token_generator: AbstractTokenGenerator = GENERATORS.get(\ngenerator, ConsistentTokenGenerator\n)(tokens)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 tokens field can take string value
|
718,838 |
24.06.2020 02:16:04
| -10,800 |
dbb2719b1db60a3f2da535652c283a42f826c019
|
v2.7.6 Fix type of wallpost responded
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/wall.py",
"new_path": "vkbottle/types/responses/wall.py",
"diff": "@@ -59,7 +59,7 @@ class GetRepostsModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List[objects.wall.Wallpost] = None\n+ items: typing.List[objects.wall.WallpostFull] = None\nclass GetModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Fix type of wallpost responded
|
718,838 |
24.06.2020 02:57:43
| -10,800 |
ea44628acbde49103e5e172f09090a6c0da68e42
|
v2.7.6 Little change
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -28,7 +28,7 @@ class API(ContextInstanceMixin, Categories, Constructor):\ngenerator: typing.Union[str] = \"consistent\",\nthrow_errors: bool = True,\n):\n- if isinstance(tokens, str):\n+ if not isinstance(tokens, list):\ntokens = [tokens]\nself.token_generator: AbstractTokenGenerator = GENERATORS.get(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Little change
|
718,842 |
26.06.2020 10:42:19
| -10,800 |
d9aef7fe71a46c3bf93ada33bf9d9df0bab774ff
|
v2.7.6 Changed ABCMessageHandler
The return value of a __repr__ must be a string object
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/message.py",
"new_path": "vkbottle/framework/framework/handler/message.py",
"diff": "@@ -168,14 +168,15 @@ class ABCMessageHandler(ABC):\ndef __repr__(self):\nrules = \"\"\n- for rules in self.rules:\n+ for rule in self.rules:\nrules += (\n- rules[0].call.__name__\n+ \"(\"\n+ + rule[0].call.__name__\n+ \": \"\n- + \", \".join([rule.__class__.__name__ for rule in rules])\n- + \"\\n\"\n+ + \", \".join([rule_.__class__.__name__ for rule_ in rule])\n+ + \"), \"\n)\n- return rules\n+ return \"<ABCMessageHandler {}>\".format(rules.rstrip(\", \"))\ndef __bool__(self):\nreturn len(self.rules) > 0\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Changed ABCMessageHandler (#149)
The return value of a __repr__ must be a string object
|
718,842 |
27.06.2020 19:05:57
| -10,800 |
82ca7b3f98e8adbf772feb643257659dd8e2b431
|
Fix response type for likes get
Renamed GetList.users to GetList.items as it is since VK API 4.94 version
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/likes.py",
"new_path": "vkbottle/types/responses/likes.py",
"diff": "@@ -30,7 +30,7 @@ class DeleteModel(BaseModel):\nclass GetList(BaseModel):\ncount: int = None\n- users: typing.List[int] = None\n+ items: typing.List[int] = None\nclass GetListModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix response type for likes get #151 (#152)
Renamed GetList.users to GetList.items as it is since VK API 4.94 version
|
718,838 |
30.06.2020 13:58:03
| -10,800 |
5e016e685937ba7be9f31ee73ba27ea456797fe2
|
v2.7.6 Fix branches false database
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -162,7 +162,7 @@ class BotProcessor(ABCProcessor):\nbreak\n# FIXME\n- if edited is False and self.branch.generator is GeneratorType.DATABASE:\n+ if edited is False and self.branch.__class__.generator is GeneratorType.DATABASE:\nif branch_checkup_key in await self.branch.queue:\nlogger.debug(\"Updating branch context\")\nawait self.branch.add(branch_checkup_key, branch.key, **branch.context)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Fix branches false database
|
718,842 |
08.07.2020 16:33:46
| -10,800 |
5bc87b4c12fbad6287d5170da1fec3d1a577d7f7
|
v2.7.6 Changed deprecated skip_defaults to exclude_unset
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/base.py",
"new_path": "vkbottle/types/base.py",
"diff": "@@ -8,11 +8,11 @@ class BaseModel(pydantic.BaseModel):\nuse_enum_values = True\ndef __str__(self):\n- return str(self.dict(skip_defaults=True))\n+ return str(self.dict(exclude_unset=True))\ndef __repr__(self):\nargs = \", \".join(\n- [f\"{key}={value}\" for key, value in self.dict(skip_defaults=True).items()]\n+ [f\"{key}={value}\" for key, value in self.dict(exclude_unset=True).items()]\n)\nreturn \"{}({})\".format(self.__class__.__name__, args)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Changed deprecated skip_defaults to exclude_unset (#159)
|
718,844 |
10.07.2020 22:24:07
| -10,800 |
986d1e0aa9f6f25132ea652d4d7dc95833e7fe68
|
v2.7.6 Fix reading error for BytesIO in uploader(#164)
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/base.py",
"new_path": "vkbottle/api/uploader/base.py",
"diff": "@@ -44,6 +44,7 @@ class Uploader:\ndef open_pathlike(pathlike: typing.Union[str, BytesIO]) -> BytesIO:\nif isinstance(pathlike, str):\nreturn open(pathlike, \"rb\")\n+ pathlike.seek(0)\nreturn pathlike\n@staticmethod\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.6 Fix reading error for BytesIO in uploader(#164)
|
718,842 |
24.07.2020 22:45:27
| -10,800 |
a3a5006abfaf9c3815dd18baf645a95a156256d0
|
Updated PyPi publish workflow to publish on every v* tag
Fixed license in setup.py
Fixed collections.abc deprecation error
Replaced .replace("<", "<")... with simple html.unescape
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/workflows/publish_to_pypi.yml",
"diff": "+name: Publish Package to PyPI\n+\n+on:\n+ push:\n+ tags:\n+ - 'v*'\n+\n+jobs:\n+ build-and-publish:\n+ runs-on: ubuntu-latest\n+\n+ steps:\n+ - uses: actions/checkout@master\n+\n+ - name: Set up Python 3.7\n+ uses: actions/setup-python@v1\n+ with:\n+ python-version: 3.7\n+\n+ - name: Install setuptools and other tools\n+ run: python3 -m pip install setuptools wheel twine\n+\n+ - name: Build packages\n+ run: python3 setup.py bdist_wheel\n+\n+ - name: Publish distribution to PyPI\n+ if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')\n+ uses: pypa/gh-action-pypi-publish@master\n+ with:\n+ user: __token__\n+ password: ${{ secrets.pypi_password }}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": ".github/workflows/pythonpublish.yml",
"new_path": null,
"diff": "-# This workflows will upload a Python Package using Twine when a release is created\n-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries\n-\n-name: Upload Python Package\n-\n-on:\n- push:\n- branches:\n- - safe\n-\n-jobs:\n- deploy:\n- runs-on: ubuntu-latest\n- steps:\n- - uses: actions/checkout@v2\n- - name: Set up Python\n- uses: actions/setup-python@v1\n- with:\n- python-version: '3.x'\n- - name: Install dependencies\n- run: |\n- python -m pip install --upgrade pip\n- pip install setuptools wheel twine\n- - name: Build and publish\n- env:\n- TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}\n- TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}\n- run: |\n- python setup.py sdist bdist_wheel\n- twine upload dist/*\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -14,7 +14,7 @@ setuptools.setup(\ndescription=\"Homogenic!\",\nlong_description=long_description,\nlong_description_content_type=\"text/markdown\",\n- license=\"GPL-3.0\",\n+ license=\"MIT\",\nurl=\"https://github.com/timoniq/vkbottle\",\npackages=setuptools.find_packages(),\nclassifiers=[\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -4,13 +4,13 @@ import re\nfrom copy import copy\nfrom vbml import Pattern, Patcher\n+from html import unescape\nfrom vkbottle.types.message import Message as BotMessage\nfrom vkbottle.types.user_longpoll import Message as UserMessage\nfrom vkbottle.types import user_longpoll\nfrom vkbottle.utils import flatten, json\n-\nMessage = typing.Union[BotMessage, UserMessage]\n@@ -36,7 +36,6 @@ class RuleExecute:\nclass AbstractRule(Copy):\n-\ncall: typing.Callable\ngetfullargspec: inspect.FullArgSpec\n@@ -257,13 +256,8 @@ class VBML(AbstractMessageRule):\nclass VBMLRule(VBML):\nasync def check(self, message: Message) -> bool:\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\n- message = (\n- message.text.replace(\"<br>\", \"\\n\")\n- .replace(\"<\", \"<\")\n- .replace(\">\", \">\")\n- .replace(\""\", '\"')\n- .replace(\"&\", \"&\")\n- )\n+ message = message.text.replace(\"<br>\", \"\\n\")\n+ message = unescape(message)\nfor pattern in patterns:\nif self._patcher.check(message, pattern) is not None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -2,7 +2,7 @@ import re\nimport sys\nimport time\nimport typing\n-from collections import MutableMapping\n+from collections.abc import MutableMapping\nfrom typing import Sequence, List\nimport random\nimport string\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Updated PyPi publish workflow to publish on every v* tag (#176)
Fixed license in setup.py
Fixed collections.abc deprecation error
Replaced .replace("<", "<")... with simple html.unescape
|
718,842 |
25.07.2020 15:01:11
| -10,800 |
fe9354eeab26a8cd713cb9dce08ed44bb971623c
|
Updated version for release v2.7.7
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,7 +9,7 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.7.6\",\n+ version=\"2.7.7\",\nauthor=\"timoniq\",\ndescription=\"Homogenic!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"2.7.6 Released 22.06.20 18:45\" # Package VKBottle version\n+__version__ = \"2.7.7\" # Package VKBottle version\n__author__ = \"Arsenii Timoniq\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Updated version for release v2.7.7 (#178)
Co-authored-by: A. J. Timoniq <52574917+timoniq@users.noreply.github.com>
|
718,842 |
26.07.2020 18:08:09
| -10,800 |
87b7a8f295e387b4963512473acf079727ca6582
|
Updated setup.py, index.md, README.md
Made the version in setup.py imported
Made open("README.md") exception handlers more explicit
Made index.md more like README.md
Created/updated links in both index and README.md
Removed VBML_INTSALL from const.py
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "import setuptools\n+from vkbottle import const\n+\ntry:\nwith open(\"README.md\", \"r\", encoding=\"utf-8\") as f:\nlong_description = f.read()\n-except:\n+except UnicodeDecodeError:\nwith open(\"README.md\", \"r\") as f:\nlong_description = f.read()\n+except FileNotFoundError:\n+ long_description = \"\"\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.7.7\",\n+ version=const.__version__,\nauthor=\"timoniq\",\ndescription=\"Homogenic!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "@@ -11,5 +11,3 @@ DEFAULT_BOT_FOLDER = \"vkbottle_bot\"\nVERSION_REST = (\n\"https://raw.githubusercontent.com/timoniq/vkbottle-rest/master/version.json\"\n)\n-\n-VBML_INSTALL = \"pip install vbml -U\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Updated setup.py, index.md, README.md (#179)
Made the version in setup.py imported
Made open("README.md") exception handlers more explicit
Made index.md more like README.md
Created/updated links in both index and README.md
Removed VBML_INTSALL from const.py
|
718,842 |
29.07.2020 21:22:07
| -10,800 |
e39a4b6be75d150cedb26ba08ec18466e463b10a
|
Fixed setup.py import error
Fixed typo in docs/getting_started.md
Fixed friends.get model
close
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "import setuptools\n-from vkbottle import const\n-\ntry:\nwith open(\"README.md\", \"r\", encoding=\"utf-8\") as f:\nlong_description = f.read()\n@@ -11,9 +9,12 @@ except UnicodeDecodeError:\nexcept FileNotFoundError:\nlong_description = \"\"\n+with open(\"vkbottle/const.py\") as f:\n+ exec(f.read())\n+\nsetuptools.setup(\nname=\"vkbottle\",\n- version=const.__version__,\n+ version=locals()[\"__version__\"],\nauthor=\"timoniq\",\ndescription=\"Homogenic!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/friends.py",
"new_path": "vkbottle/types/responses/friends.py",
"diff": "@@ -121,7 +121,7 @@ class GetSuggestionsModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List[objects.users.User] = None\n+ items: typing.List[typing.Union[int, objects.users.User]] = None\nclass GetModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fixed setup.py import error (#181)
Fixed typo in docs/getting_started.md
Fixed friends.get model
close #180
|
718,838 |
29.07.2020 23:45:35
| -10,800 |
868b7885ba60022168974fba88c04fc5677cc43c
|
Ultra important fix
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -161,7 +161,7 @@ user = User(\"user-token\")\n@user.on.message_handler(text=\"do you like <item>?\")\nasync def wrapper(ans: Message, item: str):\n- if item in [\"memes\", \"chicket nuggets\", \"vkbottle\"]:\n+ if item in [\"memes\", \"chicken nuggets\", \"vkbottle\"]:\nreturn f\"Yes! I adore {item}!\"\nreturn \"No...\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Ultra important fix
|
718,838 |
31.07.2020 19:44:30
| -10,800 |
43d63a7442323b4f6d97466a504e6cd01c066d0f
|
Errors handled with swear just_log return nothing
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/swear_handler.py",
"new_path": "vkbottle/framework/framework/swear_handler.py",
"diff": "@@ -28,13 +28,14 @@ def swear(\nif ignore:\nreturn e\nif exception_handler is not None:\n- await exception_handler(e, *args, **kwargs)\n+ return await exception_handler(e, *args, **kwargs)\nelif just_log:\nlogger.error(\n\"While {func} was handling error occurred \\n\\n{traceback}\",\nfunc=func.__name__,\ntraceback=traceback.format_exc(),\n)\n+ return\nfinally:\nlogger.debug(f\"{func.__name__} successfully handled with swear\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Errors handled with swear just_log return nothing
|
718,838 |
01.08.2020 13:22:15
| -10,800 |
697506987ee563dea554dc3df07b6b95c752e1d6
|
Fix friends.get response type (User to UserFull)
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/friends.py",
"new_path": "vkbottle/types/responses/friends.py",
"diff": "@@ -121,7 +121,7 @@ class GetSuggestionsModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List[typing.Union[int, objects.users.User]] = None\n+ items: typing.List[typing.Union[int, objects.users.UserFull]] = None\nclass GetModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix friends.get response type (User to UserFull)
|
718,838 |
02.08.2020 22:49:50
| -10,800 |
c5ebffd36aaee2064b7f27685dbf18f49580b41c
|
Update CommandRule; takes many prefixes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -158,17 +158,19 @@ class LevenshteinDisRule(AbstractMessageRule):\nclass CommandRule(AbstractMessageRule):\n- def __init__(self, message: typing.Union[str, typing.List[str]]):\n+ def __init__(self, message: typing.Union[str, typing.List[str]], prefixes: typing.Tuple[str, ...] = (\"/\", \"!\")):\nif isinstance(message, dict):\nself.watch_context = message\nmessage = list(message.keys())\nelif not isinstance(message, list):\nmessage = [message]\n- self.data = {\"message\": [\"/\" + c for c in message]}\n+ self.data = {\"message\": message, \"prefixes\": prefixes}\nasync def check(self, message: Message) -> bool:\n- if message.text in self.data[\"message\"]:\n- return True\n+ if not message.text or len(message.text) < 2:\n+ return\n+ prefix, text = message.text[0], message.text[1:]\n+ return prefix in self.data[\"prefixes\"] and text in self.data[\"message\"]\nclass EventRule(AbstractRule):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update CommandRule; takes many prefixes
|
718,838 |
04.08.2020 17:42:26
| -10,800 |
65de34e7ee80d4ef39ddde6f057597bc52b7f7bd
|
Transfer event loop getter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -109,8 +109,8 @@ class Bot(PollingAPI):\nrotation=\"20 MB\",\n)\n- self.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n- self.loop = loop or asyncio.get_event_loop()\n+ self.group_id = group_id\n+ self.loop = loop\n# Sign assets\nself._api: Api = Api(self.__tokens, throw_errors=throw_errors)\n@@ -201,7 +201,7 @@ class Bot(PollingAPI):\nlogger.debug(\"Blueprints have been successfully loaded\")\n@staticmethod\n- def get_id_by_token(token: str, throw_exc: bool = True) -> typing.Union[int, bool]:\n+ def get_id_by_token(token: str, loop: asyncio.AbstractEventLoop, throw_exc: bool = True) -> typing.Union[int, bool]:\n\"\"\"\nGet group id from token\n:param token:\n@@ -302,6 +302,8 @@ class Bot(PollingAPI):\n\"\"\"\n:return:\n\"\"\"\n+ self.loop_update(self.loop)\n+\nself._stop = False\ntask = TaskManager(\nself.loop,\n@@ -318,6 +320,9 @@ class Bot(PollingAPI):\nCan be manually stopped with:\nbot.stop()\n\"\"\"\n+ self.group_id = (await self.api.request(\"groups.getById\", {}))[0].id\n+ self.on.group_id = self.group_id # FIXME\n+\nself.__wait = wait\nlogger.debug(\"Polling will be started. Is it OK?\")\nif self.__secret is not None:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Transfer event loop getter (#183)
|
718,842 |
04.08.2020 21:18:12
| -10,800 |
53e9bfb7a7ca6b3196cb75a03785890f807701e9
|
Fixed message.send model and typos
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -66,7 +66,7 @@ class HTTPRequest:\njson_: dict = None,\ncontent_type: str = \"application/json\",\nread_content: bool = False,\n- ) -> typing.Union[dict]:\n+ ) -> typing.Union[dict, bytes]:\nasync with client.get(\nurl,\nssl=ssl.SSLContext(),\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -278,6 +278,7 @@ class Message(BaseModel):\nout: \"base.BoolInt\" = None\npayload: str = None\npeer_id: int = None\n+ message_id: int = None\nrandom_id: int = None\nref: str = None\nref_source: str = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -291,7 +291,7 @@ Send = int\nclass SendModel(BaseModel):\n- response: Send = None\n+ response: typing.Union[Send, typing.List[objects.messages.Message]] = None\nGetConversationsById.update_forward_refs()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fixed message.send model and typos (#185)
|
718,838 |
04.08.2020 21:47:39
| -10,800 |
730c8143dcce2a25a28322a6034778d058588dcc
|
Transfer user loop getter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -320,6 +320,7 @@ class Bot(PollingAPI):\nCan be manually stopped with:\nbot.stop()\n\"\"\"\n+ if not self.group_id:\nself.group_id = (await self.api.request(\"groups.getById\", {}))[0].id\nself.on.group_id = self.group_id # FIXME\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -71,7 +71,7 @@ class User(PollingAPI):\nif login and password:\nself.__tokens = self.get_tokens(login, password)\n- self.loop = loop or asyncio.get_event_loop()\n+ self.loop = loop\nself.__debug: bool = debug\nself._api: UserApi = UserApi(self.__tokens)\nself.mode = mode\n@@ -79,9 +79,7 @@ class User(PollingAPI):\nself._expand_models: bool = expand_models\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\n- self.user_id: typing.Optional[int] = user_id or self.get_id_by_token(\n- self.__tokens[0]\n- )\n+ self.user_id: typing.Optional[int] = user_id\nself._api.user_id = user_id\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\n@@ -126,14 +124,14 @@ class User(PollingAPI):\n)\n@staticmethod\n- def get_id_by_token(token: str) -> int:\n+ def get_id_by_token(token: str, loop: asyncio.AbstractEventLoop) -> int:\n\"\"\"\nGet group id from token\n:param token:\n:return:\n\"\"\"\nlogger.debug(\"Making API request users.get to get user_id\")\n- response = asyncio.get_event_loop().run_until_complete(\n+ response = loop.run_until_complete(\nrequest(\"users.get\", {}, token)\n)\nif \"error\" in response:\n@@ -201,6 +199,9 @@ class User(PollingAPI):\nCan be manually stopped with:\n>> user.stop()\n\"\"\"\n+ if not self.user_id:\n+ self.user_id = (await self.api.request(\"users.get\", {}))[0].id\n+\nself.wait = wait\nlogger.info(\"Polling will be started. Is it OK?\")\n@@ -254,6 +255,8 @@ class User(PollingAPI):\n):\n\"\"\" Run loop with bot.run() task with loop.run_forever()\n\"\"\"\n+ self.loop_update(self.loop)\n+\nself._stop = False\ntask = TaskManager(\nself.loop,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Transfer user loop getter (#186)
|
718,889 |
05.08.2020 12:16:38
| -18,000 |
a98ffa6cec61850511adda324ded1b6387d9d266
|
Added fields for LinkButtonActionType and PostType
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/link.py",
"new_path": "vkbottle/types/objects/link.py",
"diff": "@@ -41,6 +41,7 @@ class LinkButtonAction(BaseModel):\nclass LinkButtonActionType(Enum):\nopen_url = \"open_url\"\n+ join_group_and_open_url = \"join_group_and_open_url\"\nclass LinkProduct(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/wall.py",
"new_path": "vkbottle/types/objects/wall.py",
"diff": "@@ -106,6 +106,7 @@ class PostType(Enum):\ncopy = \"copy\"\nreply = \"reply\"\npostpone = \"postpone\"\n+ post_ads = \"post_ads\"\nsuggest = \"suggest\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added fields for LinkButtonActionType and PostType (#187)
|
718,838 |
06.08.2020 11:40:31
| -10,800 |
0a499d05cddcbc38f603e6f0352845011ab99170
|
Made copy dispatch sync
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -179,7 +179,7 @@ class Bot(PollingAPI):\nexcept VKError:\ncontinue\n- async def dispatch(self, bot: AnyBot):\n+ def dispatch(self, bot: AnyBot):\n\"\"\"\nConcatenate handlers to current bot object\n:param bot:\n@@ -196,7 +196,7 @@ class Bot(PollingAPI):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- self.loop.run_until_complete(self.dispatch(blueprint))\n+ self.dispatch(blueprint)\nblueprint.create(familiar=(self.branch, self.extension, self.api))\nlogger.debug(\"Blueprints have been successfully loaded\")\n@@ -321,7 +321,7 @@ class Bot(PollingAPI):\nbot.stop()\n\"\"\"\nif not self.group_id:\n- self.group_id = (await self.api.request(\"groups.getById\", {}))[0].id\n+ self.group_id = (await self.api.request(\"groups.getById\", {}))[0][\"id\"]\nself.on.group_id = self.group_id # FIXME\nself.__wait = wait\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -146,7 +146,7 @@ class User(PollingAPI):\n)\nreturn tokens\n- async def dispatch(self, user: AnyUser) -> None:\n+ def dispatch(self, user: AnyUser) -> None:\n\"\"\"\nConcatenate handlers to current user object\n:param user:\n@@ -164,7 +164,7 @@ class User(PollingAPI):\n\"\"\"\nfor blueprint in blueprints:\nblueprint.create(familiar=(self.branch, self.api))\n- self.loop.run_until_complete(self.dispatch(blueprint))\n+ self.dispatch(blueprint)\nlogger.debug(\"Blueprints have been successfully loaded\")\nasync def get_server(self) -> dict:\n@@ -200,7 +200,7 @@ class User(PollingAPI):\n>> user.stop()\n\"\"\"\nif not self.user_id:\n- self.user_id = (await self.api.request(\"users.get\", {}))[0].id\n+ self.user_id = (await self.api.request(\"users.get\", {}))[0][\"id\"]\nself.wait = wait\nlogger.info(\"Polling will be started. Is it OK?\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Made copy dispatch sync (#188)
|
718,874 |
09.08.2020 11:11:51
| -10,800 |
44ee2fcbfada4818a6af0c50a8fe17499ab0dfa5
|
Cosmetic changes; fix typing in add_branch
|
[
{
"change_type": "MODIFY",
"old_path": "examples/uploaders.py",
"new_path": "examples/uploaders.py",
"diff": "from io import BytesIO\n+from vkbottle import AudioUploader, Bot, DocUploader, Message, PhotoUploader\n+\nfrom gtts import gTTS\nfrom PIL import Image\n-from vkbottle import AudioUploader, Bot, DocUploader, Message, PhotoUploader\nbot = Bot(\"token\")\n@@ -15,18 +16,18 @@ audio_uploader = AudioUploader(bot.api, generate_attachment_strings=True)\nasync def photo_from_bytes(ans: Message):\nimage = Image.new(\"RGB\", (320, 320), (0, 0, 0))\nfp = BytesIO()\n- image.save(fp, \"RGB\")\n+ image.save(fp, \"PNG\")\nsetattr(fp, \"name\", \"image.png\")\nphoto = await photo_uploader.upload_message_photo(fp)\nawait ans(attachment=photo)\n@bot.on.message_handler(text=\"doc_from_file\", lower=True)\n-async def photo_from_bytes(ans: Message):\n- image = Image.new(\"RGB\", (320, 320), (0, 0, 0))\n- image.save(\"image.png\", \"RGB\")\n- photo = await doc_uploader.upload_doc_to_message(\"image.png\", ans.peer_id)\n- await ans(attachment=photo)\n+async def doc_from_file(ans: Message):\n+ doc = Image.new(\"RGB\", (320, 320), (0, 0, 0))\n+ doc.save(\"doc.png\", \"RGB\")\n+ doc_output = await doc_uploader.upload_doc_to_message(\"doc.png\", ans.peer_id)\n+ await ans(attachment=doc_output)\n@bot.on.message_handler(text=\"audio_message\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "import typing\nfrom vkbottle.api.api import Api\n-from ...utils.exceptions import VKError\nfrom vkbottle.framework.framework.branch import ABCBranchGenerator\nfrom vkbottle.framework.framework.extensions import AbstractExtension\nfrom vkbottle.framework.framework.handler.bot.handler import BotHandler\n+\n+from ...utils.exceptions import VKError\nfrom .abc import AbstractBlueprint\nFamiliar = typing.Tuple[ABCBranchGenerator, AbstractExtension, Api]\n@@ -28,7 +29,7 @@ class Blueprint(AbstractBlueprint):\nraise VKError(\n0,\nf\"All blueprints should have the same branch generative type ({self.name} \"\n- f\"Blueprint, branch {self.branch.__name__} / familiar {branch.__name__}\",\n+ f\"Blueprint, branch {self.branch} / familiar {branch}\",\n)\nself.extension = extension\nself.api = api_instance\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/user.py",
"new_path": "vkbottle/framework/blueprint/user.py",
"diff": "+from typing import Tuple\n+\nfrom vkbottle.api import UserApi\nfrom vkbottle.framework.framework.branch import ABCBranchGenerator\nfrom vkbottle.framework.framework.handler.user.handler import UserHandler\nfrom vkbottle.utils.exceptions import VKError\n-from typing import Tuple\n+\nfrom .abc import AbstractBlueprint\n@@ -20,6 +22,6 @@ class Blueprint(AbstractBlueprint):\nraise VKError(\n0,\nf\"All blueprints should have the same branch generative type ({self.name} \"\n- f\"Blueprint, branch {self.branch.__name__} / familiar {branch.__name__}\",\n+ f\"Blueprint, branch {self.branch} / familiar {branch}\",\n)\nself.api = api_instance\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "+import asyncio\n+import inspect\n+import typing\nfrom abc import abstractmethod\n-from .abc import ABCBranchGenerator, Branch, AbstractBranch, GeneratorType\n-from .cls import CoroutineBranch\n+\nfrom vkbottle.utils.exceptions import BranchError\nfrom vkbottle.utils.json import json\n-import typing\n-import asyncio\n-import inspect\n+\n+from .abc import ABCBranchGenerator, AbstractBranch, Branch, GeneratorType\n+from .cls import ClsBranch, CoroutineBranch\nclass DatabaseBranch(ABCBranchGenerator):\n@@ -53,7 +55,7 @@ class DatabaseBranch(ABCBranchGenerator):\nreturn from_function_branch\ndef add_branch(\n- self, branch: AbstractBranch, name: str = None, **context\n+ self, branch: ClsBranch, name: str = None, **context\n) -> AbstractBranch:\nself.names[name or branch.__name__] = branch\nreturn branch\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Cosmetic changes; fix typing in add_branch (#191)
|
718,874 |
17.08.2020 15:43:40
| -10,800 |
6005a81b0501ff3b1c3b2e9dc826224da628b837
|
Fix typo in documentation & typing fix
|
[
{
"change_type": "MODIFY",
"old_path": "docs/stuff.ru.md",
"new_path": "docs/stuff.ru.md",
"diff": "@@ -24,7 +24,7 @@ bot = Bot(\"token\")\n@bot.middleware.middleware_handler()\nclass NoBotMiddleware(Middleware):\n- async def pre(self, message: Message):\n+ async def pre(self, message: Message, *args):\nif not message.from_user:\nreturn False\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -55,7 +55,7 @@ class DatabaseBranch(ABCBranchGenerator):\nreturn from_function_branch\ndef add_branch(\n- self, branch: ClsBranch, name: str = None, **context\n+ self, branch: typing.TypeVar[\"T\"], name: str = None, **context\n) -> AbstractBranch:\nself.names[name or branch.__name__] = branch\nreturn branch\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typo in documentation & typing fix (#195)
|
718,838 |
23.08.2020 20:05:06
| -10,800 |
5c51041724f247c88f57940150ac1887f8067e43
|
clean readme add requirements
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -24,6 +24,8 @@ classifiers = [\n[tool.poetry.dependencies]\npython = \"^3.7\"\n+aiohttp = \"^3.6.2\"\n+vbml = \"^1.0\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "ADD",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": ""
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
clean readme add requirements
|
718,838 |
26.08.2020 19:05:43
| -10,800 |
ca2cdab33d7067fda9bd8cdd6dcbbb66669b4ea0
|
added exception factory
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/exception_manager.py",
"diff": "+from vkbottle.exception_factory import VKAPIError\n+\n+try:\n+ raise VKAPIError(2, \"Some exception occurred\")\n+except VKAPIError(3) as e:\n+ print(\"Oh, third exception.\")\n+except VKAPIError(2) as e:\n+ print(\"Oh, second exception.\")\n+except VKAPIError():\n+ print(\"Unknown vk error\")\n"
},
{
"change_type": "ADD",
"old_path": "tests/exception_manager.py",
"new_path": "tests/exception_manager.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "from .api import API, ABCAPI\n+from .exception_factory import ABCExceptionFactory, CodeErrorFactory, VKAPIError\nfrom .http import (\nABCHTTPClient,\nABCHTTPMiddleware,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "from abc import ABC, abstractmethod\n+import typing\nclass ABCAPI(ABC):\n@@ -8,4 +9,9 @@ class ABCAPI(ABC):\n@abstractmethod\nasync def request(self, method: str, data: dict) -> dict:\n+ \"\"\" Makes a single request opening a session \"\"\"\n+ pass\n+\n+ @abstractmethod\n+ async def validate_response(self, response: dict) -> typing.Any:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -26,6 +26,7 @@ class API(ABCAPI):\nself.http: ABCSessionManager = session_manager or SessionManager(AiohttpClient)\nasync def request(self, method: str, data: dict) -> dict:\n+ \"\"\" Makes a single request opening a session \"\"\"\nasync with self.http as session:\nresponse = await session.request_json(\n\"GET\",\n@@ -35,7 +36,10 @@ class API(ABCAPI):\n)\nreturn response\n- async def request_many(self, requests: typing.Iterable[APIRequest]) -> typing.AsyncIterator[dict]:\n+ async def request_many(\n+ self, requests: typing.Iterable[APIRequest]\n+ ) -> typing.AsyncIterator[dict]:\n+ \"\"\" Makes many requests opening one session \"\"\"\nasync with self.http as session:\nfor request in requests:\nyield await session.request_text(\n@@ -44,3 +48,6 @@ class API(ABCAPI):\ndata=request.data,\nparams={\"access_token\": self.token, \"v\": self.API_VERSION},\n)\n+\n+ async def validate_response(self, response: dict) -> typing.Any:\n+ pass\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/exception_factory/__init__.py",
"diff": "+from .abc import ABCExceptionFactory\n+from .code_error import CodeErrorFactory\n+\n+VKAPIError = CodeErrorFactory()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/exception_factory/abc.py",
"diff": "+from abc import ABC, abstractmethod\n+import typing\n+\n+\n+class ABCExceptionFactory(ABC, BaseException):\n+ \"\"\" Abstract Exception Factory\n+ Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n+ \"\"\"\n+\n+ @classmethod\n+ def __call__(\n+ cls, *args, **kwargs\n+ ) -> typing.Union[\"ABCExceptionFactory\", typing.Type[\"ABCExceptionFactory\"]]:\n+ pass\n+\n+ @classmethod\n+ @abstractmethod\n+ def exception_to_raise(cls, *args, **kwargs) -> \"ABCExceptionFactory\":\n+ pass\n+\n+ @classmethod\n+ @abstractmethod\n+ def exception_to_handle(cls, *args, **kwargs) -> typing.Type[\"ABCExceptionFactory\"]:\n+ pass\n+\n+ @classmethod\n+ @abstractmethod\n+ def generate_exc_classname(cls, *args, **kwargs) -> str:\n+ pass\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/exception_factory/code_error.py",
"diff": "+from .abc import ABCExceptionFactory\n+import typing\n+import gc\n+\n+\n+class CodeErrorFactory(ABCExceptionFactory):\n+ \"\"\" Code error factory\n+ Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n+ \"\"\"\n+\n+ @classmethod\n+ def __call__(\n+ cls, code: typing.Optional[int] = None, error_description: typing.Optional[str] = None\n+ ) -> typing.Union[\"ABCExceptionFactory\", typing.Type[\"ABCExceptionFactory\"]]:\n+ \"\"\" Interactively chooses the factory was called for: if error_description\n+ \"\"\"\n+ if error_description is not None:\n+ return cls.exception_to_raise(code, error_description)\n+ return cls.exception_to_handle(code)\n+\n+ @classmethod\n+ def exception_to_raise(cls, code: int, error_description: str) -> \"ABCExceptionFactory\":\n+ \"\"\" Returns an error with error code and error_description\n+ \"\"\"\n+ exception_type = type(cls.generate_exc_classname(code), (cls,), {})\n+ return exception_type(code, error_description)\n+\n+ @classmethod\n+ def exception_to_handle(cls, code: typing.Optional[int] = None) -> typing.Type[\"ABCExceptionFactory\"]:\n+ \"\"\" Returns error type from garbage compiler storage with error code.\n+ If code is not specified returns self type to handle exception with any code \"\"\"\n+ catch_exc_classname = cls.generate_exc_classname(code)\n+\n+ for obj in gc.get_objects():\n+ if (\n+ obj.__class__.__name__ == catch_exc_classname\n+ ):\n+ return obj.__class__\n+ return type(catch_exc_classname, (cls,), {})\n+\n+ @classmethod\n+ def generate_exc_classname(cls, code: int) -> str:\n+ \"\"\" Generates unique exception classname based on error code \"\"\"\n+ return f\"{cls.__name__}_{code}\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added exception factory
|
718,838 |
26.08.2020 22:46:24
| -10,800 |
57a04770b3cdfff63ce46335413022055cd047b0
|
move docs to low-level docs
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/index.md",
"diff": "+# Welcome to VKBottle v3 documentation!\n+\n+* [Low-level API](low-level/)\n+ * [Accessing API](low-level/api/api.md)\n+ * [Exception Handling](low-level/exception_factory/)\n+ + [Exception Factory](low-level/exception_factory/exception-factory.md)\n+ + [Error Handler](low-level/exception_factory/error-handler.md)\n+ * [Http Client](low-level/http/)\n+ + [Accessing Http Client](low-level/http/http-client.md)\n+ + [Http Middleware](low-level/http/http-middleware.md)\n+ + [Accessing Http Session Manager](low-level/http/http-session-manager.md)\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "docs/api/api.md",
"new_path": "docs/low-level/api/api.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "docs/exception_factory/error-handler.md",
"new_path": "docs/low-level/exception_factory/error-handler.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "docs/exception_factory/exception-factory.md",
"new_path": "docs/low-level/exception_factory/exception-factory.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "docs/http/http-client.md",
"new_path": "docs/low-level/http/http-client.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "docs/http/http-middleware.md",
"new_path": "docs/low-level/http/http-middleware.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "docs/http/http-session-manager.md",
"new_path": "docs/low-level/http/http-session-manager.md",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/low-level/low-level.md",
"diff": "+# Low-level API\n+\n+* [Accessing API](api/api.md)\n+* [Exception Handling](exception_factory/)\n+ + [Exception Factory](exception_factory/exception-factory.md)\n+ + [Error Handler](exception_factory/error-handler.md)\n+* [Http Client](http/)\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\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
move docs to low-level docs
|
718,838 |
27.08.2020 20:12:57
| -10,800 |
88444a5842bd9ca5255b715ed5327206dbbb79f6
|
added ci; made mypy friendly
|
[
{
"change_type": "MODIFY",
"old_path": ".flake8",
"new_path": ".flake8",
"diff": "[flake8]\nmax-line-length = 99\n-ignore = F401, F405, F403\n+ignore = F401, F405, F403, W503\nexclude = .git, build, dist, venv, docs, examples, tests, *.egg-info\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -2,9 +2,9 @@ name: CI\non:\npush:\n- branches: [ master ]\n+ branches: [ master, v3.0 ]\npull_request:\n- branches: [ master ]\n+ branches: [ master, v3.0 ]\njobs:\nbuild:\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/api_request_example.py",
"new_path": "examples/api_request_example.py",
"diff": "@@ -6,7 +6,7 @@ api = API(os.environ[\"token\"])\nasync def main():\n- print(await api.request(\"users.get\", {\"user_ids\": -1})) # Single request\n+ print(await api.request(\"users.get\", {})) # Single request\n# Multiple request for one session\nasync for response in api.request_many(\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -37,12 +37,6 @@ flake8 = \"^3.7.9\"\nmypy_extensions = \"^0.4.3\"\nblack = {version = \"^19.0\", allow-prereleases = true}\n-# Docs\n-mkdocs = \"^1.1\"\n-mkdocs-material = \"^4.6\"\n-mkautodoc = \"^0.1.0\"\n-pymdown-extensions = \"^6.1\"\n-\n# Tests\npytest = \"^5.4\"\npytest-cov = \"^2.8\"\n"
},
{
"change_type": "RENAME",
"old_path": "tests/http.py",
"new_path": "tests/http_test.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -36,21 +36,21 @@ class API(ABCAPI):\nresponse = await session.request_text(\n\"POST\",\nself.API_URL + method,\n- data=data,\n+ data=data, # type: ignore\nparams={\"access_token\": self.token, \"v\": self.API_VERSION},\n)\nreturn await self.validate_response(response)\nasync def request_many(\n- self, requests: typing.Iterable[APIRequest]\n+ self, requests: typing.Iterable[APIRequest] # type: ignore\n) -> typing.AsyncIterator[dict]:\n\"\"\" Makes many requests opening one session \"\"\"\nasync with self.http as session:\nfor request in requests:\nresponse = await session.request_text(\n\"POST\",\n- self.API_URL + request.method,\n- data=request.data,\n+ self.API_URL + request.method, # type: ignore\n+ data=request.data, # type: ignore\nparams={\"access_token\": self.token, \"v\": self.API_VERSION},\n)\nyield await self.validate_response(response)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/__init__.py",
"new_path": "vkbottle/exception_factory/__init__.py",
"diff": "@@ -3,7 +3,7 @@ from .code_error import CodeErrorFactory\nfrom .single_error import SingleError\nfrom .error_handler import ABCErrorHandler, ErrorHandler\n-VKAPIError = CodeErrorFactory(\"VKAPIError\")\n+VKAPIError = CodeErrorFactory()\nclass VKBottleError(SingleError):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/abc.py",
"new_path": "vkbottle/exception_factory/abc.py",
"diff": "@@ -4,10 +4,12 @@ import typing\nclass ABCExceptionFactory(ABC, BaseException):\n\"\"\" Abstract Exception Factory\n- Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n+ Documentation: \\\n+ https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n\"\"\"\n@classmethod\n+ @abstractmethod\ndef __call__(\ncls, *args, **kwargs\n) -> typing.Union[\"ABCExceptionFactory\", typing.Type[\"ABCExceptionFactory\"]]:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_error.py",
"new_path": "vkbottle/exception_factory/code_error.py",
"diff": "@@ -5,7 +5,8 @@ import gc\nclass CodeErrorFactory(ABCExceptionFactory):\n\"\"\" Code error factory\n- Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n+ Documentation: \\\n+ https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n\"\"\"\ndef __init__(\n@@ -15,24 +16,26 @@ class CodeErrorFactory(ABCExceptionFactory):\nself.error_description = error_description\n@classmethod\n- def __call__(\n+ def __call__( # type: ignore\ncls, code: typing.Optional[int] = None, error_description: typing.Optional[str] = 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)\n+ return cls.exception_to_raise(code, error_description) # type: ignore\nreturn cls.exception_to_handle(code)\n@classmethod\n- def exception_to_raise(cls, code: int, error_description: str) -> \"ABCExceptionFactory\":\n+ def exception_to_raise( # type: ignore\n+ cls, code: int, error_description: str\n+ ) -> \"ABCExceptionFactory\":\n\"\"\" Returns an error with error code and error_description\n\"\"\"\nexception_type = type(cls.generate_exc_classname(code), (cls,), {})\nreturn exception_type(code, error_description)\n@classmethod\n- def exception_to_handle(\n+ def exception_to_handle( # type: ignore\ncls, code: typing.Optional[int] = None\n) -> typing.Type[\"ABCExceptionFactory\"]:\n\"\"\" Returns error type from garbage compiler storage with error code.\n@@ -45,7 +48,7 @@ class CodeErrorFactory(ABCExceptionFactory):\nreturn type(catch_exc_classname, (cls,), {})\n@classmethod\n- def generate_exc_classname(cls, code: int) -> str:\n+ def generate_exc_classname(cls, code: typing.Optional[int]) -> str: # type: ignore\n\"\"\" Generates unique exception classname based on error code \"\"\"\nreturn f\"{cls.__name__}_{code}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "@@ -21,5 +21,9 @@ class ABCErrorHandler(ABC):\npass\n@abstractmethod\n- def wraps_error_handler(self) -> 1:\n+ def wraps_error_handler(\n+ self,\n+ ) -> typing.Callable[\n+ [typing.Any], typing.Callable[[typing.Any, typing.Any], typing.Awaitable[typing.Any]]\n+ ]:\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": "@@ -4,7 +4,7 @@ import typing\nclass ErrorHandler(ABCErrorHandler):\ndef __init__(self, redirect_arguments: bool = False):\n- self.error_handlers: typing.Dict[BaseException, ExceptionHandler] = {}\n+ self.error_handlers: typing.Dict[typing.Type[BaseException], ExceptionHandler] = {}\nself.undefined_error_handler: typing.Optional[ExceptionHandler] = None\nself.redirect_arguments = redirect_arguments\n@@ -16,7 +16,7 @@ class ErrorHandler(ABCErrorHandler):\nif exception_handler:\nself.error_handlers[exception_type] = exception_handler\n- return\n+ return None\ndef decorator(func: ExceptionHandler):\nself.error_handlers[exception_type] = func\n@@ -30,7 +30,7 @@ class ErrorHandler(ABCErrorHandler):\nif undefined_error_handler:\nself.undefined_error_handler = undefined_error_handler\n- return\n+ return None\ndef decorator(func: ExceptionHandler):\nself.undefined_error_handler = func\n@@ -42,8 +42,8 @@ class ErrorHandler(ABCErrorHandler):\nself, handler: ExceptionHandler, e: BaseException, *args, **kwargs\n) -> typing.Awaitable[typing.Any]:\nif self.redirect_arguments:\n- return handler(e, *args, **kwargs)\n- return handler(e)\n+ return handler(e, *args, **kwargs) # type: ignore\n+ return handler(e) # type: ignore\ndef wraps_error_handler(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/single_error.py",
"new_path": "vkbottle/exception_factory/single_error.py",
"diff": "@@ -4,28 +4,31 @@ import typing\nclass SingleError(ABCExceptionFactory):\n\"\"\" Sinle error factory\n- Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n+ Documentation: \\\n+ https://github.com/timoniq/vkbottle/tree/v3.0/docs/exception-factory/exception-factory.md\n\"\"\"\n@classmethod\n- def __call__(cls, exception_description: str) -> typing.Type[\"ABCExceptionFactory\"]:\n+ def __call__(cls, exception_description: str) -> \"ABCExceptionFactory\": # type: ignore\n\"\"\" Returns an exception to raise\n\"\"\"\nreturn cls.exception_to_raise(exception_description)\n@classmethod\n- def exception_to_raise(cls, exception_description: str) -> \"ABCExceptionFactory\":\n+ def exception_to_raise( # type: ignore\n+ cls, exception_description: str\n+ ) -> \"ABCExceptionFactory\":\n\"\"\" Returns an exception to raise\n\"\"\"\nreturn cls(exception_description)\n@classmethod\n- def exception_to_handle(\n+ def exception_to_handle( # type: ignore\ncls, code: typing.Optional[int] = None\n) -> typing.Type[\"ABCExceptionFactory\"]:\n\"\"\" Returns exception class \"\"\"\nreturn cls\n@classmethod\n- def generate_exc_classname(cls) -> str:\n+ def generate_exc_classname(cls) -> str: # type: ignore\nreturn cls.__name__\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/client/aiohttp.py",
"new_path": "vkbottle/http/client/aiohttp.py",
"diff": "import asyncio\nimport typing\n-import types\nfrom vkbottle.modules import json as json_module\nfrom aiohttp import ClientSession, TCPConnector\n@@ -16,7 +15,7 @@ class AiohttpClient(ABCHTTPClient):\nloop: typing.Optional[asyncio.AbstractEventLoop] = None,\nsession: typing.Optional[ClientSession] = None,\nmiddleware: typing.Optional[\"ABCHTTPMiddleware\"] = None,\n- json_processing_module: typing.Optional[types.ModuleType] = None,\n+ json_processing_module: typing.Optional[typing.Any] = None,\n):\nself.loop = loop or asyncio.get_event_loop()\nself.json_processing_module = json_processing_module or json_module\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/middleware/abc.py",
"new_path": "vkbottle/http/middleware/abc.py",
"diff": "@@ -8,7 +8,7 @@ HTTPMiddlewareResponse = typing.NewType(\"HTTPMiddlewareResponse\", bool)\ndef request_session_close(\n- func: typing.Callable[[str, str, typing.Optional[dict]], typing.Any]\n+ func: typing.Callable,\n) -> typing.Callable[[\"ABCHTTPClient\", str, str, typing.Optional[dict]], typing.Any]:\n\"\"\" Wrap request method running middlewares, closing client session \"\"\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added ci; made mypy friendly
|
718,838 |
27.08.2020 20:52:28
| -10,800 |
bb9bce98336fb677247846e8e7a173833682a199
|
fix ci tests; added token env variable to ci
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -36,6 +36,12 @@ jobs:\nrun: |\npoetry run flake8\npoetry run mypy vkbottle\n+\n+ - name: Set enviromental variables to run tests\n+ uses: allenevans/set-env@v1.0.0\n+ with:\n+ TOKEN: ${{ secrets.test_token }}\n+\n- name: Run tests\nrun: |\npoetry run pytest\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/conftest.py",
"new_path": "tests/conftest.py",
"diff": "@@ -2,9 +2,10 @@ import pytest\nimport os\nfrom vkbottle.api import API\n-TOKEN = os.getenv(\"token\")\n+TOKEN = os.getenv(\"TOKEN\")\n@pytest.fixture()\n-def api_getter():\n+def api():\n+ assert TOKEN\nreturn API(TOKEN)\n"
},
{
"change_type": "RENAME",
"old_path": "tests/exception_manager.py",
"new_path": "tests/exception_manager_test.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/client/aiohttp.py",
"new_path": "vkbottle/http/client/aiohttp.py",
"diff": "@@ -20,7 +20,7 @@ class AiohttpClient(ABCHTTPClient):\nself.loop = loop or asyncio.get_event_loop()\nself.json_processing_module = json_processing_module or json_module\nself.session = session or ClientSession(\n- connector=TCPConnector(verify_ssl=False, loop=self.loop),\n+ connector=TCPConnector(ssl=False),\njson_serialize=self.json_processing_module.dumps,\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix ci tests; added token env variable to ci
|
718,838 |
27.08.2020 20:58:28
| -10,800 |
eb1b9a303aee36b0df86dfc0e3a97ac9b9e79e92
|
fix ci; firstly set env vars
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -23,6 +23,12 @@ jobs:\nsteps:\n- uses: actions/checkout@master\n+ - name: Set enviromental variables to run tests\n+ uses: allenevans/set-env@v1.1.0\n+ with:\n+ overwrite: false\n+ TOKEN: ${{ secrets.test_token }}\n+\n- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}\nuses: actions/setup-python@v1\nwith:\n@@ -32,16 +38,12 @@ jobs:\nrun: |\npython -m pip install --upgrade pip poetry\npoetry install\n+\n- name: Lint code\nrun: |\npoetry run flake8\npoetry run mypy vkbottle\n- - name: Set enviromental variables to run tests\n- uses: allenevans/set-env@v1.0.0\n- with:\n- TOKEN: ${{ secrets.test_token }}\n-\n- name: Run tests\nrun: |\npoetry run pytest\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix ci; firstly set env vars
|
718,838 |
28.08.2020 01:12:02
| -10,800 |
61dec0008eeb2cbd3bbe72976373171d9d92e85a
|
added storages
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/ctx_storage_example.py",
"diff": "+from vkbottle import CtxStorage\n+\n+ctx_storage = CtxStorage()\n+ctx_storage.set(\"a\", 100)\n+\n+# In any part of code in runtime\n+\n+print(CtxStorage().get(\"a\")) # 100\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "from .api import API, ABCAPI, ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\n+from .tools import ABCStorage, CtxStorage, BaseContext\nfrom .exception_factory import (\nABCExceptionFactory,\nCodeErrorFactory,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -55,7 +55,9 @@ class API(ABCAPI):\n)\nyield await self.validate_response(response)\n- async def validate_response(self, response: typing.Union[dict, str]) -> typing.Union[dict, typing.NoReturn]:\n+ async def validate_response(\n+ self, response: typing.Union[dict, str]\n+ ) -> typing.Union[dict, typing.NoReturn]:\n\"\"\" Validates response from VK,\nto change validations change API.response_validators (list of ResponseValidator's) \"\"\"\nfor validator in self.response_validators:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/client/aiohttp.py",
"new_path": "vkbottle/http/client/aiohttp.py",
"diff": "@@ -20,8 +20,7 @@ class AiohttpClient(ABCHTTPClient):\nself.loop = loop or asyncio.get_event_loop()\nself.json_processing_module = json_processing_module or json_module\nself.session = session or ClientSession(\n- connector=TCPConnector(ssl=False),\n- json_serialize=self.json_processing_module.dumps,\n+ connector=TCPConnector(ssl=False), json_serialize=self.json_processing_module.dumps,\n)\nif middleware is not None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "+from .dev_tools import ABCStorage, CtxStorage, BaseContext\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "+from .storage import ABCStorage, CtxStorage\n+from .ctx_tool import BaseContext\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/ctx_tool.py",
"diff": "+from typing import TypeVar, Any, NoReturn\n+\n+try:\n+ import contextvars\n+except ImportError:\n+ contextvars = None # type: ignore\n+\n+\n+T = TypeVar(\"T\")\n+\n+\n+class BaseContext:\n+ \"\"\" Parent BaseContext class. Idea taken from aiogram \"\"\"\n+\n+ ctx_instance: Any\n+\n+ def __init_subclass__(cls, **kwargs):\n+ if not contextvars:\n+ raise LookupError(f\"To use {cls.__name__} you have to install contextvars\")\n+\n+ cls.ctx_instance = contextvars.ContextVar(kwargs.get(\"ctx_name\") or cls.__name__)\n+ return cls\n+\n+ @classmethod\n+ def get_instance(cls, no_error: bool = True) -> Any:\n+ if no_error:\n+ return cls.ctx_instance.get(None)\n+ return cls.ctx_instance.get()\n+\n+ @classmethod\n+ def set_instance(cls, value: \"T\") -> NoReturn:\n+ cls.ctx_instance.set(value)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/storage/__init__.py",
"diff": "+from .abc import ABCStorage\n+from .ctx_storage import CtxStorage\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/storage/abc.py",
"diff": "+from abc import ABC, abstractmethod\n+import typing\n+\n+\n+class ABCStorage(ABC):\n+ \"\"\" Abstract storage class\n+ Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/tools/storage.md\n+ \"\"\"\n+\n+ @abstractmethod\n+ def get(self, key: str) -> typing.Any:\n+ pass\n+\n+ @abstractmethod\n+ def set(self, key: str, value: typing.Any) -> typing.NoReturn:\n+ pass\n+\n+ @abstractmethod\n+ def delete(self, key: str) -> typing.NoReturn:\n+ pass\n+\n+ @abstractmethod\n+ def contains(self, key: str) -> bool:\n+ pass\n+\n+ def __repr__(self):\n+ return f\"<{self.__class__.__name__}>\"\n+\n+ def __contains__(self, item: str) -> bool:\n+ return self.contains(item)\n+\n+ def __setitem__(self, key: str, value: typing.Any) -> None:\n+ self.set(key, value)\n+\n+ def __getitem__(self, item: str) -> typing.Any:\n+ return self.get(item)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/storage/ctx_storage.py",
"diff": "+from .abc import ABCStorage\n+from vkbottle.tools.dev_tools.ctx_tool import BaseContext\n+import typing\n+\n+\n+class CtxStorage(ABCStorage, BaseContext):\n+ \"\"\" Context storage\n+ Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/tools/storage.md\n+ \"\"\"\n+\n+ storage: dict = {}\n+\n+ def __init__(\n+ self, default: dict = None, force_reset: bool = False,\n+ ):\n+\n+ default = default or {}\n+ if not self.get_instance() or force_reset:\n+ self.storage = default\n+ self.set_instance(self)\n+\n+ def set(self, key: str, value: typing.Any) -> typing.NoReturn:\n+ current_storage = self.get_instance().storage\n+ current_storage[key] = value\n+ self.set_instance(CtxStorage(current_storage, True))\n+\n+ def get(self, key: str) -> typing.Any:\n+ return self.get_instance().storage.get(key)\n+\n+ def delete(self, key: str) -> typing.NoReturn:\n+ new_storage = self.get_instance().storage\n+ new_storage.pop(key)\n+ self.set_instance(CtxStorage(new_storage, True))\n+\n+ def contains(self, key: str) -> bool:\n+ return key in self.get_instance().storage\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added storages
|
718,838 |
28.08.2020 11:21:40
| -10,800 |
8830373f3e0e21e15dcb7259658cdd1ff1caa506
|
added mkdocs; fix docs typos
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "<p align=\"center\">\n<a href=\"https://github.com/tesseradecade/vbml\">\n- <img src=\"/logo.jpg\" width=\"200px\" style=\"display: inline-block;\">\n+ <img src=\"/docs/logo.jpg\" width=\"200px\" style=\"display: inline-block;\">\n</a>\n</p>\n<h1 align=\"center\">\n"
},
{
"change_type": "RENAME",
"old_path": "logo.jpg",
"new_path": "docs/logo.jpg",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mkdocs.yml",
"diff": "+site_name: VKBottle\n+site_description: Awesome VK framework\n+site_author: timoniq\n+repo_name: timoniq/vkbottle\n+repo_url: https://github.com/timoniq/vkbottle\n+edit_uri: edit/v3.0/docs/\n+\n+extra:\n+ disqus: \"\"\n+\n+theme:\n+ name: material\n+ language: ru\n+ palette:\n+ scheme: preference\n+ primary: blue grey\n+ accent: deep orange\n+ font: Roboto Mono\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -40,6 +40,11 @@ black = {version = \"^19.0\", allow-prereleases = true}\n# Tests\npytest = \"^5.4\"\npytest-cov = \"^2.8\"\n+pytest-asyncio = \"^0.14.0\"\n+\n+# Docs\n+mkdocs = \"^1.1.2\"\n+mkdocs-material = \"^4.6.3\"\n[tool.black]\nline-length = 99\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added mkdocs; fix docs typos
|
718,844 |
29.08.2020 11:59:52
| -10,800 |
712fb872387dba10b2120c94a0e81af1a517fc6a
|
Fix http-middleware.md typo; add some tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/exception_manager_test.py",
"new_path": "tests/exception_manager_test.py",
"diff": "+from vkbottle import CodeErrorFactory, SingleError\n+\n+def test_exc_manager_code_error():\n+ exc_manager = CodeErrorFactory()\n+\n+ try:\n+ raise exc_manager(7)\n+ except exc_manager(6):\n+ assert False\n+ except exc_manager(7):\n+ assert True\n+ except exc_manager():\n+ assert False\n+\n+\n+def test_exc_manager_single_error():\n+ class SomeError(SingleError):\n+ pass\n+\n+ try:\n+ raise SomeError(\"Some error occurred\")\n+ except SomeError:\n+ pass\n+ except BaseException as e:\n+ assert False\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/http_test.py",
"new_path": "tests/http_test.py",
"diff": "+from vkbottle import SessionManager, AiohttpClient\n+import pytest\n+\n+@pytest.mark.asyncio\n+async def test_client():\n+ client = AiohttpClient()\n+ text = await client.request_text(\"GET\", \"https://google.com\")\n+ await client.close()\n+ assert text\n+\n+@pytest.mark.asyncio\n+async def test_session_manager():\n+ session_manager = SessionManager()\n+ async with session_manager as session:\n+ text = await session.request_text(\"GET\", \"https://google.com\")\n+ assert text\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -3,6 +3,7 @@ from .tools import ABCStorage, CtxStorage, BaseContext\nfrom .exception_factory import (\nABCExceptionFactory,\nCodeErrorFactory,\n+ SingleError,\nVKAPIError,\nABCErrorHandler,\nErrorHandler,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/session_manager/session_manager.py",
"new_path": "vkbottle/http/session_manager/session_manager.py",
"diff": "@@ -8,7 +8,7 @@ class SessionManager(ABCSessionManager):\nself.http_client = http_client or AiohttpClient\nself._active_session: typing.Optional[ABCHTTPClient] = None\n- async def __aenter__(self):\n+ async def __aenter__(self) -> ABCHTTPClient:\nself._active_session = self.http_client()\nreturn self._active_session\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix http-middleware.md typo; add some tests (#206)
Co-authored-by: timoniq <52574917+timoniq@users.noreply.github.com>
|
718,838 |
30.08.2020 22:29:58
| -10,800 |
d479ca2980306087dacb6124c0b60a9e6b15d5fe
|
API is typed with vkbottle-types; API real tests are now skipped by default
ResponseValidator was removed
New dependency - vkbottle-types
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -27,6 +27,7 @@ python = \"^3.7\"\naiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\n+vkbottle-types = \"^0.1.6\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/conftest.py",
"new_path": "tests/conftest.py",
"diff": "@@ -7,5 +7,4 @@ TOKEN = os.getenv(\"TOKEN\")\n@pytest.fixture()\ndef api():\n- assert TOKEN\nreturn API(TOKEN)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -2,13 +2,14 @@ from .abc import ABCAPI\nfrom .response_validator import ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\nfrom vkbottle.http import ABCSessionManager, SessionManager, AiohttpClient\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\n+from vkbottle_types.categories import APICategories\nimport typing\nAPIRequest = typing.NamedTuple(\"APIRequest\", [(\"method\", str), (\"data\", dict)])\n-class API(ABCAPI):\n+class API(ABCAPI, APICategories):\n\"\"\" Default API instance\nDocumentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/api/api.md\n\"\"\"\n@@ -63,3 +64,7 @@ class API(ABCAPI):\nfor validator in self.response_validators:\nresponse = await validator.validate(response)\nreturn response # type: ignore\n+\n+ @property\n+ def api_instance(self) -> \"API\":\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/__init__.py",
"new_path": "vkbottle/api/response_validator/__init__.py",
"diff": "from .abc import ABCResponseValidator\nfrom .json_validator import JSONValidator\nfrom .vk_api_error_validator import VKAPIErrorValidator\n-from .get_response_validator import GetResponseValidator\nDEFAULT_RESPONSE_VALIDATORS = [\nJSONValidator(),\nVKAPIErrorValidator(),\n- GetResponseValidator(),\n]\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/api/response_validator/get_response_validator.py",
"new_path": null,
"diff": "-from .abc import ABCResponseValidator\n-import typing\n-\n-\n-class GetResponseValidator(ABCResponseValidator):\n- \"\"\" Default get response validator\n- Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/api/response-validator.md\n- \"\"\"\n-\n- async def validate(self, response: dict) -> typing.Union[typing.Any, typing.NoReturn]:\n- return response.get(\"response\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
API is typed with vkbottle-types; API real tests are now skipped by default
ResponseValidator was removed
New dependency - vkbottle-types
|
718,838 |
30.08.2020 22:46:38
| -10,800 |
dfddf4aa88b793a25fac12f1ff81e0587fefd802
|
added request validators
todo: docs
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .abc import ABCAPI\nfrom .api import API\nfrom .response_validator import ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\n+from .request_validator import ABCRequestValidator, DEFAULT_REQUEST_VALIDATORS\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "@@ -15,3 +15,7 @@ class ABCAPI(ABC):\n@abstractmethod\nasync def validate_response(self, response: typing.Any) -> typing.Any:\npass\n+\n+ @abstractmethod\n+ async def validate_request(self, request: typing.Any) -> typing.Any:\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "from .abc import ABCAPI\nfrom .response_validator import ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\n+from .request_validator import ABCRequestValidator, DEFAULT_REQUEST_VALIDATORS\nfrom vkbottle.http import ABCSessionManager, SessionManager, AiohttpClient\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle_types.categories import APICategories\n@@ -30,6 +31,7 @@ class API(ABCAPI, APICategories):\nself.http: ABCSessionManager = session_manager or SessionManager(AiohttpClient)\nself.error_handler = error_handler or ErrorHandler(redirect_arguments=False)\nself.response_validators: typing.List[ABCResponseValidator] = DEFAULT_RESPONSE_VALIDATORS\n+ self.request_validators: typing.List[ABCRequestValidator] = DEFAULT_REQUEST_VALIDATORS # type: ignore\nasync def request(self, method: str, data: dict) -> dict:\n\"\"\" Makes a single request opening a session \"\"\"\n@@ -65,6 +67,13 @@ class API(ABCAPI, APICategories):\nresponse = await validator.validate(response)\nreturn response # type: ignore\n+ async def validate_request(self, request: dict) -> dict:\n+ \"\"\" Validates requests from VK,\n+ to change validations change API.request_validators (list of RequestValidator's) \"\"\"\n+ for validator in self.request_validators:\n+ request = await validator.validate(request)\n+ return request # type: ignore\n+\n@property\ndef api_instance(self) -> \"API\":\nreturn self\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/request_validator/__init__.py",
"diff": "+from .abc import ABCRequestValidator\n+from .translate_friendly_types_validator import TranslateFriendlyTypesValidator\n+\n+DEFAULT_REQUEST_VALIDATORS = [TranslateFriendlyTypesValidator()]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/request_validator/abc.py",
"diff": "+from abc import ABC, abstractmethod\n+import typing\n+\n+\n+class ABCRequestValidator(ABC):\n+ \"\"\" Abstract Response Validator class\n+ Documentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/api/response-validator.md\n+ \"\"\"\n+\n+ @abstractmethod\n+ async def validate(self, response: typing.Any) -> typing.Union[typing.Any, typing.NoReturn]:\n+ pass\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/request_validator/translate_friendly_types_validator.py",
"diff": "+from .abc import ABCRequestValidator\n+\n+\n+class TranslateFriendlyTypesValidator(ABCRequestValidator):\n+ async def validate(self, response: dict) -> dict:\n+ for k, v in response.items():\n+ # translate python-list to vk array-like type\n+ if isinstance(v, list):\n+ response[k] = \",\".join(str(e) for e in v)\n+ return response\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added request validators
todo: docs
|
718,838 |
31.08.2020 08:55:05
| -10,800 |
d81e61e40e2600b6b4c584e52994d399257c4f0e
|
fix api tests were not skipped
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -23,12 +23,6 @@ jobs:\nsteps:\n- uses: actions/checkout@master\n- - name: Set enviromental variables to run tests\n- uses: allenevans/set-env@v1.1.0\n- with:\n- overwrite: false\n- TOKEN: ${{ secrets.test_token }}\n-\n- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}\nuses: actions/setup-python@v1\nwith:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "-from .api import API, ABCAPI, ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\n+from .api import (\n+ API,\n+ ABCAPI,\n+ ABCResponseValidator,\n+ DEFAULT_RESPONSE_VALIDATORS,\n+ ABCRequestValidator,\n+ DEFAULT_REQUEST_VALIDATORS,\n+)\nfrom .tools import ABCStorage, CtxStorage, BaseContext\nfrom .exception_factory import (\nABCExceptionFactory,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/request_validator/__init__.py",
"new_path": "vkbottle/api/request_validator/__init__.py",
"diff": "from .abc import ABCRequestValidator\n-from .translate_friendly_types_validator import TranslateFriendlyTypesValidator\n+from .translate_friendly_types_validator import TranslateFriendlyTypesRequestValidator\n-DEFAULT_REQUEST_VALIDATORS = [TranslateFriendlyTypesValidator()]\n+DEFAULT_REQUEST_VALIDATORS = [TranslateFriendlyTypesRequestValidator()]\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 .abc import ABCRequestValidator\n-class TranslateFriendlyTypesValidator(ABCRequestValidator):\n+class TranslateFriendlyTypesRequestValidator(ABCRequestValidator):\nasync def validate(self, response: dict) -> dict:\nfor k, v in response.items():\n# translate python-list to vk array-like type\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/__init__.py",
"new_path": "vkbottle/api/response_validator/__init__.py",
"diff": "from .abc import ABCResponseValidator\n-from .json_validator import JSONValidator\n-from .vk_api_error_validator import VKAPIErrorValidator\n+from .json_validator import JSONResponseValidator\n+from .vk_api_error_validator import VKAPIErrorResponseValidator\nDEFAULT_RESPONSE_VALIDATORS = [\n- JSONValidator(),\n- VKAPIErrorValidator(),\n+ JSONResponseValidator(),\n+ VKAPIErrorResponseValidator(),\n]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/json_validator.py",
"new_path": "vkbottle/api/response_validator/json_validator.py",
"diff": "@@ -4,7 +4,7 @@ from vkbottle.modules import json\nimport typing\n-class JSONValidator(ABCResponseValidator):\n+class JSONResponseValidator(ABCResponseValidator):\n\"\"\" Default response json-parse validator\nDocumentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/api/response-validator.md\n\"\"\"\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": "@@ -3,7 +3,7 @@ from vkbottle.exception_factory import VKAPIError\nimport typing\n-class VKAPIErrorValidator(ABCResponseValidator):\n+class VKAPIErrorResponseValidator(ABCResponseValidator):\n\"\"\" Default vk api error response validator\nDocumentation: https://github.com/timoniq/vkbottle/tree/v3.0/docs/api/response-validator.md\n\"\"\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix api tests were not skipped
|
718,838 |
12.09.2020 15:47:11
| -10,800 |
c1c52b6e3ed634176ef898897ae531c572e9b6c7
|
add vkscript converter; minor fixes
|
[
{
"change_type": "ADD",
"old_path": "tests/labeler_test.py",
"new_path": "tests/labeler_test.py",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/vkscript_converter_test.py",
"diff": "+from vkbottle import vkscript\n+\n+VKSCRIPT = \"var a=%A%;var some_list=[];while(a<100){API.users.get({user_id:a});a = a + 1;};return some_list;\"\n+\n+\n+@vkscript\n+def my_execute_code(api, a: int = 10):\n+ some_list = []\n+ while a < 100:\n+ api.users.get(user_id=a)\n+ a += 1\n+ return some_list\n+\n+\n+def test_vkscript():\n+ assert my_execute_code(a=10) == VKSCRIPT.replace(\"%A%\", \"10\")\n+ assert my_execute_code(a=94) == VKSCRIPT.replace(\"%A%\", \"94\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -26,5 +26,6 @@ from .http import (\nJustLogHTTPMiddleware,\nSessionManager,\n)\n+from .vkscript_converter import vkscript\nevent_types = GroupTypes\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/bot.py",
"new_path": "vkbottle/bot.py",
"diff": "-from .framework.bot import Bot\n+from .framework.bot import Bot, ABCBotLabeler, BotLabeler\nfrom .tools.dev_tools.mini_types.bot import MessageMin\nfrom .dispatch.rules import bot\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/__init__.py",
"new_path": "vkbottle/framework/bot/__init__.py",
"diff": "from .bot import Bot\n+from .labeler import ABCBotLabeler, BotLabeler\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/abc.py",
"new_path": "vkbottle/framework/bot/labeler/abc.py",
"diff": "@@ -34,6 +34,10 @@ class ABCBotLabeler(ABC):\ndef private_message(self, *rules: \"ABCRule\", **custom_rules) -> LabeledMessageHandler:\npass\n+ @abstractmethod\n+ def load(self, labeler: Any):\n+ pass\n+\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\nreturn [self.custom_rules[k](v) for k, v in custom_rules.items()] # type: ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -53,3 +53,7 @@ class BotLabeler(ABCBotLabeler):\nreturn func\nreturn decorator\n+\n+ def load(self, labeler: \"BotLabeler\"):\n+ self.message_view.handlers.extend(labeler.message_view.handlers)\n+ self.message_view.middlewares.extend(labeler.message_view.middlewares)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/vkscript_converter/__init__.py",
"diff": "+from .definitions import vkscript # type: ignore\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/vkscript_converter/base_converter.py",
"diff": "+# type: ignore\n+\n+import ast\n+import typing\n+from inspect import getsource\n+\n+\n+class ConverterError(Exception):\n+ pass\n+\n+\n+class Converter:\n+ \"\"\" Translate Python into the VKScript with AST \"\"\"\n+\n+ def __init__(self):\n+ self.definitions: typing.Dict[ast.AST, ast] = {}\n+\n+ def __call__(self, for_definition: ast.AST):\n+ def decorator(func):\n+ self.definitions[for_definition] = func\n+ return func\n+\n+ return decorator\n+\n+ def find_definition(self, d):\n+ if d.__class__ not in self.definitions:\n+ raise ConverterError(\n+ f\"Definition for {d.__class__} is undefined. Maybe vkscript doesn't support it\"\n+ )\n+ return self.definitions[d.__class__](d)\n+\n+ def scriptify(self, func: typing.Callable, **values) -> str:\n+ \"\"\" Translate function to VKScript \"\"\"\n+ source = getsource(func)\n+ code = ast.parse(source).body[0]\n+ args = [a.arg for a in code.args.args]\n+ args.pop(0)\n+ if any(v not in values for v in args):\n+ raise ConverterError(\n+ \"All values should be passed to func. Predefined kwargs are not allowed\"\n+ )\n+ values_assignments = [f\"var {k}={v!r};\" for k, v in values.items()]\n+ return \"\".join(values_assignments) + \"\".join(\n+ self.find_definition(line) for line in code.body\n+ )\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/vkscript_converter/definitions.py",
"diff": "+# type: ignore\n+\n+import ast\n+import typing\n+from .base_converter import Converter, ConverterError\n+import string\n+import random\n+\n+CALL_REPLACEMENTS = {\n+ \"append\": \"push\",\n+}\n+CALL_STRING = [\"join\", \"strip\", \"split\"]\n+\n+converter = Converter()\n+find = converter.find_definition\n+\n+\n+def dispatch_keywords(keywords: dict, assigner: str = \":\", sep: str = \",\"):\n+ return sep.join(f\"{param.arg}{assigner}{find(param.value)}\" for param in keywords)\n+\n+\n+def random_string(length: int) -> str:\n+ return \"\".join(random.choice(string.ascii_lowercase) for i in range(length))\n+\n+\n+@converter(ast.Assign)\n+def assign(d: ast.Assign):\n+ left = d.targets\n+ left_ = []\n+ for target in left:\n+ if target.__class__ == ast.Name:\n+ left_.append(find(target))\n+ elif target.__class__ == ast.Subscript:\n+ pass\n+\n+ right = find(d.value)\n+ return \"var \" + \",\".join(f\"{target}={right}\" for target in left_) + \";\"\n+\n+\n+@converter(ast.Add)\n+@converter(ast.UAdd)\n+def add_operator(d: ast.Add):\n+ return \"+\"\n+\n+\n+@converter(ast.Sub)\n+@converter(ast.USub)\n+def sub_operator(d: ast.Sub):\n+ return \"-\"\n+\n+\n+@converter(ast.Mult)\n+def mult_operator(d: ast.Mult):\n+ return \"*\"\n+\n+\n+@converter(ast.Div)\n+def div_operator(d: ast.Div):\n+ return \"/\"\n+\n+\n+@converter(ast.Pow)\n+def pow_operator(d: ast.Pow):\n+ return \"**\"\n+\n+\n+@converter(ast.RShift)\n+def rshift_operator(d: ast.RShift):\n+ return \">>\"\n+\n+\n+@converter(ast.LShift)\n+def lshift_operator(d: ast.LShift):\n+ return \"<<\"\n+\n+\n+@converter(ast.BitAnd)\n+def bitand_operator(d: ast.BitAnd):\n+ return \"&\"\n+\n+\n+@converter(ast.BitOr)\n+def bitor_operator(d: ast.BitOr):\n+ return \"|\"\n+\n+\n+@converter(ast.Mod)\n+def mod_operator(d: ast.Mod):\n+ return \"%\"\n+\n+\n+@converter(ast.Gt)\n+def gt_operator(d: ast.Gt):\n+ return \">\"\n+\n+\n+@converter(ast.Lt)\n+def lt_operator(d: ast.Lt):\n+ return \"<\"\n+\n+\n+@converter(ast.GtE)\n+def gt_operator_1(d: ast.GtE):\n+ return \">=\"\n+\n+\n+@converter(ast.LtE)\n+def gt_operator_2(d: ast.LtE):\n+ return \"<=\"\n+\n+\n+@converter(ast.Eq)\n+def gt_operator_3(d: ast.Eq):\n+ return \"==\"\n+\n+\n+@converter(ast.NotEq)\n+def gt_operator_4(d: ast.Gt):\n+ return \"!=\"\n+\n+\n+@converter(ast.And)\n+def and_operator(d: ast.And):\n+ return \"&&\"\n+\n+\n+@converter(ast.Or)\n+def or_operator(d: ast.Or):\n+ return \"||\"\n+\n+\n+@converter(ast.AugAssign)\n+def aug_assign(d: ast.AugAssign):\n+ operator = find(d.op)\n+ value = find(d.value)\n+ target = find(d.target)\n+ return f\"{target} = {target} {operator} {value};\"\n+\n+\n+@converter(ast.Constant)\n+def constant(d: ast.Constant):\n+ return d.value\n+\n+\n+@converter(ast.Name)\n+def name(d: ast.Name):\n+ return d.id\n+\n+\n+@converter(ast.While)\n+def while_cycle(d: ast.While):\n+ if d.orelse:\n+ raise ConverterError(\"You can't use while or/else in vkscript\")\n+ body = \"\".join(find(line) for line in d.body)\n+ return \"while(\" + find(d.test) + \"){\" + body + \"};\"\n+\n+\n+@converter(ast.For)\n+def for_cycle(d: ast.For):\n+ random_iter_name = f\"__iter_{random_string(5)}__\"\n+ body = \"\".join(find(line) for line in d.body)\n+ return (\n+ f\"var {random_iter_name} = {find(d.iter)};\"\n+ f\"while({random_iter_name}.length > 0){{var {find(d.target)}={random_iter_name}.pop();{body}}};\"\n+ )\n+\n+\n+@converter(ast.If)\n+def if_statement(d: ast.If):\n+ return (\n+ \"if(\"\n+ + find(d.test)\n+ + \"){\"\n+ + \"\".join(find(li) for li in d.body)\n+ + \"}else{\"\n+ + (\"\".join(find(e) for e in d.orelse) if len(d.orelse) else \"\")\n+ + \"};\"\n+ )\n+\n+\n+@converter(ast.Call)\n+def call(d: ast.Call):\n+ func = d.func\n+ calls = []\n+\n+ while isinstance(func, ast.Attribute):\n+ calls.append(func.attr)\n+ func = func.value\n+\n+ if func.__class__ == ast.Str:\n+ if calls[0] in CALL_STRING:\n+ return str(find(d.args[0])) + \".\" + calls[0] + \"(\" + find(func) + \")\"\n+ elif calls[0] == \"format\":\n+ raise ConverterError(\"Use f-strings instead of str.format\")\n+ raise ConverterError(\"String formatter\")\n+\n+ if func.id.lower() == \"api\":\n+ params = dispatch_keywords(d.keywords)\n+ return \"API.\" + \".\".join(calls[::-1]) + \"({\" + params + \"})\"\n+ elif func.id == \"len\":\n+ return f\"{find(d.args[0])}.length\"\n+ elif calls and calls[0] in CALL_REPLACEMENTS:\n+ args = \",\".join(find(arg) for arg in d.args)\n+ return find(d.func.value) + \".\" + CALL_REPLACEMENTS[calls[0]] + \"(\" + args + \")\"\n+ elif calls[0] in CALL_STRING:\n+ return find(func) + \".\" + calls[0] + \"(\" + find(d.args[0]) + \")\"\n+ raise ConverterError(f\"Call for {getattr(d.func, 'attr', d.func.__dict__)} is not referenced\")\n+\n+\n+@converter(ast.Pass)\n+def pass_expr(d: ast.Pass):\n+ return \"\"\n+\n+\n+@converter(ast.Expr)\n+def expr(d: ast.Expr):\n+ return find(d.value) + \";\"\n+\n+\n+@converter(ast.Module)\n+def module(d: ast.Module):\n+ return find(d.body)\n+\n+\n+@converter(ast.BinOp)\n+def bin_operation(d: ast.BinOp):\n+ return f\"{find(d.left)}{find(d.op)}{find(d.right)}\"\n+\n+\n+@converter(ast.Compare)\n+def compare(d: ast.Compare):\n+ left = find(d.left)\n+ operations = [\n+ f\"{left}{find(operator)}{find(comparator)}\"\n+ for operator, comparator in zip(d.ops, d.comparators)\n+ ]\n+ return \"&&\".join(operations)\n+\n+\n+@converter(ast.BoolOp)\n+def bool_op(d: ast.BoolOp):\n+ return find(d.op).join(find(value) for value in d.values)\n+\n+\n+@converter(ast.UnaryOp)\n+def unary_op(d: ast.UnaryOp):\n+ return f\"{find(d.op)}{find(d.operand)}\"\n+\n+\n+@converter(ast.Subscript)\n+def subscript(d: ast.Subscript):\n+ value = find(d.value)\n+ if d.slice.__class__ == ast.Index:\n+ if d.slice.value.__class__ == str:\n+ return f\"{value}.{d.slice.value.s}\"\n+ return f\"{value}[{find(d.slice.value)}]\"\n+ raise ConverterError(f\"Slice {d.slice} is not referenced\")\n+\n+\n+@converter(ast.Attribute)\n+def attribute(d: ast.Attribute):\n+ return f\"{find(d.value)}.{d.attr}\"\n+\n+\n+@converter(ast.Return)\n+def return_statement(d: ast.Return):\n+ value = \"null\" if d is None else find(d.value)\n+ return f\"return {value};\"\n+\n+\n+@converter(ast.Delete)\n+def delete_statement(d: ast.Delete):\n+ return \"\".join(f\"delete {find(target)};\" for target in d.targets)\n+\n+\n+@converter(ast.Dict)\n+def dict_type(d: ast.Dict):\n+ dict_s = \",\".join(f\"{find(key)}:{find(value)}\" for key, value in zip(d.keys, d.values))\n+ return \"{\" + dict_s + \"}\"\n+\n+\n+@converter(ast.Num)\n+def num_type(d: ast.Num):\n+ return str(d.n)\n+\n+\n+@converter(ast.Str)\n+def str_type(d: ast.Num):\n+ return repr(d.s)\n+\n+\n+@converter(ast.JoinedStr)\n+def joined_str(d: ast.JoinedStr):\n+ return \"+\".join(find(value) for value in d.values)\n+\n+\n+@converter(ast.FormattedValue)\n+def formatted_value(d: ast.FormattedValue):\n+ return find(d.value)\n+\n+\n+@converter(ast.List)\n+@converter(ast.Tuple)\n+def list_type(d: ast.List):\n+ return \"[\" + \",\".join(find(a) for a in d.elts) + \"]\"\n+\n+\n+@converter(ast.NameConstant)\n+def name_constant_type(d: ast.NameConstant):\n+ consts = {True: \"true\", False: \"false\", None: \"null\"}\n+ return consts[d.value]\n+\n+\n+def vkscript(func: typing.Callable) -> typing.Callable[[], str]:\n+ def decorator(**context):\n+ return converter.scriptify(func, **context)\n+\n+ return decorator\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add vkscript converter; minor fixes
|
718,838 |
12.09.2020 16:56:20
| -10,800 |
93f73e3bbbe02409a53f25c039f0c8e8b46e54b2
|
added docs; ci test; move vkscript converter to tools
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "ci_test.sh",
"diff": "+poetry run pytest\n+poetry run mypy vkbottle\n+poetry run flake8\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "+ [Accessing Polling](low-level/polling/polling.md)\n* [Tools](tools/)\n* [Storages](tools/storage.md)\n+ * [VKScript](tools/vkscript.md)\n"
},
{
"change_type": "ADD",
"old_path": "docs/tools/vkscript.md",
"new_path": "docs/tools/vkscript.md",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -26,6 +26,6 @@ from .http import (\nJustLogHTTPMiddleware,\nSessionManager,\n)\n-from .vkscript_converter import vkscript\n+from vkbottle.tools.dev_tools.vkscript_converter import vkscript\nevent_types = GroupTypes\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -9,7 +9,7 @@ from typing import Any, List\nclass MessageView(ABCView):\nhandlers: List[\"ABCHandler\"] = []\n- middleware: List[\"BaseMiddleware\"] = []\n+ middlewares: List[\"BaseMiddleware\"] = []\nasync def process_event(self, event: dict) -> bool:\nif GroupEventType(event[\"type\"]) == GroupEventType.MESSAGE_NEW:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "-from .dev_tools import ABCStorage, CtxStorage, BaseContext, LoopWrapper, BotTypes, message_min\n+from .dev_tools import ABCStorage, CtxStorage, BaseContext, LoopWrapper, BotTypes, message_min, vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -2,3 +2,4 @@ from .storage import ABCStorage, CtxStorage\nfrom .loop_wrapper import LoopWrapper\nfrom .ctx_tool import BaseContext\nfrom .mini_types import BotTypes, message_min\n+from .vkscript_converter import vkscript\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/vkscript_converter/__init__.py",
"new_path": "vkbottle/tools/dev_tools/vkscript_converter/__init__.py",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "vkbottle/vkscript_converter/base_converter.py",
"new_path": "vkbottle/tools/dev_tools/vkscript_converter/base_converter.py",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "vkbottle/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev_tools/vkscript_converter/definitions.py",
"diff": ""
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
added docs; ci test; move vkscript converter to tools
|
718,838 |
12.09.2020 19:18:24
| -10,800 |
13c339393dc147675828bcccd7b2cad8defbfcc9
|
add high-level bot and vkscript docs
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -27,7 +27,7 @@ python = \"^3.7\"\naiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\n-vkbottle-types = \"^0.1.10\"\n+vkbottle-types = \"^0.1.12\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add high-level bot and vkscript docs
|
718,838 |
12.09.2020 21:05:20
| -10,800 |
e2f833130efc7d63194f9dc5a139f7d05bb820ae
|
add tons of rules; add them in custom rules
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "from .abc import ABCRule\nfrom abc import abstractmethod\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\n-from typing import List, Optional, Union\n+from typing import List, Optional, Union, Tuple\nimport vbml\n@@ -60,9 +60,165 @@ class VBMLRule(ABCMessageRule):\nreturn False\n+class StickerRule(ABCMessageRule):\n+ def __init__(self, sticker_ids: Union[List[int], int]):\n+ if isinstance(sticker_ids, int):\n+ sticker_ids = [sticker_ids]\n+ self.sticker_ids = sticker_ids\n+\n+ async def check(self, message: Message) -> bool:\n+ if not message.attachments:\n+ return False\n+ elif not message.attachments[0].sticker:\n+ return False\n+ elif message.attachments[0].sticker.sticker_id in self.sticker_ids:\n+ return True\n+ return False\n+\n+\n+class FromPeerRule(ABCMessageRule):\n+ def __init__(self, peer_ids: Union[List[int], int]):\n+ if isinstance(peer_ids, int):\n+ peer_ids = [peer_ids]\n+ self.peer_ids = peer_ids\n+\n+ async def check(self, message: Message) -> bool:\n+ if message.peer_id in self.peer_ids:\n+ return True\n+\n+\n+class AttachmentTypeRule(ABCMessageRule):\n+ def __init__(self, attachment_types: Union[List[str], str]):\n+ if isinstance(attachment_types, str):\n+ attachment_types = [attachment_types]\n+ self.attachment_types = attachment_types\n+\n+ async def check(self, message: Message) -> bool:\n+ if not message.attachments:\n+ return False\n+ for attachment in message.attachments:\n+ if attachment.type not in self.attachment_types:\n+ return False\n+ return True\n+\n+\n+class LevensteinRule(ABCMessageRule):\n+ def __init__(self, levenstein_texts: Union[List[str], str], max_distance: int = 1):\n+ if isinstance(levenstein_texts, str):\n+ levenstein_texts = [levenstein_texts]\n+ self.levenstein_texts = levenstein_texts\n+ self.max_distance = max_distance\n+\n+ @staticmethod\n+ def distance(a: str, b: str) -> int:\n+ n, m = len(a), len(b)\n+ if n > m:\n+ a, b = b, a\n+ n, m = m, n\n+\n+ current_row = range(n + 1)\n+ for i in range(1, m + 1):\n+ previous_row, current_row = current_row, [i] + [0] * n # type: ignore\n+ for j in range(1, n + 1):\n+ add, delete, change = (\n+ previous_row[j] + 1,\n+ current_row[j - 1] + 1,\n+ previous_row[j - 1],\n+ )\n+ if a[j - 1] != b[i - 1]:\n+ change += 1\n+ current_row[j] = min(add, delete, change) # type: ignore\n+\n+ return current_row[n]\n+\n+ async 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+\n+\n+class MessageLengthRule(ABCMessageRule):\n+ def __init__(self, min_length: int):\n+ self.min_length = min_length\n+\n+ async def check(self, message: Message) -> bool:\n+ if len(message.text) >= self.min_length:\n+ return True\n+ return False\n+\n+\n+class ChatActionRule(ABCMessageRule):\n+ def __init__(self, chat_action_types: Union[List[str], str]):\n+ if isinstance(chat_action_types, str):\n+ chat_action_types = [chat_action_types]\n+ self.chat_action_types = chat_action_types\n+\n+ async def check(self, message: Message) -> bool:\n+ if not message.action:\n+ return False\n+ elif message.action.type in self.chat_action_types:\n+ return True\n+ return False\n+\n+\n+class PayloadRule(ABCMessageRule):\n+ def __init__(self, payload: dict):\n+ self.payload = payload\n+\n+ async def check(self, message: Message) -> bool:\n+ return message.get_payload_json() == self.payload\n+\n+\n+class PayloadContainsRule(ABCMessageRule):\n+ def __init__(self, payload_particular_part: dict):\n+ self.payload_particular_part = payload_particular_part\n+\n+ async def check(self, message: Message) -> bool:\n+ payload = 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+\n+\n+class 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+ if k not in payload:\n+ return False\n+ elif not isinstance(payload[k], v_type):\n+ return False\n+ return True\n+\n+\n+class FromUserRule(ABCMessageRule):\n+ def __init__(self, from_user: bool = True):\n+ self.from_user = from_user\n+\n+ async def check(self, message: Message) -> bool:\n+ if message.from_id > 0:\n+ return True\n+ return False\n+\n+\n__all__ = (\n\"ABCMessageRule\",\n\"PeerRule\",\n\"CommandRule\",\n\"VBMLRule\",\n+ \"StickerRule\",\n+ \"FromPeerRule\",\n+ \"AttachmentTypeRule\",\n+ \"LevensteinRule\",\n+ \"MessageLengthRule\",\n+ \"ChatActionRule\",\n+ \"PayloadRule\",\n+ \"PayloadContainsRule\",\n+ \"PayloadMapRule\",\n+ \"FromUserRule\",\n)\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 vkbottle.dispatch.rules import ABCRule\n-from vkbottle.dispatch.rules.bot import PeerRule, VBMLRule\n+from vkbottle.dispatch.rules.bot import (\n+ PeerRule,\n+ VBMLRule,\n+ CommandRule,\n+ FromUserRule,\n+ FromPeerRule,\n+ StickerRule,\n+ AttachmentTypeRule,\n+ LevensteinRule,\n+ MessageLengthRule,\n+ ChatActionRule,\n+ PayloadRule,\n+ PayloadContainsRule,\n+ PayloadMapRule,\n+)\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\nfrom typing import Callable, Any, Dict, Optional, Type, List\nfrom vbml import Patcher\n@@ -9,6 +23,18 @@ LabeledMessageHandler = Callable[..., Callable[[MessageMin], Any]]\nDEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"from_chat\": PeerRule,\n+ \"command\": CommandRule,\n+ \"from_user\": FromUserRule,\n+ \"peer_ids\": FromPeerRule,\n+ \"sticker\": StickerRule,\n+ \"attachment\": AttachmentTypeRule,\n+ \"levenstein\": LevensteinRule,\n+ \"lev\": LevensteinRule,\n+ \"length\": MessageLengthRule,\n+ \"action\": ChatActionRule,\n+ \"payload\": PayloadRule,\n+ \"payload_contains\": PayloadContainsRule,\n+ \"payload_map\": PayloadMapRule,\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "-from .dev_tools import ABCStorage, CtxStorage, BaseContext, LoopWrapper, BotTypes, message_min, vkscript\n+from .dev_tools import (\n+ ABCStorage,\n+ CtxStorage,\n+ BaseContext,\n+ LoopWrapper,\n+ BotTypes,\n+ message_min,\n+ vkscript,\n+)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add tons of rules; add them in custom rules
|
718,838 |
12.09.2020 21:57:25
| -10,800 |
d9e0478ba271d0b7e8528336323a2a7c179b5667
|
add func rule and doc spines
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/migration.md",
"diff": "+# Migrate from VKBottle v2\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "from .abc import ABCRule\nfrom abc import abstractmethod\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\n-from typing import List, Optional, Union, Tuple\n+from typing import List, Optional, Union, Tuple, Callable, Awaitable\nimport vbml\n+import inspect\nDEFAULT_PREFIXES = [\"!\", \"/\"]\n@@ -206,6 +207,16 @@ class FromUserRule(ABCMessageRule):\nreturn False\n+class FuncRule(ABCMessageRule):\n+ def __init__(self, func: Union[Callable[[Message], Union[bool, Awaitable]]]):\n+ self.func = func\n+\n+ async def check(self, message: Message) -> bool:\n+ if inspect.iscoroutinefunction(self.func):\n+ return await self.func(message)\n+ return self.func(message)\n+\n+\n__all__ = (\n\"ABCMessageRule\",\n\"PeerRule\",\n@@ -221,4 +232,5 @@ __all__ = (\n\"PayloadContainsRule\",\n\"PayloadMapRule\",\n\"FromUserRule\",\n+ \"FuncRule\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/abc.py",
"new_path": "vkbottle/framework/bot/labeler/abc.py",
"diff": "@@ -14,6 +14,7 @@ from vkbottle.dispatch.rules.bot import (\nPayloadRule,\nPayloadContainsRule,\nPayloadMapRule,\n+ FuncRule,\n)\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\nfrom typing import Callable, Any, Dict, Optional, Type, List\n@@ -35,6 +36,7 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"payload\": PayloadRule,\n\"payload_contains\": PayloadContainsRule,\n\"payload_map\": PayloadMapRule,\n+ \"func\": FuncRule,\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add func rule and doc spines
|
718,838 |
12.09.2020 23:02:08
| -10,800 |
30e7e3d68d6ef11f713a39871e23a596910dbb6d
|
add simple logs; reprs
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -4,6 +4,7 @@ from .request_validator import ABCRequestValidator, DEFAULT_REQUEST_VALIDATORS\nfrom vkbottle.http import ABCSessionManager, SessionManager, AiohttpClient\nfrom vkbottle.exception_factory import ABCErrorHandler, ErrorHandler\nfrom vkbottle_types.categories import APICategories\n+from vkbottle.modules import logger\nimport typing\n@@ -42,6 +43,7 @@ class API(ABCAPI, APICategories):\ndata=data, # type: ignore\nparams={\"access_token\": self.token, \"v\": self.API_VERSION},\n)\n+ logger.debug(\"Request {} with {} data returned {}\".format(method, data, response))\nreturn await self.validate_response(response)\nasync def request_many(\n@@ -56,6 +58,11 @@ class API(ABCAPI, APICategories):\ndata=request.data, # type: ignore # noqa\nparams={\"access_token\": self.token, \"v\": self.API_VERSION}, # noqa\n)\n+ logger.debug(\n+ \"Request {} with {} data returned {}\".format(\n+ request.method, request.data, response # type: ignore\n+ )\n+ )\nyield await self.validate_response(response)\nasync def validate_response(\n@@ -65,6 +72,7 @@ class API(ABCAPI, APICategories):\nto change validations change API.response_validators (list of ResponseValidator's) \"\"\"\nfor validator in self.response_validators:\nresponse = await validator.validate(response)\n+ logger.debug(\"API response was validated\")\nreturn response # type: ignore\nasync def validate_request(self, request: dict) -> dict:\n@@ -72,6 +80,7 @@ class API(ABCAPI, APICategories):\nto change validations change API.request_validators (list of RequestValidator's) \"\"\"\nfor validator in self.request_validators:\nrequest = await validator.validate(request)\n+ logger.debug(\"API request was validated\")\nreturn request # type: ignore\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/abc.py",
"new_path": "vkbottle/dispatch/abc.py",
"diff": "@@ -14,7 +14,7 @@ class ABCRouter(ABC):\nmiddlewares: List[\"BaseMiddleware\"]\n@abstractmethod\n- async def route(self, event: dict, ctx_api: \"ABCAPI\") -> Any:\n+ async def route(self, event: dict, ctx_api: \"ABCAPI\"):\npass\ndef add_view(self, name: str, view: \"ABCView\") -> NoReturn:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/bot_router.py",
"new_path": "vkbottle/dispatch/bot_router.py",
"diff": "@@ -2,6 +2,7 @@ from .abc import ABCRouter\nfrom .views import bot\nfrom vkbottle.dispatch.middlewares import BaseMiddleware\nfrom vkbottle.api.abc import ABCAPI\n+from vkbottle.modules import logger\nfrom typing import List\n@@ -10,7 +11,8 @@ class BotRouter(ABCRouter):\nmiddlewares: List[\"BaseMiddleware\"] = []\nasync def route(self, event: dict, ctx_api: \"ABCAPI\"):\n+ logger.debug(\"Routing event {}\".format(event))\nfor view in self.views.values():\nif not await view.process_event(event):\ncontinue\n- return await view.handle_event(event, ctx_api)\n+ await view.handle_event(event, ctx_api)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/handlers/from_func_handler.py",
"new_path": "vkbottle/dispatch/handlers/from_func_handler.py",
"diff": "@@ -22,3 +22,6 @@ class FromFuncHandler(ABCHandler):\nasync def handle(self, event: Any, **context) -> Any:\nreturn await self.handler(event, **context)\n+\n+ def __repr__(self):\n+ return f\"<FromFuncHandler {self.handler.__name__} blocking={self.blocking} rules={self.rules}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/abc.py",
"new_path": "vkbottle/dispatch/rules/abc.py",
"diff": "@@ -7,3 +7,6 @@ class ABCRule(ABC):\n@abstractmethod\nasync def check(self, event: Union[BaseUserEvent, BaseGroupEvent]):\npass\n+\n+ def __repr__(self):\n+ return f\"<{self.__class__.__qualname__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -213,8 +213,8 @@ class FuncRule(ABCMessageRule):\nasync def check(self, message: Message) -> bool:\nif inspect.iscoroutinefunction(self.func):\n- return await self.func(message)\n- return self.func(message)\n+ return await self.func(message) # type: ignore\n+ return self.func(message) # type: ignore\n__all__ = (\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -4,6 +4,7 @@ from vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.middlewares import BaseMiddleware\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.tools.dev_tools import message_min\n+from vkbottle.modules import logger\nfrom typing import Any, List\n@@ -16,11 +17,13 @@ class MessageView(ABCView):\nreturn True\nasync def handle_event(self, event: dict, ctx_api: \"ABCAPI\") -> Any:\n+ logger.debug(\"Handling event ({}) with message view\".format(event.get(\"event_id\")))\nmessage = message_min(event, ctx_api)\nhandle_responses = []\nfor handler in self.handlers:\nresult = await handler.filter(message)\n+ logger.debug(\"Handler {} returned {}\".format(handler, result))\nif result is False:\ncontinue\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": "from .abc import ABCErrorHandler, ExceptionHandler\n+from vkbottle.modules import logger\nimport typing\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -6,6 +6,7 @@ from vkbottle.dispatch import ABCRouter, BotRouter\nfrom .labeler import ABCBotLabeler, BotLabeler\nfrom asyncio import AbstractEventLoop, get_event_loop\nfrom typing import Optional, NoReturn\n+from vkbottle.modules import logger\nclass Bot(ABCFramework):\n@@ -35,11 +36,14 @@ class Bot(ABCFramework):\nreturn self.labeler\nasync def run_polling(self) -> NoReturn:\n+ logger.info(\"Polling will be started\")\nasync for event in self.polling.listen(): # type: ignore\n+ logger.debug(f\"New event was received: {event}\")\nfor update in event[\"updates\"]:\nawait self.router.route(update, self.api)\ndef run_forever(self) -> NoReturn:\n+ logger.info(\"Loop will be ran forever\")\nself.loop_wrapper.add_task(self.run_polling())\nself.loop_wrapper.run_forever(self.loop)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "from .abc import ABCPolling\nfrom vkbottle.api import ABCAPI\nfrom typing import Optional, AsyncIterator\n+from vkbottle.modules import logger\nclass BotPolling(ABCPolling):\n@@ -22,6 +23,7 @@ class BotPolling(ABCPolling):\nself.stop = False\nasync def get_event(self, server: dict) -> dict:\n+ logger.debug(\"Making long request to get event with longpoll...\")\nasync with self.api.http as session:\nreturn await session.request_json(\n\"POST\",\n@@ -31,6 +33,7 @@ class BotPolling(ABCPolling):\n)\nasync def get_server(self) -> dict:\n+ logger.debug(\"Getting polling server...\")\nif self.group_id is None:\nself.group_id = (await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\nreturn (await self.api.request(\"groups.getLongPollServer\", {\"group_id\": self.group_id}))[\n@@ -39,6 +42,7 @@ class BotPolling(ABCPolling):\nasync def listen(self) -> AsyncIterator[dict]: # type: ignore\nserver = await self.get_server()\n+ logger.debug(\"Starting listening to longpoll\")\nwhile not self.stop:\nevent = await self.get_event(server)\nif not event.get(\"ts\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "@@ -6,4 +6,5 @@ from .dev_tools import (\nBotTypes,\nmessage_min,\nvkscript,\n+ run_in_task,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -3,3 +3,4 @@ from .loop_wrapper import LoopWrapper\nfrom .ctx_tool import BaseContext\nfrom .mini_types import BotTypes, message_min\nfrom .vkscript_converter import vkscript\n+from .utils import run_in_task\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "+from asyncio import get_running_loop\n+from typing import Coroutine, NoReturn\n+\n+\n+# This feature is not used in production\n+# but can be useful for customization\n+# purposes\n+def run_in_task(coroutine: Coroutine) -> NoReturn:\n+ loop = get_running_loop()\n+ loop.create_task(coroutine)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add simple logs; reprs
|
718,838 |
13.09.2020 10:06:01
| -10,800 |
86c6ec34827481f196c13ca7aaebb5fc26216534
|
move swear handler from vkbottle-v2 + some minor fixes; add error_handler to router
|
[
{
"change_type": "MODIFY",
"old_path": "tests/exception_manager_test.py",
"new_path": "tests/exception_manager_test.py",
"diff": "-from vkbottle import CodeErrorFactory, SingleError\n+from vkbottle import CodeErrorFactory, SingleError, swear\ndef test_exc_manager_code_error():\nexc_manager = CodeErrorFactory()\n@@ -23,3 +23,20 @@ def test_exc_manager_single_error():\npass\nexcept BaseException as e:\nassert False\n+\n+\n+def test_swear_sync():\n+ def sync_exception_handler(e: BaseException, a):\n+ assert isinstance(e, RuntimeError)\n+ return a\n+\n+ @swear(RuntimeError, just_return=True)\n+ def sync_just_return(a):\n+ raise RuntimeError(f\"Error#{a}\")\n+\n+ @swear(RuntimeError, exception_handler=sync_exception_handler)\n+ def sync_with_exc_handler(a):\n+ raise RuntimeError(f\"Error#{a}\")\n+\n+ assert sync_just_return(2)\n+ assert sync_with_exc_handler(3) == 3\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -17,6 +17,7 @@ from .exception_factory import (\nVKAPIError,\nABCErrorHandler,\nErrorHandler,\n+ swear,\n)\nfrom .http import (\nABCHTTPClient,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/abc.py",
"new_path": "vkbottle/dispatch/abc.py",
"diff": "@@ -3,6 +3,7 @@ from .views import ABCView\nfrom .middlewares import BaseMiddleware\nfrom typing import List, Dict, Callable, Type, NoReturn, Any\nfrom vkbottle.api.abc import ABCAPI\n+from vkbottle.exception_factory.error_handler import ABCErrorHandler\nclass ABCRouter(ABC):\n@@ -12,6 +13,7 @@ class ABCRouter(ABC):\nviews: Dict[str, \"ABCView\"]\nmiddlewares: List[\"BaseMiddleware\"]\n+ error_handler: \"ABCErrorHandler\"\n@abstractmethod\nasync def route(self, event: dict, ctx_api: \"ABCAPI\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/bot_router.py",
"new_path": "vkbottle/dispatch/bot_router.py",
"diff": "@@ -3,15 +3,18 @@ from .views import bot\nfrom vkbottle.dispatch.middlewares import BaseMiddleware\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.modules import logger\n+from vkbottle.exception_factory.error_handler import ErrorHandler\nfrom typing import List\nclass BotRouter(ABCRouter):\nviews = {\"message\": bot.MessageView()}\nmiddlewares: List[\"BaseMiddleware\"] = []\n+ error_handler = ErrorHandler(redirect_arguments=True)\n- async def route(self, event: dict, ctx_api: \"ABCAPI\"):\n- logger.debug(\"Routing event {}\".format(event))\n+ @error_handler.wraps_error_handler()\n+ async def route(self, event: dict, ctx_api: \"ABCAPI\"): # type: ignore\n+ logger.debug(\"Routing update {}\".format(event))\nfor view in self.views.values():\nif not await view.process_event(event):\ncontinue\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/__init__.py",
"new_path": "vkbottle/exception_factory/__init__.py",
"diff": "@@ -2,6 +2,7 @@ from .abc import ABCExceptionFactory\nfrom .code_error import CodeErrorFactory\nfrom .single_error import SingleError\nfrom .error_handler import ABCErrorHandler, ErrorHandler\n+from .swear_handler import swear\nVKAPIError = CodeErrorFactory()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/exception_factory/swear_handler/__init__.py",
"diff": "+from .swear_handler import swear\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"diff": "+from typing import Union, Tuple, Callable, Optional, Any\n+from vkbottle.modules import logger\n+from inspect import iscoroutinefunction\n+import traceback\n+\n+\n+def swear(\n+ exception: Union[BaseException, Tuple[BaseException, ...]],\n+ exception_handler: Optional[Callable] = None,\n+ just_log: bool = False,\n+ just_return: bool = False,\n+) -> Any:\n+ \"\"\" Swear catcher allows to handle exceptions | Used as a decorator\n+ :param exception: Exception(s) to handle\n+ :param exception_handler: async exception handler\n+ :param just_log: should swear handler log the error\n+ :param just_return: should the exception just be returned\n+ >>> @swear(RuntimeError, just_return=True)\n+ >>> def function():\n+ >>> raise RuntimeError(\"Oh no!\")\n+ >>> function()\n+ >>> RuntimeError(\"Oh no!\")\n+ \"\"\"\n+\n+ if not isinstance(exception, tuple):\n+ exception = (exception,)\n+\n+ def decorator(func: Callable):\n+\n+ async def asynchronous_wrapper(*args, **kwargs):\n+ try:\n+ return await func(*args, **kwargs)\n+ except exception as e:\n+ if exception_handler is not None:\n+ return await exception_handler(e, *args, **kwargs)\n+ elif just_log:\n+ logger.error(\n+ f\"{func.__name__} (handling with swear) has thrown an exception: \\n\\n{traceback.format_exc()}\"\n+ )\n+ elif just_return:\n+ return e\n+ finally:\n+ logger.debug(f\"Function {func.__name__} was handled with swear\")\n+\n+ def synchronous_wrapper(*args, **kwargs):\n+ try:\n+ return func(*args, **kwargs)\n+ except exception as e:\n+ if exception_handler is not None:\n+ return exception_handler(e, *args, **kwargs)\n+ elif just_log:\n+ logger.error(\n+ f\"{func.__name__} (handling with swear) has thrown an exception: \\n\\n{traceback.format_exc()}\"\n+ )\n+ elif just_return:\n+ return e\n+ finally:\n+ logger.debug(f\"Function {func.__name__} was handled with swear\")\n+\n+ if iscoroutinefunction(func) and iscoroutinefunction(exception_handler):\n+ return asynchronous_wrapper\n+ return synchronous_wrapper\n+\n+ return decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -3,6 +3,7 @@ from vkbottle.api import ABCAPI, API\nfrom vkbottle.polling import ABCPolling, BotPolling\nfrom vkbottle.tools import LoopWrapper\nfrom vkbottle.dispatch import ABCRouter, BotRouter\n+from vkbottle.exception_factory import ABCErrorHandler\nfrom .labeler import ABCBotLabeler, BotLabeler\nfrom asyncio import AbstractEventLoop, get_event_loop\nfrom typing import Optional, NoReturn\n@@ -35,6 +36,10 @@ class Bot(ABCFramework):\ndef on(self) -> \"ABCBotLabeler\":\nreturn self.labeler\n+ @property\n+ def error(self) -> \"ABCErrorHandler\":\n+ return self.router.error_handler\n+\nasync def run_polling(self) -> NoReturn:\nlogger.info(\"Polling will be started\")\nasync for event in self.polling.listen(): # type: ignore\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
move swear handler from vkbottle-v2 + some minor fixes; add error_handler to router
|
718,838 |
13.09.2020 10:43:12
| -10,800 |
06f952f5eaaf36637161a54ee1d004f93aab6377
|
improve middleware: add middleware responses; add simple middleware registrar
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -8,6 +8,15 @@ from .api import (\n)\nfrom .tools import ABCStorage, CtxStorage, BaseContext, BotTypes\nfrom .polling import ABCPolling, BotPolling\n+from .dispatch import (\n+ ABCHandler,\n+ BaseMiddleware,\n+ MiddlewareResponse,\n+ ABCRule,\n+ ABCView,\n+ ABCRouter,\n+ BotRouter,\n+)\nfrom .framework import ABCFramework, Bot\nfrom vkbottle_types import GroupTypes\nfrom .exception_factory import (\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/__init__.py",
"new_path": "vkbottle/dispatch/__init__.py",
"diff": "from .abc import ABCRouter\nfrom .handlers import ABCHandler\nfrom .views import ABCView, MessageView\n-from .middlewares import BaseMiddleware\n+from .rules import ABCRule\n+from .middlewares import BaseMiddleware, MiddlewareResponse\nfrom .bot_router import BotRouter\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/middlewares/__init__.py",
"new_path": "vkbottle/dispatch/middlewares/__init__.py",
"diff": "-from .abc import BaseMiddleware\n+from .abc import BaseMiddleware, MiddlewareResponse\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/middlewares/abc.py",
"new_path": "vkbottle/dispatch/middlewares/abc.py",
"diff": "from abc import ABC\n+from typing import NewType, List, Any, TYPE_CHECKING\n+\n+if TYPE_CHECKING:\n+ from vkbottle.dispatch.views.abc import ABCView\n+\n+\n+MiddlewareResponse = NewType(\"MiddlewareResponse\", bool)\nclass BaseMiddleware(ABC):\nasync def pre(self, event):\n...\n- async def post(self, event, view):\n+ async def post(self, event, view: \"ABCView\", handle_responses: List[Any]):\n...\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc.py",
"new_path": "vkbottle/dispatch/views/abc.py",
"diff": "@@ -16,3 +16,6 @@ class ABCView(ABC):\n@abstractmethod\nasync def handle_event(self, event: dict, ctx_api: \"ABCAPI\") -> Any:\npass\n+\n+ def register_middleware(self, middleware: \"BaseMiddleware\"):\n+ self.middlewares.append(middleware)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "from ..abc import ABCView\nfrom vkbottle_types.events import GroupEventType\nfrom vkbottle.dispatch.handlers import ABCHandler\n-from vkbottle.dispatch.middlewares import BaseMiddleware\n+from vkbottle.dispatch.middlewares import BaseMiddleware, MiddlewareResponse\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.tools.dev_tools import message_min\nfrom vkbottle.modules import logger\n@@ -18,8 +18,16 @@ class MessageView(ABCView):\nasync def handle_event(self, event: dict, ctx_api: \"ABCAPI\") -> Any:\nlogger.debug(\"Handling event ({}) with message view\".format(event.get(\"event_id\")))\n+ context_variables = {}\nmessage = message_min(event, ctx_api)\n+ for middleware in self.middlewares:\n+ response = await middleware.pre(message)\n+ if response == MiddlewareResponse(False):\n+ return []\n+ elif isinstance(response, dict):\n+ context_variables.update(response)\n+\nhandle_responses = []\nfor handler in self.handlers:\nresult = await handler.filter(message)\n@@ -34,4 +42,7 @@ class MessageView(ABCView):\nif handler.blocking:\nreturn handle_responses\n+ for middleware in self.middlewares:\n+ await middleware.post(message, self, handle_responses)\n+\nreturn handle_responses\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"new_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"diff": "@@ -26,7 +26,6 @@ def swear(\nexception = (exception,)\ndef decorator(func: Callable):\n-\nasync def asynchronous_wrapper(*args, **kwargs):\ntry:\nreturn await func(*args, **kwargs)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
improve middleware: add middleware responses; add simple middleware registrar
|
718,838 |
13.09.2020 13:17:46
| -10,800 |
d64b895c2fd5d592141080828bd768b4e6b34f6e
|
add multibot example and docs; minor fixes; fix docs
|
[
{
"change_type": "MODIFY",
"old_path": "docs/high-level/index.md",
"new_path": "docs/high-level/index.md",
"diff": "# High-level API\n-* [Bot](high-level/bot/)\n- + [Access Bot](high-level/bot/bot.md)\n- + [Labeler](high-level/bot/labeler.md)\n-* [Handling](high-level/handling/)\n- + [Handler](high-level/handling/handler.md)\n- + [View](high-level/handling/view.md)\n-* [Routing](high-level/routing/)\n\\ No newline at end of file\n+* [Bot](bot/)\n+ + [Access Bot](bot/bot.md)\n+ + [Labeler](bot/labeler.md)\n+ + [Multibot](bot/multibot.md)\n+* [Handling](handling/index.md)\n+ + [Handler](handling/handler.md)\n+ + [View](handling/view.md)\n+* [Routing](routing/index.md)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/low-level/index.md",
"new_path": "docs/low-level/index.md",
"diff": "# Low-level API\n-* [API](api/)\n+* [API](api/index.md)\n+ [Accessing API](api/api.md)\n+ [Response Validators](api/response-validator.md)\n-* [Exception Handling](exception_factory/)\n+* [Exception Handling](exception_factory/index.md)\n+ [Exception Factory](exception_factory/exception-factory.md)\n+ [Error Handler](exception_factory/error-handler.md)\n-* [Http Client](http/)\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/)\n+* [Polling](polling/index.md)\n+ [Accessing Polling](polling/polling.md)\n\\ No newline at end of file\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": "from vkbottle_types.objects import MessagesMessage, MessagesClientInfo\nfrom vkbottle_types.events.bot_events import MessageNew\n-from vkbottle.api.abc import ABCAPI\n-from typing import Optional, Any, List\n+from vkbottle.api import ABCAPI, API\n+from typing import Optional, Any, List, Union\nclass MessageMin(MessagesMessage):\n@@ -9,7 +9,7 @@ class MessageMin(MessagesMessage):\nunprepared_ctx_api: Optional[Any] = None\n@property\n- def ctx_api(self) -> \"ABCAPI\":\n+ def ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\nasync def answer(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add multibot example and docs; minor fixes; fix docs
|
718,838 |
20.09.2020 11:11:17
| -10,800 |
19ac554a7cabf083b4c949cfd3c65c99d138ca7a
|
make bot-default-labeler handlers blocking by default
|
[
{
"change_type": "DELETE",
"old_path": "vkbottle/bot/__init__.py",
"new_path": null,
"diff": "-from ..dispatch.rules import bot\n-from ..framework.bot import ABCBotLabeler\n-from ..framework.bot import Bot\n-from ..framework.bot import BotLabeler\n-from ..framework.bot import run_multibot\n-from ..tools.dev_tools.mini_types.bot import MessageMin\n-\n-Message = MessageMin\n-rules = bot\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -8,7 +8,7 @@ class BotLabeler(ABCBotLabeler):\nmessage_view = MessageView()\ndef message(\n- self, *rules: \"ABCRule\", blocking: bool = False, **custom_rules\n+ self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\n@@ -21,7 +21,7 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef chat_message(\n- self, *rules: \"ABCRule\", blocking: bool = False, **custom_rules\n+ self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\n@@ -38,7 +38,7 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef private_message(\n- self, *rules: \"ABCRule\", blocking: bool = False, **custom_rules\n+ self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
make bot-default-labeler handlers blocking by default
|
718,838 |
20.09.2020 18:04:51
| -10,800 |
ee26b4ca27bf4761254ac30a00c6b0d9812822a7
|
add coro rule; readme installation block; remove reorder-python-imports from pre-commit-config
|
[
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -38,16 +38,6 @@ repos:\nargs: [--in-place, --max-line-length=99]\nstages: [commit]\n- - id: reorder-python-imports\n- name: reorder-python-imports\n- entry: reorder-python-imports\n- language: system\n- types: [python]\n- args:\n- - --separate-relative\n- - --py37-plus\n- stages: [commit]\n-\n- id: mypy\nname: mypy check\nentry: mypy\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "from .abc import ABCRule\nfrom abc import abstractmethod\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\n-from typing import List, Optional, Union, Tuple, Callable, Awaitable\n+from typing import List, Optional, Union, Tuple, Callable, Awaitable, Coroutine\nimport vbml\nimport inspect\n@@ -217,6 +217,14 @@ class FuncRule(ABCMessageRule):\nreturn self.func(message) # type: ignore\n+class CoroutineRule(ABCMessageRule):\n+ def __init__(self, coroutine: Coroutine):\n+ self.coro = coroutine\n+\n+ async def check(self, message: Message) -> bool:\n+ return await self.coro\n+\n+\n__all__ = (\n\"ABCMessageRule\",\n\"PeerRule\",\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/abc.py",
"new_path": "vkbottle/framework/bot/labeler/abc.py",
"diff": "@@ -15,6 +15,7 @@ from vkbottle.dispatch.rules.bot import (\nPayloadContainsRule,\nPayloadMapRule,\nFuncRule,\n+ CoroutineRule,\n)\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\nfrom typing import Callable, Any, Dict, Optional, Type, List\n@@ -37,6 +38,8 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"payload_contains\": PayloadContainsRule,\n\"payload_map\": PayloadMapRule,\n\"func\": FuncRule,\n+ \"coro\": CoroutineRule,\n+ \"coroutine\": CoroutineRule,\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add coro rule; readme installation block; remove reorder-python-imports from pre-commit-config
|
718,838 |
22.09.2020 21:29:23
| -10,800 |
9cd644c396ebb475457da125eefe20cb011b7792
|
some fixes + default text approximators feature [documentation needed]
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/abc.py",
"new_path": "vkbottle/dispatch/abc.py",
"diff": "@@ -11,7 +11,7 @@ class ABCRouter(ABC):\nDocumentation: soon\n\"\"\"\n- views: Dict[str, \"ABCView\"]\n+ views: Dict[str, \"ABCView\"] = {}\nmiddlewares: List[\"BaseMiddleware\"]\nerror_handler: \"ABCErrorHandler\"\n@@ -19,6 +19,10 @@ class ABCRouter(ABC):\nasync def route(self, event: dict, ctx_api: \"ABCAPI\"):\npass\n+ @abstractmethod\n+ def construct(self, views: Dict[str, \"ABCView\"]) -> \"ABCRouter\":\n+ pass\n+\ndef add_view(self, name: str, view: \"ABCView\") -> NoReturn:\nself.views[name] = view\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/bot_router.py",
"new_path": "vkbottle/dispatch/bot_router.py",
"diff": "from .abc import ABCRouter\n-from .views import bot\nfrom vkbottle.dispatch.middlewares import BaseMiddleware\n+from vkbottle.dispatch.views import ABCView\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.modules import logger\nfrom vkbottle.exception_factory.error_handler import ErrorHandler\n-from typing import List\n+from typing import List, Dict\nclass BotRouter(ABCRouter):\n- views = {\"message\": bot.MessageView()}\nmiddlewares: List[\"BaseMiddleware\"] = []\nerror_handler = ErrorHandler(redirect_arguments=True)\n@@ -19,3 +18,7 @@ class BotRouter(ABCRouter):\nif not await view.process_event(event):\ncontinue\nawait view.handle_event(event, ctx_api)\n+\n+ def construct(self, views: Dict[str, \"ABCView\"]) -> \"BotRouter\":\n+ self.views = views\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -241,4 +241,5 @@ __all__ = (\n\"PayloadMapRule\",\n\"FromUserRule\",\n\"FuncRule\",\n+ \"CoroutineRule\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "-from typing import Any, List\n+from typing import Any, List, Callable\nfrom vkbottle_types.events import GroupEventType\n@@ -7,6 +7,7 @@ from vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.middlewares import BaseMiddleware, MiddlewareResponse\nfrom vkbottle.modules import logger\nfrom vkbottle.tools.dev_tools import message_min\n+from vkbottle.tools.dev_tools.mini_types.bot import MessageMin\nfrom ..abc import ABCView\n@@ -14,6 +15,7 @@ class MessageView(ABCView):\ndef __init__(self):\nself.handlers: List[\"ABCHandler\"] = []\nself.middlewares: List[\"BaseMiddleware\"] = []\n+ self.default_text_approximators: List[Callable[[MessageMin], str]] = []\nasync def process_event(self, event: dict) -> bool:\nif GroupEventType(event[\"type\"]) == GroupEventType.MESSAGE_NEW:\n@@ -24,6 +26,9 @@ class MessageView(ABCView):\ncontext_variables = {}\nmessage = message_min(event, ctx_api)\n+ for text_ax in self.default_text_approximators:\n+ message.text = text_ax(message)\n+\nfor middleware in self.middlewares:\nresponse = await middleware.pre(message)\nif response == MiddlewareResponse(False):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "@@ -6,6 +6,8 @@ ExceptionHandler = typing.Optional[typing.Callable[[BaseException], typing.Await\nclass ABCErrorHandler(ABC):\n+ error_handlers: typing.Any\n+\n@abstractmethod\ndef register_error_handler(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -23,15 +23,23 @@ class Bot(ABCFramework):\n):\nself.api = API(token) if token is not None else api # type: ignore\nself.loop_wrapper = loop_wrapper or LoopWrapper()\n- self.router = router or BotRouter()\nself.labeler = labeler or BotLabeler()\nself._polling = polling or BotPolling(self.api)\n+ self._router = router or BotRouter()\nself._loop = loop\n@property\ndef polling(self) -> \"ABCPolling\":\nreturn self._polling.construct(self.api)\n+ @property\n+ def router(self) -> \"ABCRouter\":\n+ return self._router.construct(views=self.labeler.views())\n+\n+ @router.setter\n+ def router(self, new_router: \"ABCRouter\"):\n+ self._router = new_router\n+\n@property\ndef on(self) -> \"ABCBotLabeler\":\nreturn self.labeler\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/abc.py",
"new_path": "vkbottle/framework/bot/labeler/abc.py",
"diff": "@@ -4,6 +4,7 @@ from typing import Callable, Any, Dict, Type, List\nfrom vbml import Patcher\nfrom vkbottle.dispatch.rules import ABCRule\n+from vkbottle.dispatch.views import ABCView\nfrom vkbottle.dispatch.rules.bot import (\nPeerRule,\nVBMLRule,\n@@ -63,6 +64,10 @@ class ABCBotLabeler(ABC):\ndef private_message(self, *rules: \"ABCRule\", **custom_rules) -> LabeledMessageHandler:\npass\n+ @abstractmethod\n+ def views(self) -> Dict[str, \"ABCView\"]:\n+ pass\n+\n@abstractmethod\ndef load(self, labeler: Any):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "from vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule, bot\n-from vkbottle.dispatch.views import MessageView\n+from vkbottle.dispatch.views import MessageView, ABCView\nfrom .abc import ABCBotLabeler, LabeledMessageHandler\n+from typing import Dict\nclass BotLabeler(ABCBotLabeler):\n@@ -58,3 +59,6 @@ class BotLabeler(ABCBotLabeler):\ndef load(self, labeler: \"BotLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.extend(labeler.message_view.middlewares)\n+\n+ def views(self) -> Dict[str, \"ABCView\"]:\n+ return {\"message\": self.message_view}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
some fixes + default text approximators feature [documentation needed]
|
718,838 |
22.09.2020 21:40:21
| -10,800 |
38d4613ea62ec4ff28fe5864624f4f3359898888
|
little blueprint fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/abc_blueprint.py",
"new_path": "vkbottle/framework/abc_blueprint.py",
"diff": "@@ -22,7 +22,7 @@ class ABCBlueprint(ABCFramework):\npass\n@abstractmethod\n- def load(self, framework: Any):\n+ def load(self, framework: Any) -> \"ABCBlueprint\":\npass\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "@@ -27,12 +27,13 @@ class BotBlueprint(ABCBlueprint):\nself.constructed = True\nreturn self\n- def load(self, framework: \"Bot\"):\n+ def load(self, framework: \"Bot\") -> \"BotBlueprint\":\nframework.router.middlewares.extend(self.router.middlewares)\nframework.router.error_handler.error_handlers.update( # type: ignore\nself.router.error_handler.error_handlers\n)\n- self.labeler.load(framework.labeler) # type: ignore\n+ framework.labeler.load(self.labeler) # type: ignore\n+ return self.construct(framework.api, framework.polling)\n@property\ndef on(self) -> BotLabeler:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
little blueprint fix
|
718,838 |
22.09.2020 21:46:01
| -10,800 |
e239644dee4d9e6f7a3afba313993061ed0deef5
|
fix vbml rule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -56,7 +56,7 @@ class VBMLRule(ABCMessageRule):\nasync def check(self, message: Message) -> bool:\nfor pattern in self.patterns:\nresult = self.patcher.check(pattern, message.text)\n- if result is not None:\n+ if result not in (None, False):\nreturn result\nreturn False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix vbml rule
|
718,838 |
23.09.2020 17:25:15
| -10,800 |
5f6458925928752f5a5e7239a1c25071efd9c715
|
remove unused middlewares from router; fixes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/abc.py",
"new_path": "vkbottle/dispatch/abc.py",
"diff": "@@ -12,7 +12,6 @@ class ABCRouter(ABC):\n\"\"\"\nviews: Dict[str, \"ABCView\"] = {}\n- middlewares: List[\"BaseMiddleware\"]\nerror_handler: \"ABCErrorHandler\"\n@abstractmethod\n@@ -26,19 +25,9 @@ class ABCRouter(ABC):\ndef add_view(self, name: str, view: \"ABCView\") -> NoReturn:\nself.views[name] = view\n- def add_middleware(self, middleware: \"BaseMiddleware\") -> NoReturn:\n- self.middlewares.append(middleware)\n-\ndef view(self, name: str) -> Callable[..., Type[\"ABCView\"]]:\ndef decorator(view: Type[\"ABCView\"]):\nself.add_view(name, view())\nreturn view\nreturn decorator\n-\n- def middleware(self) -> Callable[..., Type[\"BaseMiddleware\"]]:\n- def decorator(middleware: Type[\"BaseMiddleware\"]):\n- self.add_middleware(middleware())\n- return middleware\n-\n- return decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/bot_router.py",
"new_path": "vkbottle/dispatch/bot_router.py",
"diff": "@@ -8,7 +8,6 @@ from typing import List, Dict\nclass BotRouter(ABCRouter):\n- middlewares: List[\"BaseMiddleware\"] = []\nerror_handler = ErrorHandler(redirect_arguments=True)\n@error_handler.wraps_error_handler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -90,7 +90,7 @@ class FromPeerRule(ABCMessageRule):\nclass AttachmentTypeRule(ABCMessageRule):\ndef __init__(self, attachment_types: Union[List[str], str]):\n- if isinstance(attachment_types, str):\n+ if not isinstance(attachment_types, list):\nattachment_types = [attachment_types]\nself.attachment_types = attachment_types\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -46,7 +46,7 @@ class MessageView(ABCView):\nelif not isinstance(result, dict):\nresult = {}\n- handle_responses.append(await handler.handle(message, **result))\n+ handle_responses.append(await handler.handle(message, **result, **context_variables))\nif handler.blocking:\nreturn handle_responses\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "@@ -28,10 +28,7 @@ class BotBlueprint(ABCBlueprint):\nreturn self\ndef load(self, framework: \"Bot\") -> \"BotBlueprint\":\n- framework.router.middlewares.extend(self.router.middlewares)\n- framework.router.error_handler.error_handlers.update( # type: ignore\n- self.router.error_handler.error_handlers\n- )\n+ framework.router.load(self.router)\nframework.labeler.load(self.labeler) # type: ignore\nreturn self.construct(framework.api, framework.polling)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
remove unused middlewares from router; fixes
|
718,838 |
23.09.2020 17:30:10
| -10,800 |
99da3da8c8083044d7aa5ddcc420f98213cb7d16
|
remove unused router loading
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "@@ -28,7 +28,6 @@ class BotBlueprint(ABCBlueprint):\nreturn self\ndef load(self, framework: \"Bot\") -> \"BotBlueprint\":\n- framework.router.load(self.router)\nframework.labeler.load(self.labeler) # type: ignore\nreturn self.construct(framework.api, framework.polling)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
remove unused router loading
|
718,838 |
11.10.2020 13:35:25
| -10,800 |
b36e42677c056f260c46b722745531f8c91a2657
|
add loop wrapper repeat feature; documentation; some fixes
|
[
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "* [Tools](tools/index.md)\n* [Storages](tools/storage.md)\n* [VKScript](tools/vkscript.md)\n+ * [Loop Wrapper](tools/loop-wrapper.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -38,6 +38,6 @@ from .http import (\nManySessionManager,\n)\nfrom .polling import ABCPolling, BotPolling\n-from .tools import ABCStorage, CtxStorage, BaseContext, BotTypes\n+from .tools import ABCStorage, CtxStorage, BaseContext, BotTypes, LoopWrapper, RepeatedTask\nevent_types = GroupTypes\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "@@ -3,6 +3,7 @@ from .dev_tools import (\nCtxStorage,\nBaseContext,\nLoopWrapper,\n+ RepeatedTask,\nBotTypes,\nmessage_min,\nvkscript,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "from .storage import ABCStorage, CtxStorage\n-from .loop_wrapper import LoopWrapper\n+from .loop_wrapper import LoopWrapper, RepeatedTask\nfrom .ctx_tool import BaseContext\nfrom .mini_types import BotTypes, message_min\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"new_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"diff": "from typing import Optional, List, Coroutine, Any, Union, Callable, Iterable\nfrom vkbottle.modules import logger\nfrom asyncio import AbstractEventLoop, get_event_loop\n+from .repeated_task import RepeatedTask\nimport asyncio\nTask = Coroutine[Any, Any, Any]\nclass LoopWrapper:\n+ \"\"\" Loop Wrapper for vkbottle manages startup, shutdown and main tasks,\n+ creates loop and runs it forever \"\"\"\n+\ndef __init__(\nself,\n*,\n@@ -19,6 +23,8 @@ class LoopWrapper:\nself.tasks = tasks or []\ndef run_forever(self, loop: Optional[AbstractEventLoop] = None):\n+ \"\"\" Runs startup tasks and makes the loop running forever \"\"\"\n+\nif not len(self.tasks):\nlogger.warn(\"You ran loop with 0 tasks. Is it ok?\")\n@@ -37,9 +43,34 @@ class LoopWrapper:\nloop.close()\ndef add_task(self, task: Union[Task, Callable[..., Task]]):\n- if asyncio.iscoroutinefunction(task): # type: ignore\n+ \"\"\" Adds tasks to be ran in run_forever\n+ :param task: coroutine / coroutine function with zero arguments\n+ \"\"\"\n+\n+ if asyncio.iscoroutinefunction(task) or isinstance(task, RepeatedTask): # type: ignore\nself.tasks.append(task()) # type: ignore\nelif asyncio.iscoroutine(task): # type: ignore\nself.tasks.append(task) # type: ignore\nelse:\nraise TypeError(\"Task should be coroutine or coroutine function\")\n+\n+ def repeat(\n+ self, seconds: int = 0, minutes: int = 0, hours: int = 0, days: int = 0\n+ ) -> Callable[[Callable], Callable]:\n+ \"\"\" A tiny template to wrap repeated tasks with decorator\n+ >>> lw = LoopWrapper()\n+ >>> @lw.repeat(seconds=5)\n+ >>> async def repeated_function():\n+ >>> print(\"This will be logged every five seconds\")\n+ >>> lw.run_forever()\n+ \"\"\"\n+\n+ seconds += minutes * 60\n+ seconds += hours * 60 * 60\n+ seconds += days * 24 * 60 * 60\n+\n+ def decorator(func: Callable):\n+ self.add_task(RepeatedTask(seconds, func))\n+ return func\n+\n+ return decorator\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": "@@ -34,11 +34,11 @@ class MessageMin(MessagesMessage):\ndisable_mentions: Optional[bool] = None,\ntemplate: Optional[dict] = None,\nintent: Optional[str] = None,\n- ):\n+ ) -> int:\ndata = {k: v for k, v in locals().items() if k != \"self\" and v is not None}\ndata[\"peer_id\"] = self.peer_id\n- return await self.ctx_api.request(\"messages.send\", data)\n+ return (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\nMessageMin.update_forward_refs()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/repeated_task.py",
"diff": "+from asyncio import sleep\n+from typing import Callable, Coroutine, Any\n+\n+Handler = Callable[..., Coroutine[Any, Any, Any]]\n+\n+\n+class RepeatedTask:\n+ def __init__(self, seconds: int, handler: Handler):\n+ self.seconds = seconds\n+ self.handler = handler\n+\n+ async def __call__(self, *args, **kwargs):\n+ while True:\n+ await sleep(self.seconds)\n+ await self.handler(*args, **kwargs)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add loop wrapper repeat feature; documentation; some fixes
|
718,838 |
12.10.2020 16:16:07
| -10,800 |
1e46412ab683316da53ed5cdb04a40d0274cd817
|
rename repeat -> interval and RepeatedTask -> DelayedTask; add timer; fix documentation;
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -38,6 +38,6 @@ from .http import (\nManySessionManager,\n)\nfrom .polling import ABCPolling, BotPolling\n-from .tools import ABCStorage, CtxStorage, BaseContext, BotTypes, LoopWrapper, RepeatedTask\n+from .tools import ABCStorage, CtxStorage, BaseContext, BotTypes, LoopWrapper, DelayedTask\nevent_types = GroupTypes\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "@@ -3,7 +3,7 @@ from .dev_tools import (\nCtxStorage,\nBaseContext,\nLoopWrapper,\n- RepeatedTask,\n+ DelayedTask,\nBotTypes,\nmessage_min,\nvkscript,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "from .storage import ABCStorage, CtxStorage\n-from .loop_wrapper import LoopWrapper, RepeatedTask\n+from .loop_wrapper import LoopWrapper, DelayedTask\nfrom .ctx_tool import BaseContext\nfrom .mini_types import BotTypes, message_min\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/tools/dev_tools/repeated_task.py",
"new_path": "vkbottle/tools/dev_tools/delayed_task.py",
"diff": "@@ -4,12 +4,15 @@ from typing import Callable, Coroutine, Any\nHandler = Callable[..., Coroutine[Any, Any, Any]]\n-class RepeatedTask:\n- def __init__(self, seconds: int, handler: Handler):\n+class DelayedTask:\n+ def __init__(self, seconds: int, handler: Handler, do_break: bool = False):\nself.seconds = seconds\nself.handler = handler\n+ self.do_break = do_break\nasync def __call__(self, *args, **kwargs):\nwhile True:\nawait sleep(self.seconds)\nawait self.handler(*args, **kwargs)\n+ if self.do_break:\n+ break\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"new_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"diff": "from typing import Optional, List, Coroutine, Any, Union, Callable, Iterable\nfrom vkbottle.modules import logger\nfrom asyncio import AbstractEventLoop, get_event_loop\n-from .repeated_task import RepeatedTask\n+from .delayed_task import DelayedTask\nimport asyncio\nTask = Coroutine[Any, Any, Any]\n@@ -47,19 +47,19 @@ class LoopWrapper:\n:param task: coroutine / coroutine function with zero arguments\n\"\"\"\n- if asyncio.iscoroutinefunction(task) or isinstance(task, RepeatedTask): # type: ignore\n+ if asyncio.iscoroutinefunction(task) or isinstance(task, DelayedTask): # type: ignore\nself.tasks.append(task()) # type: ignore\nelif asyncio.iscoroutine(task): # type: ignore\nself.tasks.append(task) # type: ignore\nelse:\nraise TypeError(\"Task should be coroutine or coroutine function\")\n- def repeat(\n+ def interval(\nself, seconds: int = 0, minutes: int = 0, hours: int = 0, days: int = 0\n) -> Callable[[Callable], Callable]:\n\"\"\" A tiny template to wrap repeated tasks with decorator\n>>> lw = LoopWrapper()\n- >>> @lw.repeat(seconds=5)\n+ >>> @lw.interval(seconds=5)\n>>> async def repeated_function():\n>>> print(\"This will be logged every five seconds\")\n>>> lw.run_forever()\n@@ -70,7 +70,27 @@ class LoopWrapper:\nseconds += days * 24 * 60 * 60\ndef decorator(func: Callable):\n- self.add_task(RepeatedTask(seconds, func))\n+ self.add_task(DelayedTask(seconds, func))\n+ return func\n+\n+ return decorator\n+\n+ def timer(\n+ self, seconds: int = 0, minutes: int = 0, hours: int = 0, days: int = 0\n+ ) -> Callable[[Callable], Callable]:\n+ \"\"\" A tiny template to wrap tasks with timer\n+ >>> lw = LoopWrapper()\n+ >>> @lw.timer(seconds=5)\n+ >>> async def delayed_function():\n+ >>> print(\"This will after 5 seconds\")\n+ >>> lw.run_forever()\n+ \"\"\"\n+ seconds += minutes * 60\n+ seconds += hours * 60 * 60\n+ seconds += days * 24 * 60 * 60\n+\n+ def decorator(func: Callable):\n+ self.add_task(DelayedTask(seconds, func, do_break=True))\nreturn func\nreturn decorator\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
rename repeat -> interval and RepeatedTask -> DelayedTask; add timer; fix documentation;
|
718,838 |
13.10.2020 18:20:22
| -10,800 |
99272dd537c72aad7e6d6c0ae43fc3690bb4b4cb
|
documenatation + code cleanup
|
[
{
"change_type": "MODIFY",
"old_path": ".github/FUNDING.yml",
"new_path": ".github/FUNDING.yml",
"diff": "-patreon: timoniq\n-custom: https://qiwi.me/pirashki\n+custom: [\"https://boosty.to/timoniq\", \"https://qiwi.me/pirashki\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"new_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"diff": "@@ -5,7 +5,9 @@ import traceback\ndef swear(\n- exception: Union[BaseException, Type[BaseException], Tuple[Union[BaseException, Type[BaseException]], ...]],\n+ exception: Union[\n+ BaseException, Type[BaseException], Tuple[Union[BaseException, Type[BaseException]], ...]\n+ ],\nexception_handler: Optional[Callable] = None,\njust_log: bool = False,\njust_return: bool = False,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "from choicelib import choice_in_order\n+import logging\njson = choice_in_order([\"ujson\", \"hyperjson\", \"orjson\"], do_import=True, default=\"json\")\nlogger = choice_in_order([\"loguru\"], do_import=True, default=\"logging\")\n+\n+if logger.__name__ == \"logging\":\n+ logger = logging.getLogger(\"vkbottle\")\n+elif logger.__name__ == \"loguru\":\n+ logger = getattr(logger, \"logger\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"new_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"diff": "@@ -37,6 +37,8 @@ class LoopWrapper:\nloop.create_task(task)\nloop.run_forever()\n+ except KeyboardInterrupt:\n+ logger.info(\"Keyboard Interrupt\")\nfinally:\n[loop.run_until_complete(shutdown_task) for shutdown_task in self.on_shutdown]\nif loop.is_running():\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
documenatation + code cleanup
Co-Authored-By: Alexey <1337kwiz@gmail.com>
|
718,838 |
14.10.2020 18:42:09
| -10,800 |
cf2d2387c49b122c4dc4904e84faea045c69200a
|
add handler return manager
|
[
{
"change_type": "MODIFY",
"old_path": "docs/high-level/index.md",
"new_path": "docs/high-level/index.md",
"diff": "* [Handling](handling/index.md)\n+ [Handler](handling/handler.md)\n+ [View](handling/view.md)\n+ + [Return Manager](handling/return-manager.md)\n* [Routing](routing/index.md)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "* [Handling](high-level/handling/index.md)\n+ [Handler](high-level/handling/handler.md)\n+ [View](high-level/handling/view.md)\n+ + [Return Manager](high-level/handling/return-manager.md)\n* [Routing](high-level/routing/index.md)\n* [Low-level API](low-level/index.md)\n* [API](low-level/api/index.md)\n* [Storages](tools/storage.md)\n* [VKScript](tools/vkscript.md)\n* [Loop Wrapper](tools/loop-wrapper.md)\n+ * [Auth Flows](tools/auth.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -17,6 +17,7 @@ from .dispatch import (\nABCView,\nABCRouter,\nBotRouter,\n+ BaseReturnManager,\n)\nfrom .exception_factory import (\nABCExceptionFactory,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/__init__.py",
"new_path": "vkbottle/dispatch/__init__.py",
"diff": "@@ -3,4 +3,5 @@ from .handlers import ABCHandler\nfrom .views import ABCView, MessageView\nfrom .rules import ABCRule\nfrom .middlewares import BaseMiddleware, MiddlewareResponse\n+from .return_manager import BaseReturnManager\nfrom .bot_router import BotRouter\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/dispatch/return_manager/__init__.py",
"diff": "+from .abc import BaseReturnManager\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/dispatch/return_manager/abc.py",
"diff": "+from abc import ABC\n+from typing import Dict, Callable, Coroutine, Any, Union, Tuple, Optional, NamedTuple\n+\n+\n+HandlerProperty = NamedTuple(\n+ \"HandlerProperty\", ((\"types\", Union[type, Tuple[type, ...]]), (\"handler\", Callable))\n+)\n+\n+\n+class BaseReturnManager(ABC):\n+ def get_handler(self, value: Any) -> Optional[Callable]:\n+ for types, handler in self.handlers.items():\n+ if isinstance(value, types):\n+ return handler\n+\n+ @property\n+ def handlers(self) -> Dict[Union[type, Tuple[type, ...]], Callable[[Any], Coroutine]]:\n+ handlers = {}\n+ for k, v in vars(self.__class__).items():\n+ if not isinstance(v, HandlerProperty):\n+ continue\n+ handlers[v.types] = v.handler\n+ return handlers\n+\n+ @classmethod\n+ def instance_of(\n+ cls, types: Union[type, Tuple[type, ...]]\n+ ) -> Callable[[Callable], HandlerProperty]:\n+ def decorator(func: Callable):\n+ return HandlerProperty(types, func)\n+\n+ return decorator\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/dispatch/return_manager/bot/__init__.py",
"diff": "+from .message import BotMessageReturnHandler\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/dispatch/return_manager/bot/message.py",
"diff": "+from vkbottle.dispatch.return_manager.abc import BaseReturnManager\n+from vkbottle.tools.dev_tools.mini_types.bot import MessageMin\n+from typing import Union\n+\n+\n+class BotMessageReturnHandler(BaseReturnManager):\n+ @BaseReturnManager.instance_of(str)\n+ async def str_handler(self, value: str, message: MessageMin, _: dict):\n+ await message.answer(value)\n+\n+ @BaseReturnManager.instance_of((tuple, list))\n+ async def iter_handler(self, value: Union[tuple, list], message: MessageMin, _: dict):\n+ [await message.answer(str(e)) for e in value]\n+\n+ @BaseReturnManager.instance_of(dict)\n+ async def dict_handler(self, value: dict, message: MessageMin, _: dict):\n+ await message.answer(**value)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc.py",
"new_path": "vkbottle/dispatch/views/abc.py",
"diff": "@@ -4,11 +4,13 @@ from typing import Any, List\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.middlewares import BaseMiddleware\n+from vkbottle.dispatch.return_manager import BaseReturnManager\nclass ABCView(ABC):\nhandlers: List[\"ABCHandler\"]\nmiddlewares: List[\"BaseMiddleware\"]\n+ handler_return_manager: BaseReturnManager\n@abstractmethod\nasync def process_event(self, event: dict) -> bool:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -5,6 +5,7 @@ from vkbottle_types.events import GroupEventType\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.dispatch.handlers import ABCHandler\nfrom vkbottle.dispatch.middlewares import BaseMiddleware, MiddlewareResponse\n+from vkbottle.dispatch.return_manager.bot import BotMessageReturnHandler\nfrom vkbottle.modules import logger\nfrom vkbottle.tools.dev_tools import message_min\nfrom vkbottle.tools.dev_tools.mini_types.bot import MessageMin\n@@ -16,6 +17,7 @@ class MessageView(ABCView):\nself.handlers: List[\"ABCHandler\"] = []\nself.middlewares: List[\"BaseMiddleware\"] = []\nself.default_text_approximators: List[Callable[[MessageMin], str]] = []\n+ self.handler_return_manager = BotMessageReturnHandler()\nasync def process_event(self, event: dict) -> bool:\nif GroupEventType(event[\"type\"]) == GroupEventType.MESSAGE_NEW:\n@@ -46,11 +48,20 @@ class MessageView(ABCView):\nelif not isinstance(result, dict):\nresult = {}\n- handle_responses.append(await handler.handle(message, **result, **context_variables))\n+ handler_response = await handler.handle(message, **result, **context_variables)\n+ handle_responses.append(handler_response)\n+\n+ return_handler = self.handler_return_manager.get_handler(handler_response)\n+ if return_handler is not None:\n+ await return_handler(\n+ self.handler_return_manager,\n+ handler_response,\n+ message,\n+ {**result, **context_variables},\n+ )\n+\nif handler.blocking:\n- return handle_responses\n+ return\nfor middleware in self.middlewares:\nawait middleware.post(message, self, handle_responses)\n-\n- return handle_responses\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add handler return manager
|
718,838 |
24.10.2020 17:47:20
| -10,800 |
4731d6f91f78eef95367e5b2d354f37841dd258d
|
add keyboard generator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -41,6 +41,6 @@ from .http import (\nManySessionManager,\n)\nfrom .polling import ABCPolling, BotPolling\n-from .tools import ABCStorage, CtxStorage, BaseContext, BotTypes, LoopWrapper, DelayedTask\n+from .tools import *\nevent_types = GroupTypes\n"
},
{
"change_type": "ADD",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -8,6 +8,7 @@ from .labeler import ABCBotLabeler, BotLabeler\nfrom asyncio import AbstractEventLoop, get_event_loop\nfrom typing import Optional, NoReturn\nfrom vkbottle.modules import logger\n+from typing import Union\nclass Bot(ABCFramework):\n@@ -21,7 +22,7 @@ class Bot(ABCFramework):\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCBotLabeler\"] = None,\n):\n- self.api = API(token) if token is not None else api # type: ignore\n+ self.api: Union[ABCAPI, API] = API(token) if token is not None else api # type: ignore\nself.loop_wrapper = loop_wrapper or LoopWrapper()\nself.labeler = labeler or BotLabeler()\nself.state_dispenser = BuiltinStateDispenser()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "-from .dev_tools import (\n- ABCStorage,\n- CtxStorage,\n- BaseContext,\n- LoopWrapper,\n- DelayedTask,\n- BotTypes,\n- message_min,\n- vkscript,\n- run_in_task,\n-)\n+from .dev_tools import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -2,5 +2,6 @@ from .storage import ABCStorage, CtxStorage\nfrom .loop_wrapper import LoopWrapper, DelayedTask\nfrom .ctx_tool import BaseContext\nfrom .mini_types import BotTypes, message_min\n+from .keyboard import *\nfrom .vkscript_converter import vkscript\nfrom .utils import run_in_task\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/keyboard/__init__.py",
"diff": "+from .keyboard import Keyboard, KeyboardButtonColor\n+from .action import *\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/keyboard/action.py",
"diff": "+from abc import ABC\n+from typing import Optional, Union\n+\n+Payload = Union[str, dict]\n+\n+\n+class ABCAction(ABC):\n+ type: str\n+\n+ def get_data(self) -> dict:\n+ data = vars(self)\n+ data[\"type\"] = self.type\n+ return data\n+\n+\n+class Text(ABCAction):\n+ type = \"text\"\n+\n+ def __init__(self, label: str, payload: Optional[Payload] = None):\n+ self.label = label\n+ self.payload = payload\n+\n+\n+class OpenLink(ABCAction):\n+ type = \"open_link\"\n+\n+ def __init__(self, link: str, label: str, payload: Optional[Payload] = None):\n+ self.link = link\n+ self.label = label\n+ self.payload = payload\n+\n+\n+class Location(ABCAction):\n+ type = \"location\"\n+\n+ def __init__(self, payload: Optional[Payload] = None):\n+ self.payload = payload\n+\n+\n+class VKPay(ABCAction):\n+ type = \"vkpay\"\n+\n+ def __init__(self, payload: Optional[Payload] = None, hash: Optional[str] = None):\n+ self.payload = payload\n+ self.hash = hash\n+\n+\n+class VKApps(ABCAction):\n+ type = \"open_app\"\n+\n+ def __init__(\n+ self,\n+ app_id: int,\n+ owner_id: int,\n+ payload: Optional[Payload] = None,\n+ label: Optional[str] = None,\n+ hash: Optional[str] = None,\n+ ):\n+ self.app_id = app_id\n+ self.owner_id = owner_id\n+ self.payload = payload\n+ self.label = label\n+ self.hash = hash\n+\n+\n+class Callback(ABCAction):\n+ type = \"callback\"\n+\n+ def __init__(self, label: str, payload: str):\n+ self.label = label\n+ self.payload = payload\n+\n+\n+__all__ = (\n+ \"ABCAction\",\n+ \"Text\",\n+ \"OpenLink\",\n+ \"Location\",\n+ \"VKApps\",\n+ \"Callback\",\n+)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"diff": "+from .color import KeyboardButtonColor\n+from .action import ABCAction\n+from typing import Optional\n+\n+\n+class KeyboardButton:\n+ def __init__(self, action: ABCAction, color: Optional[KeyboardButtonColor] = None):\n+ self.action = action\n+ self.color = color\n+\n+ def get_data(self) -> dict:\n+ data = {\"action\": self.action.get_data()}\n+ if self.action.type == \"text\" and self.color:\n+ data[\"color\"] = self.color.value\n+ return data\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/keyboard/color.py",
"diff": "+from enum import Enum\n+\n+\n+class KeyboardButtonColor(Enum):\n+ PRIMARY = \"primary\"\n+ SECONDARY = \"secondary\"\n+ NEGATIVE = \"negative\"\n+ POSITIVE = \"positive\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/keyboard/keyboard.py",
"diff": "+from vkbottle.modules import json\n+from .button import KeyboardButton, KeyboardButtonColor\n+from .action import ABCAction\n+from typing import List, Optional\n+\n+\n+class Keyboard:\n+ def __init__(self, one_time: bool = False, inline: bool = False):\n+ self.one_time = one_time\n+ self.inline = inline\n+ self.buttons: List[List[KeyboardButton]] = []\n+\n+ def row(self) -> \"Keyboard\":\n+ if len(self.buttons) and not len(self.buttons[-1]):\n+ raise RuntimeError(\"Last row is empty!\")\n+ self.buttons.append([])\n+ return self\n+\n+ def add(self, action: ABCAction, color: Optional[KeyboardButtonColor] = None) -> \"Keyboard\":\n+ if not len(self.buttons):\n+ self.row()\n+ button = KeyboardButton(action, color)\n+ self.buttons[-1].append(button)\n+ return self\n+\n+ def get_json(self) -> str:\n+ return json.dumps(\n+ {\n+ \"one_time\": self.one_time,\n+ \"inline\": self.inline,\n+ \"buttons\": [[button.get_data() for button in row] for row in self.buttons],\n+ }\n+ )\n+\n+ def __str__(self) -> str:\n+ return self.get_json()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add keyboard generator
|
718,838 |
26.10.2020 13:31:51
| -10,800 |
6330989869b793374b981a0ce568458ba866cc21
|
add raw event
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -27,7 +27,7 @@ python = \"^3.7\"\naiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\n-vkbottle-types = \"^0.1.16\"\n+vkbottle-types = \"^0.1.17\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "from vkbottle_types import GroupTypes, BaseStateGroup, StatePeer\n+from vkbottle_types.events import GroupEventType\nfrom vkbottle.tools.dev_tools.vkscript_converter import vkscript\nfrom .api import (\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/__init__.py",
"new_path": "vkbottle/dispatch/views/__init__.py",
"diff": "from .abc import ABCView\n-from .bot import MessageView\n+from .bot import MessageView, RawEventView, HandlerBasement\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/__init__.py",
"new_path": "vkbottle/dispatch/views/bot/__init__.py",
"diff": "from .message import MessageView\n+from .raw import RawEventView, HandlerBasement\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -50,19 +50,17 @@ class MessageView(ABCView):\nif result is False:\ncontinue\n- elif not isinstance(result, dict):\n- result = {}\n- handler_response = await handler.handle(message, **result, **context_variables)\n+ elif isinstance(result, dict):\n+ context_variables.update(result)\n+\n+ handler_response = await handler.handle(message, **context_variables)\nhandle_responses.append(handler_response)\nreturn_handler = self.handler_return_manager.get_handler(handler_response)\nif return_handler is not None:\nawait return_handler(\n- self.handler_return_manager,\n- handler_response,\n- message,\n- {**result, **context_variables},\n+ self.handler_return_manager, handler_response, message, context_variables\n)\nif handler.blocking:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "+from typing import Any, List, Dict, NamedTuple, Type\n+\n+from vkbottle_types.events import GroupEventType, BaseGroupEvent\n+\n+from vkbottle.api.abc import ABCAPI\n+from vkbottle.dispatch.handlers import ABCHandler\n+from vkbottle.dispatch.middlewares import BaseMiddleware, MiddlewareResponse\n+from vkbottle.dispatch.return_manager.bot import BotMessageReturnHandler\n+from vkbottle.dispatch.dispenser.abc import ABCStateDispenser\n+from vkbottle.modules import logger\n+from ..abc import ABCView\n+\n+\n+HandlerBasement = NamedTuple(\n+ \"HandlerBasement\", [(\"dataclass\", Type[BaseGroupEvent]), (\"handler\", ABCHandler)]\n+)\n+\n+\n+class RawEventView(ABCView):\n+ def __init__(self):\n+ self.handlers: Dict[GroupEventType, HandlerBasement] = {}\n+ self.middlewares: List[\"BaseMiddleware\"] = []\n+ self.handler_return_manager = BotMessageReturnHandler()\n+\n+ async def process_event(self, event: dict) -> bool:\n+ if GroupEventType(event[\"type\"]) in self.handlers:\n+ return True\n+\n+ async def handle_event(\n+ self, event: dict, ctx_api: \"ABCAPI\", state_dispenser: \"ABCStateDispenser\"\n+ ) -> Any:\n+ logger.debug(\"Handling event ({}) with message view\".format(event.get(\"event_id\")))\n+\n+ handler_basement = self.handlers[GroupEventType(event[\"type\"])]\n+ context_variables = {}\n+\n+ event_model = handler_basement.dataclass(**event)\n+ setattr(event_model, \"unprepared_ctx_api\", ctx_api)\n+\n+ for middleware in self.middlewares:\n+ response = await middleware.pre(event_model)\n+ if response == MiddlewareResponse(False):\n+ return []\n+ elif isinstance(response, dict):\n+ context_variables.update(response)\n+\n+ result = await handler_basement.handler.filter(event_model)\n+ logger.debug(\"Handler {} returned {}\".format(handler_basement.handler, result))\n+\n+ if result is False:\n+ return\n+\n+ elif isinstance(result, dict):\n+ context_variables.update(result)\n+\n+ handler_response = await handler_basement.handler.handle(event_model, **context_variables)\n+\n+ return_handler = self.handler_return_manager.get_handler(handler_response)\n+ if return_handler is not None:\n+ await return_handler(\n+ self.handler_return_manager,\n+ handler_response,\n+ event_model,\n+ {**result, **context_variables},\n+ )\n+\n+ for middleware in self.middlewares:\n+ await middleware.post(event_model, self, [handler_response])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_error.py",
"new_path": "vkbottle/exception_factory/code_error.py",
"diff": "@@ -53,7 +53,4 @@ class CodeErrorFactory(ABCExceptionFactory):\nreturn f\"{cls.__name__}_{code}\"\ndef __str__(self):\n- return (\n- f\"\\n\\t[{self.code}] {self.error_description}\\n\"\n- f\"\\tTip: Use Error({self.code}) to catch exception built in CodeErrorFactory\"\n- )\n+ return f\"[{self.code}] {self.error_description}\\n\"\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\n-from typing import Callable, Any, Dict, Type, List\n+from typing import Callable, Any, Dict, Type, List, Union\nfrom vbml import Patcher\n@@ -26,6 +26,7 @@ from vkbottle.dispatch.rules.bot import (\nfrom vkbottle.tools.dev_tools.mini_types.bot.message import MessageMin\nLabeledMessageHandler = Callable[..., Callable[[MessageMin], Any]]\n+LabeledHandler = Callable[..., Callable[[Any], Any]]\nDEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"from_chat\": PeerRule,\n@@ -66,6 +67,16 @@ class ABCBotLabeler(ABC):\ndef private_message(self, *rules: \"ABCRule\", **custom_rules) -> LabeledMessageHandler:\npass\n+ @abstractmethod\n+ def raw_event(\n+ self,\n+ event: Union[str, List[str]],\n+ dataclass: Callable = dict,\n+ *rules: \"ABCRule\",\n+ **custom_rules,\n+ ) -> LabeledHandler:\n+ pass\n+\n@abstractmethod\ndef views(self) -> Dict[str, \"ABCView\"]:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "from vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule, bot\n-from vkbottle.dispatch.views import MessageView, ABCView\n-from .abc import ABCBotLabeler, LabeledMessageHandler\n-from typing import Dict\n+from vkbottle.dispatch.views import MessageView, ABCView, RawEventView, HandlerBasement\n+from .abc import ABCBotLabeler, LabeledMessageHandler, LabeledHandler\n+from typing import Dict, Union, List, Callable\nclass BotLabeler(ABCBotLabeler):\ndef __init__(self):\n- self.message_view: MessageView = MessageView()\n+ self.message_view = MessageView()\n+ self.raw_event_view = RawEventView()\ndef message(\nself, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n@@ -56,9 +57,30 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\n+ def raw_event(\n+ self,\n+ event: Union[str, List[str]],\n+ dataclass: Callable = dict,\n+ *rules: \"ABCRule\",\n+ **custom_rules,\n+ ) -> LabeledHandler:\n+ if not isinstance(event, list):\n+ event = [event]\n+\n+ def decorator(func):\n+ for e in event:\n+ self.raw_event_view.handlers[e] = HandlerBasement(\n+ dataclass, FromFuncHandler(func, *rules, *self.get_custom_rules(custom_rules)),\n+ )\n+ return func\n+\n+ return decorator\n+\ndef load(self, labeler: \"BotLabeler\"):\nself.message_view.handlers.extend(labeler.message_view.handlers)\nself.message_view.middlewares.extend(labeler.message_view.middlewares)\n+ self.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\n+ self.raw_event_view.middlewares.extend(labeler.raw_event_view.middlewares)\ndef views(self) -> Dict[str, \"ABCView\"]:\n- return {\"message\": self.message_view}\n+ return {\"message\": self.message_view, \"raw\": self.raw_event_view}\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": "@@ -6,6 +6,7 @@ from typing import Optional, Any, List, Union\nclass MessageMin(MessagesMessage):\n+ group_id: Optional[int] = None\nclient_info: Optional[\"MessagesClientInfo\"] = None\nunprepared_ctx_api: Optional[Any] = None\nstate_peer: Optional[StatePeer] = None\n@@ -49,7 +50,9 @@ MessageMin.update_forward_refs()\ndef message_min(event: dict, ctx_api: \"ABCAPI\") -> \"MessageMin\":\nupdate = MessageNew(**event)\nmessage = MessageMin(\n- **update.object.message.dict(), client_info=update.object.client_info.dict(),\n+ **update.object.message.dict(),\n+ client_info=update.object.client_info.dict(),\n+ group_id=update.group_id,\n)\nsetattr(message, \"unprepared_ctx_api\", ctx_api)\nreturn message\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add raw event
|
718,838 |
04.11.2020 23:53:34
| -10,800 |
064acdb0965fd42264bd49d6afb5bd2b5ff4d236
|
more tests; coverage 70%
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "-from vkbottle import Bot, API\n+from vkbottle import Bot, API, GroupTypes, GroupEventType\n+from vkbottle.bot import Message\nfrom vkbottle.tools.test_utils import with_mocked_api, MockedClient\nimport pytest\nimport typing\n@@ -23,6 +24,29 @@ EXAMPLE_EVENT = {\n\"comments\": {\"count\": 0},\n},\n\"group_id\": 123456,\n+ },\n+ {\n+ \"type\": \"message_new\",\n+ \"object\": {\n+ \"client_info\": {\n+ \"button_actions\": [\n+ \"text\",\n+ \"vkpay\",\n+ \"open_app\",\n+ \"location\",\n+ \"open_link\",\n+ \"callback\"\n+ ],\n+ \"keyboard\": True,\n+ \"inline_keyboard\": True,\n+ \"carousel\": False,\n+ \"lang_id\": 0\n+ },\n+ \"message\": {\n+ \"id\": 100,\n+ \"from_id\": 1,\n+ }\n+ }\n}\n],\n}\n@@ -41,10 +65,23 @@ async def test_bot_polling():\nreturn {\"response\": {\"ts\": 1, \"server\": \"!SERVER!\", \"key\": \"\"}}\nelif \"!SERVER!\" in data[\"url\"]:\nreturn EXAMPLE_EVENT\n+ elif \"messages.send\" in data[\"url\"]:\n+ return json.dumps({\"response\": 100})\nbot = Bot(\"token\")\nset_http_callback(bot.api, callback)\n+ @bot.labeler.raw_event(GroupEventType.WALL_POST_NEW, GroupTypes.WallPostNew)\n+ async def wall_post_handler(post: GroupTypes.WallPostNew):\n+ assert post.object.owner_id == -123456\n+ assert post.ctx_api == bot.api\n+\n+ @bot.labeler.message()\n+ async def message_handler(message: Message):\n+ assert message.id == 100\n+ assert message.from_id == 1\n+ assert await message.answer() == 100\n+\nasync for event in bot.polling.listen():\nassert event.get(\"updates\")\nfor update in event[\"updates\"]:\n"
},
{
"change_type": "RENAME",
"old_path": "tests/labeler_test.py",
"new_path": "tests/flows_test.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -5,3 +5,4 @@ from .mini_types import BotTypes, message_min\nfrom .keyboard import *\nfrom .vkscript_converter import vkscript\nfrom .utils import run_in_task\n+from . import auth\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
more tests; coverage 70%
|
718,883 |
05.11.2020 14:14:03
| -18,000 |
ffa5971fbaa02ba050d7d7fcba27a6e50460e61f
|
StickerRule improvement
empty sticker_ids list handles all stickers
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -63,7 +63,7 @@ class VBMLRule(ABCMessageRule):\nclass StickerRule(ABCMessageRule):\n- def __init__(self, sticker_ids: Union[List[int], int]):\n+ def __init__(self, sticker_ids: Union[List[int], int] = None):\nif isinstance(sticker_ids, int):\nsticker_ids = [sticker_ids]\nself.sticker_ids = sticker_ids\n@@ -73,6 +73,10 @@ class StickerRule(ABCMessageRule):\nreturn False\nelif not message.attachments[0].sticker:\nreturn False\n+ else:\n+ if self.sticker_ids is None:\n+ if message.attachments[0].sticker.sticker_id:\n+ return True\nelif message.attachments[0].sticker.sticker_id in self.sticker_ids:\nreturn True\nreturn False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
StickerRule improvement (#248)
empty sticker_ids list handles all stickers
|
718,838 |
05.11.2020 15:32:56
| -10,800 |
dd9a09c7eb22ed3e1867d888cdaefd8d5f483325
|
add keyboard docs; fix keyboard json gen;
coverage +5%
|
[
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "+ [Accessing Polling](low-level/polling/polling.md)\n* [Tools](tools/index.md)\n* [Storages](tools/storage.md)\n+ * [Keyboard](tools/keyboard.md)\n* [VKScript](tools/vkscript.md)\n* [Loop Wrapper](tools/loop-wrapper.md)\n* [Auth Flows](tools/auth.md)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "from vkbottle import Bot, API, GroupTypes, GroupEventType\n-from vkbottle.bot import Message\n+from vkbottle.bot import Message, rules\nfrom vkbottle.tools.test_utils import with_mocked_api, MockedClient\n+from vkbottle.tools.dev_tools import message_min\nimport pytest\n+import vbml\nimport typing\nimport json\n@@ -96,3 +98,19 @@ async def test_bot_scopes():\nassert bot.api == bot.polling.api\nassert bot.labeler.message_view is bot.router.views[\"message\"]\nassert bot.labeler.raw_event_view is bot.router.views[\"raw\"]\n+\n+\n+def fake_message(ctx_api: API, **data: typing.Any) -> Message:\n+ return message_min({\"object\": {\"message\": data, \"client_info\": data.get(\"client_info\", EXAMPLE_EVENT[\"updates\"][1][\"object\"][\"client_info\"])}}, ctx_api)\n+\n+\n+@pytest.mark.asyncio\n+@with_mocked_api(None)\n+async def test_rules(api: API):\n+ assert await rules.FromPeerRule(123).check(fake_message(api, peer_id=123))\n+ assert not await rules.FromUserRule().check(fake_message(api, from_id=-1))\n+ assert await rules.VBMLRule(\"i am in love with <whom>\", vbml.Patcher()).check(fake_message(api, text=\"i am in love with you\")) == {\"whom\": \"you\"}\n+ assert await rules.FuncRule(lambda m: m.text.endswith(\"!\")).check(fake_message(api, text=\"yes!\"))\n+ assert not await rules.PeerRule(from_chat=True).check(fake_message(api, peer_id=1, from_id=1))\n+ assert await rules.PayloadMapRule([(\"a\", int), (\"b\", str)]).check(fake_message(api, payload=json.dumps({\"a\": 1, \"b\": \"\"})))\n+ assert await rules.StickerRule(sticker_ids=[1, 2]).check(fake_message(api, attachments=[{\"type\": \"sticker\", \"sticker\": {\"sticker_id\": 2}}]))\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/tools_test.py",
"diff": "+from vkbottle.tools import Keyboard, KeyboardButtonColor, Text, Callback, CtxStorage, LoopWrapper\n+\n+KEYBOARD_JSON = ('{\"one_time\":true,\"inline\":false,\"buttons\":[[{\"action\":'\n+ '{\"label\":\"I love nuggets\",\"payload\":{\"love\":\"nuggets\"},'\n+ '\"type\":\"text\"}}],[{\"action\":{\"label\":\"Eat nuggets\",'\n+ '\"payload\":{\"eat\":\"nuggets\"},\"type\":\"callback\"}}]]}')\n+\n+ctx_storage = CtxStorage()\n+\n+\n+class MockedLoop:\n+ @staticmethod\n+ def create_task(task):\n+ ctx_storage.set(\"checked-test-lw-create-task\", task.__name__)\n+\n+ @staticmethod\n+ def run_until_complete(task):\n+ c = ctx_storage.get(\"checked-test-lw-run-until-complete\") or []\n+ ctx_storage.set(\"checked-test-lw-run-until-complete\", [*c, task.__name__])\n+\n+ @staticmethod\n+ def run_forever():\n+ ctx_storage.set(\"checked-test-lw-run-forever\", True)\n+\n+ @staticmethod\n+ def is_running():\n+ return False\n+\n+\n+def test_keyboard_non_builder():\n+ keyboard = Keyboard(one_time=True)\n+ keyboard.add(Text(\"I love nuggets\", {\"love\": \"nuggets\"}))\n+ keyboard.row()\n+ keyboard.add(Callback(\"Eat nuggets\", {\"eat\": \"nuggets\"}), color=KeyboardButtonColor.POSITIVE)\n+ assert keyboard.get_json() == KEYBOARD_JSON\n+\n+\n+def test_keyboard_builder():\n+ assert (Keyboard(one_time=True)\n+ .add(Text(\"I love nuggets\", {\"love\": \"nuggets\"}))\n+ .row()\n+ .add(Callback(\"Eat nuggets\", {\"eat\": \"nuggets\"}), color=KeyboardButtonColor.POSITIVE)\n+ .get_json()) == KEYBOARD_JSON\n+\n+def test_loop_wrapper():\n+ async def task1(): pass\n+ async def task2(): pass\n+ async def task3(): pass\n+\n+ lw = LoopWrapper(tasks=[task1])\n+ lw.on_startup.append(task2)\n+ lw.on_shutdown.append(task3)\n+\n+ lw.run_forever(MockedLoop())\n+\n+ assert ctx_storage.get(\"checked-test-lw-create-task\") == task1.__name__\n+ assert ctx_storage.get(\"checked-test-lw-run-until-complete\") == [task2.__name__, task3.__name__]\n+ assert ctx_storage.get(\"checked-test-lw-run-forever\")\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/vkscript_converter_test.py",
"new_path": "tests/vkscript_converter_test.py",
"diff": "from vkbottle import vkscript\n-VKSCRIPT = \"var a=%A%;var some_list=[];while(a<100){API.users.get({user_id:a});a = a + 1;};return some_list;\"\n+BASIC_CYCLE = \"var a=%A%;var some_list=[];while(a<100){API.users.get({user_id:a});a = a + 1;};return some_list;\"\n@vkscript\n-def my_execute_code(api, a: int = 10):\n+def basic_cycle(api, a: int = 10):\nsome_list = []\nwhile a < 100:\napi.users.get(user_id=a)\n@@ -12,6 +12,18 @@ def my_execute_code(api, a: int = 10):\nreturn some_list\n+@vkscript\n+def types(api):\n+ a = 5.1\n+ b = 5 * a\n+ results = [b, b - 2]\n+ for i in results:\n+ results.append(i ** 2)\n+ results.pop()\n+ return results\n+\n+\ndef test_vkscript():\n- assert my_execute_code(a=10) == VKSCRIPT.replace(\"%A%\", \"10\")\n- assert my_execute_code(a=94) == VKSCRIPT.replace(\"%A%\", \"94\")\n+ assert basic_cycle(a=10) == BASIC_CYCLE.replace(\"%A%\", \"10\")\n+ assert basic_cycle(a=94) == BASIC_CYCLE.replace(\"%A%\", \"94\")\n+ assert types()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -88,4 +88,4 @@ class API(ABCAPI, APICategories):\nreturn self\ndef __repr__(self) -> str:\n- return f\"<API token={self.token[:5]}...>\"\n+ return f\"<API token={self.token[:5] if self.token else '?'}...>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/request_rescheduler/blocking.py",
"new_path": "vkbottle/api/request_rescheduler/blocking.py",
"diff": "@@ -34,5 +34,5 @@ class BlockingRequestRescheduler(ABCRequestRescheduler):\nattempt_number += 1\nlogger.debug(f\"Attempt succeed? - {isinstance(recent_response, dict)}\")\n- logger.info(f\"Finally succeed after {self.delay ^ attempt_number} seconds\")\n+ logger.info(f\"Finally succeed after {self.delay ** attempt_number} seconds\")\nreturn recent_response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "@@ -36,10 +36,10 @@ class RawEventView(ABCView):\nevent_model = handler_basement.dataclass(**event)\n- if not hasattr(event_model, \"unprepared_ctx_api\"):\n- setattr(event_model, \"unprepared_ctx_api\", ctx_api)\n- elif isinstance(event_model, dict):\n+ if isinstance(event_model, dict):\nevent_model[\"ctx_api\"] = ctx_api\n+ else:\n+ setattr(event_model, \"unprepared_ctx_api\", ctx_api)\nfor middleware in self.middlewares:\nresponse = await middleware.pre(event_model)\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": "@@ -39,12 +39,12 @@ class ErrorHandler(ABCErrorHandler):\nreturn decorator\n- def call_handler(\n+ async def call_handler(\nself, handler: ExceptionHandler, e: BaseException, *args, **kwargs\n) -> typing.Awaitable[typing.Any]:\nif self.redirect_arguments:\n- return handler(e, *args, **kwargs) # type: ignore\n- return handler(e) # type: ignore\n+ return await handler(e, *args, **kwargs) # type: ignore\n+ return await handler(e) # type: ignore\ndef wraps_error_handler(\nself,\n@@ -56,7 +56,7 @@ class ErrorHandler(ABCErrorHandler):\ntry:\nreturn await func(*args, **kwargs)\nexcept BaseException as e:\n- return self.handle(e, *args, **kwargs)\n+ return await self.handle(e, *args, **kwargs)\nreturn wrapper\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/__init__.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/__init__.py",
"diff": "from .keyboard import Keyboard, KeyboardButtonColor\nfrom .action import *\n+\n+EMPTY_KEYBOARD = Keyboard().get_json()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/keyboard.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/keyboard.py",
"diff": "@@ -24,7 +24,7 @@ class Keyboard:\nreturn self\ndef get_json(self) -> str:\n- return json.dumps(\n+ data = json.dumps(\n{\n\"one_time\": self.one_time,\n\"inline\": self.inline,\n@@ -32,5 +32,9 @@ class Keyboard:\n}\n)\n+ if isinstance(data, bytes):\n+ return data.decode(\"utf-8\")\n+ return data.encode(\"utf-8\").decode(\"utf-8\")\n+\ndef __str__(self) -> str:\nreturn self.get_json()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev_tools/vkscript_converter/definitions.py",
"diff": "@@ -8,6 +8,7 @@ import random\nCALL_REPLACEMENTS = {\n\"append\": \"push\",\n+ \"pop\": \"pop\",\n}\nCALL_STRING = [\"join\", \"strip\", \"split\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/test_utils.py",
"new_path": "vkbottle/tools/test_utils.py",
"diff": "@@ -4,6 +4,7 @@ from typing import Any, Optional, NoReturn, Callable\nclass MockedClient(ABCHTTPClient):\ndef __init__(self, return_value: Optional[Any] = None, callback: Optional[Callable] = None):\n+ super().__init__()\nself.return_value = return_value\nself.callback = callback or (lambda data: None)\n@@ -32,7 +33,7 @@ def with_mocked_api(return_value: Any):\ndef decorator(func: Any):\nasync def wrapper(*args, **kwargs):\n- api = API(None)\n+ api = API(\"token\")\napi.http._session = MockedClient(return_value)\nreturn await func(*args, **kwargs, api=api)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add keyboard docs; fix keyboard json gen;
coverage +5%
|
718,838 |
05.11.2020 22:20:24
| -10,800 |
d2f1a45c902fbd07ee73dec16b8720293ed0c2bf
|
fix attachment type rule; add comments to examples; add filter shorten feature
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/blueprint.py",
"new_path": "examples/high-level/blueprint.py",
"diff": "@@ -3,6 +3,13 @@ from .blueprints import bps\nimport logging\nimport os\n+# You should provide API to bot before\n+# constructing blueprints otherwise they won't\n+# have it, API is not needed if you are not\n+# requested to use it outside of handlers and\n+# cannot be passed to blueprint if you use\n+# multibot. Read the docs at\n+# > high-level/bot/blueprint\nbot = Bot(os.environ[\"token\"])\nlogging.basicConfig(level=logging.INFO)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/low-level/error_handler_example.py",
"new_path": "examples/low-level/error_handler_example.py",
"diff": "@@ -3,6 +3,12 @@ import asyncio\nerror_handler = ErrorHandler()\n+# You can set redirect_arguments to error_handler and they\n+# will be passed after exception to exception handler\n+# ---\n+# async def f(a, b): raise RuntimeError\n+# async def exc_h(exc: RuntimeError, a, b): ...\n+\nasync def exc_handler(exc: RuntimeError):\nprint(\"Oops error:\", exc)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -65,6 +65,7 @@ class VBMLRule(ABCMessageRule):\nclass StickerRule(ABCMessageRule):\ndef __init__(self, sticker_ids: Union[List[int], int] = None):\n+ sticker_ids = sticker_ids or []\nif isinstance(sticker_ids, int):\nsticker_ids = [sticker_ids]\nself.sticker_ids = sticker_ids\n@@ -104,7 +105,7 @@ class AttachmentTypeRule(ABCMessageRule):\nif not message.attachments:\nreturn False\nfor attachment in message.attachments:\n- if attachment.type not in self.attachment_types:\n+ if attachment.type.value not in self.attachment_types:\nreturn False\nreturn True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "-from typing import Dict, Union, List, Callable\n+from typing import Dict, Union, List, Callable, Tuple, Set\nfrom vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule, bot\nfrom vkbottle.dispatch.views import MessageView, ABCView, RawEventView, HandlerBasement\n+from vkbottle.tools.dev_tools.utils import convert_shorten_filter\nfrom .abc import ABCBotLabeler, LabeledMessageHandler, LabeledHandler\n+ShortenRule = Union[ABCRule, Tuple[ABCRule, ...], Set[ABCRule]]\n+\n+\nclass BotLabeler(ABCBotLabeler):\ndef __init__(self):\nself.message_view = MessageView()\nself.raw_event_view = RawEventView()\ndef message(\n- self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n+ self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\n- func, *rules, *self.get_custom_rules(custom_rules), blocking=blocking\n+ func,\n+ *map(convert_shorten_filter, rules),\n+ *self.get_custom_rules(custom_rules),\n+ blocking=blocking,\n)\n)\nreturn func\n@@ -25,14 +32,14 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef chat_message(\n- self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n+ self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\nbot.PeerRule(True),\n- *rules,\n+ *map(convert_shorten_filter, rules),\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n)\n@@ -42,14 +49,14 @@ class BotLabeler(ABCBotLabeler):\nreturn decorator\ndef private_message(\n- self, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n+ self, *rules: ShortenRule, blocking: bool = True, **custom_rules\n) -> LabeledMessageHandler:\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\nfunc,\nbot.PeerRule(False),\n- *rules,\n+ *map(convert_shorten_filter, rules),\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n)\n@@ -62,7 +69,7 @@ class BotLabeler(ABCBotLabeler):\nself,\nevent: Union[str, List[str]],\ndataclass: Callable = dict,\n- *rules: \"ABCRule\",\n+ *rules: ShortenRule,\n**custom_rules,\n) -> LabeledHandler:\nif not isinstance(event, list):\n@@ -71,7 +78,12 @@ class BotLabeler(ABCBotLabeler):\ndef decorator(func):\nfor e in event:\nself.raw_event_view.handlers[e] = HandlerBasement(\n- dataclass, FromFuncHandler(func, *rules, *self.get_custom_rules(custom_rules)),\n+ dataclass,\n+ FromFuncHandler(\n+ func,\n+ *map(convert_shorten_filter, rules),\n+ *self.get_custom_rules(custom_rules),\n+ ),\n)\nreturn func\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -4,5 +4,5 @@ from .keyboard import *\nfrom .loop_wrapper import LoopWrapper, DelayedTask\nfrom .mini_types import BotTypes, message_min\nfrom .storage import ABCStorage, CtxStorage\n-from .utils import run_in_task\n+from .utils import run_in_task, convert_shorten_filter\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "from asyncio import get_running_loop\n-from typing import Coroutine, NoReturn\n+from typing import Coroutine, NoReturn, Union, Tuple, Set\n+from vkbottle.dispatch.rules import ABCRule\n+from vkbottle.dispatch.filter import AndFilter, OrFilter\n# This feature is not used in production\n# but can be useful for customization\n# purposes\ndef run_in_task(coroutine: Coroutine) -> NoReturn:\n+ \"\"\" Gets loop and runs add makes task from the given coroutine \"\"\"\nloop = get_running_loop()\nloop.create_task(coroutine)\n+\n+\n+def convert_shorten_filter(shorten: Union[ABCRule, Tuple[ABCRule, ...], Set[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"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix attachment type rule; add comments to examples; add filter shorten feature
|
718,838 |
05.11.2020 23:03:26
| -10,800 |
e0049aaebb467c52d74568c46a98f0205d4c0728
|
improve docs, readme
+ test
|
[
{
"change_type": "MODIFY",
"old_path": "mkdocs.yml",
"new_path": "mkdocs.yml",
"diff": "@@ -13,6 +13,6 @@ theme:\nlanguage: ru\npalette:\nscheme: preference\n- primary: blue grey\n- accent: deep orange\n+ primary: black\n+ accent: blue\nfont: Roboto Mono\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "-from vkbottle import Bot, API, GroupTypes, GroupEventType\n+from vkbottle import Bot, API, GroupTypes, GroupEventType, AndFilter, OrFilter\nfrom vkbottle.bot import Message, rules\nfrom vkbottle.tools.test_utils import with_mocked_api, MockedClient\nfrom vkbottle.tools.dev_tools import message_min\n@@ -129,3 +129,10 @@ async def test_rules(api: API):\nassert await rules.StickerRule(sticker_ids=[1, 2]).check(\nfake_message(api, attachments=[{\"type\": \"sticker\", \"sticker\": {\"sticker_id\": 2}}])\n)\n+\n+ assert await AndFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\n+ fake_message(api, peer_id=123)\n+ ) is not False\n+ assert await OrFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\n+ fake_message(api, peer_id=1)\n+ ) is not False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
improve docs, readme
+ test
|
718,838 |
07.11.2020 13:08:03
| -10,800 |
9d1a7e49ab3e11a622c25e95bb438cb498088d0c
|
add ignore case for vbml; configs for custom rules
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/labeler_setup.py",
"new_path": "examples/high-level/labeler_setup.py",
"diff": "@@ -25,9 +25,9 @@ bot = Bot(os.environ[\"token\"])\n# vkbottle 2.x\n# This is first shortcut for VBMLRule from custom_rules\n-# <ignore_case = True> makes get_vbml_rule to add\n+# <vbml_ignore_case = True> makes get_vbml_rule to add\n# re.IGNORECASE to flags\n-bot.labeler.ignore_case = True\n+bot.labeler.vbml_ignore_case = True\n# You can add default flags if ignore case is False\n# <bot.labeler.default_flags = ...>\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 Union\n+from typing import Union, Type\nfrom vkbottle_types.events import BaseUserEvent, BaseGroupEvent\nclass ABCRule(ABC):\n+ config: dict\n+\n+ @classmethod\n+ def with_config(cls, config: dict) -> Type[\"ABCRule\"]:\n+ cls.config = config\n+ return cls\n+\n@abstractmethod\nasync def check(self, event: Union[BaseUserEvent, BaseGroupEvent]):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -24,7 +24,7 @@ class PeerRule(ABCMessageRule):\ndef __init__(self, from_chat: bool = True):\nself.from_chat = from_chat\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif message.peer_id != message.from_id:\nreturn self.from_chat\nreturn not self.from_chat\n@@ -35,7 +35,7 @@ class CommandRule(ABCMessageRule):\nself.prefixes = prefixes or DEFAULT_PREFIXES\nself.command_text = command_text\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nfor prefix in self.prefixes:\nif message.text == prefix + self.command_text:\nreturn True\n@@ -46,20 +46,22 @@ class VBMLRule(ABCMessageRule):\ndef __init__(\nself,\npattern: Union[str, \"vbml.Pattern\", List[Union[str, \"vbml.Pattern\"]]],\n- patcher: \"vbml.Patcher\",\n+ patcher: Optional[\"vbml.Patcher\"] = None,\nflags: Optional[re.RegexFlag] = None,\n):\n+ flags = flags or self.config.get(\"flags\")\n+\nif isinstance(pattern, str):\n- pattern = [vbml.Pattern(pattern, flags=flags)]\n+ pattern = [vbml.Pattern(pattern, flags=flags or self.config[\"flags\"])]\nelif isinstance(pattern, vbml.Pattern):\npattern = [pattern]\nelif isinstance(pattern, list):\npattern = [p if isinstance(p, vbml.Pattern) else vbml.Pattern(p) for p in pattern]\nself.patterns = pattern\n- self.patcher = patcher\n+ self.patcher = patcher or self.config[\"patcher\"]\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nfor pattern in self.patterns:\nresult = self.patcher.check(pattern, message.text)\nif result not in (None, False):\n@@ -93,7 +95,7 @@ class StickerRule(ABCMessageRule):\nsticker_ids = [sticker_ids]\nself.sticker_ids = sticker_ids\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif not message.attachments:\nreturn False\nelif not message.attachments[0].sticker:\n@@ -113,7 +115,7 @@ class FromPeerRule(ABCMessageRule):\npeer_ids = [peer_ids]\nself.peer_ids = peer_ids\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif message.peer_id in self.peer_ids:\nreturn True\n@@ -124,7 +126,7 @@ class AttachmentTypeRule(ABCMessageRule):\nattachment_types = [attachment_types]\nself.attachment_types = attachment_types\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif not message.attachments:\nreturn False\nfor attachment in message.attachments:\n@@ -162,7 +164,7 @@ class LevensteinRule(ABCMessageRule):\nreturn current_row[n]\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nfor levenstein_text in self.levenstein_texts:\nif self.distance(message.text, levenstein_text) <= self.max_distance:\nreturn True\n@@ -173,7 +175,7 @@ class MessageLengthRule(ABCMessageRule):\ndef __init__(self, min_length: int):\nself.min_length = min_length\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif len(message.text) >= self.min_length:\nreturn True\nreturn False\n@@ -185,7 +187,7 @@ class ChatActionRule(ABCMessageRule):\nchat_action_types = [chat_action_types]\nself.chat_action_types = chat_action_types\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif not message.action:\nreturn False\nelif message.action.type in self.chat_action_types:\n@@ -197,7 +199,7 @@ class PayloadRule(ABCMessageRule):\ndef __init__(self, payload: dict):\nself.payload = payload\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nreturn message.get_payload_json() == self.payload\n@@ -205,7 +207,7 @@ class PayloadContainsRule(ABCMessageRule):\ndef __init__(self, payload_particular_part: dict):\nself.payload_particular_part = payload_particular_part\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\npayload = message.get_payload_json(unpack_failure=lambda p: {})\nfor k, v in self.payload_particular_part.items():\nif payload.get(k) != v:\n@@ -217,7 +219,7 @@ class PayloadMapRule(ABCMessageRule):\ndef __init__(self, payload_map: List[Tuple[str, type]]):\nself.payload_map = payload_map\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\npayload = message.get_payload_json(unpack_failure=lambda p: {})\nfor (k, v_type) in self.payload_map:\nif k not in payload:\n@@ -231,7 +233,7 @@ class FromUserRule(ABCMessageRule):\ndef __init__(self, from_user: bool = True):\nself.from_user = from_user\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif message.from_id > 0:\nreturn True\nreturn False\n@@ -241,7 +243,7 @@ class FuncRule(ABCMessageRule):\ndef __init__(self, func: Union[Callable[[Message], Union[bool, Awaitable]]]):\nself.func = func\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif inspect.iscoroutinefunction(self.func):\nreturn await self.func(message) # type: ignore\nreturn self.func(message) # type: ignore\n@@ -251,7 +253,7 @@ class CoroutineRule(ABCMessageRule):\ndef __init__(self, coroutine: Coroutine):\nself.coro = coroutine\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nreturn await self.coro\n@@ -261,7 +263,7 @@ class StateRule(ABCMessageRule):\nstate = [state]\nself.state = state\n- async def check(self, message: Message) -> bool:\n+ async def check(self, message: Message) -> Union[dict, bool]:\nif message.state_peer is None:\nreturn False\nreturn message.state_peer.state in self.state\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "+import re\nfrom typing import Dict, Union, List, Callable, Tuple, Set, Any, Type\n+import vbml\n+\nfrom vkbottle.dispatch.handlers import FromFuncHandler\nfrom vkbottle.dispatch.rules import ABCRule\n-from vkbottle.dispatch.views import MessageView, ABCView, RawEventView, HandlerBasement\n-from vkbottle.tools.dev_tools.utils import convert_shorten_filter\n-from .abc import ABCBotLabeler, LabeledMessageHandler, LabeledHandler\n-\nfrom vkbottle.dispatch.rules.bot import (\nPeerRule,\nVBMLRule,\n@@ -25,10 +24,9 @@ from vkbottle.dispatch.rules.bot import (\nStateRule,\nRegexRule,\n)\n-\n-import re\n-import vbml\n-\n+from vkbottle.dispatch.views import MessageView, ABCView, RawEventView, HandlerBasement\n+from vkbottle.tools.dev_tools.utils import convert_shorten_filter\n+from .abc import ABCBotLabeler, LabeledMessageHandler, LabeledHandler\nShortenRule = Union[ABCRule, Tuple[ABCRule, ...], Set[ABCRule]]\nDEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n@@ -50,18 +48,65 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"coroutine\": CoroutineRule,\n\"state\": StateRule,\n\"regexp\": RegexRule,\n+ \"text\": VBMLRule,\n}\nclass BotLabeler(ABCBotLabeler):\n+ \"\"\" BotLabeler - shortcut manager for router\n+ Can be loaded to other BotLabeler\n+ >>> bl = BotLabeler()\n+ >>> ...\n+ >>> bl.load(BotLabeler())\n+ Views are fixed. Custom rules can be set locally (they are\n+ not inherited to other labelers). Rule config is accessible from\n+ all custom rules from ABCRule.config\n+ \"\"\"\n+\ndef __init__(self, **kwargs):\n+ # Default views are fixed in BotLabeler,\n+ # if you need to create your own implement\n+ # custom labeler\nself.message_view = MessageView()\nself.raw_event_view = RawEventView()\n- self.patcher = kwargs.get(\"patcher\") or vbml.Patcher()\n+\nself.custom_rules = kwargs.get(\"custom_rules\") or DEFAULT_CUSTOM_RULES\n- self.custom_rules[\"text\"] = lambda x: self.get_vbml_rule(self, x)\n- self.ignore_case = False\n- self.default_flags = re.MULTILINE\n+\n+ # Rule config is accessible from every single custom rule\n+ self.rule_config: Dict[str, Any] = {\n+ \"vbml_flags\": re.MULTILINE, # Flags for VBMLRule\n+ \"vbml_patcher\": vbml.Patcher(), # Patcher for VBMLRule\n+ }\n+\n+ @property\n+ def vbml_ignore_case(self) -> bool:\n+ \"\"\" Gets ignore case flag from rule config flags \"\"\"\n+ return re.IGNORECASE in self.rule_config[\"flags\"]\n+\n+ @vbml_ignore_case.setter\n+ def vbml_ignore_case(self, ignore_case: bool):\n+ \"\"\" Adds ignore case flag to rule config flags or removes it\n+ \"\"\"\n+ if not ignore_case:\n+ self.rule_config[\"flags\"] ^= re.IGNORECASE\n+ else:\n+ self.rule_config[\"flags\"] |= re.IGNORECASE\n+\n+ @property\n+ def vbml_patcher(self) -> vbml.Patcher:\n+ return self.rule_config[\"patcher\"]\n+\n+ @vbml_patcher.setter\n+ def vbml_patcher(self, patcher: vbml.Patcher):\n+ self.rule_config[\"patcher\"] = patcher\n+\n+ @property\n+ def vbml_flags(self) -> re.RegexFlag:\n+ return self.rule_config[\"flags\"]\n+\n+ @vbml_flags.setter\n+ def vbml_flags(self, flags: re.RegexFlag):\n+ self.rule_config[\"flags\"] = flags\ndef message(\nself, *rules: ShortenRule, blocking: bool = True, **custom_rules\n@@ -120,6 +165,7 @@ class BotLabeler(ABCBotLabeler):\n*rules: ShortenRule,\n**custom_rules,\n) -> LabeledHandler:\n+\nif not isinstance(event, list):\nevent = [event]\n@@ -143,21 +189,8 @@ class BotLabeler(ABCBotLabeler):\nself.raw_event_view.handlers.update(labeler.raw_event_view.handlers)\nself.raw_event_view.middlewares.extend(labeler.raw_event_view.middlewares)\n- @staticmethod\n- def get_vbml_rule(labeler: \"BotLabeler\", pattern: Any) -> \"VBMLRule\":\n- \"\"\" Cast a vbml rule with patcher and flags, needed to simplify\n- VBMLRule setup.\n- \"\"\"\n- return VBMLRule(\n- pattern,\n- labeler.patcher,\n- flags=(\n- labeler.default_flags if not labeler.ignore_case else re.MULTILINE | re.IGNORECASE\n- ),\n- )\n-\ndef get_custom_rules(self, custom_rules: Dict[str, Any]) -> List[\"ABCRule\"]:\n- return [self.custom_rules[k](v) for k, v in custom_rules.items()] # type: ignore\n+ return [self.custom_rules[k].with_config(self.rule_config)(v) for k, v in custom_rules.items()] # type: ignore\ndef views(self) -> Dict[str, \"ABCView\"]:\nreturn {\"message\": self.message_view, \"raw\": self.raw_event_view}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add ignore case for vbml; configs for custom rules
|
718,838 |
07.11.2020 14:15:59
| -10,800 |
3ed6255e909fe4d47c3a4963129acbbbedd22e16
|
add state dispenser example; fix state rule
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/labeler_setup.py",
"new_path": "examples/high-level/labeler_setup.py",
"diff": "@@ -54,6 +54,7 @@ class SpamState(BaseStateGroup):\nGOOD = 1\nBAD = 2\n+\n# Lets add some handlers\n@bot.on.chat_message(spam=[\"!\", \".\", \"?\", \"$\", \"#\", \"@\", \"%\"])\nasync def spam_handler(message: Message):\n@@ -75,4 +76,5 @@ async def forgive_handler(message: Message):\nawait bot.state_dispenser.set(message.from_id, SpamState.GOOD)\nreturn \"You are forgiven, my dear!\"\n+\nbot.run_forever()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/high-level/state_dispenser.py",
"diff": "+from vkbottle.bot import Bot, Message\n+from vkbottle import BaseStateGroup, Keyboard, Text\n+import os\n+\n+# Create a simple bot\n+bot = Bot(os.environ[\"token\"])\n+\n+# StateDispenser can be accessed / set with\n+# bot.state_dispenser\n+\n+# Lets make a group of states\n+# State group is IntEnum\n+class MenuState(BaseStateGroup):\n+ START = 1\n+ INFO = 2\n+\n+\n+@bot.on.private_message(state=None)\n+async def start_handler(message: Message):\n+ await message.answer(\n+ \"Hi! Welcome to the start menu, use menu buttons\",\n+ keyboard=(\n+ Keyboard()\n+ .add(Text(\"Info\", {\"cmd\": \"info\"}))\n+ .add(Text(\"Buy coffee\", {\"cmd\": \"buy\"}))\n+ .get_json()\n+ ),\n+ )\n+ await bot.state_dispenser.set(message.peer_id, MenuState.START)\n+\n+\n+@bot.on.private_message(state=MenuState.START, payload={\"cmd\": \"info\"})\n+async def info_handler(message: Message):\n+ await message.answer(\n+ \"What are you interested in?\",\n+ keyboard=(\n+ Keyboard()\n+ .add(Text(\"Books\", {\"item\": \"books\"}))\n+ .add(Text(\"Cinema\", {\"item\": \"cinema\"}))\n+ .add(Text(\"Undo\", {\"item\": \"undo\"}))\n+ .get_json()\n+ ),\n+ )\n+ await bot.state_dispenser.set(message.peer_id, MenuState.INFO)\n+\n+\n+@bot.on.private_message(state=MenuState.INFO, payload_map=[(\"item\", str)])\n+async def info_item_handler(message: Message):\n+ await message.answer(f\"Cool! I am too interested in {message.get_payload_json()['item']}!\")\n+ await start_handler(message)\n+\n+\n+@bot.on.private_message(state=MenuState.START, payload={\"cmd\": \"buy\"})\n+async def buy_handler(_):\n+ return \"Ok buy it here: https://example.com\"\n+\n+\n+bot.run_forever()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -265,7 +265,7 @@ class StateRule(ABCMessageRule):\nasync def check(self, message: Message) -> Union[dict, bool]:\nif message.state_peer is None:\n- return False\n+ return bool(self.state)\nreturn message.state_peer.state in self.state\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add state dispenser example; fix state rule
|
718,838 |
07.11.2020 14:23:36
| -10,800 |
32ad853c0f3c29706d2b641949520887db0ea9a5
|
add auto_rules; change names in config
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/abc.py",
"new_path": "vkbottle/dispatch/rules/abc.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle_types.events import BaseUserEvent, BaseGroupEvent\nclass ABCRule(ABC):\n- config: dict\n+ config: dict = {}\n@classmethod\ndef with_config(cls, config: dict) -> Type[\"ABCRule\"]:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -49,17 +49,17 @@ class VBMLRule(ABCMessageRule):\npatcher: Optional[\"vbml.Patcher\"] = None,\nflags: Optional[re.RegexFlag] = None,\n):\n- flags = flags or self.config.get(\"flags\")\n+ flags = flags or self.config.get(\"vbml_flags\")\nif isinstance(pattern, str):\n- pattern = [vbml.Pattern(pattern, flags=flags or self.config[\"flags\"])]\n+ pattern = [vbml.Pattern(pattern, flags=flags or self.config.get(\"vbml_flags\"))]\nelif isinstance(pattern, vbml.Pattern):\npattern = [pattern]\nelif isinstance(pattern, list):\npattern = [p if isinstance(p, vbml.Pattern) else vbml.Pattern(p) for p in pattern]\nself.patterns = pattern\n- self.patcher = patcher or self.config[\"patcher\"]\n+ self.patcher = patcher or self.config[\"vbml_patcher\"]\nasync def check(self, message: Message) -> Union[dict, bool]:\nfor pattern in self.patterns:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -71,6 +71,7 @@ class BotLabeler(ABCBotLabeler):\nself.raw_event_view = RawEventView()\nself.custom_rules = kwargs.get(\"custom_rules\") or DEFAULT_CUSTOM_RULES\n+ self.auto_rules: List[\"ABCRule\"] = []\n# Rule config is accessible from every single custom rule\nself.rule_config: Dict[str, Any] = {\n@@ -88,25 +89,25 @@ class BotLabeler(ABCBotLabeler):\n\"\"\" Adds ignore case flag to rule config flags or removes it\n\"\"\"\nif not ignore_case:\n- self.rule_config[\"flags\"] ^= re.IGNORECASE\n+ self.rule_config[\"vbml_flags\"] ^= re.IGNORECASE\nelse:\n- self.rule_config[\"flags\"] |= re.IGNORECASE\n+ self.rule_config[\"vbml_flags\"] |= re.IGNORECASE\n@property\ndef vbml_patcher(self) -> vbml.Patcher:\n- return self.rule_config[\"patcher\"]\n+ return self.rule_config[\"vbml_patcher\"]\n@vbml_patcher.setter\ndef vbml_patcher(self, patcher: vbml.Patcher):\n- self.rule_config[\"patcher\"] = patcher\n+ self.rule_config[\"vbml_patcher\"] = patcher\n@property\ndef vbml_flags(self) -> re.RegexFlag:\n- return self.rule_config[\"flags\"]\n+ return self.rule_config[\"vbml_flags\"]\n@vbml_flags.setter\ndef vbml_flags(self, flags: re.RegexFlag):\n- self.rule_config[\"flags\"] = flags\n+ self.rule_config[\"vbml_flags\"] = flags\ndef message(\nself, *rules: ShortenRule, blocking: bool = True, **custom_rules\n@@ -116,6 +117,7 @@ class BotLabeler(ABCBotLabeler):\nFromFuncHandler(\nfunc,\n*map(convert_shorten_filter, rules),\n+ *self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n)\n@@ -133,6 +135,7 @@ class BotLabeler(ABCBotLabeler):\nfunc,\nPeerRule(True),\n*map(convert_shorten_filter, rules),\n+ *self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n)\n@@ -150,6 +153,7 @@ class BotLabeler(ABCBotLabeler):\nfunc,\nPeerRule(False),\n*map(convert_shorten_filter, rules),\n+ *self.auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n)\n@@ -176,6 +180,7 @@ class BotLabeler(ABCBotLabeler):\nFromFuncHandler(\nfunc,\n*map(convert_shorten_filter, rules),\n+ *self.auto_rules,\n*self.get_custom_rules(custom_rules),\n),\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add auto_rules; change names in config
|
718,838 |
07.11.2020 17:18:06
| -10,800 |
30fb2b065e63ebf0a0ab10f5d12bfa8530241609
|
fix payload type hint for Callback button action
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/action.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/action.py",
"diff": "@@ -66,7 +66,7 @@ class VKApps(ABCAction):\nclass Callback(ABCAction):\ntype = \"callback\"\n- def __init__(self, label: str, payload: str):\n+ def __init__(self, label: str, payload: Payload):\nself.label = label\nself.payload = payload\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix payload type hint for Callback button action
|
718,838 |
07.11.2020 17:51:14
| -10,800 |
ac5dd085115745905588d7580f0ed16997a9154b
|
add schema keyboard generator; keyboard example
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/high-level/generate_keyboard.py",
"diff": "+from vkbottle import Keyboard, Text, KeyboardButtonColor\n+\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 <.get_json()> to make keyboard sendable\n+KEYBOARD_STANDARD = Keyboard(one_time=True, inline=False)\n+KEYBOARD_STANDARD.add(Text(\"Button 1\"), color=KeyboardButtonColor.POSITIVE)\n+KEYBOARD_STANDARD.add(Text(\"Button 2\"))\n+KEYBOARD_STANDARD.row()\n+KEYBOARD_STANDARD.add(Text(\"Button 3\"))\n+KEYBOARD_STANDARD = KEYBOARD_STANDARD.get_json()\n+\n+# add and row methods returns the instance of Keyboard\n+# so you can use it as builder\n+KEYBOARD_WITH_BUILDER = (\n+ Keyboard(one_time=True, inline=False)\n+ .add(Text(\"Button 1\"), color=KeyboardButtonColor.POSITIVE)\n+ .add(Text(\"Button 2\"))\n+ .row()\n+ .add(Text(\"Button 3\"))\n+ .get_json()\n+)\n+\n+# Schema is another way to create keyboard\n+# all fields except of color are read as action fields\n+KEYBOARD_WITH_SCHEMA = (\n+ Keyboard(one_time=True, inline=False)\n+ .schema(\n+ [\n+ [\n+ {\"label\": \"Button 1\", \"type\": \"text\", \"color\": \"positive\"},\n+ {\"label\": \"Button 2\", \"type\": \"text\"},\n+ ],\n+ [{\"label\": \"Button 3\", \"type\": \"text\"}],\n+ ]\n+ )\n+ .get_json()\n+)\n+\n+assert KEYBOARD_STANDARD == KEYBOARD_WITH_BUILDER == KEYBOARD_WITH_SCHEMA\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"diff": "@@ -5,11 +5,33 @@ from .color import KeyboardButtonColor\nclass KeyboardButton:\n- def __init__(self, action: ABCAction, color: Optional[KeyboardButtonColor] = None):\n+ def __init__(\n+ self,\n+ action: ABCAction,\n+ color: KeyboardButtonColor,\n+ data: dict,\n+ ):\nself.action = action\nself.color = color\n+ self.data = data\n+\n+ @classmethod\n+ def from_typed(cls, action: ABCAction, color: Optional[KeyboardButtonColor] = None):\n+ return cls(action, color, None) # type: ignore\n+\n+ @classmethod\n+ def from_dict(cls, data: dict):\n+ color = data.get(\"color\")\n+ data = {\"action\": data}\n+ if color is not None:\n+ data[\"action\"].pop(\"color\")\n+ data[\"color\"] = color\n+ return cls(None, None, data) # type: ignore\ndef get_data(self) -> dict:\n+ if self.data is not None:\n+ return self.data\n+\ndata = {\"action\": self.action.get_data()}\nif self.action.type == \"text\" and self.color:\ndata[\"color\"] = self.color.value\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/keyboard.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/keyboard.py",
"diff": "@@ -20,10 +20,17 @@ class Keyboard:\ndef add(self, action: ABCAction, color: Optional[KeyboardButtonColor] = None) -> \"Keyboard\":\nif not len(self.buttons):\nself.row()\n- button = KeyboardButton(action, color)\n+ button = KeyboardButton.from_typed(action, color)\nself.buttons[-1].append(button)\nreturn self\n+ def schema(self, rows: List[List[dict]]):\n+ for row in rows:\n+ self.row()\n+ for button in row:\n+ self.buttons[-1].append(KeyboardButton.from_dict(button))\n+ return self\n+\ndef get_json(self) -> str:\ndata = json.dumps(\n{\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add schema keyboard generator; keyboard example
|
718,838 |
07.11.2020 23:53:40
| -10,800 |
5ec4a9011652408b1569dc02186ff7d6116cde4e
|
add load_blueprints_from_folder
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"diff": "@@ -6,10 +6,7 @@ from .color import KeyboardButtonColor\nclass KeyboardButton:\ndef __init__(\n- self,\n- action: ABCAction,\n- color: KeyboardButtonColor,\n- data: dict,\n+ self, action: ABCAction, color: KeyboardButtonColor, data: dict,\n):\nself.action = action\nself.color = color\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "from asyncio import get_running_loop\n-from typing import Coroutine, NoReturn, Union, Tuple, Set\nfrom vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.filter import AndFilter, OrFilter\n+import importlib\n+import typing\n+import os\n+import re\n+\n+if typing.TYPE_CHECKING:\n+ from vkbottle.framework.abc_blueprint import ABCBlueprint\n# This feature is not used in production\n# but can be useful for customization\n# purposes\n-def run_in_task(coroutine: Coroutine) -> NoReturn:\n+def run_in_task(coroutine: typing.Coroutine) -> typing.NoReturn:\n\"\"\" Gets loop and runs add makes task from the given coroutine \"\"\"\nloop = get_running_loop()\nloop.create_task(coroutine)\n-def convert_shorten_filter(shorten: Union[ABCRule, Tuple[ABCRule, ...], Set[ABCRule]]):\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@@ -22,3 +30,26 @@ def convert_shorten_filter(shorten: Union[ABCRule, Tuple[ABCRule, ...], Set[ABCR\nelif isinstance(shorten, tuple):\nreturn OrFilter(*shorten)\nreturn shorten\n+\n+\n+def load_blueprints_from_folder(module_name: str) -> typing.Iterator[\"ABCBlueprint\"]:\n+ \"\"\" Gets blueprints from package\n+ >>> for bp in load_blueprints_from_folder(\"blueprints\"):\n+ >>> bp.load(...)\n+ \"\"\"\n+ bp_paths = []\n+ for filename in os.listdir(module_name):\n+ if not filename.endswith(\".py\") or filename.startswith(\"__\"):\n+ continue\n+\n+ with open(os.path.join(module_name, filename)) as file:\n+ bp_names = re.findall(\n+ r\"^(\\w+) = (?:Bot|User|)Blueprint\\(\", file.read(), flags=re.MULTILINE\n+ )\n+ assert len(bp_names) == 1\n+ bp_paths.append((filename[:-3], bp_names[0]))\n+\n+ for bp_path in bp_paths:\n+ module, bp_name = bp_path\n+ bp_module = importlib.import_module(module_name + \".\" + module)\n+ yield getattr(bp_module, bp_name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add load_blueprints_from_folder
|
718,838 |
08.11.2020 00:05:59
| -10,800 |
74456d69507fa658492ec67e1e17885a6729404a
|
rename load_blueprints_from_folder -> add load_blueprints_from_package
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/blueprint.py",
"new_path": "examples/high-level/blueprint.py",
"diff": "@@ -16,4 +16,9 @@ logging.basicConfig(level=logging.INFO)\nfor bp in bps:\nbp.load(bot)\n+# Moreover you can use:\n+# import vkbottle import load_blueprints_from_package\n+# for bp in load_blueprints_from_package(\"blueprints\"):\n+# bp.load(bot)\n+\nbot.run_forever()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/__init__.py",
"new_path": "vkbottle/tools/dev_tools/__init__.py",
"diff": "@@ -4,5 +4,5 @@ from .keyboard import *\nfrom .loop_wrapper import LoopWrapper, DelayedTask\nfrom .mini_types import BotTypes, message_min\nfrom .storage import ABCStorage, CtxStorage\n-from .utils import run_in_task, convert_shorten_filter\n+from .utils import run_in_task, convert_shorten_filter, load_blueprints_from_package\nfrom .vkscript_converter import vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "@@ -32,17 +32,17 @@ def convert_shorten_filter(\nreturn shorten\n-def load_blueprints_from_folder(module_name: str) -> typing.Iterator[\"ABCBlueprint\"]:\n+def load_blueprints_from_package(package_name: str) -> typing.Iterator[\"ABCBlueprint\"]:\n\"\"\" Gets blueprints from package\n- >>> for bp in load_blueprints_from_folder(\"blueprints\"):\n+ >>> for bp in load_blueprints_from_package(\"blueprints\"):\n>>> bp.load(...)\n\"\"\"\nbp_paths = []\n- for filename in os.listdir(module_name):\n+ for filename in os.listdir(package_name):\nif not filename.endswith(\".py\") or filename.startswith(\"__\"):\ncontinue\n- with open(os.path.join(module_name, filename)) as file:\n+ with open(os.path.join(package_name, filename)) as file:\nbp_names = re.findall(\nr\"^(\\w+) = (?:Bot|User|)Blueprint\\(\", file.read(), flags=re.MULTILINE\n)\n@@ -51,5 +51,5 @@ def load_blueprints_from_folder(module_name: str) -> typing.Iterator[\"ABCBluepri\nfor bp_path in bp_paths:\nmodule, bp_name = bp_path\n- bp_module = importlib.import_module(module_name + \".\" + module)\n+ bp_module = importlib.import_module(package_name + \".\" + module)\nyield getattr(bp_module, bp_name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
rename load_blueprints_from_folder -> add load_blueprints_from_package
|
718,838 |
08.11.2020 00:48:12
| -10,800 |
4269d96520e77f90b204712a618d95725a0a4d86
|
PayloadRule can take list of dicts; add tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -130,18 +130,43 @@ async def test_rules(api: API):\nfake_message(api, attachments=[{\"type\": \"sticker\", \"sticker\": {\"sticker_id\": 2}}])\n)\n- assert await AndFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\n+ assert (\n+ await AndFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\nfake_message(api, peer_id=123)\n- ) is not False\n- assert await OrFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\n+ )\n+ is not False\n+ )\n+ assert (\n+ await OrFilter(rules.FromPeerRule(123), rules.FromPeerRule([1, 123])).check(\nfake_message(api, peer_id=1)\n- ) is not False\n- assert await rules.RegexRule(r\"Hi .*?\").check(fake_message(api, text=\"Hi bro\")) == {\"match\": ()}\n- assert await rules.RegexRule(\"Hi (.*?)$\").check(fake_message(api, text=\"Hi bro\")) == {\"match\": (\"bro\",)}\n- assert not await rules.RegexRule(r\"Hi .*?\").check(fake_message(api, text=\"Hi\")) == {\"match\": ()}\n+ )\n+ is not False\n+ )\n+ assert await rules.RegexRule(r\"Hi .*?\").check(fake_message(api, text=\"Hi bro\")) == {\n+ \"match\": ()\n+ }\n+ assert await rules.RegexRule(\"Hi (.*?)$\").check(fake_message(api, text=\"Hi bro\")) == {\n+ \"match\": (\"bro\",)\n+ }\n+ assert not await rules.RegexRule(r\"Hi .*?\").check(fake_message(api, text=\"Hi\")) == {\n+ \"match\": ()\n+ }\nlabeler = BotLabeler()\nlabeler.vbml_ignore_case = True\n- assert await labeler.get_custom_rules({\"text\": \"privet\"})[0].check(fake_message(api, text=\"Privet\")) == {}\n+ assert (\n+ await labeler.get_custom_rules({\"text\": \"privet\"})[0].check(\n+ fake_message(api, text=\"Privet\")\n+ )\n+ == {}\n+ )\nlabeler.vbml_ignore_case = False\n- assert not await labeler.get_custom_rules({\"text\": \"privet\"})[0].check(fake_message(api, text=\"Private\"))\n+ assert not await labeler.get_custom_rules({\"text\": \"privet\"})[0].check(\n+ fake_message(api, text=\"Private\")\n+ )\n+ assert await rules.PayloadRule({\"cmd\": \"text\"}).check(\n+ fake_message(api, payload='{\"cmd\":\"text\"}')\n+ )\n+ assert await rules.PayloadRule([{\"cmd\": \"text\"}, {\"cmd\": \"ne text\"}]).check(\n+ fake_message(api, payload='{\"cmd\":\"text\"}')\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -196,11 +196,13 @@ class ChatActionRule(ABCMessageRule):\nclass PayloadRule(ABCMessageRule):\n- def __init__(self, payload: dict):\n+ def __init__(self, payload: Union[dict, List[dict]]):\n+ if isinstance(payload, dict):\n+ payload = [payload]\nself.payload = payload\nasync def check(self, message: Message) -> Union[dict, bool]:\n- return message.get_payload_json() == self.payload\n+ return message.get_payload_json() in self.payload\nclass PayloadContainsRule(ABCMessageRule):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
PayloadRule can take list of dicts; add tests
|
718,883 |
08.11.2020 13:38:17
| -18,000 |
0cb4ab3525340a7f50c185967f6ef7b3e5316120
|
ForwardMessagesRule, ReplyMessageRule, GeoRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -101,7 +101,7 @@ class StickerRule(ABCMessageRule):\nelif not message.attachments[0].sticker:\nreturn False\nelse:\n- if self.sticker_ids is None:\n+ if not self.sticker_ids:\nif message.attachments[0].sticker.sticker_id:\nreturn True\nelif message.attachments[0].sticker.sticker_id in self.sticker_ids:\n@@ -135,6 +135,30 @@ class AttachmentTypeRule(ABCMessageRule):\nreturn True\n+class ForwardMessagesRule(ABCMessageRule):\n+ async def check(self, message: Message) -> bool:\n+ if not message.fwd_messages:\n+ return False\n+\n+ return True\n+\n+\n+class ReplyMessageRule(ABCMessageRule):\n+ async def check(self, message: Message) -> bool:\n+ if not message.reply_message:\n+ return False\n+\n+ return True\n+\n+\n+class GeoRule(ABCMessageRule):\n+ async def check(self, message: Message) -> bool:\n+ if not message.geo:\n+ return False\n+\n+ return True\n+\n+\nclass LevensteinRule(ABCMessageRule):\ndef __init__(self, levenstein_texts: Union[List[str], str], max_distance: int = 1):\nif isinstance(levenstein_texts, str):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
ForwardMessagesRule, ReplyMessageRule, GeoRule (#253)
|
718,838 |
08.11.2020 12:27:41
| -10,800 |
0c10461a2758bdffce4790c274b7e2f5f115b2b0
|
fix StateRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -286,7 +286,7 @@ class CoroutineRule(ABCMessageRule):\nclass StateRule(ABCMessageRule):\ndef __init__(self, state: Union[List[BaseStateGroup], BaseStateGroup]):\nif not isinstance(state, list):\n- state = [state]\n+ state = [] if state is None else [state]\nself.state = state\nasync def check(self, message: Message) -> Union[dict, bool]:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix StateRule
|
718,838 |
08.11.2020 12:49:09
| -10,800 |
01b7b0be1ef325b2e32a605b83d862a2723f9ab3
|
add error handler to router; handle all exceptions; StateRule add tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -6,6 +6,7 @@ import pytest\nimport vbml\nimport typing\nimport json\n+import enum\nEXAMPLE_EVENT = {\n\"ts\": 1,\n@@ -51,6 +52,10 @@ EXAMPLE_EVENT = {\n}\n+class MockIntEnum(enum.IntEnum):\n+ MOCK = 1\n+\n+\ndef set_http_callback(api: API, callback: typing.Callable[[dict], typing.Any]):\napi.http._session = MockedClient(callback=callback)\n@@ -170,3 +175,5 @@ async def test_rules(api: API):\nassert await rules.PayloadRule([{\"cmd\": \"text\"}, {\"cmd\": \"ne text\"}]).check(\nfake_message(api, payload='{\"cmd\":\"text\"}')\n)\n+ assert await rules.StateRule(state=None).check(fake_message(api))\n+ assert not await rules.StateRule(state=MockIntEnum.MOCK).check(fake_message(api))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/abc.py",
"new_path": "vkbottle/dispatch/abc.py",
"diff": "@@ -14,6 +14,7 @@ class ABCRouter(ABC):\nviews: Dict[str, \"ABCView\"] = {}\nstate_dispenser: ABCStateDispenser\n+ error_handler: ABCErrorHandler\n@abstractmethod\nasync def route(self, event: dict, ctx_api: \"ABCAPI\") -> NoReturn:\n@@ -21,7 +22,10 @@ class ABCRouter(ABC):\n@abstractmethod\ndef construct(\n- self, views: Dict[str, \"ABCView\"], state_dispenser: ABCStateDispenser\n+ self,\n+ views: Dict[str, \"ABCView\"],\n+ state_dispenser: ABCStateDispenser,\n+ error_handler: ABCErrorHandler,\n) -> \"ABCRouter\":\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/bot_router.py",
"new_path": "vkbottle/dispatch/bot_router.py",
"diff": "@@ -2,6 +2,7 @@ from typing import Dict, NoReturn\nfrom vkbottle.api.abc import ABCAPI\nfrom vkbottle.dispatch.dispenser import ABCStateDispenser\n+from vkbottle.exception_factory import ABCErrorHandler\nfrom vkbottle.dispatch.views import ABCView\nfrom vkbottle.modules import logger\nfrom .abc import ABCRouter\n@@ -12,13 +13,20 @@ class BotRouter(ABCRouter):\nlogger.debug(\"Routing update {}\".format(event))\nfor view in self.views.values():\n+ try:\nif not await view.process_event(event):\ncontinue\nawait view.handle_event(event, ctx_api, self.state_dispenser)\n+ except BaseException as e:\n+ await self.error_handler.handle(e)\ndef construct(\n- self, views: Dict[str, \"ABCView\"], state_dispenser: ABCStateDispenser\n+ self,\n+ views: Dict[str, \"ABCView\"],\n+ state_dispenser: ABCStateDispenser,\n+ error_handler: ABCErrorHandler,\n) -> \"BotRouter\":\nself.views = views\nself.state_dispenser = state_dispenser\n+ self.error_handler = error_handler\nreturn self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -291,7 +291,7 @@ class StateRule(ABCMessageRule):\nasync def check(self, message: Message) -> Union[dict, bool]:\nif message.state_peer is None:\n- return bool(self.state)\n+ return not self.state\nreturn message.state_peer.state in self.state\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -40,7 +40,9 @@ class Bot(ABCFramework):\n@property\ndef router(self) -> \"ABCRouter\":\nreturn self._router.construct(\n- views=self.labeler.views(), state_dispenser=self.state_dispenser\n+ views=self.labeler.views(),\n+ state_dispenser=self.state_dispenser,\n+ error_handler=self.error_handler,\n)\n@router.setter\n@@ -56,12 +58,9 @@ class Bot(ABCFramework):\nlogger.info(f\"Starting polling for {polling.api!r}\")\nasync for event in polling.listen(): # type: ignore\n- try:\nlogger.debug(f\"New event was received: {event}\")\nfor update in event[\"updates\"]:\nawait self.router.route(update, polling.api)\n- except self.error_handler.handling_exceptions as e:\n- await self.error_handler.handle(e)\ndef run_forever(self) -> NoReturn:\nlogger.info(\"Loop will be ran forever\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "@@ -55,7 +55,7 @@ class BotPolling(ABCPolling):\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n- except self.error_handler.handling_exceptions as e:\n+ except BaseException as e:\nyield await self.error_handler.handle(e)\ndef construct(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add error handler to router; handle all exceptions; StateRule add tests
|
718,838 |
08.11.2020 19:35:45
| -10,800 |
f691113257c8442681efa0c2ac120d88794399d9
|
move callback buttons example to high-level
|
[
{
"change_type": "RENAME",
"old_path": "examples/callback_buttons.py",
"new_path": "examples/high-level/callback_buttons.py",
"diff": "@@ -20,8 +20,8 @@ async def send_callback_button(message: Message):\n@bot.on.raw_event(GroupEventType.MESSAGE_EVENT, dataclass=GroupTypes.MessageEvent)\nasync def handle_message_event(event: GroupTypes.MessageEvent):\n- # The event_data parameter accepts three object types\n- # In this example we will consider \"show_snackbar\" type\n+ # event_data parameter accepts three object types\n+ # \"show_snackbar\" type\nawait bot.api.messages.send_message_event_answer(\nevent_id=event.object.event_id,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
move callback buttons example to high-level
|
718,842 |
09.11.2020 19:38:55
| -10,800 |
18c87ee1700717b7d063ac3682fe89696417cb27
|
Changed publish workflow to publish to TestPyPI
Removed unnecessary Message import in readme example
|
[
{
"change_type": "DELETE",
"old_path": ".github/workflows/publish_to_pypi.yml",
"new_path": null,
"diff": "-name: Publish Package to PyPI with poetry\n-\n-on:\n- push:\n- tags:\n- - 'v*'\n-\n-jobs:\n- build-and-publish:\n- runs-on: ubuntu-latest\n- steps:\n- - uses: actions/checkout@master\n- - name: Build and publish to pypi\n- uses: JRubics/poetry-publish@v1.2\n- with:\n- pypi_token: ${{ secrets.pypi_password }}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/workflows/publish_to_test_pypi.yml",
"diff": "+name: Publish Package to TestPyPI with poetry\n+\n+on:\n+ push:\n+ tags:\n+ - 'v*'\n+\n+jobs:\n+ build-and-test-publish:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@master\n+ - name: Build and publish to pypi\n+ uses: JRubics/poetry-publish@v1.2\n+ with:\n+ repository_name: testpypi\n+ repository_url: https://test.pypi.org/legacy/\n+ pypi_token: ${{ secrets.test_pypi_password }}\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Changed publish workflow to publish to TestPyPI
Removed unnecessary Message import in readme example
|
718,842 |
09.11.2020 20:11:54
| -10,800 |
689316d435b8fd6c9de36628f2ccc46db726fd4b
|
Added Makefile recipes
Added recipes for
fixing code format
testing code with pytest
publishing to pypi with token from env
Removed autopep8 support
Remove ci_tst.sh
|
[
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -27,15 +27,11 @@ repos:\nentry: autoflake\nlanguage: system\ntypes: [ python ]\n- args: [--in-place, --exclude=__init__.py, --remove-all-unused-imports, --remove-duplicate-keys]\n- stages: [commit]\n-\n- - id: autopep8\n- name: autopep8\n- entry: autopep8\n- language: system\n- types: [python]\n- args: [--in-place, --max-line-length=99]\n+ args:\n+ - --in-place\n+ - --exclude=__init__.py,venv\n+ - --remove-all-unused-imports\n+ - --remove-duplicate-keys\nstages: [ commit ]\n- id: mypy\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Makefile",
"diff": "+fix:\n+ black .\n+ autoflake --recursive --in-place --exclude=__init__.py,venv --remove-all-unused-imports --remove-duplicate-keys .\n+\n+test:\n+ poetry run pytest --cov vkbottle tests\n+ poetry run mypy vkbottle\n+ poetry run flake8\n+\n+publish:\n+ poetry build\n+ poetry config pypi-token.pypi ${PYPI_TOKEN}\n+ poetry publish\n"
},
{
"change_type": "DELETE",
"old_path": "ci_test.sh",
"new_path": null,
"diff": "-poetry run pytest --cov vkbottle tests\n-poetry run mypy vkbottle\n-poetry run flake8\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added Makefile recipes
Added recipes for
- fixing code format
- testing code with pytest
- publishing to pypi with token from env
Removed autopep8 support
Remove ci_tst.sh
|
718,838 |
09.11.2020 23:52:13
| -10,800 |
ddf6ead31e222f473e9c6cdba3a82abd23aade80
|
add docs and example for middlewares; fixes + add reprs
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/middlewares/abc.py",
"new_path": "vkbottle/dispatch/middlewares/abc.py",
"diff": "@@ -3,6 +3,7 @@ from typing import NewType, List, Any, TYPE_CHECKING\nif TYPE_CHECKING:\nfrom vkbottle.dispatch.views.abc import ABCView\n+ from vkbottle.dispatch.handlers.abc import ABCHandler\nMiddlewareResponse = NewType(\"MiddlewareResponse\", bool)\n@@ -12,5 +13,10 @@ class BaseMiddleware(ABC):\nasync def pre(self, event):\n...\n- async def post(self, event, view: \"ABCView\", handle_responses: List[Any]):\n+ async def post(\n+ self, event, view: \"ABCView\", handle_responses: List[Any], handlers: List[\"ABCHandler\"]\n+ ):\n...\n+\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__.__name__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/return_manager/abc.py",
"new_path": "vkbottle/dispatch/return_manager/abc.py",
"diff": "@@ -30,3 +30,6 @@ class BaseReturnManager(ABC):\nreturn HandlerProperty(types, func)\nreturn decorator\n+\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__.__name__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/abc.py",
"new_path": "vkbottle/dispatch/rules/abc.py",
"diff": "@@ -17,4 +17,4 @@ class ABCRule(ABC):\npass\ndef __repr__(self):\n- return f\"<{self.__class__.__qualname__} config={self.config}>\"\n+ return f\"<{self.__class__.__qualname__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc.py",
"new_path": "vkbottle/dispatch/views/abc.py",
"diff": "@@ -25,3 +25,11 @@ class ABCView(ABC):\ndef register_middleware(self, middleware: \"BaseMiddleware\"):\nself.middlewares.append(middleware)\n+\n+ def __repr__(self) -> str:\n+ return (\n+ f\"<{self.__class__.__name__} \"\n+ f\"handlers={self.handlers} \"\n+ f\"middlewares={self.middlewares} \"\n+ f\"handler_return_manager={self.handler_return_manager}\"\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -44,6 +44,8 @@ class MessageView(ABCView):\ncontext_variables.update(response)\nhandle_responses = []\n+ handlers = []\n+\nfor handler in self.handlers:\nresult = await handler.filter(message)\nlogger.debug(\"Handler {} returned {}\".format(handler, result))\n@@ -56,6 +58,7 @@ class MessageView(ABCView):\nhandler_response = await handler.handle(message, **context_variables)\nhandle_responses.append(handler_response)\n+ handlers.append(handler)\nreturn_handler = self.handler_return_manager.get_handler(handler_response)\nif return_handler is not None:\n@@ -64,7 +67,7 @@ class MessageView(ABCView):\n)\nif handler.blocking:\n- return\n+ break\nfor middleware in self.middlewares:\n- await middleware.post(message, self, handle_responses)\n+ await middleware.post(message, self, handle_responses, handlers)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/raw.py",
"new_path": "vkbottle/dispatch/views/bot/raw.py",
"diff": "@@ -65,4 +65,6 @@ class RawEventView(ABCView):\n)\nfor middleware in self.middlewares:\n- await middleware.post(event_model, self, [handler_response])\n+ await middleware.post(\n+ event_model, self, [handler_response], [handler_basement.handler]\n+ )\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add docs and example for middlewares; fixes + add reprs
|
718,838 |
09.11.2020 23:54:46
| -10,800 |
2bf83d135601b1e3cf5bb98dfc3cd2a96c1e30d7
|
add middleware docs to index
|
[
{
"change_type": "MODIFY",
"old_path": "docs/high-level/handling/index.md",
"new_path": "docs/high-level/handling/index.md",
"diff": "* [Return Manager](return-manager.md)\n* [State Dispenser](state-dispenser.md)\n* [View](view.md)\n+* [Middleware](middleware.md)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/high-level/index.md",
"new_path": "docs/high-level/index.md",
"diff": "+ [View](handling/view.md)\n+ [Return Manager](handling/return-manager.md)\n+ [State Dispenser](handling/state-dispenser.md)\n+ + [Middleware](handling/middleware.md)\n* [Routing](routing/index.md)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/index.md",
"new_path": "docs/index.md",
"diff": "+ [View](high-level/handling/view.md)\n+ [Return Manager](high-level/handling/return-manager.md)\n+ [State Dispenser](high-level/handling/state-dispenser.md)\n+ + [Middleware](high-level/handling/middleware.md)\n* [Routing](high-level/routing/index.md)\n* [Low-level API](low-level/index.md)\n* [API](low-level/api/index.md)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add middleware docs to index
|
718,842 |
09.11.2020 20:24:08
| -10,800 |
05fd1173da756c971bfbcd7227aaf7fbe34a92df
|
Added bot.py ignore as it's used for imports
Ran make fix to cleanup code
|
[
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -29,7 +29,7 @@ repos:\ntypes: [ python ]\nargs:\n- --in-place\n- - --exclude=__init__.py,venv\n+ - --exclude=__init__.py,bot.py,venv\n- --remove-all-unused-imports\n- --remove-duplicate-keys\nstages: [ commit ]\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "fix:\nblack .\n- autoflake --recursive --in-place --exclude=__init__.py,venv --remove-all-unused-imports --remove-duplicate-keys .\n+ autoflake --recursive --in-place --exclude=__init__.py,bot.py,venv --remove-all-unused-imports --remove-duplicate-keys .\ntest:\npoetry run pytest --cov vkbottle tests\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/http_test.py",
"new_path": "tests/http_test.py",
"diff": "-from vkbottle import ManySessionManager, AiohttpClient\n+from vkbottle import ManySessionManager\nfrom vkbottle.tools.test_utils import MockedClient\nimport pytest\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "@@ -21,7 +21,6 @@ class ABCAPI(ABC):\n@abstractmethod\nasync def request(self, method: str, data: dict) -> dict:\n\"\"\" Makes a single request opening a session \"\"\"\n- pass\n@abstractmethod\nasync def validate_response(self, method: str, data: dict, response: typing.Any) -> typing.Any:\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\n-from typing import Callable, Any, Dict, Type, List, Union\n+from typing import Any, Callable, Dict, List, Union\nfrom vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views import ABCView\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added bot.py ignore as it's used for imports
Ran make fix to cleanup code
|
718,842 |
10.11.2020 11:47:44
| -10,800 |
d2425c65fbcad1c6885d465a2d5777069c14f621
|
Updated Makefile
Added .PHONY, .ONESHELL, .DEFUALT targets
Added help message recipe
Renamed test recipe to check
Added command to remove dist/ dir after pypi publish
|
[
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "-fix:\n- black .\n- autoflake --recursive --in-place --exclude=__init__.py,bot.py,venv --remove-all-unused-imports --remove-duplicate-keys .\n+# Treat these arguments not as files, but as recipes\n+.PHONY: help minimal init check fix publish\n+\n+# Used to execute all in one shell\n+.ONESHELL:\n+\n+# Default recipe\n+.DEFAULT: help\n+help:\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+\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-test:\n- poetry run pytest --cov vkbottle tests\n- poetry run mypy vkbottle\n- poetry run flake8\n+minimal:\n+ $(install)\n+ @echo;\n+ @echo \"Installing dependencies\"\n+ @echo \"=======================\";\n+ @poetry install --no-dev\n+\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+\n+check:\n+ @poetry run mypy vkbottle\n+ @poetry run flake8\n+ @poetry run pytest --cov vkbottle tests\n+\n+fix:\n+ @black .\n+ @autoflake --recursive --in-place --exclude=__init__.py,bot.py,venv --remove-all-unused-imports --remove-duplicate-keys .\npublish:\npoetry build\npoetry config pypi-token.pypi ${PYPI_TOKEN}\n- poetry publish\n+ poetry publish; true # \"; true\" is used to ignore command exit code so that rm -rf can execute anyway\n+ rm -rf dist/\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Updated Makefile
Added .PHONY, .ONESHELL, .DEFUALT targets
Added help message recipe
Renamed test recipe to check
Added command to remove dist/ dir after pypi publish
|
718,842 |
10.11.2020 11:49:44
| -10,800 |
9d58a5d42f5ba3c70e293c978881701d178f30c6
|
Ran another make fix to cleanup code
|
[
{
"change_type": "MODIFY",
"old_path": "tests/tools_test.py",
"new_path": "tests/tools_test.py",
"diff": "from vkbottle.tools import Keyboard, KeyboardButtonColor, Text, Callback, CtxStorage, LoopWrapper\nfrom vkbottle.modules import json\n-KEYBOARD_JSON = json.dumps({\n+KEYBOARD_JSON = json.dumps(\n+ {\n\"one_time\": True,\n\"inline\": False,\n\"buttons\": [\n- [{\"action\": {\"label\": \"I love nuggets\", \"payload\": {\"love\": \"nuggets\"}, \"type\": \"text\"}}],\n- [{\"action\": {\"label\": \"Eat nuggets\", \"payload\": {\"eat\": \"nuggets\"}, \"type\": \"callback\"}}],\n+ [\n+ {\n+ \"action\": {\n+ \"label\": \"I love nuggets\",\n+ \"payload\": {\"love\": \"nuggets\"},\n+ \"type\": \"text\",\n+ }\n+ }\n],\n-})\n+ [\n+ {\n+ \"action\": {\n+ \"label\": \"Eat nuggets\",\n+ \"payload\": {\"eat\": \"nuggets\"},\n+ \"type\": \"callback\",\n+ }\n+ }\n+ ],\n+ ],\n+ }\n+)\nctx_storage = CtxStorage()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Ran another make fix to cleanup code
|
718,838 |
10.11.2020 17:30:46
| -10,800 |
c485cc3eaab1d95e8129c750815ed1de3f1f099b
|
fix excess polling event while handling error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "@@ -56,7 +56,7 @@ class BotPolling(ABCPolling):\nserver[\"ts\"] = event[\"ts\"]\nyield event\nexcept BaseException as e:\n- yield await self.error_handler.handle(e)\n+ await self.error_handler.handle(e)\ndef construct(\nself, api: \"ABCAPI\", error_handler: Optional[\"ABCErrorHandler\"] = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix excess polling event while handling error
|
718,838 |
13.11.2020 21:56:07
| -10,800 |
8eceee793ef81037ae2cfd570778c195c9ed7847
|
fix rule check for from_func_handler
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/handlers/from_func_handler.py",
"new_path": "vkbottle/dispatch/handlers/from_func_handler.py",
"diff": "@@ -14,7 +14,7 @@ class FromFuncHandler(ABCHandler):\nrule_context = {}\nfor rule in self.rules:\nresult = await rule.check(event)\n- if result is False:\n+ if result is False or result is None:\nreturn False\nelif result is True:\ncontinue\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -116,8 +116,7 @@ class FromPeerRule(ABCMessageRule):\nself.peer_ids = peer_ids\nasync def check(self, message: Message) -> Union[dict, bool]:\n- if message.peer_id in self.peer_ids:\n- return True\n+ return message.peer_id in self.peer_ids\nclass AttachmentTypeRule(ABCMessageRule):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix rule check for from_func_handler
|
718,838 |
14.11.2020 16:39:17
| -10,800 |
960caea914c5a05c25a03f92ced80d55ac4526b7
|
vbml rule takes list of strs
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -56,7 +56,12 @@ class VBMLRule(ABCMessageRule):\nelif isinstance(pattern, vbml.Pattern):\npattern = [pattern]\nelif isinstance(pattern, list):\n- pattern = [p if isinstance(p, vbml.Pattern) else vbml.Pattern(p) for p in pattern]\n+ pattern = [\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+ ]\nself.patterns = pattern\nself.patcher = patcher or self.config[\"vbml_patcher\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
vbml rule takes list of strs
|
718,852 |
16.11.2020 17:37:10
| -10,800 |
9e3ac555f8f7e05cf86e02dd597902a0b6f4f6ce
|
fix callback button colors
.
|
[
{
"change_type": "MODIFY",
"old_path": "tests/tools_test.py",
"new_path": "tests/tools_test.py",
"diff": "@@ -21,7 +21,8 @@ KEYBOARD_JSON = json.dumps(\n\"label\": \"Eat nuggets\",\n\"payload\": {\"eat\": \"nuggets\"},\n\"type\": \"callback\",\n- }\n+ },\n+ \"color\": \"positive\"\n}\n],\n],\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"new_path": "vkbottle/tools/dev_tools/keyboard/button.py",
"diff": "@@ -30,6 +30,6 @@ class KeyboardButton:\nreturn self.data\ndata = {\"action\": self.action.get_data()}\n- if self.action.type == \"text\" and self.color:\n+ if self.action.type in (\"text\", \"callback\",) and self.color:\ndata[\"color\"] = self.color.value\nreturn data\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix callback button colors (#260)
.
|
718,838 |
18.11.2020 21:14:28
| -10,800 |
e7271765be31d793171ecff9721e66d4a3c6aa3e
|
add state dispenser payload
+ update funding links
+ update vkbottle-types version
|
[
{
"change_type": "MODIFY",
"old_path": ".github/FUNDING.yml",
"new_path": ".github/FUNDING.yml",
"diff": "-custom: [\"https://boosty.to/timoniq\", \"https://qiwi.me/pirashki\"]\n+custom: [\"https://boosty.to/timoniq\", \"https://timoniq.host/donate\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -27,7 +27,7 @@ python = \"^3.7\"\naiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\n-vkbottle-types = \"^0.1.18\"\n+vkbottle-types = \"^0.1.20\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/dispenser/abc.py",
"new_path": "vkbottle/dispatch/dispenser/abc.py",
"diff": "@@ -12,7 +12,7 @@ class ABCStateDispenser(ABC):\npass\n@abstractmethod\n- async def set(self, peer_id: int, state: BaseStateGroup):\n+ async def set(self, peer_id: int, state: BaseStateGroup, **payload):\npass\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/dispenser/builtin.py",
"new_path": "vkbottle/dispatch/dispenser/builtin.py",
"diff": "@@ -12,8 +12,8 @@ class BuiltinStateDispenser(ABCStateDispenser):\nasync def get(self, peer_id: int) -> Optional[StatePeer]:\nreturn self.dictionary.get(peer_id)\n- async def set(self, peer_id: int, state: BaseStateGroup):\n- self.dictionary[peer_id] = StatePeer(peer_id=peer_id, state=state)\n+ async def set(self, peer_id: int, state: BaseStateGroup, **payload):\n+ self.dictionary[peer_id] = StatePeer(peer_id=peer_id, state=state, payload=payload)\nasync def delete(self, peer_id: int):\nself.dictionary.pop(peer_id)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add state dispenser payload
+ update funding links
+ update vkbottle-types version
|
718,838 |
19.11.2020 18:56:07
| -10,800 |
1326baad09fece25d36bc0e324a39b70092fe821
|
fix api typings for blueprint
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/abc_blueprint.py",
"new_path": "vkbottle/framework/abc_blueprint.py",
"diff": "import asyncio\nfrom abc import abstractmethod\n-from typing import Optional, NoReturn, Any\n+from typing import Optional, NoReturn, Any, Union\n-from vkbottle.api import ABCAPI\n+from vkbottle.api import ABCAPI, API\nfrom vkbottle.dispatch import ABCRouter\nfrom vkbottle.polling import ABCPolling\nfrom .abc import ABCFramework\n@@ -40,7 +40,7 @@ class ABCBlueprint(ABCFramework):\nreturn asyncio.get_running_loop()\n@property # type: ignore\n- def api(self) -> ABCAPI: # type: ignore\n+ def api(self) -> Union[ABCAPI, API]: # type: ignore\nif not self._api:\nraise RuntimeError(\n\"You need to construct blueprint firstly. \"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "-from typing import Optional\n+from typing import Optional, Union\n-from vkbottle.api import ABCAPI\n+from vkbottle.api import ABCAPI, API\nfrom vkbottle.dispatch import BotRouter\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\nfrom vkbottle.framework.bot.bot import Bot\n@@ -23,7 +23,7 @@ class BotBlueprint(ABCBlueprint):\nself.router: BotRouter = router or BotRouter()\nself.constructed = False\n- def construct(self, api: ABCAPI, polling: ABCPolling) -> \"BotBlueprint\":\n+ def construct(self, api: Union[ABCAPI, API], polling: ABCPolling) -> \"BotBlueprint\":\nself.api = api\nself.polling = polling\nself.constructed = True\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix api typings for blueprint
|
718,838 |
19.11.2020 21:26:55
| -10,800 |
39012928b6c2ed48d3d957ae444abed7268e4a23
|
add state dispenser to blueprints; + state group rule;
+ test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "-from vkbottle import Bot, API, GroupTypes, GroupEventType, AndFilter, OrFilter\n+from vkbottle import Bot, API, GroupTypes, GroupEventType, AndFilter, OrFilter, StatePeer\nfrom vkbottle.bot import Message, rules, BotLabeler\nfrom vkbottle.tools.test_utils import with_mocked_api, MockedClient\nfrom vkbottle.tools.dev_tools import message_min\n@@ -177,3 +177,7 @@ async def test_rules(api: API):\n)\nassert await rules.StateRule(state=None).check(fake_message(api))\nassert not await rules.StateRule(state=MockIntEnum.MOCK).check(fake_message(api))\n+ assert await rules.StateGroupRule(state_group=None).check(fake_message(api))\n+ sg_mock_message = fake_message(api)\n+ sg_mock_message.state_peer = StatePeer(peer_id=1, state=MockIntEnum.MOCK, payload={})\n+ assert await rules.StateGroupRule(state_group=MockIntEnum).check(sg_mock_message)\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\n+from typing import List, Optional, Union, Tuple, Callable, Awaitable, Coroutine, Type\nimport typing\nimport vbml\n@@ -299,6 +299,18 @@ class StateRule(ABCMessageRule):\nreturn message.state_peer.state in self.state\n+class StateGroupRule(ABCMessageRule):\n+ def __init__(self, state_group: Union[List[Type[BaseStateGroup]], Type[BaseStateGroup]]):\n+ if not isinstance(state_group, list):\n+ state_group = [] if state_group is None else [state_group]\n+ self.state_group = state_group\n+\n+ async def check(self, message: Message) -> Union[dict, bool]:\n+ if message.state_peer is None:\n+ return not self.state_group\n+ return type(message.state_peer.state) in self.state_group\n+\n+\n__all__ = (\n\"ABCMessageRule\",\n\"PeerRule\",\n@@ -317,5 +329,6 @@ __all__ = (\n\"FuncRule\",\n\"CoroutineRule\",\n\"StateRule\",\n+ \"StateGroupRule\",\n\"RegexRule\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/abc_blueprint.py",
"new_path": "vkbottle/framework/abc_blueprint.py",
"diff": "@@ -3,22 +3,28 @@ from abc import abstractmethod\nfrom typing import Optional, NoReturn, Any, Union\nfrom vkbottle.api import ABCAPI, API\n-from vkbottle.dispatch import ABCRouter\n+from vkbottle.dispatch import ABCRouter, ABCStateDispenser\nfrom vkbottle.polling import ABCPolling\nfrom .abc import ABCFramework\n+CONSTRUCT_BLUEPRINT = \"You need to construct blueprint firstly\"\n+\n+\nclass ABCBlueprint(ABCFramework):\nrouter: ABCRouter\n_polling: Optional[ABCPolling] = None\n_api: Optional[ABCAPI] = None\n+ _state_dispenser: Optional[ABCStateDispenser] = None\nname: str = \"Unnamed\"\nconstructed: bool = False\n@abstractmethod\n- def construct(self, api: ABCAPI, polling: ABCPolling) -> \"ABCBlueprint\":\n+ def construct(\n+ self, api: ABCAPI, polling: ABCPolling, state_dispenser: ABCStateDispenser\n+ ) -> \"ABCBlueprint\":\npass\n@abstractmethod\n@@ -27,14 +33,22 @@ class ABCBlueprint(ABCFramework):\n@property\ndef polling(self) -> ABCPolling:\n- if not self._polling:\n- raise RuntimeError(\"You need to construct blueprint firstly\")\n+ self.assert_constructed()\nreturn self._polling\n@polling.setter\ndef polling(self, new_polling: ABCPolling): # type: ignore\nself._polling = new_polling\n+ @property\n+ def state_dispenser(self) -> ABCStateDispenser:\n+ self.assert_constructed()\n+ return self._state_dispenser\n+\n+ @state_dispenser.setter\n+ def state_dispenser(self, new_state_dispenser: ABCStateDispenser):\n+ self._state_dispenser = new_state_dispenser\n+\n@property\ndef loop(self) -> asyncio.AbstractEventLoop:\nreturn asyncio.get_running_loop()\n@@ -43,8 +57,8 @@ class ABCBlueprint(ABCFramework):\ndef api(self) -> Union[ABCAPI, API]: # type: ignore\nif not self._api:\nraise RuntimeError(\n- \"You need to construct blueprint firstly. \"\n- \"Beware: if you use multibot, api can only be accessed with event.ctx_api\"\n+ CONSTRUCT_BLUEPRINT\n+ + \" Beware: if you use multibot, api can only be accessed with event.ctx_api\"\n)\nreturn self._api\n@@ -58,5 +72,9 @@ class ABCBlueprint(ABCFramework):\ndef run_forever(self) -> NoReturn:\nraise RuntimeError(\"You are not allowed to run polling with blueprint\")\n+ def assert_constructed(self) -> NoReturn:\n+ if not self.constructed:\n+ raise RuntimeError(CONSTRUCT_BLUEPRINT)\n+\ndef __repr__(self):\nreturn f\"<Blueprint {self.name!r} {self.__class__.__qualname__} constructed={self.constructed}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "from typing import Optional, Union\nfrom vkbottle.api import ABCAPI, API\n-from vkbottle.dispatch import BotRouter\n+from vkbottle.dispatch import BotRouter, ABCStateDispenser\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\nfrom vkbottle.framework.bot.bot import Bot\nfrom vkbottle.framework.bot.labeler import BotLabeler\n@@ -23,16 +23,19 @@ class BotBlueprint(ABCBlueprint):\nself.router: BotRouter = router or BotRouter()\nself.constructed = False\n- def construct(self, api: Union[ABCAPI, API], polling: ABCPolling) -> \"BotBlueprint\":\n+ def construct(\n+ self, api: Union[ABCAPI, API], polling: ABCPolling, state_dispenser: ABCStateDispenser\n+ ) -> \"BotBlueprint\":\nself.api = api\nself.polling = polling\n+ self.state_dispenser = state_dispenser\nself.constructed = True\nreturn self\ndef load(self, framework: \"Bot\") -> \"BotBlueprint\":\nframework.labeler.load(self.labeler) # type: ignore\nlogger.debug(f\"Blueprint {self.name!r} loaded\")\n- return self.construct(framework.api, framework.polling)\n+ return self.construct(framework.api, framework.polling, framework.state_dispenser)\n@property\ndef on(self) -> BotLabeler:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/labeler/default.py",
"new_path": "vkbottle/framework/bot/labeler/default.py",
"diff": "@@ -22,6 +22,7 @@ from vkbottle.dispatch.rules.bot import (\nFuncRule,\nCoroutineRule,\nStateRule,\n+ StateGroupRule,\nRegexRule,\n)\nfrom vkbottle.dispatch.views import MessageView, ABCView, RawEventView, HandlerBasement\n@@ -47,6 +48,7 @@ DEFAULT_CUSTOM_RULES: Dict[str, Type[ABCRule]] = {\n\"coro\": CoroutineRule,\n\"coroutine\": CoroutineRule,\n\"state\": StateRule,\n+ \"state_group\": StateGroupRule,\n\"regexp\": RegexRule,\n\"text\": VBMLRule,\n}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add state dispenser to blueprints; + state group rule;
+ test
|
718,876 |
30.11.2020 16:43:33
| -18,000 |
2694a5018ff73a4feb159d637ffe7e4d6bcbcb7a
|
Fix ChatActionRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -218,7 +218,7 @@ class ChatActionRule(ABCMessageRule):\nasync def check(self, message: Message) -> Union[dict, bool]:\nif not message.action:\nreturn False\n- elif message.action.type in self.chat_action_types:\n+ elif message.action.type.value in self.chat_action_types:\nreturn True\nreturn False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix ChatActionRule (#267)
|
718,838 |
01.12.2020 17:31:21
| -10,800 |
6ac6bc421ce6e643d1fbd74221e9a7cb7cec6fbb
|
bump version vkbottle-types; add validate_request to api.request
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -27,7 +27,7 @@ python = \"^3.7\"\naiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\n-vkbottle-types = \"^0.1.20\"\n+vkbottle-types = \"^0.1.21\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -37,6 +37,8 @@ class API(ABCAPI, APICategories):\nasync def request(self, method: str, data: dict) -> dict:\n\"\"\" Makes a single request opening a session \"\"\"\n+ data = await self.validate_request(data)\n+\nasync with self.http as session:\nresponse = await session.request_text(\n\"POST\",\n@@ -53,7 +55,7 @@ class API(ABCAPI, APICategories):\n\"\"\" Makes many requests opening one session \"\"\"\nasync with self.http as session:\nfor request in requests:\n- method, data = request.method, request.data # type: ignore\n+ method, data = request.method, await self.validate_request(request.data) # type: ignore\nresponse = await session.request_text(\n\"POST\",\nself.API_URL + method,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
bump version vkbottle-types; add validate_request to api.request
|
718,866 |
07.12.2020 14:18:45
| -10,800 |
634dad04e907582db89aef5faec6cffecd7d276b
|
FromUserRule cleanup
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -263,10 +263,8 @@ class FromUserRule(ABCMessageRule):\ndef __init__(self, from_user: bool = True):\nself.from_user = from_user\n- async def check(self, message: Message) -> Union[dict, bool]:\n- if message.from_id > 0:\n- return True\n- return False\n+ async def check(self, message: Message) -> bool:\n+ return self.from_user is (message.from_id > 0)\nclass FuncRule(ABCMessageRule):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
FromUserRule cleanup (#272)
|
718,838 |
11.12.2020 00:03:37
| -10,800 |
deb77be91adabc0144fbc3791175012e96768461
|
fix template type in message.answer
|
[
{
"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": "@@ -37,7 +37,7 @@ class MessageMin(MessagesMessage):\npayload: Optional[str] = None,\ndont_parse_links: Optional[bool] = None,\ndisable_mentions: Optional[bool] = None,\n- template: Optional[dict] = None,\n+ template: Optional[str] = None,\nintent: Optional[str] = None,\n) -> int:\ndata = {k: v for k, v in locals().items() if k != \"self\" and v is not None}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix template type in message.answer
|
718,838 |
11.12.2020 00:20:34
| -10,800 |
9067f50b00b86f48f092d8ade2fde2fca9b3b08c
|
template generator ported from v2.x
|
[
{
"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 .template import TemplateElement, template_gen\nfrom .loop_wrapper import LoopWrapper, DelayedTask\nfrom .mini_types import BotTypes, message_min\nfrom .storage import ABCStorage, CtxStorage\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/template/__init__.py",
"diff": "+from .generator import template_gen\n+from .element import TemplateElement\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/template/element.py",
"diff": "+from vkbottle.modules import json\n+from typing import Optional, List\n+\n+\n+class TemplateElement:\n+ \"\"\" Easy template element generator \"\"\"\n+\n+ def __init__(\n+ self,\n+ title: Optional[str] = None,\n+ description: Optional[str] = None,\n+ photo_id: Optional[str] = None,\n+ buttons: Optional[List[dict]] = None,\n+ action: Optional[dict] = None,\n+ ):\n+ assert buttons, \"Buttons are required\"\n+ assert photo_id and (title or description), \"photo_id or title is required\"\n+\n+ if isinstance(buttons, str):\n+ buttons = json.loads(buttons)\n+\n+ if isinstance(buttons, dict):\n+ buttons = buttons.get(\"buttons\")[0] # taking only first row\n+\n+ self.raw: dict = {k: v for k, v in locals().items() if v is not None and k != \"self\"}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/template/generator.py",
"diff": "+from vkbottle.modules import json\n+from .element import TemplateElement\n+\n+\n+def template_gen(*e: TemplateElement):\n+ \"\"\" Generates dumped carousel out of box \"\"\"\n+ return json.dumps({\"type\": \"carousel\", \"elements\": [e.raw for e in e]})\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
template generator ported from v2.x
|
718,838 |
11.12.2020 01:01:31
| -10,800 |
84756d7575b4c9b697f71fc5c46067317a27535a
|
template docs and tests; add keyboard_gen as legacy
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "from .dev_tools import *\n+from .production_tools import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/production_tools/__init__.py",
"new_path": "vkbottle/tools/production_tools/__init__.py",
"diff": "+from .legacies import keyboard_gen\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/production_tools/legacies/__init__.py",
"new_path": "vkbottle/tools/production_tools/legacies/__init__.py",
"diff": "+from .keyboard_generator import keyboard_gen # type: ignore\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/production_tools/legacies/keyboard_generator.py",
"diff": "+# type: ignore\n+# ^ ignore typing because legacies were entirely\n+# copied from vkbottle 2.x without quality insurance\n+\n+from typing import List\n+from vkbottle.modules import json\n+from warnings import warn\n+\n+\n+def keyboard_gen(pattern: List[List[dict]], one_time: bool = False, inline: bool = False):\n+ \"\"\" Simple keyboard generator\n+ :param pattern: Keyboard simple pattern, check github readme\n+ :param one_time: Should keyboard be hidden after first use?\n+ :param inline: Should keyboard be inline?\n+ :return: VK Api Keyboard JSON\n+ \"\"\"\n+ warn(\"keyboard_gen generator is obsolete, use Keyboard instead\", DeprecationWarning)\n+\n+ rows = pattern\n+ buttons = list()\n+\n+ for row in rows:\n+ row_buttons = list()\n+ for button in row:\n+ action = dict()\n+ fields = dict()\n+\n+ action[\"type\"] = button.get(\"type\", \"text\")\n+ action.update({k: v for k, v in button.items() if k not in (\"type\", \"text\", \"color\")})\n+\n+ if action[\"type\"] == \"text\":\n+ action[\"label\"] = button.get(\"text\", button.get(\"label\"))\n+ fields[\"color\"] = button.get(\"color\", \"default\")\n+\n+ row_button = {\"action\": action, **fields}\n+\n+ row_buttons.append(row_button)\n+ buttons.append(row_buttons)\n+\n+ keyboard = str(\n+ json.dumps(dict(one_time=one_time, buttons=buttons, inline=inline))\n+ .encode(\"utf-8\")\n+ .decode(\"utf-8\")\n+ )\n+\n+ return keyboard\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
template docs and tests; add keyboard_gen as legacy
|
718,838 |
11.12.2020 01:21:56
| -10,800 |
134eb76e6289b7674142316ca72646ce999d9388
|
fix rule types (close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -24,7 +24,7 @@ class PeerRule(ABCMessageRule):\ndef __init__(self, from_chat: bool = True):\nself.from_chat = from_chat\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif message.peer_id != message.from_id:\nreturn self.from_chat\nreturn not self.from_chat\n@@ -35,7 +35,7 @@ class CommandRule(ABCMessageRule):\nself.prefixes = prefixes or DEFAULT_PREFIXES\nself.command_text = command_text\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nfor prefix in self.prefixes:\nif message.text == prefix + self.command_text:\nreturn True\n@@ -100,7 +100,7 @@ class StickerRule(ABCMessageRule):\nsticker_ids = [sticker_ids]\nself.sticker_ids = sticker_ids\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif not message.attachments:\nreturn False\nelif not message.attachments[0].sticker:\n@@ -120,7 +120,7 @@ class FromPeerRule(ABCMessageRule):\npeer_ids = [peer_ids]\nself.peer_ids = peer_ids\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nreturn message.peer_id in self.peer_ids\n@@ -130,7 +130,7 @@ class AttachmentTypeRule(ABCMessageRule):\nattachment_types = [attachment_types]\nself.attachment_types = attachment_types\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif not message.attachments:\nreturn False\nfor attachment in message.attachments:\n@@ -151,7 +151,6 @@ class ReplyMessageRule(ABCMessageRule):\nasync def check(self, message: Message) -> bool:\nif not message.reply_message:\nreturn False\n-\nreturn True\n@@ -159,7 +158,6 @@ class GeoRule(ABCMessageRule):\nasync def check(self, message: Message) -> bool:\nif not message.geo:\nreturn False\n-\nreturn True\n@@ -192,7 +190,7 @@ class LevensteinRule(ABCMessageRule):\nreturn current_row[n]\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nfor levenstein_text in self.levenstein_texts:\nif self.distance(message.text, levenstein_text) <= self.max_distance:\nreturn True\n@@ -203,10 +201,8 @@ class MessageLengthRule(ABCMessageRule):\ndef __init__(self, min_length: int):\nself.min_length = min_length\n- async def check(self, message: Message) -> Union[dict, bool]:\n- if len(message.text) >= self.min_length:\n- return True\n- return False\n+ async def check(self, message: Message) -> bool:\n+ return len(message.text) >= self.min_length\nclass ChatActionRule(ABCMessageRule):\n@@ -215,7 +211,7 @@ class ChatActionRule(ABCMessageRule):\nchat_action_types = [chat_action_types]\nself.chat_action_types = chat_action_types\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif not message.action:\nreturn False\nelif message.action.type.value in self.chat_action_types:\n@@ -229,7 +225,7 @@ class PayloadRule(ABCMessageRule):\npayload = [payload]\nself.payload = payload\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nreturn message.get_payload_json() in self.payload\n@@ -237,7 +233,7 @@ class PayloadContainsRule(ABCMessageRule):\ndef __init__(self, payload_particular_part: dict):\nself.payload_particular_part = payload_particular_part\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\npayload = message.get_payload_json(unpack_failure=lambda p: {})\nfor k, v in self.payload_particular_part.items():\nif payload.get(k) != v:\n@@ -249,7 +245,7 @@ class PayloadMapRule(ABCMessageRule):\ndef __init__(self, payload_map: List[Tuple[str, type]]):\nself.payload_map = payload_map\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\npayload = message.get_payload_json(unpack_failure=lambda p: {})\nfor (k, v_type) in self.payload_map:\nif k not in payload:\n@@ -291,7 +287,7 @@ class StateRule(ABCMessageRule):\nstate = [] if state is None else [state]\nself.state = state\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif message.state_peer is None:\nreturn not self.state\nreturn message.state_peer.state in self.state\n@@ -303,7 +299,7 @@ class StateGroupRule(ABCMessageRule):\nstate_group = [] if state_group is None else [state_group]\nself.state_group = state_group\n- async def check(self, message: Message) -> Union[dict, bool]:\n+ async def check(self, message: Message) -> bool:\nif message.state_peer is None:\nreturn not self.state_group\nreturn type(message.state_peer.state) in self.state_group\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
fix rule types (close #274)
|
718,866 |
12.12.2020 20:10:59
| -10,800 |
baa398c6e5d2245fb7658c85c7c437c69b744b29
|
minify PeerRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/bot.py",
"new_path": "vkbottle/dispatch/rules/bot.py",
"diff": "@@ -25,9 +25,7 @@ class PeerRule(ABCMessageRule):\nself.from_chat = from_chat\nasync def check(self, message: Message) -> bool:\n- if message.peer_id != message.from_id:\n- return self.from_chat\n- return not self.from_chat\n+ return self.from_chat is (message.peer_id != message.from_id)\nclass CommandRule(ABCMessageRule):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
minify PeerRule (#279)
|
718,838 |
13.12.2020 01:03:05
| -10,800 |
34fe53ccb8c9f5af09e9dedc94923c5888d371ba
|
add task_each_event param
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -23,6 +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):\nself.api: Union[ABCAPI, API] = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n@@ -32,6 +33,7 @@ class Bot(ABCFramework):\nself._polling = polling or BotPolling(self.api)\nself._router = router or BotRouter()\nself._loop = loop\n+ self.task_each_event = task_each_event\n@property\ndef polling(self) -> \"ABCPolling\":\n@@ -60,7 +62,10 @@ class Bot(ABCFramework):\nasync for event in polling.listen(): # type: ignore\nlogger.debug(f\"New event was received: {event}\")\nfor update in event[\"updates\"]:\n+ if not self.task_each_event:\nawait self.router.route(update, polling.api)\n+ else:\n+ self.loop.create_task(self.router.route(update, polling.api))\ndef run_forever(self) -> NoReturn:\nlogger.info(\"Loop will be ran forever\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add task_each_event param
|
718,838 |
21.12.2020 19:52:12
| -10,800 |
6bf2f2265f558a77e082d93af06f9563ed73ab7c
|
Auto Reload
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -28,6 +28,7 @@ aiohttp = \"^3.6.2\"\nvbml = \"^1.0\"\nchoicelib = \"^0.1.1\"\nvkbottle-types = \"^0.1.21\"\n+watchdog = \"^0.10.3\"\n[tool.poetry.dev-dependencies]\n# Lint\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev_tools/auto_reload.py",
"diff": "+import os\n+import sys\n+\n+from watchgod import awatch\n+from vkbottle.modules import logger\n+\n+_startup_cwd = os.getcwd()\n+\n+\n+def restart():\n+ \"\"\" https://github.com/cherrypy/cherrypy/blob/0857fa81eb0ab647c7b59a019338bab057f7748b/cherrypy/process/wspbus.py#L305\n+ \"\"\"\n+ args = sys.argv[:]\n+ logger.debug(\"Restarting: %s\" % \" \".join(args))\n+ args.insert(0, sys.executable)\n+ if sys.platform == \"win32\":\n+ args = ['\"%s\"' % arg for arg in args]\n+\n+ os.chdir(_startup_cwd)\n+ os.execv(sys.executable, args)\n+\n+\n+async def watch_to_reload(check_dir: str):\n+ \"\"\"\n+ Coro which see changes in your code and restart him.\n+ :return:\n+ \"\"\"\n+ async for _ in awatch(check_dir):\n+ logger.info(\"Changes were found. Restarting...\")\n+ restart()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"new_path": "vkbottle/tools/dev_tools/loop_wrapper.py",
"diff": "@@ -4,6 +4,7 @@ from typing import Optional, List, Coroutine, Any, Union, Callable\nfrom vkbottle.modules import logger\nfrom .delayed_task import DelayedTask\n+from .auto_reload import watch_to_reload\nTask = Coroutine[Any, Any, Any]\n@@ -17,10 +18,14 @@ class LoopWrapper:\n*,\non_startup: Optional[List[Task]] = None,\non_shutdown: Optional[List[Task]] = None,\n+ auto_reload: Optional[bool] = None,\n+ auto_reload_dir: Optional[str] = None,\ntasks: Optional[List[Task]] = None,\n):\nself.on_startup = on_startup or []\nself.on_shutdown = on_shutdown or []\n+ self.auto_reload = auto_reload or False\n+ self.auto_reload_dir = auto_reload_dir or \".\"\nself.tasks = tasks or []\ndef run_forever(self, loop: Optional[AbstractEventLoop] = None):\n@@ -34,6 +39,9 @@ class LoopWrapper:\ntry:\n[loop.run_until_complete(startup_task) for startup_task in self.on_startup]\n+ if self.auto_reload:\n+ loop.create_task(watch_to_reload(self.auto_reload_dir))\n+\nfor task in self.tasks:\nloop.create_task(task)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Auto Reload #262 (#289)
Co-authored-by: Ne0shka <neosha.73@gmail.com>
|
718,838 |
22.12.2020 14:26:28
| -10,800 |
4ed9bf559596d10c82c87f11309c1f5ec42645eb
|
add token generators
|
[
{
"change_type": "MODIFY",
"old_path": "tests/bot_test.py",
"new_path": "tests/bot_test.py",
"diff": "@@ -96,7 +96,7 @@ async def test_bot_polling():\n@pytest.mark.asyncio\nasync def test_bot_scopes():\nbot = Bot(token=\"some token\")\n- assert bot.api.token == \"some token\"\n+ assert await bot.api.token_generator.get_token() == \"some token\"\nassert bot.api == bot.polling.api\nassert bot.labeler.message_view is bot.router.views[\"message\"]\nassert bot.labeler.raw_event_view is bot.router.views[\"raw\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -11,6 +11,11 @@ from .api import (\nDEFAULT_REQUEST_VALIDATORS,\nABCRequestRescheduler,\nBlockingRequestRescheduler,\n+ ABCTokenGenerator,\n+ SingleTokenGenerator,\n+ ConsistentTokenGenerator,\n+ Token,\n+ get_token_generator,\n)\nfrom .dispatch import (\nABCHandler,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .abc import ABCAPI\nfrom .api import API\n+from .token_generator import (\n+ ABCTokenGenerator,\n+ Token,\n+ get_token_generator,\n+ SingleTokenGenerator,\n+ ConsistentTokenGenerator,\n+)\nfrom .request_rescheduler import ABCRequestRescheduler, BlockingRequestRescheduler\nfrom .response_validator import ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\nfrom .request_validator import ABCRequestValidator, DEFAULT_REQUEST_VALIDATORS\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "@@ -4,7 +4,6 @@ from abc import ABC, abstractmethod\nfrom vkbottle.http import ABCSessionManager\nif typing.TYPE_CHECKING:\n- from .api_error_handler import ABCAPIErrorHandler\nfrom .request_rescheduler import ABCRequestRescheduler\n@@ -15,7 +14,6 @@ class ABCAPI(ABC):\nhttp: \"ABCSessionManager\"\nignore_errors: bool\n- api_error_handler: \"ABCAPIErrorHandler\"\nrequest_rescheduler: \"ABCRequestRescheduler\"\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -5,6 +5,7 @@ from vkbottle_types.categories import APICategories\nfrom vkbottle.http import ABCSessionManager, AiohttpClient, SingleSessionManager\nfrom vkbottle.modules import logger\nfrom .abc import ABCAPI\n+from .token_generator import Token, get_token_generator\nfrom .request_rescheduler import ABCRequestRescheduler, BlockingRequestRescheduler\nfrom .request_validator import ABCRequestValidator, DEFAULT_REQUEST_VALIDATORS\nfrom .response_validator import ABCResponseValidator, DEFAULT_RESPONSE_VALIDATORS\n@@ -23,12 +24,12 @@ class API(ABCAPI, APICategories):\ndef __init__(\nself,\n- token: str,\n+ token: Token,\nignore_errors: bool = False,\nsession_manager: typing.Optional[SingleSessionManager] = None,\nrequest_rescheduler: typing.Optional[ABCRequestRescheduler] = None,\n):\n- self.token = token\n+ self.token_generator = get_token_generator(token)\nself.ignore_errors = ignore_errors\nself.http: ABCSessionManager = session_manager or SingleSessionManager(AiohttpClient)\nself.request_rescheduler = request_rescheduler or BlockingRequestRescheduler()\n@@ -40,11 +41,12 @@ class API(ABCAPI, APICategories):\ndata = await self.validate_request(data)\nasync with self.http as session:\n+ async with self.token_generator as token:\nresponse = await session.request_text(\n\"POST\",\nself.API_URL + method,\ndata=data, # type: ignore\n- params={\"access_token\": self.token, \"v\": self.API_VERSION},\n+ params={\"access_token\": token, \"v\": self.API_VERSION},\n)\nlogger.debug(\"Request {} with {} data returned {}\".format(method, data, response))\nreturn await self.validate_response(method, data, response)\n@@ -56,11 +58,12 @@ class API(ABCAPI, APICategories):\nasync with self.http as session:\nfor request in requests:\nmethod, data = request.method, await self.validate_request(request.data) # type: ignore\n+ async with self.token_generator as token:\nresponse = await session.request_text(\n\"POST\",\nself.API_URL + method,\ndata=data, # noqa\n- params={\"access_token\": self.token, \"v\": self.API_VERSION}, # noqa\n+ params={\"access_token\": token, \"v\": self.API_VERSION}, # noqa\n)\nlogger.debug(\"Request {} with {} data returned {}\".format(method, data, response))\nyield await self.validate_response(method, data, response)\n@@ -88,4 +91,4 @@ class API(ABCAPI, APICategories):\nreturn self\ndef __repr__(self) -> str:\n- return f\"<API token={self.token[:5] if self.token else '?'}...>\"\n+ return f\"<API token_generator={self.token_generator}...>\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token_generator/__init__.py",
"diff": "+from .abc import ABCTokenGenerator, Token\n+from .consistent import ConsistentTokenGenerator\n+from .single import SingleTokenGenerator\n+from .util import get_token_generator\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token_generator/abc.py",
"diff": "+from abc import ABC, abstractmethod\n+from typing import Union, List\n+\n+\n+class ABCTokenGenerator(ABC):\n+ async def __aenter__(self):\n+ return await self.get_token()\n+\n+ async def __aexit__(self, exc_type, exc_val, exc_tb):\n+ pass\n+\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__}>\"\n+\n+ @abstractmethod\n+ async def get_token(self) -> str:\n+ pass\n+\n+\n+Token = Union[str, List[str], ABCTokenGenerator]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token_generator/consistent.py",
"diff": "+from .abc import ABCTokenGenerator\n+from typing import List\n+\n+\n+class ConsistentTokenGenerator(ABCTokenGenerator):\n+ def __init__(self, tokens: List[str]):\n+ self.tokens = tokens\n+ self.index = 0\n+\n+ async def get_token(self) -> str:\n+ i = self.index\n+ self.index = i + 1 if i < len(self.tokens) + 1 else 0\n+ return self.tokens[i]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token_generator/single.py",
"diff": "+from .abc import ABCTokenGenerator\n+\n+\n+class SingleTokenGenerator(ABCTokenGenerator):\n+ def __init__(self, token: str):\n+ self.token = token\n+\n+ async def get_token(self) -> str:\n+ return self.token\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token_generator/util.py",
"diff": "+from .abc import ABCTokenGenerator, Token\n+from .consistent import ConsistentTokenGenerator\n+from .single import SingleTokenGenerator\n+\n+\n+def get_token_generator(token: \"Token\") -> \"ABCTokenGenerator\":\n+ \"\"\" Converts token shortcuts to generators\n+ >>> get_token_generator(\"abc123\") # <SingleTokenGenerator>\n+ >>> get_token_generator([\"abc123\", \"def456\"]) # <ConsistentTokenGenerator>\n+ >>> get_token_generator(ConsistentTokenGenerator([\"abc123\", \"def456\"])) # <ConsistentTokenGenerator>\n+ \"\"\"\n+ if isinstance(token, str):\n+ return SingleTokenGenerator(token)\n+ elif isinstance(token, list):\n+ return ConsistentTokenGenerator(token)\n+ return token\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/return_manager/bot/message.py",
"new_path": "vkbottle/dispatch/return_manager/bot/message.py",
"diff": "-from typing import Union\n+from typing import Union, TYPE_CHECKING\nfrom vkbottle.dispatch.return_manager.abc import BaseReturnManager\n+\n+if TYPE_CHECKING:\nfrom vkbottle.tools.dev_tools.mini_types.bot import MessageMin\nclass BotMessageReturnHandler(BaseReturnManager):\n@BaseReturnManager.instance_of(str)\n- async def str_handler(self, value: str, message: MessageMin, _: dict):\n+ async def str_handler(self, value: str, message: \"MessageMin\", _: dict):\nawait message.answer(value)\n@BaseReturnManager.instance_of((tuple, list))\n- async def iter_handler(self, value: Union[tuple, list], message: MessageMin, _: dict):\n+ async def iter_handler(self, value: Union[tuple, list], message: \"MessageMin\", _: dict):\n[await message.answer(str(e)) for e in value]\n@BaseReturnManager.instance_of(dict)\n- async def dict_handler(self, value: dict, message: MessageMin, _: dict):\n+ async def dict_handler(self, value: dict, message: \"MessageMin\", _: dict):\nawait message.answer(**value)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev_tools/utils.py",
"new_path": "vkbottle/tools/dev_tools/utils.py",
"diff": "from asyncio import get_running_loop\nfrom vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.filter import AndFilter, OrFilter\n+from vkbottle.api.token_generator.single import SingleTokenGenerator\n+from vkbottle.api.token_generator.consistent import ConsistentTokenGenerator\nimport importlib\nimport typing\nimport os\n@@ -8,6 +10,7 @@ import re\nif typing.TYPE_CHECKING:\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\n+ from vkbottle.api.token_generator import ABCTokenGenerator, Token\n# This feature is not used in production\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
add token generators
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.