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,889 |
07.02.2020 00:40:49
| -18,000 |
58fddaaded2d11e2b8f50e58b054e8acaaedd957
|
Handler rule text accepts list
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -198,23 +198,29 @@ class MessageHandler:\ndef _text_rule(\nself,\nfunc: typing.Callable,\n- text: typing.Union[str, Pattern],\n+ text: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]],\nlower: bool,\ncommand: bool,\npattern: str,\n) -> AbstractRule:\nif not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n- pattern = self._patcher.pattern(\n+ texts: typing.List[str] = text if isinstance(text, list) else [text]\n+ patterns: typing.List[Pattern] = []\n+ for text in texts:\n+ patterns.append(self._patcher.pattern(\ntext,\npattern=(prefix + pattern) if prefix else pattern,\n- flags=re.IGNORECASE if lower else None,\n- )\n- rule = VBMLRule(pattern)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, pattern.arguments)\n+ flags=re.IGNORECASE if lower else None\n+ ))\n+ rule = VBMLRule(patterns)\n+ arguments = [arguments for pattern in patterns for arguments in pattern.arguments]\n+ rule.data[\"ignore_ans\"] = should_ignore_ans(func, arguments)\nelse:\n- rule = VBMLRule(self._patcher.pattern(text))\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, text.arguments)\n+ patterns: typing.List[Pattern] = text if isinstance(text, list) else [text]\n+ rule = VBMLRule(patterns)\n+ arguments = [arguments for pattern in patterns for arguments in pattern.arguments]\n+ rule.data[\"ignore_ans\"] = should_ignore_ans(func, arguments)\nreturn rule\n@@ -268,7 +274,7 @@ class MessageHandler:\ndef __call__(\nself,\n*rules,\n- text: typing.Union[str, Pattern] = None,\n+ text: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]] = None,\ncommand: bool = False,\nlower: bool = False,\n**col_rules,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Handler rule text accepts list (#23)
|
718,838 |
07.02.2020 23:10:28
| -10,800 |
585039372806dd4f83309e04e01f6b4386b717fa
|
v1 Big Speed Commit
[need tests]
+ new examples
+ fix chat_mention
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/branches_new.py",
"diff": "+from vkbottle import Bot, Message\n+from vkbottle.branch import ClsBranch, ExitBranch\n+import os\n+\n+\n+# Add variable TOKEN to your env variables\n+bot = Bot(os.environ[\"TOKEN\"])\n+\n+\n+@bot.branch.simple_branch()\n+async def branch_wrapper(ans: Message, word):\n+ if ans.text.lower() in [\"exit\", \"stop\"]:\n+ await ans(\"As you want to!\")\n+ return ExitBranch()\n+ await ans(word)\n+\n+\n+@bot.branch.cls_branch(branch_name=\"another\")\n+class Branch(ClsBranch):\n+ async def branch(self, ans: Message):\n+ return \"An another class branch\"\n+\n+ async def exit(self, ans: Message):\n+ await ans(\"life on mars?\")\n+\n+\n+@bot.on.message_handler(text=[\"say <word>\", \"add <word>\"])\n+async def pronounce(ans: Message, word):\n+ bot.branch.add(ans.peer_id, Branch, word=word)\n+ return \"Okay!\"\n+\n+bot.run_polling()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/stress.py",
"diff": "+from vkbottle import Bot, Message\n+import os, random, string, asyncio\n+from asyncio import sleep\n+\n+# Add variable TOKEN to your env variables\n+bot = Bot(os.environ[\"TOKEN\"], debug=False)\n+STRINGS = []\n+TIMES = 0\n+\n+\n+def random_string(length=10):\n+ \"\"\"Generate a random string of fixed length \"\"\"\n+ letters = string.ascii_lowercase\n+ return ''.join(random.choice(letters) for i in range(length))\n+\n+\n+async def stress(ans: Message):\n+ for s in STRINGS:\n+ await ans(f\"/r {s}\")\n+ await sleep(0.4)\n+ await ans(\"/re - to see results\")\n+\n+\n+@bot.on.message_handler(text=[\"/s\", \"/stress <t:int>\"])\n+async def pronounce(ans: Message, t=100):\n+ globals()[\"STRINGS\"] = [random_string() for i in range(t)]\n+ globals()[\"TIMES\"] = t\n+ bot.loop.create_task(stress(ans))\n+\n+\n+@bot.on.message_handler(text=[\"/results\", \"/re\"])\n+async def res():\n+ return f\"{TIMES - len(STRINGS)}/{TIMES}. I haven't seen {STRINGS}\"\n+\n+\n+@bot.on.message_handler(text=\"/r <s>\")\n+async def response(s):\n+ if s in STRINGS:\n+ STRINGS.pop(STRINGS.index(s))\n+\n+bot.run_polling()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/stress_devourer.py",
"diff": "+from vkbottle import Bot, Message\n+import os\n+\n+# Add variable TOKEN to your env variables\n+bot = Bot(os.environ[\"TOKEN\"], debug=False)\n+\n+\n+@bot.on.message_handler(text=\"/r <s>\")\n+async def pronounce(s):\n+ return f\"/r {s}\"\n+\n+bot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "aiohttp\n+contextvars\npydantic\ncolorama\ntermcolor\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -7,6 +7,8 @@ except:\nwith open(\"README.md\", \"r\") as f:\nlong_description = f.read()\n+with open(\"requirements.txt\", \"r\") as f:\n+ requirements = f.read().splitlines()\nsetuptools.setup(\nname=\"vkbottle\",\n@@ -24,5 +26,5 @@ setuptools.setup(\n\"Programming Language :: Python :: 3.7\",\n\"Operating System :: OS Independent\",\n],\n- install_requires=[\"aiohttp\", \"pydantic\", \"colorama\", \"termcolor\", \"vbml\"],\n+ install_requires=requirements,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "-from .framework import Bot, Branch, ExitBranch, User, rule\n+from .framework import Bot, Branch, ExitBranch, User, rule, branch\nfrom .types.message import Message\nfrom .utils.task import TaskManager\nfrom .api import template_gen, TemplateElement\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/branch.py",
"diff": "+from .framework.branch import (\n+ BranchManager,\n+ Branch,\n+ ExitBranch,\n+ AbstractBranch,\n+ FunctionBranch,\n+ ClsBranch,\n+)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "from .bot import Bot\nfrom .user import User\n-from .branch import Branch, ExitBranch\n+from .branch import (\n+ Branch,\n+ ExitBranch,\n+ AbstractBranch,\n+ ClsBranch,\n+ FunctionBranch\n+)\nfrom . import rule\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -74,6 +74,7 @@ class Bot(HTTP, EventProcessor):\nplugin_folder=folder_checkup(plugin_folder or \"vkbottle_bot\"),\nlogger_enabled=log_to_file,\n)\n+ Logger.set_current(self._logger)\nself.group_id = group_id or self.get_id_by_token(token)\n# Main workers\n@@ -192,17 +193,13 @@ class Bot(HTTP, EventProcessor):\n:param long_poll_server:\n:return: VK LongPoll Event\n\"\"\"\n- try:\nurl = \"{}?act=a_check&key={}&ts={}&wait={}&rps_delay=0\".format(\nlong_poll_server[\"server\"],\nlong_poll_server[\"key\"],\nlong_poll_server[\"ts\"],\n- self.__wait or DEFAULT_WAIT,\n+ self.__wait,\n)\nreturn await self.request.post(url)\n- except AsyncioTimeoutError:\n- self._logger.error(\"TimeoutError of asyncio in longpoll request\")\n- return await self.make_long_request(long_poll_server)\ndef run_polling(self):\n\"\"\"\n@@ -218,19 +215,17 @@ class Bot(HTTP, EventProcessor):\nself.__wait = wait\nself._logger.info(\"Polling will be started. Is it OK?\")\n+ if not self.status.dispatched:\n+ await self.on.dispatch(self.get_current_rest)\n+ self.status.dispatched = True\n+\nawait self.get_server()\nself._logger.debug(\"Polling successfully started. Press Ctrl+C to stop it\")\nwhile True:\n- try:\nevent = await self.make_long_request(self.long_poll_server)\n- if isinstance(event, dict):\n- self.loop.create_task(self.emulate(event))\nawait self.get_server()\n-\n- except (ClientConnectionError, ServerTimeoutError, AsyncioTimeoutError):\n- # No internet connection\n- await self._logger.warning(\"Server Timeout Error!\")\n+ self.loop.create_task(self.emulate(event))\nasync def emulate(self, event: dict, confirmation_token: str = None) -> str:\n\"\"\"\n@@ -240,10 +235,6 @@ class Bot(HTTP, EventProcessor):\n:return: \"ok\"\n\"\"\"\n- if not self.status.dispatched:\n- await self.on.dispatch(self.get_current_rest)\n- self.status.dispatched = True\n-\nif event.get(\"type\") == \"confirmation\":\nif event.get(\"group_id\") == self.group_id:\nreturn confirmation_token or \"dissatisfied\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/__init__.py",
"new_path": "vkbottle/framework/branch/__init__.py",
"diff": "from .branch import BranchManager\nfrom .standart_branch import Branch, ExitBranch\n+from .cls import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "-import typing\n+import typing, asyncio\n+\n+from .cls import FunctionBranch, AbstractBranch\nfrom ...api.exceptions import BranchError\nfrom ...utils import folder_checkup\n@@ -12,35 +14,53 @@ class BranchManager:\nself.log_path: str = \"{path}/{branch_file}\".format(\npath=self.plugin_folder, branch_file=BRANCH_DATA\n)\n- self._meet_up: dict = {}\n- self._branch_queue: dict = {}\n+ self._meet_up: typing.Dict[str, AbstractBranch] = {}\n+ self._branch_queue: typing.Dict[int, AbstractBranch] = {}\n- def simple_branch(self, branch_name: str):\n- def decorator(func):\n- self._meet_up[branch_name] = func\n+ def simple_branch(self, branch_name: str = None):\n+ def decorator(func: typing.Callable):\n+ if not asyncio.iscoroutinefunction(func):\n+ raise BranchError(\"Branch functions should be async\")\n+ self._meet_up[branch_name or func.__name__] = FunctionBranch(branch_name or func.__name__, call=func)\nreturn func\n+ return decorator\n+ def cls_branch(self, branch_name: str = None):\n+ def decorator(cls: typing.ClassVar):\n+ self._meet_up[branch_name or cls.__name__] = cls(branch_name)\n+ return cls\nreturn decorator\n@property\n- def queue(self) -> dict:\n+ def queue(self) -> typing.Dict[int, AbstractBranch]:\nreturn self._branch_queue\n@property\n- def branches(self) -> dict:\n+ def branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self._meet_up\n- def add(self, uid: int, branch: str, **kwargs) -> None:\n+ def add(self, uid: int, branch: typing.Union[typing.Callable, str, AbstractBranch], **context) -> None:\n+ if isinstance(branch, str):\nif branch not in self._meet_up:\n- raise BranchError('Branch \"{}\" is undefined'.format(branch))\n- self._branch_queue[uid] = [branch, kwargs]\n+ raise BranchError(\"Branch {} hasn't been yet assigned with decorator\".format(branch))\n+ branch = self._meet_up[branch]\n+ elif isinstance(branch, typing.Coroutine):\n+ q = {b.data[\"call\"]: b for b in self._meet_up.values() if \"call\" in b.data}\n+ if branch not in q:\n+ raise BranchError(\"Branch {} hasn't been yet assigned with decorator\".format(branch.__name__))\n+ branch = q[branch]\n+ else:\n+ for k, v in self._meet_up.items():\n+ if isinstance(v, branch):\n+ branch = self._meet_up[k]\n+ break\n+ branch.create(**context)\n+ self._branch_queue[uid] = branch\n- def load(self, uid: int) -> typing.Optional[typing.List]:\n+ def load(self, uid: int) -> AbstractBranch:\nif uid in self._branch_queue:\n- return self._branch_queue.get(uid, None)\n- return None\n+ return self._branch_queue.get(uid)\n- def exit(self, uid: int) -> typing.Optional[typing.List]:\n+ def exit(self, uid: int) -> AbstractBranch:\nif uid in self._branch_queue:\nreturn self._branch_queue.pop(uid, None)\n- return None\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "+from copy import copy\n+\n+from ...types import Message\n+from ...utils import Logger\n+\n+logger = Logger.get_current\n+\n+\n+class Copy:\n+ def copy(self):\n+ return copy(self)\n+\n+\n+class AbstractBranch(Copy):\n+ def __init__(self, name: str = None, **kwargs):\n+ if not hasattr(self, \"key\"):\n+ self.key = name if name is not None else getattr(self, \"__class__\").__name__\n+ self.data = kwargs\n+\n+ def create(self, **context):\n+ self.context = context\n+ ...\n+\n+ async def enter(self, ans: Message):\n+ ...\n+\n+ async def branch(self, ans: Message):\n+ ...\n+\n+ async def exit(self, ans: Message):\n+ ...\n+\n+\n+class ClsBranch(AbstractBranch):\n+ async def enter(self, ans: Message):\n+ logger().info(\"Branch \\\"{}\\\" entered at %#%\")\n+\n+ async def exit(self, ans: Message):\n+ logger().info(\"Branch \\\"{}\\\" exit at %#%\")\n+\n+\n+class FunctionBranch(ClsBranch):\n+ async def branch(self, ans: Message):\n+ return await self.data[\"call\"](ans, **self.context)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -30,7 +30,7 @@ class EventProcessor(RegexHelper):\nstatus: BotStatus\ngroup_id: int\n_logger: Logger\n- __loop: AbstractEventLoop\n+ loop: AbstractEventLoop\nasync def _processor(self, obj: dict, client_info: dict):\nprocessor = dict(obj=obj, client_info=client_info)\n@@ -41,7 +41,8 @@ class EventProcessor(RegexHelper):\n)\nif message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\n- return await self._branched_processor(obj, client_info)\n+ self.loop.create_task(self._branched_processor(obj, client_info))\n+ return\nif self.on.pre:\nawait (self.on.pre(message))\n@@ -115,19 +116,21 @@ class EventProcessor(RegexHelper):\n)\nbranch = self.branch.load(answer.peer_id)\n- task = await (self.branch.branches[branch[0]](answer, **branch[1]))\n+\n+ await branch.enter(answer)\n+ task = await branch.branch(answer)\ntask = await self._handler_return(task, obj, client_info)\n- _kw = str(branch[1])\nself._logger.debug(\n\"New BRANCHED-message compiled with branch <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n'\"{}\" with {} kwargs'.format(\n- branch[0], _kw if len(_kw) < 100 else _kw[1:99] + \"...\"\n+ branch.key, branch.context if len(branch.context) < 100 else branch.context[1:99] + \"...\"\n),\nanswer.from_id,\n)\n)\n+ await branch.exit(answer)\nreturn task\nasync def _handler_return(self, handler_return, obj: dict, client_info: dict):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -124,9 +124,8 @@ class Handler:\ndef chat_mention(self):\ndef decorator(func):\n- pattern = self._patcher.pattern(\n- pattern=\"\", _pattern=r\"\\[(club|public){}\\|.*?]\".format(self.group_id)\n- )\n+ pattern = Pattern(pattern=r\"\\[(club|public){}\\|.*?]\".format(self.group_id))\n+ print(pattern.pattern)\nignore_ans = len(signature(func).parameters) < 1\nrule = VBMLRule(pattern)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -8,6 +8,7 @@ import sys\nfrom termcolor import colored\nfrom colorama import init as color_opt\n+from .util import ContextInstanceMixin\nLOG_FILE_PATTERN = r\"[a-zA-Z0-9]+\\.log\"\nDEFAULT_LOG_NAME = \"bot\"\n@@ -29,7 +30,7 @@ class Coloring:\n)\n-class Logger:\n+class Logger(ContextInstanceMixin):\ndef __init__(\nself,\ndebug: bool,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v1 Big Speed Commit
[need tests]
+ new examples
+ fix chat_mention
|
718,838 |
08.02.2020 13:04:31
| -10,800 |
f9a37aa44f211218794084e966a426932c1895f3
|
v1 logger - loguru
|
[
{
"change_type": "MODIFY",
"old_path": "examples/raid.py",
"new_path": "examples/raid.py",
"diff": "@@ -9,7 +9,7 @@ bot = Bot(\"token\")\nasync def raid(ans: Message, text: str, times: int):\nfor i in range(times):\nawait ans(text)\n- await asyncio.sleep(1)\n+ await asyncio.sleep(0.2)\nbot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress.py",
"new_path": "examples/tests/stress.py",
"diff": "@@ -15,13 +15,13 @@ def random_string(length=10):\nasync def stress(ans: Message):\n- for s in STRINGS:\n+ for s in STRINGS.copy():\nawait ans(f\"/r {s}\")\n- await sleep(0.4)\n+ await sleep(0.3)\nawait ans(\"/re - to see results\")\n-@bot.on.message_handler(text=[\"/s\", \"/stress <t:int>\"])\n+@bot.on.message_handler(text=[\"/s\", \"/s <t:int>\"])\nasync def pronounce(ans: Message, t=100):\nglobals()[\"STRINGS\"] = [random_string() for i in range(t)]\nglobals()[\"TIMES\"] = t\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress_devourer.py",
"new_path": "examples/tests/stress_devourer.py",
"diff": "@@ -2,7 +2,7 @@ from vkbottle import Bot, Message\nimport os\n# Add variable TOKEN to your env variables\n-bot = Bot(os.environ[\"TOKEN\"], debug=False)\n+bot = Bot(os.environ[\"TOKEN\"])\n@bot.on.message_handler(text=\"/r <s>\")\n"
},
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "aiohttp\ncontextvars\npydantic\n-colorama\n-termcolor\n+loguru\nvbml\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -2,7 +2,7 @@ import time\nimport asyncio\nimport typing\n-from termcolor import cprint\n+from loguru import logger\nfrom ..const import API_VERSION, API_URL\nfrom .exceptions import VKError\n@@ -30,25 +30,26 @@ async def request_instance(method: str, req: typing.Coroutine):\nif not isinstance(response, dict):\nwhile not isinstance(response, dict):\n+ # Works only on python 3.6+\ndelay = 1\n- cprint(\n- f\"\\n--- {time.strftime('%m-%d %H:%M:%S')}\"\n+ logger.critical(\n+ \"\\n---\"\nf\"{time.localtime()} - DELAY {delay * 5} sec\\n\"\nf\"Check your internet connection. Maybe VK died, request returned: {response}\"\nf\"Error appeared after request: {method}\",\n- color=\"yellow\",\n)\nawait asyncio.sleep(delay * 5)\ndelay += 1\nresponse = await req\n- cprint(f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\n+ logger.critical(\n+ f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\nf\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\nf\"RESPONSE: {response}\\n\",\n- color=\"green\",\n)\nif \"error\" in response:\n+ logger.debug(\"Error after request {method}, response: {r}\", method=method, r=response)\nraise VKError([response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]])\nreturn response[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/_status.py",
"new_path": "vkbottle/framework/_status.py",
"diff": "+from loguru import logger\n+\n+\n+class LoggerLevel:\n+ def __init__(self, level):\n+ self.level = level\n+\n+ def __call__(self, record):\n+ level_no = logger.level(self.level).no\n+ return record[\"level\"].no >= level_no\n+\n+\nclass BotStatus:\npolling_started: bool = False\ndispatched: bool = False\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "-import traceback\n+import traceback, sys, typing\n+from loguru import logger\nfrom asyncio import get_event_loop, AbstractEventLoop\n-from asyncio import TimeoutError as AsyncioTimeoutError\n-from aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\n-\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..api import Api, request\nfrom ..handler import Handler, ErrorHandler\n-from ..utils.logger import Logger, keyboard_interrupt\nfrom ..http import HTTP\nfrom ..api import VKError\nfrom vbml import Patcher, PatchedValidators\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\nfrom .branch import BranchManager\n-from ..utils.tools import folder_checkup\n-from ._status import BotStatus\n+from ._status import BotStatus, LoggerLevel\ntry:\nimport vbml\n@@ -37,10 +33,8 @@ class Bot(HTTP, EventProcessor):\ntoken: str,\n*,\ngroup_id: int = None,\n- debug: bool = True,\n- plugin_folder: str = None,\n- log_to_file: bool = False,\n- log_to: str = None,\n+ debug: typing.Union[str, bool] = True,\n+ log_to_path: typing.Union[str, bool] = None,\nsecret: str = None,\n):\n\"\"\"\n@@ -48,9 +42,7 @@ class Bot(HTTP, EventProcessor):\n:param token: bot token\n:param group_id: [auto]\n:param debug: should bot debug messages for emulating\n- :param plugin_folder: folder for logs\n- :param log_to_file: make logs\n- :param log_to: log path\n+ :param log_to_path: make logs\n:param secret: secret vk code for callback\n\"\"\"\n# Base bot classifiers\n@@ -65,21 +57,30 @@ class Bot(HTTP, EventProcessor):\nself.__api: Api = Api(token)\nApi.set_current(self.__api)\n+ if isinstance(debug, bool):\n+ debug = \"INFO\" if debug else \"ERROR\"\n+\n+ self.logger = LoggerLevel(debug)\n+\nif not Patcher.get_current():\nPatcher.set_current(Patcher(pattern=\"^{}$\", validators=DefaultValidators))\n- self._logger: Logger = Logger(\n- debug=debug,\n- log_file=log_to,\n- plugin_folder=folder_checkup(plugin_folder or \"vkbottle_bot\"),\n- logger_enabled=log_to_file,\n- )\n- Logger.set_current(self._logger)\n+ logger.remove()\n+ logger.add(sys.stderr,\n+ colorize=True,\n+ format=\"<level>[<blue>VKBottle</blue>] {message}</level> <white>[TIME {time:HH:MM:ss}]</white>\",\n+ filter=self.logger,\n+ level=0,\n+ enqueue=True)\n+ logger.level(\"INFO\", color=\"<white>\")\n+ logger.level(\"ERROR\", color=\"<red>\")\n+ if log_to_path:\n+ logger.add(\"log_{time}.log\" if log_to_path is True else log_to_path, rotation=\"100 MB\")\nself.group_id = group_id or self.get_id_by_token(token)\n# Main workers\n- self.branch: BranchManager = BranchManager(plugin_folder or DEFAULT_BOT_FOLDER)\n- self.on: Handler = Handler(self._logger, self.group_id)\n+ self.branch: BranchManager = BranchManager(DEFAULT_BOT_FOLDER)\n+ self.on: Handler = Handler(self.group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\ndef dispatch(self, ext: \"Bot\"):\n@@ -90,6 +91,7 @@ class Bot(HTTP, EventProcessor):\n\"\"\"\nself.on.concatenate(ext.on)\nself.error_handler.update(ext.error_handler.processors)\n+ logger.debug(\"Bot has been successfully dispatched\")\n@staticmethod\ndef get_id_by_token(token: str):\n@@ -98,6 +100,7 @@ class Bot(HTTP, EventProcessor):\n:param token:\n:return:\n\"\"\"\n+ logger.debug(\"Making API request groups.getById to get group_id\")\nresponse = get_event_loop().run_until_complete(request(token, \"groups.getById\"))\nif \"error\" in response:\nraise VKError(\"Token is invalid\")\n@@ -110,28 +113,10 @@ class Bot(HTTP, EventProcessor):\n:return:\n\"\"\"\nif self.__secret:\n+ logger.debug(\"Checking secret for event ({secret})\", secret=event.get(\"secret\"))\nreturn event.get(\"secret\") == self.__secret\nreturn True\n- def set_debug(self, debug: bool, **params):\n- \"\"\"\n- DEPRECATED\n- Set debug regime\n- :param debug: debug mode\n- :param params: logging params\n- :return:\n- \"\"\"\n- self.__debug = debug\n- self._logger: Logger = Logger(\n- debug,\n- **params,\n- **{\n- k: v\n- for k, v in self._logger.logger_params.items()\n- if k not in {**params, \"debug\": None}\n- },\n- )\n-\ndef loop_update(self, loop: AbstractEventLoop = None):\n\"\"\"\nUpdate event loop\n@@ -207,20 +192,22 @@ class Bot(HTTP, EventProcessor):\n\"\"\"\nloop = self.__loop\ntry:\n- loop.run_until_complete(self.run())\n+ loop.create_task(self.run())\n+ loop.run_forever()\nexcept KeyboardInterrupt:\n- keyboard_interrupt()\n+ logger.error(\"Keyboard Interrupt\")\n+ exit(0)\nasync def run(self, wait: int = DEFAULT_WAIT):\nself.__wait = wait\n- self._logger.info(\"Polling will be started. Is it OK?\")\n+ logger.debug(\"Polling will be started. Is it OK?\")\nif not self.status.dispatched:\nawait self.on.dispatch(self.get_current_rest)\nself.status.dispatched = True\nawait self.get_server()\n- self._logger.debug(\"Polling successfully started. Press Ctrl+C to stop it\")\n+ logger.info(\"Polling successfully started. Press Ctrl+C to stop it\")\nwhile True:\nevent = await self.make_long_request(self.long_poll_server)\n@@ -234,6 +221,11 @@ class Bot(HTTP, EventProcessor):\n:param confirmation_token: code which confirm VK callback\n:return: \"ok\"\n\"\"\"\n+ if not self.status.dispatched:\n+ await self.on.dispatch(self.get_current_rest)\n+ self.status.dispatched = True\n+\n+ logger.debug(\"Event: {event}\", event=event)\nif event.get(\"type\") == \"confirmation\":\nif event.get(\"group_id\") == self.group_id:\n@@ -241,6 +233,7 @@ class Bot(HTTP, EventProcessor):\nupdates = event.get(\"updates\", [event])\nif not self._check_secret(event):\n+ logger.debug(\"Aborted. Secret is invalid\")\nreturn \"access denied\"\ntry:\n@@ -268,14 +261,14 @@ class Bot(HTTP, EventProcessor):\ne = list(e.args)[0]\nif e[0] in self.error_handler.processors:\nhandler = self.error_handler.processors[e[0]][\"call\"]\n- self._logger.debug(\n+ logger.debug(\n\"VKError ?{}! Processing it with handler <{}>\".format(\ne, handler.__name__\n)\n)\nawait handler(e)\nelse:\n- self._logger.error(\n+ logger.error(\n\"VKError! Add @bot.error_handler({}) to process this error!\".format(\ne\n)\n@@ -283,10 +276,8 @@ class Bot(HTTP, EventProcessor):\nraise VKError(e)\nexcept:\n- self._logger.error(\n- \"While bot worked error occurred TIME %#%\\n\\n{}\".format(\n- traceback.format_exc()\n- )\n+ logger.error(\n+ \"While bot worked error occurred TIME {time}\\n\\n{traceback}\", traceback=traceback.format_exc()\n)\nreturn \"ok\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/cls.py",
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "from copy import copy\n+from loguru import logger\nfrom ...types import Message\n-from ...utils import Logger\n-\n-logger = Logger.get_current\nclass Copy:\n@@ -33,10 +31,10 @@ class AbstractBranch(Copy):\nclass ClsBranch(AbstractBranch):\nasync def enter(self, ans: Message):\n- logger().info(\"Branch \\\"{}\\\" entered at %#%\")\n+ logger.info(\"Branch \\\"{}\\\" entered at %#%\")\nasync def exit(self, ans: Message):\n- logger().info(\"Branch \\\"{}\\\" exit at %#%\")\n+ logger.info(\"Branch \\\"{}\\\" exit at %#%\")\nclass FunctionBranch(ClsBranch):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "import typing\nfrom asyncio import AbstractEventLoop\nfrom re import sub\n+from loguru import logger\nfrom vbml import Patcher\nfrom ..types.message import Message\nfrom ..api import Api, HandlerReturnError\nfrom ..handler import Handler\n-from ..utils import Logger\nfrom .branch import BranchManager\nfrom .regex import RegexHelper\nfrom .branch import Branch, ExitBranch\n@@ -29,7 +29,6 @@ class EventProcessor(RegexHelper):\nbranch: BranchManager\nstatus: BotStatus\ngroup_id: int\n- _logger: Logger\nloop: AbstractEventLoop\nasync def _processor(self, obj: dict, client_info: dict):\n@@ -47,11 +46,10 @@ class EventProcessor(RegexHelper):\nif self.on.pre:\nawait (self.on.pre(message))\n- self._logger.debug(\n- '-> MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\n+ logger.debug(\n+ '-> MESSAGE FROM {} TEXT \"{}\"',\nmessage.from_id, message.text.replace(\"\\n\", \" \")\n)\n- )\ntask = None\nfor rules in self.on.rules:\n@@ -66,9 +64,12 @@ class EventProcessor(RegexHelper):\ntask = await rules[0].call(*args, **kwargs)\n- self._logger.debug(\n- \"New message compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- rules[0].call.__name__, message.from_id\n+ logger.info(\n+ \"New message \\\"{}\\\" compiled with decorator <{}> (from: {}/{})\".format(\n+ message.text.replace(\"\\n\", \" \"),\n+ rules[0].call.__name__,\n+ message.peer_id,\n+ message.from_id,\n)\n)\nbreak\n@@ -82,20 +83,21 @@ class EventProcessor(RegexHelper):\n:param obj: VK Server Event Object\n\"\"\"\n- self._logger.debug(\n- '-> EVENT FROM {} TYPE \"{}\" TIME %#%'.format(\n+ logger.debug(\n+ '-> EVENT FROM {} TYPE \"{}\"',\nget_attr(obj, [\"user_id\", \"from_id\"]), event_type.upper()\n)\n- )\nfor rule in self.on.event.rules:\nif await rule.check(event_type):\nevent = rule.data[\"data\"](**obj)\nawait rule.call(event, *rule.context.args, **rule.context.kwargs)\n- self._logger.debug(\n- \"New event compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- rule.call.__name__, \"*\"\n+ logger.info(\n+ \"New event \\\"{}\\\" compiled with decorator <{}> (from: {})\".format(\n+ event_type.upper(),\n+ rule.call.__name__,\n+ get_attr(obj, [\"user_id\", \"from_id\"]),\n)\n)\nreturn True\n@@ -109,11 +111,10 @@ class EventProcessor(RegexHelper):\nanswer = Message(**obj, client_info=client_info)\n- self._logger.debug(\n- '-> BRANCHED MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\n+ logger.debug(\n+ '-> BRANCHED MESSAGE FROM {} TEXT \"{}\"',\nanswer.peer_id, answer.text.replace(\"\\n\", \" \")\n)\n- )\nbranch = self.branch.load(answer.peer_id)\n@@ -122,12 +123,14 @@ class EventProcessor(RegexHelper):\ntask = await self._handler_return(task, obj, client_info)\n- self._logger.debug(\n- \"New BRANCHED-message compiled with branch <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n+ logger.info(\n+ \"New BRANCHED \\\"{0}\\\" compiled with branch <{2}> (from: {1})\".format(\n+ answer.text.replace(\"\\n\", \" \"),\n+ answer.from_id,\n'\"{}\" with {} kwargs'.format(\n- branch.key, branch.context if len(branch.context) < 100 else branch.context[1:99] + \"...\"\n+ branch.key,\n+ branch.context if len(branch.context) < 100 else branch.context[1:99] + \"...\"\n),\n- answer.from_id,\n)\n)\nawait branch.exit(answer)\n@@ -143,14 +146,14 @@ class EventProcessor(RegexHelper):\nreturn_type = type(handler_return)\nif return_type in [Branch, ExitBranch]:\nif return_type == Branch:\n- self._logger.mark(\"[Branch Collected]\", handler_return.branch_name)\n+ logger.debug(\"[Branch Collected]\", handler_return.branch_name)\nself.branch.add(\nobj[\"peer_id\"],\nhandler_return.branch_name,\n**handler_return.branch_kwargs\n)\nelse:\n- self._logger.mark(\"[Branch Exited]\")\n+ logger.debug(\"[Branch Exited]\")\nself.branch.exit(obj[\"peer_id\"])\nelif return_type in [str, int, dict, list, tuple, float]:\nawait Message(**obj, client_info=client_info)(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "-import typing, traceback\n+import typing, traceback, sys\nfrom asyncio import get_event_loop, AbstractEventLoop\n+from loguru import logger\nimport aiohttp, vbml\nfrom ..http import HTTP\nfrom ..api import UserApi\nfrom ..handler import UserHandler\n-from ..utils import Logger, keyboard_interrupt\n-from ..utils.tools import folder_checkup\n+from ._status import LoggerLevel\nDEFAULT_WAIT = 20\n@@ -26,9 +26,8 @@ class User(HTTP):\ntoken: str,\nuser_id: int = None,\ndebug: bool = True,\n- plugin_folder: str = None,\nmode: int = None,\n- log_to_file: bool = False,\n+ log_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n):\nself.__loop: AbstractEventLoop = get_event_loop()\n@@ -40,12 +39,17 @@ class User(HTTP):\nself.user_id: typing.Optional[int] = user_id\nself.on: UserHandler = UserHandler(self._mode)\n- self._logger: Logger = Logger(\n- debug,\n- plugin_folder=folder_checkup(plugin_folder or \"vkbottle_user_lp\"),\n- logger_enabled=log_to_file,\n- prefix=\"User LP VKBottle\",\n- )\n+\n+ self.logger = LoggerLevel(\"INFO\" if debug else \"ERROR\")\n+ logger.remove()\n+ logger.add(sys.stderr,\n+ colorize=True,\n+ format=\"<level>[<blue>User LP</blue>] {message}</level>\",\n+ filter=self.logger,\n+ level=0,\n+ enqueue=True)\n+ if log_to_path:\n+ logger.add(\"log_user_{time}.log\" if log_to_path is True else log_to_path, rotation=\"100 MB\")\n@property\ndef api(self):\n@@ -80,10 +84,10 @@ class User(HTTP):\nasync def run(self, wait: int = DEFAULT_WAIT):\nself.__wait = wait\n- self._logger.info(\"Polling will be started. Is it OK?\")\n+ logger.info(\"Polling will be started. Is it OK?\")\nawait self.get_server()\n- self._logger.debug(\"Polling successfully started\")\n+ logger.debug(\"Polling successfully started\")\nwhile True:\ntry:\n@@ -136,7 +140,8 @@ class User(HTTP):\ntry:\nloop.run_until_complete(self.run())\nexcept KeyboardInterrupt:\n- keyboard_interrupt()\n+ logger.error(\"Keyboard Interrupt\")\n+ exit(0)\ndef mode(self, mode: int):\nself._mode = mode\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "import typing\nimport re\nfrom inspect import iscoroutinefunction, signature\n+from loguru import logger\nfrom vbml import Patcher, Pattern\nfrom .events import Event\n-from ..utils import Logger\nfrom ..const import __version__\nfrom ..api import HandlerError\nfrom ..framework.rule import (\n@@ -36,9 +36,8 @@ def should_ignore_ans(func: typing.Callable, arguments: list) -> bool:\nclass Handler:\n- def __init__(self, logger: Logger, group_id: int = 0):\n+ def __init__(self, group_id: int = 0):\nself.group_id: int = group_id\n- self.__logger = logger\nself.rules: typing.List[typing.List[AbstractRule]] = list()\nself.message: MessageHandler = MessageHandler(\n@@ -74,6 +73,8 @@ class Handler:\nif self.pre is None:\nself._pre_p = handler.pre\n+ logger.debug(\"Bot Handler was concatenated with {handler}\", handler=handler.__name__)\n+\nasync def dispatch(self, get_current_rest: typing.Callable = None) -> None:\n\"\"\"\nDispatch handlers from only-handlers and both-handlers\n@@ -93,12 +94,13 @@ class Handler:\n# Check updates from timoniq/vkbottle-rest\ncurrent_rest = await get_current_rest()\nif current_rest[\"version\"] != __version__:\n- self.__logger.mark(\n+ logger.info(\n\"You are using old version of VKBottle. Update is found: {}\".format(\ncurrent_rest[\"version\"]\n),\ncurrent_rest[\"description\"],\n)\n+ logger.debug(\"Bot successfully dispatched\")\ndef change_prefix_for_all(self, prefix: list) -> None:\nself.message.prefix = prefix\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "from .task import TaskManager\nfrom .tools import dict_of_dicts_merge, flatten, folder_checkup, except_none_self\n-from .logger import Logger, keyboard_interrupt\nfrom .util import ContextInstanceMixin\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/utils/logger.py",
"new_path": null,
"diff": "-import os\n-import re\n-import time\n-import logging\n-from logging import handlers\n-import typing\n-import sys\n-\n-from termcolor import colored\n-from colorama import init as color_opt\n-from .util import ContextInstanceMixin\n-\n-LOG_FILE_PATTERN = r\"[a-zA-Z0-9]+\\.log\"\n-DEFAULT_LOG_NAME = \"bot\"\n-LOG_FORMAT = \"[%(asctime)s %(name)s - %(levelname)s] - %(message)s\"\n-\n-\n-class Coloring:\n- def __init__(self, prefix: str = \"VKBottle\", prefix_color: str = \"blue\"):\n- color_opt()\n- self.prefix = \"[\" + colored(prefix, prefix_color) + \"]\"\n-\n- def __call__(self, text: str, color: str = \"white\") -> colored:\n- return \"{prefix} {text}\".format(\n- prefix=self.prefix,\n- text=colored(\n- text.replace(\"%#%\", time.strftime(\"%m-%d %H:%M:%S\", time.localtime())),\n- color,\n- ),\n- )\n-\n-\n-class Logger(ContextInstanceMixin):\n- def __init__(\n- self,\n- debug: bool,\n- log_file: str = None,\n- plugin_folder: str = \"vkbottle_project\",\n- level=None,\n- logger_name: str = None,\n- logger_enabled: bool = True,\n- prefix: str = \"VKBottle\",\n- prefix_color: str = \"blue\",\n- ):\n-\n- self.__debug: bool = debug\n- self.__coloring = Coloring(prefix, prefix_color)\n- self.__level = level or logging.DEBUG\n- self.__log_file = log_file\n- self.__plugin_folder = plugin_folder\n- self.__logger_name = logger_name\n- self.__logger_enabled = logger_enabled\n- self.colored = colored\n- self.logger = logging.getLogger(logger_name or \"VKBottle\")\n-\n- path = \"{path}/logs\".format(path=plugin_folder)\n-\n- self.log_path = \"{path}/{log_file}_{time}.log\".format(\n- path=path,\n- log_file=log_file\n- if log_file and re.match(LOG_FILE_PATTERN, log_file)\n- else DEFAULT_LOG_NAME,\n- time=time.strftime(\"%m-%d_%H:%M:%S\", time.localtime()),\n- )\n- if not os.path.isdir(path) and logger_enabled:\n- os.makedirs(\"{path}/logs\".format(path=plugin_folder))\n-\n- if logger_enabled:\n-\n- open(self.log_path, \"w+\").close()\n- self.logger.setLevel(self.__level)\n- formatter = logging.Formatter(LOG_FORMAT)\n-\n- handler = handlers.WatchedFileHandler(self.log_path)\n- handler.setLevel(self.__level)\n- handler.setFormatter(formatter)\n- self.logger.addHandler(handler)\n- self.debug(\"My logging file path is {}\".format(self.log_path))\n-\n- @property\n- def logger_params(self):\n- return dict(\n- debug=self.__debug,\n- log_file=self.__log_file,\n- plugin_folder=self.__plugin_folder,\n- level=self.__level,\n- logger_name=self.__logger_name,\n- logger_enabled=self.__logger_enabled,\n- )\n-\n- def info(self, *some: typing.Any):\n- self.logger.info(\" \".join([str(i) for i in some]))\n-\n- def debug(self, *some):\n- self.logger.debug(\" \".join([str(i) for i in some]))\n- if self.__debug:\n- print(self.__coloring(\" \".join([str(i) for i in some])))\n-\n- def mark(self, *some):\n- self.logger.debug(\" \".join([str(i) for i in some]))\n- if self.__debug:\n- print(self.__coloring(\" \".join([str(i) for i in some]), \"grey\"))\n-\n- def warning(self, *some):\n- self.logger.debug(\" \".join([str(i) for i in some]))\n- if self.__debug:\n- print(self.__coloring(\" \".join([str(i) for i in some]), \"yellow\"))\n-\n- def error(self, *some):\n- self.logger.debug(\" \".join([str(i) for i in some]))\n- if self.__debug:\n- print(self.__coloring(\" \".join([str(i) for i in some]), \"red\"))\n-\n-\n-def keyboard_interrupt() -> None:\n- print(Coloring(\"VKBottle\")(\"Keyboard Interrupt\", color=\"yellow\"))\n- sys.exit(0)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "import asyncio\nimport typing\n-from .logger import keyboard_interrupt\n+from loguru import logger\n\"\"\"\n@@ -67,7 +67,8 @@ class TaskManager:\nself.loop.run_forever()\nexcept KeyboardInterrupt:\n- keyboard_interrupt()\n+ logger.error(\"Keyboard Interrupt\")\n+ exit(0)\nfinally:\nif on_shutdown is not None:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v1 logger - loguru
|
718,838 |
09.02.2020 13:22:31
| -10,800 |
a8a54c7144292e21d9777a5d910b8d98ae1e94bc
|
v1 Add Examples
+ reformat by black
|
[
{
"change_type": "MODIFY",
"old_path": "examples/longpoll_bot.py",
"new_path": "examples/longpoll_bot.py",
"diff": "@@ -10,7 +10,7 @@ If bot can't do it and VKError with codes 901 or 902 appeared, bot uses logger t\n\"\"\"\n-@bot.on.message(text=\"hi\")\n+@bot.on.message(text=[\"hi\", \"hello\"])\nasync def wrapper(ans: Message):\nkeyboard = [[{\"text\": \"fantastic button\"}]]\nawait ans(\"hi, my lil friend\", keyboard=keyboard_gen(keyboard))\n@@ -25,7 +25,7 @@ async def wrapper(event: types.GroupJoin):\n@bot.error_handler(901, 902)\nasync def error(error):\n- print(\"Cant send message to this user :(, error code:\", error[0])\n+ print(\"Cant send message to the user :(, error code:\", error[0])\nif __name__ == \"__main__\":\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_new.py",
"new_path": "examples/tests/branches_new.py",
"diff": "@@ -29,4 +29,5 @@ async def pronounce(ans: Message, word):\nbot.branch.add(ans.peer_id, Branch, word=word)\nreturn \"Okay!\"\n+\nbot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress.py",
"new_path": "examples/tests/stress.py",
"diff": "@@ -3,7 +3,7 @@ import os, random, string, asyncio\nfrom asyncio import sleep\n# Add variable TOKEN to your env variables\n-bot = Bot(os.environ[\"TOKEN\"], debug=False)\n+bot = Bot(os.environ[\"TOKEN\"], debug=\"ERROR\")\nSTRINGS = []\nTIMES = 0\n@@ -11,7 +11,7 @@ TIMES = 0\ndef random_string(length=10):\n\"\"\"Generate a random string of fixed length \"\"\"\nletters = string.ascii_lowercase\n- return ''.join(random.choice(letters) for i in range(length))\n+ return \"\".join(random.choice(letters) for i in range(length))\nasync def stress(ans: Message):\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress_devourer.py",
"new_path": "examples/tests/stress_devourer.py",
"diff": "-from vkbottle import Bot, Message\n+from vkbottle import Bot, Message, VKError\nimport os\n# Add variable TOKEN to your env variables\n-bot = Bot(os.environ[\"TOKEN\"])\n+bot = Bot(os.environ[\"TOKEN\"], debug=\"ERROR\")\n@bot.on.message_handler(text=\"/r <s>\")\nasync def pronounce(s):\nreturn f\"/r {s}\"\n+\nbot.run_polling()\n"
},
{
"change_type": "DELETE",
"old_path": "portable/PORTABLE.json",
"new_path": null,
"diff": "-{\n- \"version\": \"timoniq/vkbottle-rest\",\n- \"license\": \"GPL-3.0\",\n- \"author\": \"Arseniy Timonik\"\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -49,7 +49,9 @@ async def request_instance(method: str, req: typing.Coroutine):\n)\nif \"error\" in response:\n- logger.debug(\"Error after request {method}, response: {r}\", method=method, r=response)\n+ logger.debug(\n+ \"Error after request {method}, response: {r}\", method=method, r=response\n+ )\nraise VKError([response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]])\nreturn response[\"response\"]\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/api/methods/__init__.py",
"new_path": "vkbottle/api/methods/__init__.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "from .bot import Bot\nfrom .user import User\n-from .branch import (\n- Branch,\n- ExitBranch,\n- AbstractBranch,\n- ClsBranch,\n- FunctionBranch\n-)\n+from .branch import Branch, ExitBranch, AbstractBranch, ClsBranch, FunctionBranch\nfrom . import rule\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "@@ -21,14 +21,18 @@ class BranchManager:\ndef decorator(func: typing.Callable):\nif not asyncio.iscoroutinefunction(func):\nraise BranchError(\"Branch functions should be async\")\n- self._meet_up[branch_name or func.__name__] = FunctionBranch(branch_name or func.__name__, call=func)\n+ self._meet_up[branch_name or func.__name__] = FunctionBranch(\n+ branch_name or func.__name__, call=func\n+ )\nreturn func\n+\nreturn decorator\ndef cls_branch(self, branch_name: str = None):\ndef decorator(cls: typing.ClassVar):\nself._meet_up[branch_name or cls.__name__] = cls(branch_name)\nreturn cls\n+\nreturn decorator\n@property\n@@ -39,15 +43,26 @@ class BranchManager:\ndef branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self._meet_up\n- def add(self, uid: int, branch: typing.Union[typing.Callable, str, AbstractBranch], **context) -> None:\n+ def add(\n+ self,\n+ uid: int,\n+ branch: typing.Union[typing.Callable, str, AbstractBranch],\n+ **context\n+ ) -> None:\nif isinstance(branch, str):\nif branch not in self._meet_up:\n- raise BranchError(\"Branch {} hasn't been yet assigned with decorator\".format(branch))\n+ raise BranchError(\n+ \"Branch {} hasn't been yet assigned with decorator\".format(branch)\n+ )\nbranch = self._meet_up[branch]\nelif isinstance(branch, typing.Coroutine):\nq = {b.data[\"call\"]: b for b in self._meet_up.values() if \"call\" in b.data}\nif branch not in q:\n- raise BranchError(\"Branch {} hasn't been yet assigned with decorator\".format(branch.__name__))\n+ raise BranchError(\n+ \"Branch {} hasn't been yet assigned with decorator\".format(\n+ branch.__name__\n+ )\n+ )\nbranch = q[branch]\nelse:\nfor k, v in self._meet_up.items():\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/cls.py",
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "@@ -31,10 +31,10 @@ class AbstractBranch(Copy):\nclass ClsBranch(AbstractBranch):\nasync def enter(self, ans: Message):\n- logger.info(\"Branch \\\"{}\\\" entered at %#%\")\n+ logger.info('Branch \"{}\" entered at %#%')\nasync def exit(self, ans: Message):\n- logger.info(\"Branch \\\"{}\\\" exit at %#%\")\n+ logger.info('Branch \"{}\" exit at %#%')\nclass FunctionBranch(ClsBranch):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -40,9 +40,7 @@ class Handler:\nself.group_id: int = group_id\nself.rules: typing.List[typing.List[AbstractRule]] = list()\n- self.message: MessageHandler = MessageHandler(\n- default_rules=[PrivateMessage()]\n- )\n+ self.message: MessageHandler = MessageHandler(default_rules=[PrivateMessage()])\nself.chat_message: MessageHandler = MessageHandler(\ndefault_rules=[ChatMessage()]\n)\n@@ -73,7 +71,9 @@ class Handler:\nif self.pre is None:\nself._pre_p = handler.pre\n- logger.debug(\"Bot Handler was concatenated with {handler}\", handler=handler.__name__)\n+ logger.debug(\n+ \"Bot Handler was concatenated with {handler}\", handler=handler.__name__\n+ )\nasync def dispatch(self, get_current_rest: typing.Callable = None) -> None:\n\"\"\"\n@@ -204,22 +204,28 @@ class MessageHandler:\ncommand: bool,\npattern: str,\n) -> AbstractRule:\n- texts: typing.List[typing.Union[str, Pattern]] = text if isinstance(text, list) else [text]\n+ texts: typing.List[typing.Union[str, Pattern]] = text if isinstance(\n+ text, list\n+ ) else [text]\npatterns: typing.List[Pattern] = []\nfor text in texts:\nif not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n- patterns.append(self._patcher.pattern(\n+ patterns.append(\n+ self._patcher.pattern(\ntext,\npattern=(prefix + pattern) if prefix else pattern,\n- flags=re.IGNORECASE if lower else None\n- ))\n+ flags=re.IGNORECASE if lower else None,\n+ )\n+ )\nelse:\npatterns.append(text)\nrule = VBMLRule(patterns)\n- arguments = [arguments for pattern in patterns for arguments in pattern.arguments]\n+ arguments = [\n+ arguments for pattern in patterns for arguments in pattern.arguments\n+ ]\nrule.data[\"ignore_ans\"] = should_ignore_ans(func, arguments)\nreturn rule\n@@ -233,7 +239,9 @@ class MessageHandler:\nself,\nfunc: typing.Callable,\n*rules,\n- text: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]] = None,\n+ text: typing.Union[\n+ str, Pattern, typing.List[typing.Union[str, Pattern]]\n+ ] = None,\nlower: bool = False,\ncommand: bool = False,\npattern: str = None,\n@@ -274,7 +282,9 @@ class MessageHandler:\ndef __call__(\nself,\n*rules,\n- text: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]] = None,\n+ text: typing.Union[\n+ str, Pattern, typing.List[typing.Union[str, Pattern]]\n+ ] = None,\ncommand: bool = False,\nlower: bool = False,\n**col_rules,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v1 Add Examples
+ reformat by black
|
718,889 |
09.02.2020 19:24:58
| -18,000 |
a64001f9c7e28c41f5422ca450dc19c1bd2bdfa1
|
Attachment typing
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/attachments/attachments.py",
"new_path": "vkbottle/types/attachments/attachments.py",
"diff": "from enum import Enum\nfrom ..base import BaseModel\n-from .photo import Photo, PostedPhoto\n+from .photo import Photo\nfrom .video import Video\nfrom .audio import Audio\nfrom .document import Document\n@@ -13,21 +13,22 @@ from .page import Page\nfrom .album import Album\nfrom .market import Market\nfrom .market_album import MarketAlbum\n+from ..wall_post import WallPost\n+from ..wall_comment import WallComment\nfrom .sticker import Sticker\n-from .pretty_cards import PrettyCards\nfrom .audio_msg import AudioMsg\n+from .gift import Gift\nimport typing\nfrom typing import Optional\n-# https://vk.com/dev/objects/attachments_w\n+# https://vk.com/dev/objects/attachments_m\nclass Attachments(str, Enum):\nnot_attachments = []\nphoto = Photo\n- posted_photo = PostedPhoto\nvideo = Video\naudio = Audio\ndocument = Document\n@@ -41,14 +42,15 @@ class Attachments(str, Enum):\nphotos_list = typing.List[int]\nmarket = Market\nmarket_album = MarketAlbum\n+ wall = WallPost\n+ wall_reply = WallComment\nsticker = Sticker\n- pretty_cards = PrettyCards\n+ gift = Gift\nclass Attachment(BaseModel):\ntype: str = None\nphoto: Optional[Photo]\n- posted_photo: Optional[PostedPhoto]\nvideo: Optional[Video]\naudio: Optional[Audio]\ndoc: Optional[Document]\n@@ -62,6 +64,8 @@ class Attachment(BaseModel):\nphotos_list: Optional[typing.List[Photo]]\nmarket: Optional[Market]\nmarket_album: Optional[MarketAlbum]\n+ wall: Optional[WallPost]\n+ wall_reply: Optional[WallComment]\nsticker: Optional[Sticker]\n- pretty_cards: Optional[PrettyCards]\naudio_message: Optional[AudioMsg]\n+ gift: Optional[Gift]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/types/attachments/attachments_w.py",
"diff": "+from enum import Enum\n+from ..base import BaseModel\n+from .photo import Photo, PostedPhoto\n+from .video import Video\n+from .audio import Audio\n+from .document import Document\n+from .graffiti import Graffiti\n+from .link import Link\n+from .note import Note\n+from .app import App\n+from .poll import Poll\n+from .page import Page\n+from .album import Album\n+from .market import Market\n+from .market_album import MarketAlbum\n+from .sticker import Sticker\n+from .pretty_cards import PrettyCards\n+from .event import Event\n+\n+import typing\n+from typing import Optional\n+\n+\n+# https://vk.com/dev/objects/attachments_w\n+\n+\n+class AttachmentsW(str, Enum):\n+ not_attachments = []\n+ photo = Photo\n+ posted_photo = PostedPhoto\n+ video = Video\n+ audio = Audio\n+ document = Document\n+ graffiti = Graffiti\n+ link = Link\n+ note = Note\n+ app = App\n+ poll = Poll\n+ page = Page\n+ album = Album\n+ photos_list = typing.List[int]\n+ market = Market\n+ market_album = MarketAlbum\n+ sticker = Sticker\n+ pretty_cards = PrettyCards\n+ event = Event\n+\n+\n+class AttachmentW(BaseModel):\n+ type: str = None\n+ photo: Optional[Photo]\n+ posted_photo: Optional[PostedPhoto]\n+ video: Optional[Video]\n+ audio: Optional[Audio]\n+ doc: Optional[Document]\n+ graffiti: Optional[Graffiti]\n+ link: Optional[Link]\n+ note: Optional[Note]\n+ app: Optional[App]\n+ poll: Optional[Poll]\n+ page: Optional[Page]\n+ album: Optional[Album]\n+ photos_list: Optional[typing.List[Photo]]\n+ market: Optional[Market]\n+ market_album: Optional[MarketAlbum]\n+ sticker: Optional[Sticker]\n+ pretty_cards: Optional[PrettyCards]\n+ event: Optional[Event]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/types/attachments/event.py",
"diff": "+from ..base import BaseModel\n+import typing\n+\n+class Event(BaseModel):\n+ id: int = None\n+ time: int = None\n+ member_status: int = None\n+ is_favorite: bool = None\n+ address: str = None\n+ text: str = None\n+ button_text: str = None\n+ friends: typing.List[int] = []\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/wall_comment.py",
"new_path": "vkbottle/types/wall_comment.py",
"diff": "from .base import BaseModel\n-from .attachments import Attachments\n+from .attachments.attachments_w import AttachmentsW\nimport typing\n@@ -22,9 +22,11 @@ class WallComment(BaseModel):\ntext: str = None\nreply_to_user: int = None\nreply_to_comment: int = None\n- attachments: Attachments = None\n+ attachments: AttachmentsW = None\nparents_stack: typing.List[int] = None\nthread: WallCommentThread = None\n+ post_id: int = None\n+ owner_id: int = None\nWallCommentThread.update_forward_refs()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/wall_post.py",
"new_path": "vkbottle/types/wall_post.py",
"diff": "from .base import BaseModel\n-from .attachments import Like, Repost, Geo, Attachment\n+from .attachments import Like, Repost, Geo\n+from .attachments.attachments_w import AttachmentW\nfrom .additional import PostSource\nimport typing\n@@ -11,7 +12,8 @@ class WallPostComments(BaseModel):\ncount: int = None\ncan_post: int = None\ngroups_can_post: int = None\n-\n+ can_close: bool = None\n+ can_open: bool = None\nclass WallPost(BaseModel):\nid: int = None\n@@ -28,7 +30,7 @@ class WallPost(BaseModel):\nreposts: Repost = None\npost_type: str = None\npost_source: PostSource = None\n- attachments: typing.List[Attachment] = None\n+ attachments: typing.List[AttachmentW] = None\ngeo: Geo = None\nsigner_id: int = None\ncopy_history: typing.Any = None\n@@ -38,3 +40,4 @@ class WallPost(BaseModel):\nis_pinned: int = None\nmarked_as_ads: int = None\nis_favorite: bool = None\n+ postponed_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Attachment typing (#26)
|
718,838 |
09.02.2020 22:37:28
| -10,800 |
b80a7a6d5c7abebe221b529d1b97150a568c03d0
|
v1 Requirements incomp fix
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -7,8 +7,7 @@ except:\nwith open(\"README.md\", \"r\") as f:\nlong_description = f.read()\n-with open(\"requirements.txt\", \"r\") as f:\n- requirements = f.read().splitlines()\n+requirements = [\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\", \"loguru\"]\nsetuptools.setup(\nname=\"vkbottle\",\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v1 Requirements incomp fix
|
718,838 |
10.02.2020 07:35:28
| -10,800 |
a3ef790501356ffa3d18ba1a88a681eb493d4613
|
v1 Add mobile regime
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -36,6 +36,7 @@ class Bot(HTTP, EventProcessor):\ngroup_id: int = None,\ndebug: typing.Union[str, bool] = True,\nlog_to_path: typing.Union[str, bool] = None,\n+ mobile: bool = False,\nsecret: str = None,\n):\n\"\"\"\n@@ -73,7 +74,7 @@ class Bot(HTTP, EventProcessor):\nformat=\"<level>[<blue>VKBottle</blue>] {message}</level> <white>[TIME {time:HH:MM:ss}]</white>\",\nfilter=self.logger,\nlevel=0,\n- enqueue=True,\n+ enqueue=mobile is False,\n)\nlogger.level(\"INFO\", color=\"<white>\")\nlogger.level(\"ERROR\", color=\"<red>\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v1 Add mobile regime
|
718,838 |
10.02.2020 17:48:49
| -10,800 |
da447b516dace646ed4dcaf105fa0cf63e7612bc
|
v2 Update version
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -7,11 +7,9 @@ except:\nwith open(\"README.md\", \"r\") as f:\nlong_description = f.read()\n-requirements = [\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\", \"loguru\"]\n-\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.00\",\n+ version=\"2.01\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n@@ -25,5 +23,5 @@ setuptools.setup(\n\"Programming Language :: Python :: 3.7\",\n\"Operating System :: OS Independent\",\n],\n- install_requires=requirements,\n+ install_requires=[\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\", \"loguru\"],\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Update version
|
718,838 |
10.02.2020 22:10:21
| -10,800 |
2a313610e2645f3a75fc845e98341089c25160f2
|
v2 Auto Logger Regime choicer
+ remove loguru from requirements
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/forwarder.py",
"diff": "+from vkbottle.user import User\n+from vkbottle import TaskManager, VKError\n+import os, random, asyncio\n+\n+user = User(os.environ[\"TOKEN\"])\n+\n+\n+async def start_forwarding(peer_id: int, text: str):\n+ mid = await user.api.messages.send(peer_id=peer_id, message=text, random_id=random.randint(-2e9, 2e9))\n+ for i in range(200):\n+ try:\n+ await asyncio.sleep(1.8)\n+ except VKError:\n+ input(\"[Press after you input captcha] >> \")\n+\n+tm = TaskManager(user.loop)\n+tm.add_task(start_forwarding(os.environ[\"PEER_ID\"], os.environ[\"TEXT\"]))\n+tm.run()\n"
},
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "aiohttp\ncontextvars\npydantic\n-loguru\nvbml\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,7 +9,7 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.01\",\n+ version=\"2.02\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n@@ -23,5 +23,5 @@ setuptools.setup(\n\"Programming Language :: Python :: 3.7\",\n\"Operating System :: OS Independent\",\n],\n- install_requires=[\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\", \"loguru\"],\n+ install_requires=[\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\"],\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -2,7 +2,7 @@ import time\nimport asyncio\nimport typing\n-from loguru import logger\n+from ..utils import logger\nfrom ..const import API_VERSION, API_URL\nfrom .exceptions import VKError\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/_status.py",
"new_path": "vkbottle/framework/_status.py",
"diff": "-from loguru import logger\n+from ..utils import logger\nclass LoggerLevel:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "import traceback, sys, typing\n-from loguru import logger\nfrom asyncio import get_event_loop, AbstractEventLoop\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..api import Api, request\nfrom ..handler import Handler, ErrorHandler\nfrom ..http import HTTP\nfrom ..api import VKError\n-from ..utils import flatten\n+from ..utils import logger\nfrom vbml import Patcher, PatchedValidators\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/cls.py",
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "from copy import copy\n-from loguru import logger\n+from ...utils import logger\nfrom ...types import Message\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "import typing\nfrom asyncio import AbstractEventLoop\nfrom re import sub\n-from loguru import logger\n+from ..utils import logger\nfrom vbml import Patcher\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "import typing, traceback, sys\nfrom asyncio import get_event_loop, AbstractEventLoop\n-from loguru import logger\n+from ..utils import logger\nimport aiohttp, vbml\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "import typing\nimport re\nfrom inspect import iscoroutinefunction, signature\n-from loguru import logger\n+from ..utils import logger\nfrom vbml import Patcher, Pattern\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "from .task import TaskManager\nfrom .tools import dict_of_dicts_merge, flatten, folder_checkup, except_none_self\nfrom .util import ContextInstanceMixin\n+from .logger import logger\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/utils/logger.py",
"diff": "+try:\n+ from loguru import logger\n+except ImportError:\n+ from .tools import Logger\n+ logger = Logger()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "import asyncio\nimport typing\n-from loguru import logger\n+from ..utils import logger\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "from collections import MutableMapping\nfrom typing import Sequence\n-import os\n+import os, sys, time\n+\n+\n+class Logger:\n+ def __getattr__(self, item):\n+ if item in [\"remove\", \"add\", \"level\"]:\n+ return lambda *args, **kwargs: None\n+ return Logger()\n+\n+ def __call__(self, message: str, **kwargs):\n+ t = time.strftime(\"%m-%d %H:%M:%S\", time.localtime())\n+ sys.stdout.write(\"\\n[VKBottle] \" + message.format(**kwargs) + \" [TIME {}]\".format(t))\ndef dict_of_dicts_merge(d1, d2):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Auto Logger Regime choicer
+ remove loguru from requirements
|
718,889 |
11.02.2020 12:56:15
| -18,000 |
4881f8d1f1aba0c19789c5f220ccb6bb61e48c1b
|
Update wall_comment.py
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/wall_comment.py",
"new_path": "vkbottle/types/wall_comment.py",
"diff": "from .base import BaseModel\n-from .attachments.attachments_w import AttachmentsW\n+from .attachments.attachments_w import AttachmentW\nfrom typing import List\n@@ -22,7 +22,7 @@ class WallComment(BaseModel):\ntext: str = None\nreply_to_user: int = None\nreply_to_comment: int = None\n- attachments: List[AttachmentsW] = []\n+ attachments: List[AttachmentW] = []\nparents_stack: List[int] = []\nthread: WallCommentThread = None\npost_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update wall_comment.py (#28)
|
718,838 |
11.02.2020 16:08:31
| -10,800 |
89a325e277e9f79d15e337cd43ec89e39f75fbd6
|
v2 fix logging and secret longpoll check
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -209,6 +209,9 @@ class Bot(HTTP, EventProcessor):\nasync def run(self, wait: int = DEFAULT_WAIT):\nself.__wait = wait\nlogger.debug(\"Polling will be started. Is it OK?\")\n+ if self.__secret is not None:\n+ logger.warning(\"You set up secret and started polling. Removing secret\")\n+ self.__secret = None\nif not self.status.dispatched:\nawait self.on.dispatch(self.get_current_rest)\n@@ -250,8 +253,6 @@ class Bot(HTTP, EventProcessor):\nreturn \"access denied\"\nfor update in updates:\n- if not update:\n- continue\ntry:\nobj = update[\"object\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -9,9 +9,9 @@ class Logger:\nreturn lambda *args, **kwargs: None\nreturn Logger()\n- def __call__(self, message: str, **kwargs):\n+ def __call__(self, message: str, *args, **kwargs):\nt = time.strftime(\"%m-%d %H:%M:%S\", time.localtime())\n- sys.stdout.write(\"\\n[VKBottle] \" + message.format(**kwargs) + \" [TIME {}]\".format(t))\n+ sys.stdout.write(\"\\n[VKBottle] \" + message.format(*args, **kwargs) + \" [TIME {}]\".format(t))\ndef dict_of_dicts_merge(d1, d2):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 fix logging and secret longpoll check
|
718,889 |
11.02.2020 21:11:55
| -18,000 |
b5b86f22deac03ab942dcfb3fdc704e7223b8e89
|
Edit processing
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -53,7 +53,12 @@ class EventProcessor(RegexHelper):\ntask = None\nfor rules in self.on.rules:\n- if all([await rule.check(message) for rule in rules]):\n+\n+ for rule in rules:\n+ if not await rule.check(message):\n+ break\n+\n+ else:\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -180,7 +180,7 @@ class MessageHandler:\ndef add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable):\ncurrent = list()\n- for rule in rules + self.default_rules:\n+ for rule in self.default_rules + rules:\nif isinstance(rule, str):\nrule = VBMLRule(rule)\nrule.create(func)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Edit processing (#29)
|
718,889 |
12.02.2020 16:24:07
| -18,000 |
2d8ca687ebb86ce89106966cf200afc967d63b11
|
Dataclasses instead of dict in event handling functions
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -6,6 +6,7 @@ from ..utils import logger\nfrom vbml import Patcher\nfrom ..types.message import Message\n+from ..types.events import EVENT_DICT\nfrom ..api import Api, HandlerReturnError\nfrom ..handler import Handler\nfrom .branch import BranchManager\n@@ -95,7 +96,7 @@ class EventProcessor(RegexHelper):\nfor rule in self.on.event.rules:\nif await rule.check(event_type):\n- event = rule.data[\"data\"](**obj)\n+ event = EVENT_DICT.get(event_type, dict)(type=event_type, object=obj)\nawait rule.call(event, *rule.context.args, **rule.context.kwargs)\nlogger.info(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -135,8 +135,6 @@ class EventRule(AbstractRule):\nasync def check(self, event):\nfor e in self.data[\"event\"]:\n- if \"data\" not in self.data:\n- self.data = {\"data\": dict}\nif e == event:\nreturn True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/__init__.py",
"new_path": "vkbottle/types/events/__init__.py",
"diff": "from . import community\n+from .community import EVENT_DICT\n+from .community.events_list import EventList\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/__init__.py",
"new_path": "vkbottle/types/events/community/__init__.py",
"diff": "+from .events_list import EventList\n+from . import event\n+\n+EVENT_DICT = {\n+ EventList.MESSAGE_NEW: event.MessageNew,\n+ EventList.MESSAGE_REPLY: event.MessageReply,\n+ EventList.MESSAGE_EDIT: event.MessageEdit,\n+ EventList.MESSAGE_ALLOW: event.MessageAllow,\n+ EventList.MESSAGE_DENY: event.MessageDeny,\n+\n+ EventList.PHOTO_NEW: event.PhotoNew,\n+ EventList.PHOTO_COMMENT_NEW: event.PhotoCommentNew,\n+ EventList.PHOTO_COMMENT_EDIT: event.PhotoCommentEdit,\n+ EventList.PHOTO_COMMENT_RESTORE: event.PhotoCommentRestore,\n+ EventList.PHOTO_COMMENT_DELETE: event.PhotoCommentDelete,\n+\n+ EventList.AUDIO_NEW: event.AudioNew,\n+\n+ EventList.VIDEO_NEW: event.VideoNew,\n+ EventList.VIDEO_COMMENT_NEW: event.VideoCommentNew,\n+ EventList.VIDEO_COMMENT_EDIT: event.VideoCommentEdit,\n+ EventList.VIDEO_COMMENT_RESTORE: event.VideoCommentRestore,\n+ EventList.VIDEO_COMMENT_DELETE: event.VideoCommentDelete,\n+\n+ EventList.WALL_POST_NEW: event.WallPostNew,\n+ EventList.WALL_REPOST: event.WallRepost,\n+ EventList.WALL_REPLY_NEW: event.WallReplyNew,\n+ EventList.WALL_REPLY_EDIT: event.WallReplyEdit,\n+ EventList.WALL_REPLY_RESTORE: event.WallReplyRestore,\n+ EventList.WALL_REPLY_DELETE: event.WallReplyDelete,\n+\n+ EventList.BOARD_POST_NEW: event.BoardPostNew,\n+ EventList.BOARD_POST_EDIT: event.BoardPostEdit,\n+ EventList.BOARD_POST_RESTORE: event.BoardPostRestore,\n+ EventList.BOARD_POST_DELETE: event.BoardPostDelete,\n+\n+ EventList.MARKET_COMMENT_NEW: event.MarketCommentNew,\n+ EventList.MARKET_COMMENT_EDIT: event.MarketCommentEdit,\n+ EventList.MARKET_COMMENT_RESTORE: event.MarketCommentRestore,\n+ EventList.MARKET_COMMENT_DELETE: event.MarketCommentDelete,\n+\n+ EventList.GROUP_LEAVE: event.GroupLeave,\n+ EventList.GROUP_JOIN: event.GroupJoin,\n+ EventList.USER_BLOCK: event.UserBlock,\n+ EventList.USER_UNBLOCK: event.UserUnblock,\n+\n+ EventList.POLL_VOTE_NEW: event.PollVoteNew,\n+ EventList.GROUP_OFFICERS_EDIT: event.GroupOfficersEdit,\n+ EventList.GROUP_CHANGE_SETTINGS: event.GroupChangeSettings,\n+ EventList.GROUP_CHANGE_PHOTO: event.GroupChangePhoto\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/event.py",
"new_path": "vkbottle/types/events/community/event.py",
"diff": "@@ -23,6 +23,10 @@ class MessageNew(BaseEvent):\nobject: Message = None\n+class MessageEdit(MessageNew):\n+ type: str = None\n+\n+\nclass MessageReply(MessageNew):\ntype: str = None\n@@ -44,7 +48,7 @@ class PhotoNew(BaseEvent):\nclass PhotoCommentNew(BaseEvent):\ntype: str = None\n- object: EventsObjects.PhotoCommentNew = None\n+ object: EventsObjects.PhotoComment = None\nclass PhotoCommentEdit(PhotoCommentNew):\n@@ -72,7 +76,7 @@ class VideoNew(BaseEvent):\nclass VideoCommentNew(BaseEvent):\ntype: str = None\n- object: EventsObjects.VideoCommentNew = None\n+ object: EventsObjects.VideoComment = None\nclass VideoCommentEdit(VideoCommentNew):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Dataclasses instead of dict in event handling functions (#30)
|
718,838 |
12.02.2020 17:27:32
| -10,800 |
69f9b9507c1d07fe1e81c8a2f1f74021f7e35b42
|
v2 Add integration of uvloop and loguru
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "import traceback, sys, typing\n-from asyncio import get_event_loop, AbstractEventLoop\n+import asyncio\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..api import Api, request\nfrom ..handler import Handler, ErrorHandler\n@@ -18,6 +18,13 @@ except ImportError:\nprint(\"Please install vbml to use VKBottle. Use command: {}\".format(VBML_INSTALL))\n+try:\n+ import uvloop\n+ asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\n+except ImportError:\n+ pass\n+\n+\nDEFAULT_WAIT = 20\n@@ -48,16 +55,11 @@ class Bot(HTTP, EventProcessor):\n\"\"\"\n# Base bot classifiers\nself.__token: str = token\n- self.__loop: AbstractEventLoop = get_event_loop()\nself.__debug: bool = debug\nself.__wait = None\nself.__secret = secret\nself._status: BotStatus = BotStatus()\n- # Sign assets\n- self.__api: Api = Api(token)\n- Api.set_current(self.__api)\n-\nif isinstance(debug, bool):\ndebug = \"INFO\" if debug else \"ERROR\"\n@@ -82,7 +84,13 @@ class Bot(HTTP, EventProcessor):\n\"log_{time}.log\" if log_to_path is True else log_to_path,\nrotation=\"100 MB\",\n)\n+\n+ # Sign assets\n+ self.__api: Api = Api(token)\n+ Api.set_current(self.__api)\n+\nself.group_id = group_id or self.get_id_by_token(token)\n+ self.__loop = asyncio.get_event_loop()\n# Main workers\nself.branch: BranchManager = BranchManager(DEFAULT_BOT_FOLDER)\n@@ -107,7 +115,7 @@ class Bot(HTTP, EventProcessor):\n:return:\n\"\"\"\nlogger.debug(\"Making API request groups.getById to get group_id\")\n- response = get_event_loop().run_until_complete(request(token, \"groups.getById\"))\n+ response = asyncio.get_event_loop().run_until_complete(request(token, \"groups.getById\"))\nif \"error\" in response:\nraise VKError(\"Token is invalid\")\nreturn response[\"response\"][0][\"id\"]\n@@ -125,13 +133,13 @@ class Bot(HTTP, EventProcessor):\nreturn event.get(\"secret\") == self.__secret\nreturn True\n- def loop_update(self, loop: AbstractEventLoop = None):\n+ def loop_update(self, loop: asyncio.AbstractEventLoop = None):\n\"\"\"\nUpdate event loop\n:param loop:\n:return:\n\"\"\"\n- self.__loop = loop or get_event_loop()\n+ self.__loop = loop or asyncio.get_event_loop()\nreturn self.__loop\ndef empty_copy(self) -> \"Bot\":\n@@ -222,8 +230,8 @@ class Bot(HTTP, EventProcessor):\nwhile True:\nevent = await self.make_long_request(self.long_poll_server)\n- await self.get_server()\nself.loop.create_task(self.emulate(event))\n+ await self.get_server()\nasync def emulate(\nself, event: dict, confirmation_token: str = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/cls.py",
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "@@ -31,10 +31,10 @@ class AbstractBranch(Copy):\nclass ClsBranch(AbstractBranch):\nasync def enter(self, ans: Message):\n- logger.info('Branch \"{}\" entered at %#%')\n+ logger.info(\"Branch {} entered at\", self.key)\nasync def exit(self, ans: Message):\n- logger.info('Branch \"{}\" exit at %#%')\n+ logger.info(\"Branch {} exit at\", self.key)\nclass FunctionBranch(ClsBranch):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Add integration of uvloop and loguru
|
718,838 |
13.02.2020 18:58:34
| -10,800 |
13b1279ae7cfe2f3a19061c7a5cdf9cc40447655
|
v2 Fix payload
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -230,7 +230,11 @@ class MessageHandler:\nreturn rule\n+ def concatenate_payload(self):\n+ self.rules = self.payload.rules + self.rules\n+\ndef concatenate(self, message_handler: \"MessageHandler\"):\n+ self.concatenate_payload()\nself.rules += message_handler.rules\nself.prefix += [p for p in message_handler.prefix if p not in self.prefix]\nself.payload.rules += message_handler.payload.rules\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Fix payload
|
718,838 |
13.02.2020 19:18:28
| -10,800 |
fe835f7544c65ffb569dd898fe838480d53851a1
|
v2 Change payload priority
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress.py",
"new_path": "examples/tests/stress.py",
"diff": "@@ -3,7 +3,7 @@ import os, random, string, asyncio\nfrom asyncio import sleep\n# Add variable TOKEN to your env variables\n-bot = Bot(os.environ[\"TOKEN\"], debug=\"ERROR\")\n+bot = Bot(os.environ[\"TOKEN\"])\nSTRINGS = []\nTIMES = 0\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -87,7 +87,7 @@ class Handler:\nself.message.payload.rules + self.chat_message.payload.rules\n)\n- self.rules = self.message_handler.rules + self.message_handler.payload.rules\n+ self.rules = self.message_handler.payload.rules + self.message_handler.rules\nif get_current_rest:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Change payload priority
|
718,838 |
15.02.2020 09:03:45
| -10,800 |
7506cc6b3164bfb0f26e6a3f86f0f192187307ef
|
v2 Auto reload
|
[
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "aiohttp\ncontextvars\npydantic\n+watchgod\nvbml\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/utils/auto_reload.py",
"diff": "+import os\n+import sys\n+\n+from watchgod import awatch\n+from .logger import logger\n+\n+_startup_cwd = os.getcwd()\n+\n+\n+def restart():\n+ \"\"\"\n+ Authors: https://github.com/cherrypy/cherrypy/blob/0857fa81eb0ab647c7b59a019338bab057f7748b/cherrypy/process/wspbus.py#L305\n+ :return:\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 _auto_reload():\n+ \"\"\"\n+ Coro which see changes in your code and restart him.\n+ :return:\n+ \"\"\"\n+ async for _ in awatch(\".\"):\n+ logger.info(\"Changes were found. Restarting...\")\n+ restart()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -2,6 +2,7 @@ import asyncio\nimport typing\nfrom ..utils import logger\n+from .auto_reload import _auto_reload\n\"\"\"\n@@ -43,6 +44,7 @@ class TaskManager:\n*,\non_shutdown: typing.Callable = None,\non_startup: typing.Callable = None,\n+ auto_reload: bool = False,\nasyncio_debug_mode: bool = False,\n):\n\"\"\"\n@@ -62,6 +64,9 @@ class TaskManager:\nif asyncio_debug_mode:\nself.loop.set_debug(True)\n+ if auto_reload:\n+ self.loop.create_task(_auto_reload())\n+\n[self.loop.create_task(task) for task in self.tasks]\nself.loop.run_forever()\n@@ -73,6 +78,7 @@ class TaskManager:\nfinally:\nif on_shutdown is not None:\nself.loop.run_until_complete(on_shutdown())\n+ self.close()\ndef close(self):\n\"\"\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Auto reload
|
718,838 |
18.02.2020 06:37:39
| -10,800 |
0206cee3e091b98a84b95e2df2ddd42077703e92
|
v2 api changes
|
[
{
"change_type": "MODIFY",
"old_path": "examples/callback_bot.py",
"new_path": "examples/callback_bot.py",
"diff": "-from vkbottle import Bot, Message\nfrom aiohttp.web import RouteTableDef, Application, Request, run_app\n+from vkbottle import Bot\napp = Application()\nroutes = RouteTableDef()\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/raid.py",
"new_path": "examples/raid.py",
"diff": "+import asyncio\n+import vbml\n+\nfrom vkbottle import Bot, Message\nfrom vkbottle.rule import VBMLRule\n-import vbml, asyncio\nbot = Bot(\"token\")\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress_devourer.py",
"new_path": "examples/tests/stress_devourer.py",
"diff": "@@ -6,7 +6,7 @@ bot = Bot(os.environ[\"TOKEN\"], debug=\"ERROR\")\n@bot.on.message_handler(text=\"/r <s>\")\n-async def pronounce(s):\n+async def pronounce(ans: Message, s):\nreturn f\"/r {s}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "-import traceback, sys, typing\nimport asyncio\n-from ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\n+import sys\n+import traceback\n+import typing\n+\n+from vbml import Patcher, PatchedValidators\n+\n+from ._event import EventTypes\n+from ._status import BotStatus, LoggerLevel\n+from .branch import BranchManager\n+from .processor import EventProcessor\nfrom ..api import Api, request\n+from ..api import VKError\n+from ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..handler import Handler, ErrorHandler\nfrom ..http import HTTP\n-from ..api import VKError\nfrom ..utils import logger\n-from vbml import Patcher, PatchedValidators\n-from ._event import EventTypes\n-from .processor import EventProcessor\n-from .branch import BranchManager\n-from ._status import BotStatus, LoggerLevel\ntry:\nimport vbml\n@@ -231,7 +235,7 @@ class Bot(HTTP, EventProcessor):\nwhile True:\nevent = await self.make_long_request(self.long_poll_server)\nself.loop.create_task(self.emulate(event))\n- await self.get_server()\n+ self.long_poll_server[\"ts\"] = event[\"ts\"]\nasync def emulate(\nself, event: dict, confirmation_token: str = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -41,7 +41,7 @@ class EventProcessor(RegexHelper):\n)\nif message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\n- self.loop.create_task(self._branched_processor(obj, client_info))\n+ await self._branched_processor(obj, client_info)\nreturn\nif self.on.pre:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "-import typing, traceback, sys\n+import sys\n+import traceback\n+import typing\nfrom asyncio import get_event_loop, AbstractEventLoop\n-from ..utils import logger\n-import aiohttp, vbml\n+import aiohttp\n+import vbml\n-from ..http import HTTP\n+from ._status import LoggerLevel\nfrom ..api import UserApi\nfrom ..handler import UserHandler\n-from ._status import LoggerLevel\n-\n+from ..http import HTTP\n+from ..utils import logger\nDEFAULT_WAIT = 20\nVERSION = 3\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 api changes
|
718,838 |
18.02.2020 23:02:40
| -10,800 |
3f021018dc941c2034a7c8f4b6a76919ef06cfb1
|
v2 Stable fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -234,9 +234,11 @@ class Bot(HTTP, EventProcessor):\nwhile True:\nevent = await self.make_long_request(self.long_poll_server)\n+ if isinstance(event, dict):\nself.loop.create_task(self.emulate(event))\n- if \"ts\" in event:\nself.long_poll_server[\"ts\"] = event[\"ts\"]\n+ else:\n+ await self.get_server()\nasync def emulate(\nself, event: dict, confirmation_token: str = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Stable fix
|
718,838 |
20.02.2020 17:43:27
| -10,800 |
52f73621390d6b7e8aae5032091c802381a9e2d0
|
lil additions
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,7 +9,7 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.02\",\n+ version=\"2.03\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -137,6 +137,10 @@ class Bot(HTTP, EventProcessor):\nreturn event.get(\"secret\") == self.__secret\nreturn True\n+ def executor_api(self, api):\n+ self.__api = api\n+ Api.set_current(api)\n+\ndef loop_update(self, loop: asyncio.AbstractEventLoop = None):\n\"\"\"\nUpdate event loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/util.py",
"new_path": "vkbottle/utils/util.py",
"diff": "@@ -21,8 +21,4 @@ class ContextInstanceMixin:\n@classmethod\ndef set_current(cls: Type[T], value: T):\n- if not isinstance(value, cls):\n- raise TypeError(\n- f\"Value should be instance of '{cls.__name__}' not '{type(value).__name__}'\"\n- )\ncls.__context_instance.set(value)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
lil additions
|
718,838 |
21.02.2020 21:40:35
| -10,800 |
6d0553f9c3869688d9848c7bbefd2a4bfccca829
|
v2 User Updates
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -109,14 +109,14 @@ bot.run_polling()\n```python\nfrom vkbottle.user import User\n-from vkbottle.user.types import Message\n+from vkbottle.user import types\nfrom vkbottle.rule import VBMLUserRule\nuser = User(\"user-token\", 123)\nuser.mode(2)\n@user.on.message_new(VBMLUserRule(\"can i ask you about <theme>?\",))\n-async def wrapper(ans: Message, theme):\n+async def wrapper(ans: types.Message, theme):\nif theme in [\"examples\", \"how to do smt\", \"depression\", \"insomnia\"]:\nawait ans(\"You can ask me about it in telegram @timoniq or make an issue on github!\")\nelse:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "import sys\nimport traceback\nimport typing\n+import asyncio\nfrom asyncio import get_event_loop, AbstractEventLoop\nimport aiohttp\nimport vbml\nfrom ._status import LoggerLevel\n-from ..api import UserApi\n+from ..api import UserApi, VKError, request\nfrom ..handler import UserHandler\nfrom ..http import HTTP\nfrom ..utils import logger\n@@ -39,7 +40,7 @@ class User(HTTP):\nself._mode = mode\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\n- self.user_id: typing.Optional[int] = user_id\n+ self.user_id: typing.Optional[int] = user_id or self.get_id_by_token(token)\nself.on: UserHandler = UserHandler(self._mode)\nself.logger = LoggerLevel(\"INFO\" if debug else \"ERROR\")\n@@ -57,6 +58,19 @@ class User(HTTP):\ndef api(self):\nreturn self.__api\n+ @staticmethod\n+ def get_id_by_token(token: str):\n+ \"\"\"\n+ Get group id from token\n+ :param token:\n+ :return:\n+ \"\"\"\n+ logger.debug(\"Making API request users.get to get user_id\")\n+ response = asyncio.get_event_loop().run_until_complete(request(token, \"users.get\"))\n+ if \"error\" in response:\n+ raise VKError(\"Token is invalid\")\n+ return response[\"response\"][0][\"id\"]\n+\nasync def get_server(self):\n\"\"\"\nGet longPoll server for long request creation\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -15,6 +15,25 @@ class Message(BaseModel):\nattachments: dict = None\nrandom_id: int = None\n+ async def get(self) -> dict:\n+ return (await API().request(\"messages.getById\", {\"message_ids\": self.message_id}))[\"items\"][0]\n+\n+ @property\n+ async def from_id(self) -> int:\n+ return (await self.get())[\"from_id\"]\n+\n+ @property\n+ async def date(self) -> int:\n+ return (await self.get())[\"date\"]\n+\n+ @property\n+ async def out(self) -> int:\n+ return (await self.get())[\"out\"]\n+\n+ @property\n+ async def read_state(self) -> int:\n+ return (await self.get())[\"read_state\"]\n+\nasync def reply(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 User Updates
|
718,838 |
22.02.2020 16:54:23
| -10,800 |
40fde7126096666bc17f288649157b5e415fd2be
|
v2 Minor user polling fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -108,7 +108,7 @@ class User(HTTP):\nwhile True:\ntry:\nevent = await self.make_long_request(self.long_poll_server)\n- if isinstance(event, dict):\n+ if isinstance(event, dict) and event.get(\"ts\"):\nself.__loop.create_task(self.emulate(event))\nself.long_poll_server[\"ts\"] = event[\"ts\"]\nelse:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Minor user polling fix
|
718,867 |
24.02.2020 01:16:44
| 21,600 |
eaa616967fcd1a229f50645dfb8d8e88eba29f97
|
Added inline param in Keyboard class
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/keyboard.py",
"new_path": "vkbottle/api/keyboard/keyboard.py",
"diff": "@@ -30,9 +30,10 @@ class KeyboardButton:\nclass Keyboard:\n- def __init__(self, one_time: bool = False):\n+ def __init__(self, one_time: bool = False, inline: bool = False):\nself.buttons: typing.List[typing.List[KeyboardButton]] = []\nself.one_time: bool = one_time\n+ self.inline: bool = inline\ndef add_row(self):\nif len(self.buttons) and not len(self.buttons[-1]):\n@@ -49,6 +50,7 @@ class Keyboard:\ndef generate(self):\nkeyboard = {\n\"one_time\": self.one_time,\n+ \"inline\": self.inline,\n\"buttons\": [[b.button for b in row] for row in self.buttons],\n}\nreturn json.dumps(keyboard)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -7,6 +7,7 @@ from vbml import Pattern, Patcher\nfrom ...types import Message, BaseModel\nfrom ...types import user_longpoll\nfrom ...utils import flatten\n+from ...user import types\nclass Copy:\n@@ -52,6 +53,10 @@ class AbstractMessageRule(AbstractRule):\nasync def check(self, message: Message):\n...\n+class MessageUserRule(AbstractMessageRule):\n+ async def check(self, message: types.Message):\n+ ...\n+\nclass UnionMixin(AbstractMessageRule):\ndef __init__(self, mixin=None):\n@@ -135,8 +140,6 @@ class EventRule(AbstractRule):\nasync def check(self, event):\nfor e in self.data[\"event\"]:\n- if \"data\" not in self.data:\n- self.data = {\"data\": dict}\nif e == event:\nreturn True\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added inline param in Keyboard class (#34)
|
718,838 |
25.02.2020 16:39:56
| -10,800 |
40ba662752f30627195e1a35c22735e27fd2f203
|
v2 Fix broken
broke import!
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -7,7 +7,6 @@ from vbml import Pattern, Patcher\nfrom ...types import Message, BaseModel\nfrom ...types import user_longpoll\nfrom ...utils import flatten\n-from ...user import types\nclass Copy:\n@@ -53,8 +52,9 @@ class AbstractMessageRule(AbstractRule):\nasync def check(self, message: Message):\n...\n+\nclass MessageUserRule(AbstractMessageRule):\n- async def check(self, message: types.Message):\n+ async def check(self, message: user_longpoll.Message):\n...\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -2,7 +2,6 @@ import sys\nimport traceback\nimport typing\nimport asyncio\n-from asyncio import get_event_loop, AbstractEventLoop\nimport aiohttp\nimport vbml\n@@ -33,7 +32,7 @@ class User(HTTP):\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n):\n- self.__loop: AbstractEventLoop = get_event_loop()\n+ self.__loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()\nself.__debug: bool = debug\nself.__api: UserApi = UserApi(token)\nUserApi.set_current(self.__api)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Fix broken
@zpodushkin broke import!
|
718,889 |
25.02.2020 18:41:24
| -18,000 |
54f6b616f81e6a427b6a6ee90c6c953a88382dbc
|
Event object choose
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "import typing\nimport json\n+import inspect\nfrom copy import copy\nfrom vbml import Pattern, Patcher\n@@ -27,12 +28,14 @@ class AbstractRule(Copy):\ndef __init_subclass__(cls, **kwargs):\ncls.call: typing.Optional[typing.Callable] = None\ncls.context: RuleExecute = RuleExecute()\n+ cls.getfullargspec = None\ndef create(self, func: typing.Callable, data: dict = None):\nself.call: typing.Callable = func\nself.context = RuleExecute()\nif data is not None:\nsetattr(self, \"data\", {**getattr(self, \"data\", {}), **data})\n+ self.getfullargspec = inspect.getfullargspec(self.call)\nasync def check(self, event):\n...\n@@ -139,6 +142,8 @@ class EventRule(AbstractRule):\nself.data = {\"event\": event}\nasync def check(self, event):\n+ if \"data\" not in self.data:\n+ self.data[\"data\"] = self.getfullargspec.annotations.get(self.getfullargspec.args[0], dict)\nfor e in self.data[\"event\"]:\nif e == event:\nreturn True\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Event object choose (#39)
|
718,889 |
25.02.2020 18:42:56
| -18,000 |
cd1162f2d30937a3ae11515591defd40e1de62b0
|
Inherit type
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/event.py",
"new_path": "vkbottle/types/events/community/event.py",
"diff": "from enum import Enum\n+from typing import Union\nfrom ...base import BaseModel\nfrom .events_list import EventList as events\nfrom . import events_objects as EventsObjects\n@@ -8,184 +9,158 @@ from ...attachments import Photo, Audio, Video\nfrom ...wall_post import WallPost\n-import pydantic\n# https://vk.com/dev/groups_events\nclass BaseEvent(BaseModel):\ngroup_id: int = None\n- type: Enum = None\n+ type: Union[Enum, str] = None\nclass MessageNew(BaseEvent):\n- type: str = None\nobject: Message = None\nclass MessageReply(MessageNew):\n- type: str = None\n+ ...\nclass MessageAllow(BaseEvent):\n- type: str = None\nobject: EventsObjects.MessageAllow = None\nclass MessageDeny(BaseEvent):\n- type: str = None\nobject: EventsObjects.MessageAllow = None\nclass PhotoNew(BaseEvent):\n- type: str = None\nobject: Photo = None\nclass PhotoCommentNew(BaseEvent):\n- type: str = None\n- object: EventsObjects.PhotoCommentNew = None\n+ object: EventsObjects.PhotoComment = None\nclass PhotoCommentEdit(PhotoCommentNew):\n- type: str = None\n+ ...\nclass PhotoCommentRestore(PhotoCommentNew):\n- type: str = None\n+ ...\nclass PhotoCommentDelete(BaseEvent):\n- type: str = None\nobject: EventsObjects.PhotoCommentDelete = None\nclass AudioNew(BaseEvent):\n- type: str = None\nobject: Audio = None\nclass VideoNew(BaseEvent):\n- type: str = None\nobject: Video = None\nclass VideoCommentNew(BaseEvent):\n- type: str = None\n- object: EventsObjects.VideoCommentNew = None\n+ object: EventsObjects.VideoComment = None\nclass VideoCommentEdit(VideoCommentNew):\n- type: str = None\n+ ...\nclass VideoCommentRestore(VideoCommentNew):\n- type: str = None\n+ ...\nclass VideoCommentDelete(BaseEvent):\n- type: str = None\nobject: EventsObjects.VideoCommentDelete = None\nclass WallPostNew(BaseEvent):\n- type: str = None\nobject: WallPost = None\nclass WallRepost(WallPostNew):\n- type: str = None\n+ ...\nclass WallReplyNew(BaseEvent):\n- type: str = None\nobject: EventsObjects.WallReplyNew = None\nclass WallReplyEdit(WallReplyNew):\n- type: str = None\n+ ...\nclass WallReplyRestore(WallReplyNew):\n- type: str = None\n+ ...\nclass WallReplyDelete(BaseEvent):\n- type: str = None\nobject: EventsObjects.WallReplyDelete = None\nclass BoardPostNew(BaseEvent):\n- type: str = None\nobject: EventsObjects.BoardPostNew = None\nclass BoardPostEdit(BoardPostNew):\n- type: str = None\n+ ...\nclass BoardPostRestore(BoardPostNew):\n- type: str = None\n+ ...\nclass BoardPostDelete(BaseEvent):\n- type: str = None\nobject: EventsObjects.BoardPostDelete = None\nclass MarketCommentNew(BaseEvent):\n- type: str = None\nobject: EventsObjects.MarketCommentNew = None\nclass MarketCommentEdit(MarketCommentNew):\n- type: str = None\n+ ...\nclass MarketCommentRestore(MarketCommentNew):\n- type: str = None\n+ ...\nclass MarketCommentDelete(BaseEvent):\n- type: str = None\nobject: EventsObjects.MarketCommentDelete = None\nclass GroupLeave(BaseEvent):\n- type: str = None\nobject: EventsObjects.GroupLeave = None\nclass GroupJoin(BaseEvent):\n- type: str = None\nobject: EventsObjects.GroupJoin = None\nclass UserBlock(BaseEvent):\n- type: str = None\nobject: EventsObjects.UserBlock = None\nclass UserUnblock(BaseEvent):\n- type: str = None\nobject: EventsObjects.UserUnblock = None\nclass PollVoteNew(BaseEvent):\n- type: str = None\nobject: EventsObjects.PollVoteNew = None\nclass GroupOfficersEdit(BaseEvent):\n- type: str = None\nobject: EventsObjects.GroupOfficersEdit = None\nclass GroupChangeSettings(BaseEvent):\n- type: str = None\nobject: EventsObjects.GroupChangeSettings = None\nclass GroupChangePhoto(BaseEvent):\n- type: str = None\nobject: EventsObjects.GroupChangePhoto = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Inherit type (#40)
|
718,838 |
25.02.2020 17:47:19
| -10,800 |
4a00f1a2517e8cad6b8ca1c817add1bc72cebf9d
|
v2 Fix of the main shit
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/forwarder.py",
"new_path": "examples/tests/forwarder.py",
"diff": "@@ -9,6 +9,12 @@ async def start_forwarding(peer_id: int, text: str):\nmid = await user.api.messages.send(peer_id=peer_id, message=text, random_id=random.randint(-2e9, 2e9))\nfor i in range(200):\ntry:\n+ mid = await user.api.messages.send(\n+ peer_id=peer_id,\n+ message=text,\n+ forward_messages=mid,\n+ random_id=random.randint(-2e9, 2e9)\n+ )\nawait asyncio.sleep(1.8)\nexcept VKError:\ninput(\"[Press after you input captcha] >> \")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -25,8 +25,8 @@ async def request(\nreturn await session.post(url, data=params or {})\n-async def request_instance(method: str, req: typing.Coroutine):\n- response = await req\n+async def request_instance(method: str, req: tuple):\n+ response = await request(*req)\nif not isinstance(response, dict):\nwhile not isinstance(response, dict):\n@@ -40,7 +40,7 @@ async def request_instance(method: str, req: typing.Coroutine):\n)\nawait asyncio.sleep(delay * 5)\ndelay += 1\n- response = await req\n+ response = await request(*req)\nlogger.critical(\nf\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\n@@ -79,8 +79,7 @@ class Method:\nif isinstance(v, (list, tuple)):\nkwargs[k] = \",\".join(str(x) for x in v)\n- req = request(self._token, self._method, kwargs)\n- return await request_instance(self._method, req)\n+ return await request_instance(self._method, (self._token, self._method, kwargs))\nclass ApiInstance(ContextInstanceMixin):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Fix of the main shit
|
718,838 |
25.02.2020 18:02:21
| -10,800 |
7ba02ccf830d955456ef5456c6556e35e1bbc923
|
v2 user handler concatenate
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/user.py",
"new_path": "vkbottle/handler/user.py",
"diff": "@@ -16,6 +16,9 @@ class Handler:\nself.rules: typing.List[UserLongPollEventRule] = list()\nself.mode = mode\n+ def concatenate(self, other: \"Handler\"):\n+ self.rules += other.rules\n+\ndef additional_fields(self, event: int):\nif event in [1, 2, 3, 4]:\nreturn MESSAGE_FIELDS[self.mode]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 user handler concatenate
|
718,838 |
26.02.2020 22:04:28
| -10,800 |
0390c85f7753c45be82d187b46ee4ccb7bb78b25
|
v2 senior bro
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -148,13 +148,7 @@ class EventProcessor(RegexHelper):\n:param obj:\n:return:\n\"\"\"\n- if isinstance(handler_return, (str, int, dict, list, tuple, float)):\n+ if handler_return is not None:\nawait Message(**obj, client_info=client_info)(\nstr(handler_return), **self.status.handler_return_context\n)\n- elif handler_return is not None:\n- raise HandlerReturnError(\n- \"Type {} can't be returned out of handler\".format(\n- type(handler_return).__name__\n- )\n- )\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 senior bro
|
718,867 |
27.02.2020 06:58:16
| 21,600 |
8cc5fa6e948d6aa58db82f8b6fae0dd57ea18d40
|
Edit README Callback description
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -70,23 +70,28 @@ bot.run_polling()\n```python\nfrom vkbottle import Bot, Message\n-from aiohttp.web import RouteTableDef, Application, Request, run_app\n+from aiohttp import web\n+bot = Bot(token=\"my-token\", secret=\"my-secret\")\n+app = web.Application()\n-app = Application()\n-routes = RouteTableDef()\n-bot = Bot(\"my-token\", secret=\"SecretKey\")\n-@routes.get(\"/bot\")\n-async def executor(request: Request):\n- return await bot.emulate(event=dict(request.query), confirmation_token=\"ConfirmationToken\")\n+async def executor(request: web.Request):\n+ event = await request.json()\n+ return await bot.emulate(event=event, confirmation_token=\"ConfirmationToken\")\n+\n@bot.on.message(text=\"test\", lower=True)\nasync def wrapper(ans: Message):\n- await ans(\"test!\")\n+ return \"Tested!\"\n+\n-app.add_routes(routes)\n-run_app(app)\n+app.router.add_route(\n+ path='/',\n+ method='POST',\n+ handler=executor\n+ )\n+web.run_app(app=app, host=host, port=port)\n```\n### Rules\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Edit README Callback description (#43)
|
718,838 |
27.02.2020 19:48:58
| -10,800 |
b16f8cb72f32967c028ded47af14fb4d2bdf612e
|
v2 Lil additions and editions
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -4,7 +4,6 @@ import traceback\nimport typing\nfrom vbml import Patcher, PatchedValidators\n-from json import dumps\nfrom ._event import EventTypes\nfrom ._status import BotStatus, LoggerLevel\n@@ -16,7 +15,7 @@ from ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..handler import Handler, ErrorHandler\nfrom ..http import HTTP\nfrom ..utils import logger, TaskManager, chunks\n-from ..utils.json import USAGE, json\n+from ..utils.json import USAGE\ntry:\nimport vbml\n@@ -25,7 +24,6 @@ except ImportError:\ntry:\nimport uvloop\n-\nasyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\nexcept ImportError:\npass\n@@ -106,9 +104,11 @@ class Bot(HTTP, EventProcessor):\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\nasync def get_updates(self):\n+ # noqa\nlogger.info(\"Receiving updates from conversations\")\nupdates = []\nclose, offset = False, 0\n+\nwhile not close:\nconversations = await self.api.request(\n\"messages.getConversations\",\n@@ -118,9 +118,7 @@ class Bot(HTTP, EventProcessor):\nlogger.info(f\"Conversation count - {conversations['count']}\")\noffset += 200\n- items = [item for item in conversations[\"items\"]]\n-\n- updates.extend([item[\"conversation\"][\"out_read\"] for item in items])\n+ updates.extend([item[\"conversation\"][\"out_read\"] for item in conversations[\"items\"]])\nif len(conversations[\"items\"]) < 200:\nclose = True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -153,6 +153,10 @@ class EventProcessor(RegexHelper):\n:param obj:\n:return:\n\"\"\"\n+ if isinstance(handler_return, Branch):\n+ self.branch.add(obj[\"peer_id\"], handler_return.branch_name, **handler_return.branch_kwargs)\n+ elif isinstance(handler_return, ExitBranch):\n+ self.branch.exit(obj[\"peer_id\"])\nif handler_return is not None:\nawait Message(**obj, client_info=client_info)(\nstr(handler_return), **self.status.handler_return_context\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Lil additions and editions
|
718,838 |
27.02.2020 20:14:24
| -10,800 |
3a579e392ce376c8140ce25d37bd88bafe6659f5
|
v2 TokenQueue
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/stress.py",
"new_path": "examples/tests/stress.py",
"diff": "@@ -29,12 +29,12 @@ async def pronounce(ans: Message, t=100):\n@bot.on.message_handler(text=[\"/results\", \"/re\"])\n-async def res():\n+async def res(ans: Message):\nreturn f\"{TIMES - len(STRINGS)}/{TIMES}. I haven't seen {STRINGS}\"\n@bot.on.message_handler(text=\"/r <s>\")\n-async def response(s):\n+async def response(ans: Message, s):\nif s in STRINGS:\nSTRINGS.pop(STRINGS.index(s))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .api import Api, UserApi, request\nfrom .exceptions import *\nfrom .template import template_gen, TemplateElement\n+from .token import TokenQueue\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -7,6 +7,7 @@ from ..const import API_VERSION, API_URL\nfrom .exceptions import VKError\nfrom ..http import HTTPRequest\nfrom ..utils import ContextInstanceMixin\n+from .token import TokenQueue\ndef exception_handler(loop, context):\n@@ -82,12 +83,16 @@ class Method:\nclass ApiInstance(ContextInstanceMixin):\n- def __init__(self, token: str):\n- self._token = token\n+ def __init__(self):\n+ self._token_queue = TokenQueue.get_current\nself._request = HTTPRequest()\n+ @property\n+ def token(self):\n+ return self._token_queue().get()\n+\nasync def request(self, method: str, params: dict):\n- return await request_instance(method, (self._token, method, params))\n+ return await request_instance(method, (self.token, method, params))\ndef __getattr__(self, method):\n\"\"\"\n@@ -100,7 +105,7 @@ class ApiInstance(ContextInstanceMixin):\nm = method.split(\"_\")\nmethod = m[0] + \"\".join(i.title() for i in m[1:])\n- return Method(self._token, method)\n+ return Method(self.token, method)\nclass UserApi(ApiInstance, ContextInstanceMixin):\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/token.py",
"diff": "+from ..utils import ContextInstanceMixin\n+import typing\n+\n+\n+class TokenQueue(ContextInstanceMixin):\n+ tokens: typing.List[str] = []\n+ index: int = 0\n+\n+ def __init__(self, token: str):\n+ self.tokens.append(token)\n+\n+ def extend(self, *tokens):\n+ self.tokens.extend(tokens)\n+\n+ def get(self):\n+ token = self.tokens[self.index]\n+ self.index = self.index + 1 if self.index + 1 < len(self.tokens) else 0\n+ return token\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -9,7 +9,7 @@ from ._event import EventTypes\nfrom ._status import BotStatus, LoggerLevel\nfrom .branch import BranchManager\nfrom .processor import EventProcessor\n-from ..api import Api, request\n+from ..api import Api, request, TokenQueue\nfrom ..api import VKError\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..handler import Handler, ErrorHandler\n@@ -90,7 +90,10 @@ class Bot(HTTP, EventProcessor):\n)\n# Sign assets\n- self.__api: Api = Api(token)\n+ self.__token_queue = TokenQueue(token)\n+ TokenQueue.set_current(self.__token_queue)\n+\n+ self.__api: Api = Api()\nApi.set_current(self.__api)\nself.group_id = group_id or self.get_id_by_token(token)\n@@ -138,6 +141,10 @@ class Bot(HTTP, EventProcessor):\n}\n)\n+ def add_tokens(self, *tokens):\n+ self.__token_queue.extend(*tokens)\n+ TokenQueue.set_current(self.__token_queue)\n+\ndef dispatch(self, ext: \"Bot\"):\n\"\"\"\nConcatenate handlers to current bot object\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 TokenQueue
|
718,838 |
27.02.2020 20:51:09
| -10,800 |
30d35b54d0fa44a7d989d01e20f7e6993807a780
|
v2 noqa hotfix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -134,12 +134,15 @@ class Bot(HTTP, EventProcessor):\n)\nfor m in messages[\"items\"]:\nif m[\"from_id\"] != -self.group_id:\n+ try:\nawait self.emulate(\n{\n\"type\": \"message_new\",\n\"object\": {\"message\": m, \"client_info\": {}},\n}\n)\n+ except VKError:\n+ pass # noqa\ndef add_tokens(self, *tokens):\nself.__token_queue.extend(*tokens)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 noqa hotfix
|
718,838 |
28.02.2020 00:23:47
| -10,800 |
d0a026675e4e18da5444b5fc425cddd0ba028e3a
|
v2 skip_updates fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -116,6 +116,8 @@ class Bot(HTTP, EventProcessor):\n)\nif offset == 0:\nlogger.info(f\"Conversation count - {conversations['count']}\")\n+ if conversations['count'] == 0:\n+ return\noffset += 200\nupdates.extend([item[\"conversation\"][\"out_read\"] for item in conversations[\"items\"]])\n@@ -252,7 +254,7 @@ class Bot(HTTP, EventProcessor):\ndef run_polling(\nself,\n*,\n- skip_updates: bool = False,\n+ skip_updates: bool = True,\nauto_reload: bool = False,\non_shutdown: typing.Callable = None,\non_startup: typing.Callable = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 skip_updates fix
|
718,838 |
28.02.2020 15:58:12
| -10,800 |
2ed4b7d6b525f4f98ba39831ba42dd126a437f19
|
v2 fix branch log
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -157,7 +157,7 @@ class EventProcessor(RegexHelper):\nself.branch.add(obj[\"peer_id\"], handler_return.branch_name, **handler_return.branch_kwargs)\nelif isinstance(handler_return, ExitBranch):\nself.branch.exit(obj[\"peer_id\"])\n- if handler_return is not None:\n+ elif handler_return is not None:\nawait Message(**obj, client_info=client_info)(\nstr(handler_return), **self.status.handler_return_context\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 fix branch log
|
718,838 |
28.02.2020 16:33:57
| -10,800 |
701c2dc1d181e46075ccc901099e83237c9bcad1
|
v2 Update docs
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -63,7 +63,7 @@ async def wrapper(ans: Message, name):\nawait ans(\"Hello, {}\".format(name))\n-bot.run_polling()\n+bot.run_polling(skip_updates=False)\n```\n### Callback\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/RulesExecutor.md",
"new_path": "docs/RulesExecutor.md",
"diff": "@@ -61,7 +61,7 @@ from vkbottle import Message\nclass MyFirstRule(AbstractRule):\ndef __init__(self, count: int):\n- self.data[\"c\"] = count\n+ self.data = {\"c\": count}\nasync def check(self, message: Message):\nif len(message.text.split()) == self.data[\"c\"]:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Update docs
|
718,838 |
28.02.2020 21:41:33
| -10,800 |
d0c67a560ce23b3d85a92120f56db86acdc89829
|
v2 Add patcher comp
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -46,6 +46,7 @@ class Bot(HTTP, EventProcessor):\ngroup_id: int = None,\ndebug: typing.Union[str, bool] = True,\nlog_to_path: typing.Union[str, bool] = None,\n+ patcher: Patcher = None,\nmobile: bool = False,\nsecret: str = None,\n):\n@@ -70,7 +71,7 @@ class Bot(HTTP, EventProcessor):\nself.logger = LoggerLevel(debug)\nif not Patcher.get_current():\n- Patcher.set_current(Patcher(pattern=\"^{}$\", validators=DefaultValidators))\n+ Patcher.set_current(patcher or Patcher(pattern=\"^{}$\", validators=DefaultValidators))\nlogger.remove()\nlogger.add(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2 Add patcher comp
|
718,838 |
29.02.2020 23:14:37
| -10,800 |
8fd74c9ccf324787788a615e11f8504ae054e682
|
Add tortoise examples with pre_process
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/middleware.py",
"diff": "+from time import time as current\n+\n+from tortoise import Tortoise\n+\n+from vkbottle import Bot, Message\n+from vkbottle.rule import AbstractMessageRule\n+from .tortoise_models import User\n+\n+bot = Bot(\"token\")\n+\n+\"\"\"\n+Better works with tortoise.\n+Choose only asynchronous libraries to integrate them with vkbottle\n+\"\"\"\n+\n+\n+class Registered(AbstractMessageRule):\n+ async def check(self, message: Message):\n+ self.context.args.append(await User.get(uid=message.from_id))\n+ return True\n+\n+\n+@bot.on.pre_process()\n+async def middleware(ans: Message):\n+ if not await User.get_or_none(uid=ans.from_id):\n+ await User.create(uid=ans.from_id, time=current())\n+ await ans(\"You are now registered\")\n+\n+\n+@bot.on.message(Registered(), lev=[\"hi\", \"hello\"])\n+async def wrapper(ans: Message, user: User):\n+ await ans(f\"hi, my lil friend, unix time of registration: {user.time}\")\n+\n+\n+async def init_db():\n+ await Tortoise.init(db_url=\"sqlite://users.db\", modules={\"models\": [\"tortoise_models\"]})\n+ await Tortoise.generate_schemas()\n+\n+bot.run_polling(skip_updates=False)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tortoise_models.py",
"diff": "+from tortoise import fields\n+from tortoise.models import Model\n+\n+\n+class User(Model):\n+ id = fields.IntField(pk=True)\n+ uid = fields.IntField()\n+ time = fields.IntField()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add tortoise examples with pre_process
|
718,838 |
02.03.2020 19:55:46
| -10,800 |
366f7b612dad7bc87ddfc78924c896e11d99598e
|
v2.4 Add possibility to ignore errors by the option throw_errors to False
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -24,7 +24,7 @@ async def request(\nreturn await session.post(url, data=params or {})\n-async def request_instance(method: str, req: tuple):\n+async def request_instance(method: str, req: tuple, throw_errors: bool = True):\nresponse = await request(*req)\nif not isinstance(response, dict):\n@@ -51,15 +51,18 @@ async def request_instance(method: str, req: tuple):\nlogger.debug(\n\"Error after request {method}, response: {r}\", method=method, r=response\n)\n+ if throw_errors:\nraise VKError([response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]])\n+ return response\nreturn response[\"response\"]\nclass Method:\n- def __init__(self, token: str, method: str):\n+ def __init__(self, token: str, method: str, throw_errors: bool = True):\nself._token = token\nself._method = method\n+ self._throw_errors = throw_errors\ndef __getattr__(self, method):\nif \"_\" in method:\n@@ -78,16 +81,17 @@ class Method:\nif isinstance(v, (list, tuple)):\nkwargs[k] = \",\".join(str(x) for x in v)\n- return await request_instance(self._method, (self._token, self._method, kwargs))\n+ return await request_instance(self._method, (self._token, self._method, kwargs), self._throw_errors)\nclass ApiInstance(ContextInstanceMixin):\n- def __init__(self, token: str):\n+ def __init__(self, token: str, throw_errors: bool = True):\nself._token = token\nself._request = HTTPRequest()\n+ self.throw_errors: bool = throw_errors\nasync def request(self, method: str, params: dict):\n- return await request_instance(method, (self._token, method, params))\n+ return await request_instance(method, (self._token, method, params), self.throw_errors)\ndef __getattr__(self, method):\n\"\"\"\n@@ -100,7 +104,7 @@ class ApiInstance(ContextInstanceMixin):\nm = method.split(\"_\")\nmethod = m[0] + \"\".join(i.title() for i in m[1:])\n- return Method(self._token, method)\n+ return Method(self._token, method, self.throw_errors)\nclass UserApi(ApiInstance, ContextInstanceMixin):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -46,6 +46,7 @@ class Bot(HTTP, EventProcessor):\n*,\ngroup_id: int = None,\ndebug: typing.Union[str, bool] = True,\n+ throw_errors: bool = True,\nlog_to_path: typing.Union[str, bool] = None,\npatcher: Patcher = None,\nmobile: bool = False,\n@@ -96,7 +97,7 @@ class Bot(HTTP, EventProcessor):\n)\n# Sign assets\n- self.__api: Api = Api(token)\n+ self.__api: Api = Api(token, throw_errors=throw_errors)\nApi.set_current(self.__api)\nself.group_id = group_id or self.get_id_by_token(token)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 Add possibility to ignore errors by the option throw_errors to False
|
718,838 |
03.03.2020 22:27:41
| -10,800 |
c77ccacdbefec51b0d7c2e7bb4e73f29f63e7cf2
|
v2.4 Middlewares
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/middleware.py",
"diff": "+from vkbottle import Bot, Message\n+from vkbottle.ext import Middleware\n+import os\n+from time import time\n+\n+# Add variable TOKEN to your env variables\n+bot = Bot(os.environ[\"TOKEN\"], debug=\"DEBUG\")\n+\n+\n+@bot.middleware.middleware_handler()\n+class UserCheck(Middleware):\n+ async def middleware(self, message: Message):\n+ return message.from_id > 0\n+\n+\n+@bot.on.message_handler(lev={\"hello\": [\"reaction to hello\"], \"hi\": {\"source\": \"reaction to hi\"}})\n+async def pronounce(ans: Message, source):\n+ return f\"Hello! {source}\"\n+\n+\n+bot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,7 +9,7 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.4\",\n+ version=\"2.5\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/ext.py",
"diff": "+from .handler.middleware import Middleware\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/_status.py",
"new_path": "vkbottle/framework/_status.py",
"diff": "@@ -14,6 +14,7 @@ class BotStatus:\npolling_started: bool = False\ndispatched: bool = False\nhandler_return_context: dict = {}\n+ middleware_expressions: bool = True\n@property\ndef readable(self) -> dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -13,6 +13,7 @@ from ..api import Api, request\nfrom ..api import VKError\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\nfrom ..handler import Handler, ErrorHandler\n+from ..handler.middleware import MiddlewareExecutor\nfrom ..http import HTTP\nfrom ..utils import logger, TaskManager, chunks\nfrom ..utils.json import USAGE\n@@ -105,6 +106,7 @@ class Bot(HTTP, EventProcessor):\n# Main workers\nself.branch: BranchManager = BranchManager(DEFAULT_BOT_FOLDER)\n+ self.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler(self.group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -6,8 +6,9 @@ from ..utils import logger\nfrom vbml import Patcher\nfrom ..types.message import Message\n-from ..api import Api, HandlerReturnError\n+from ..api import Api\nfrom ..handler import Handler\n+from ..handler.middleware import MiddlewareExecutor\nfrom .branch import BranchManager\nfrom .regex import RegexHelper\nfrom .branch import Branch, ExitBranch\n@@ -25,6 +26,7 @@ def get_attr(adict: dict, attrs: typing.List[str]):\nclass EventProcessor(RegexHelper):\napi: Api\non: Handler\n+ middleware: MiddlewareExecutor\npatcher: Patcher\nbranch: BranchManager\nstatus: BotStatus\n@@ -39,13 +41,15 @@ class EventProcessor(RegexHelper):\nclient_info=client_info\n)\n+ async for mr in self.middleware.run_middleware(message):\n+ if self.status.middleware_expressions:\n+ if mr is False:\n+ return\n+\nif message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\nawait self._branched_processor(obj, client_info)\nreturn\n- if self.on.pre:\n- await (self.on.pre(message))\n-\nlogger.debug(\n'-> MESSAGE FROM {} TEXT \"{}\"',\nmessage.from_id,\n@@ -56,7 +60,7 @@ class EventProcessor(RegexHelper):\nfor rules in self.on.rules:\nfor rule in rules:\n- if not await rule.check(message):\n+ if not await rule(message):\nbreak\nelse:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "import typing\n-import json\nimport inspect\nfrom copy import copy\n@@ -7,7 +6,7 @@ from vbml import Pattern, Patcher\nfrom ...types import Message, BaseModel\nfrom ...types import user_longpoll\n-from ...utils import flatten\n+from ...utils import flatten, json\nclass Copy:\n@@ -20,23 +19,41 @@ class RuleExecute:\nself.args = []\nself.kwargs = {}\n+ def update(self, args: list, kwargs: dict):\n+ self.args.extend(args)\n+ self.kwargs.update(kwargs)\n+\ndef __call__(self):\nreturn self.args, self.kwargs\nclass AbstractRule(Copy):\ndef __init_subclass__(cls, **kwargs):\n- cls.call: typing.Optional[typing.Callable] = None\ncls.context: RuleExecute = RuleExecute()\n- cls.getfullargspec = None\n+ cls.watch_context = None\ndef create(self, func: typing.Callable, data: dict = None):\nself.call: typing.Callable = func\n- self.context = RuleExecute()\nif data is not None:\nsetattr(self, \"data\", {**getattr(self, \"data\", {}), **data})\nself.getfullargspec = inspect.getfullargspec(self.call)\n+ def resolve(self, value):\n+ if self.watch_context:\n+ context = self.watch_context.get(value)\n+\n+ if isinstance(context, (list, tuple)):\n+ self.context.args.extend(context)\n+ elif isinstance(context, dict):\n+ self.context.kwargs.update(context)\n+ else:\n+ self.context.args.append(context)\n+\n+\n+ async def __call__(self, event):\n+ self.__init_subclass__()\n+ return await self.check(event)\n+\nasync def check(self, event):\n...\n@@ -91,7 +108,10 @@ class MessageRule(AbstractMessageRule):\nclass LevenshteinDisRule(AbstractMessageRule):\ndef __init__(self, mixin: typing.Union[str, typing.List[str]], lev_d: float = 1):\n- if not isinstance(mixin, list):\n+ if isinstance(mixin, dict):\n+ self.watch_context = mixin\n+ mixin = list(mixin.keys())\n+ elif not isinstance(mixin, list):\nmixin = [mixin]\nself.data = {\"samples\": mixin}\nself.lev = lev_d\n@@ -121,12 +141,16 @@ class LevenshteinDisRule(AbstractMessageRule):\nasync def check(self, message: Message):\nfor sample in self.data[\"samples\"]:\nif self.distance(message.text, sample) <= self.lev:\n+ self.resolve(sample)\nreturn True\nclass CommandRule(AbstractMessageRule):\ndef __init__(self, message: typing.Union[str, typing.List[str]]):\n- if isinstance(message, str):\n+ if isinstance(message, dict):\n+ self.watch_context = message\n+ message = list(message.keys())\n+ elif not isinstance(message, list):\nmessage = [message]\nself.data = {\"message\": [\"/\" + c for c in message]}\n@@ -183,11 +207,20 @@ class PrivateMessage(AbstractMessageRule):\nreturn True\n-class VBML:\n+class VBML(AbstractMessageRule):\ndef __init__(\nself,\n- pattern: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]],\n+ pattern: typing.Union[\n+ str,\n+ Pattern,\n+ typing.List[typing.Union[str, Pattern]],\n+ typing.Dict[typing.Union[str, Pattern], typing.Union[list, dict]]\n+ ],\n):\n+ if isinstance(pattern, dict):\n+ self.watch_context = pattern\n+ pattern = list(pattern.keys())\n+ print(pattern)\nself._patcher = Patcher.get_current()\npatterns: typing.List[Pattern] = []\nif isinstance(pattern, Pattern):\n@@ -204,17 +237,18 @@ class VBML:\nself.data = {\"pattern\": patterns}\n-class VBMLRule(AbstractMessageRule, VBML):\n+class VBMLRule(VBML):\nasync def check(self, message: Message):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\nfor pattern in patterns:\nif self._patcher.check(message.text, pattern) is not None:\nself.context.kwargs = pattern.dict()\n+ self.resolve(pattern)\nreturn True\n-class VBMLUserRule(AbstractUserRule, VBML):\n+class VBMLUserRule(VBML):\nasync def check(self, message: user_longpoll.Message):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -154,7 +154,6 @@ class Handler:\ndef decorator(func):\nself._pre_p = func\nreturn func\n-\nreturn decorator\ndef __repr__(self):\n@@ -204,9 +203,16 @@ class MessageHandler:\ncommand: bool,\npattern: str,\n) -> AbstractRule:\n+ source = None\n+\n+ if not isinstance(text, dict):\ntexts: typing.List[typing.Union[str, Pattern]] = text if isinstance(\ntext, list\n) else [text]\n+ else:\n+ source = list(text.values())\n+ texts = list(text.keys())\n+\npatterns: typing.List[Pattern] = []\nfor text in texts:\n@@ -223,6 +229,8 @@ class MessageHandler:\npatterns.append(text)\nrule = VBMLRule(patterns)\n+ if source:\n+ rule.watch_context = dict(zip(patterns, source))\narguments = [\narguments for pattern in patterns for arguments in pattern.arguments\n]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/handler/middleware/__init__.py",
"diff": "+from .middleware import Middleware\n+from .executor import MiddlewareExecutor\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/handler/middleware/executor.py",
"diff": "+from ...types import BaseModel\n+from ...utils import logger\n+from .middleware import Middleware\n+import typing\n+import types\n+\n+\n+class MiddlewareExecutor:\n+ def __init__(self):\n+ self.middleware: typing.List[typing.Union[Middleware, typing.Callable]] = []\n+\n+ def add_middleware(self, middleware: typing.Union[Middleware, typing.Callable]):\n+ self.middleware.append(middleware)\n+\n+ def middleware_handler(self, *context):\n+ def wrapper(cls):\n+ if not isinstance(cls, types.FunctionType):\n+ self.middleware.append(cls(*context))\n+ else:\n+ self.middleware.append(cls)\n+ return cls\n+ return wrapper\n+\n+ def export_middleware(self, middleware_list: typing.List[Middleware]):\n+ self.middleware.extend(middleware_list)\n+\n+ async def run_middleware(self, event: BaseModel):\n+ for middleware in self.middleware:\n+ logger.debug(f\"Executing middleware {middleware.__class__.__name__}\")\n+ yield await middleware(event)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/handler/middleware/middleware.py",
"diff": "+from ...types import BaseModel\n+\n+\n+class Middleware:\n+ async def middleware(self, event: BaseModel):\n+ ...\n+\n+ async def __call__(self, *args, **kwargs):\n+ return await self.middleware(*args, **kwargs)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -77,7 +77,9 @@ class Message(BaseModel):\nreturn self.peer_id - 2000000000\nasync def reply(self, message: str = None, attachment: str = None, **params):\n+ message = str(message)\nlocals().update(params)\n+\nreturn await API().request(\n\"messages.send\",\ndict(\n@@ -94,7 +96,8 @@ class Message(BaseModel):\nasync def __call__(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\n- for message in sep_bytes(message or \"\"):\n+\n+ for message in sep_bytes(str(message or \"\")):\nm = await API().request(\n\"messages.send\",\ndict(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 Middlewares
|
718,838 |
03.03.2020 22:28:16
| -10,800 |
9d1845726f4083f3ab3f4f5ac29ced5c266f5c3a
|
v2.4 Example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/middleware.py",
"new_path": "examples/middleware.py",
"diff": "@@ -4,6 +4,7 @@ from tortoise import Tortoise\nfrom vkbottle import Bot, Message\nfrom vkbottle.rule import AbstractMessageRule\n+from vkbottle.ext import Middleware\nfrom .tortoise_models import User\nbot = Bot(\"token\")\n@@ -20,11 +21,12 @@ class Registered(AbstractMessageRule):\nreturn True\n-@bot.on.pre_process()\n-async def middleware(ans: Message):\n- if not await User.get_or_none(uid=ans.from_id):\n- await User.create(uid=ans.from_id, time=current())\n- await ans(\"You are now registered\")\n+@bot.middleware.middleware_handler()\n+class Register(Middleware):\n+ async def middleware(self, message: Message):\n+ if not await User.get_or_none(uid=message.from_id):\n+ await User.create(uid=message.from_id, time=current())\n+ await message(\"You are now registered\")\n@bot.on.message(Registered(), lev=[\"hi\", \"hello\"])\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 Example
|
718,838 |
04.03.2020 12:08:51
| -10,800 |
bf19123bdb0d08d0797892c9c66fc1a3a1733f33
|
v2.4 throw_errors
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "import time\nimport asyncio\n+import typing\nfrom ..utils import logger\n@@ -90,8 +91,12 @@ class ApiInstance(ContextInstanceMixin):\nself._request = HTTPRequest()\nself.throw_errors: bool = throw_errors\n- async def request(self, method: str, params: dict):\n- return await request_instance(method, (self._token, method, params), self.throw_errors)\n+ async def request(self, method: str, params: dict, throw_errors: typing.Optional[bool] = None):\n+ return await request_instance(\n+ method,\n+ (self._token, method, params),\n+ (throw_errors if throw_errors is not None else self.throw_errors)\n+ )\ndef __getattr__(self, method):\n\"\"\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 throw_errors
|
718,838 |
04.03.2020 17:58:50
| -10,800 |
b58eebe88d3d20a8d16cfe0c7f67092bc7f64107
|
v2.4 Reduce dead pale flesh
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/middleware.py",
"new_path": "examples/tests/middleware.py",
"diff": "@@ -13,7 +13,9 @@ class UserCheck(Middleware):\nreturn message.from_id > 0\n-@bot.on.message_handler(lev={\"hello\": [\"reaction to hello\"], \"hi\": {\"source\": \"reaction to hi\"}})\n+@bot.on.message_handler(\n+ lev={\"hello\": [\"reaction to hello\"], \"hi\": {\"source\": \"reaction to hi\"}}\n+)\nasync def pronounce(ans: Message, source):\nreturn f\"Hello! {source}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -53,7 +53,9 @@ async def request_instance(method: str, req: tuple, throw_errors: bool = True):\n\"Error after request {method}, response: {r}\", method=method, r=response\n)\nif throw_errors:\n- raise VKError([response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]])\n+ raise VKError(\n+ [response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]]\n+ )\nreturn response\nreturn response[\"response\"]\n@@ -82,7 +84,9 @@ class Method:\nif isinstance(v, (list, tuple)):\nkwargs[k] = \",\".join(str(x) for x in v)\n- return await request_instance(self._method, (self._token, self._method, kwargs), self._throw_errors)\n+ return await request_instance(\n+ self._method, (self._token, self._method, kwargs), self._throw_errors\n+ )\nclass ApiInstance(ContextInstanceMixin):\n@@ -91,11 +95,13 @@ class ApiInstance(ContextInstanceMixin):\nself._request = HTTPRequest()\nself.throw_errors: bool = throw_errors\n- async def request(self, method: str, params: dict, throw_errors: typing.Optional[bool] = None):\n+ async def request(\n+ self, method: str, params: dict, throw_errors: typing.Optional[bool] = None\n+ ):\nreturn await request_instance(\nmethod,\n(self._token, method, params),\n- (throw_errors if throw_errors is not None else self.throw_errors)\n+ (throw_errors if throw_errors is not None else self.throw_errors),\n)\ndef __getattr__(self, method):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -49,7 +49,6 @@ class AbstractRule(Copy):\nelse:\nself.context.args.append(context)\n-\nasync def __call__(self, event):\nself.__init_subclass__()\nreturn await self.check(event)\n@@ -214,7 +213,7 @@ class VBML(AbstractMessageRule):\nstr,\nPattern,\ntyping.List[typing.Union[str, Pattern]],\n- typing.Dict[typing.Union[str, Pattern], typing.Union[list, dict]]\n+ typing.Dict[typing.Union[str, Pattern], typing.Union[list, dict]],\n],\n):\nif isinstance(pattern, dict):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -72,7 +72,8 @@ class Handler:\nself._pre_p = handler.pre\nlogger.debug(\n- \"Bot Handler was concatenated with {handler}\", handler=handler.__class__.__name__\n+ \"Bot Handler was concatenated with {handler}\",\n+ handler=handler.__class__.__name__,\n)\nasync def dispatch(self, get_current_rest: typing.Callable = None) -> None:\n@@ -154,6 +155,7 @@ class Handler:\ndef decorator(func):\nself._pre_p = func\nreturn func\n+\nreturn decorator\ndef __repr__(self):\n@@ -320,60 +322,6 @@ class MessageHandler:\nreturn decorator\n- def startswith(\n- self,\n- text: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]],\n- *rules,\n- command: bool = False,\n- lower: bool = False,\n- **col_rules,\n- ):\n- \"\"\"\n- Startswith regex message processor\n-\n- For example:\n- >>> # @bot.on.message.startswith(text)\n-\n- :param text: text which message should start\n- :param command: Is this is a /command\n- :param lower: Should IGNORECASE param for regex be used\n- \"\"\"\n-\n- def decorator(func):\n- current: typing.List[AbstractRule] = list(rules)\n- current.extend(self._col_rules(**col_rules))\n-\n- if text:\n- current.append(self._text_rule(func, text, lower, command, \"{}\"))\n-\n- self.add_rules(current, func)\n- return func\n-\n- return decorator\n-\n- def regex(self, pattern: str, *rules):\n- \"\"\"\n- Regex message compiler\n- :param pattern: Regex string\n- \"\"\"\n-\n- def decorator(func):\n- current = list()\n-\n- rule = VBMLRule(self._patcher.pattern(\"\", pattern=pattern))\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = False\n- current.append(rule)\n-\n- for rule in rules:\n- rule.create(func)\n- current.append(rule)\n-\n- self.rules.append(current)\n- return func\n-\n- return decorator\n-\ndef __repr__(self):\nfor rules in self.rules:\nprint(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/middleware/executor.py",
"new_path": "vkbottle/handler/middleware/executor.py",
"diff": "@@ -19,6 +19,7 @@ class MiddlewareExecutor:\nelse:\nself.middleware.append(cls)\nreturn cls\n+\nreturn wrapper\ndef export_middleware(self, middleware_list: typing.List[Middleware]):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 Reduce dead pale flesh
|
718,838 |
06.03.2020 14:09:49
| -10,800 |
6741f82e00fbac01229a5ad5b35b2d0e461431dc
|
v2.4 remove trash
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "@@ -3,17 +3,12 @@ import typing, asyncio\nfrom .cls import FunctionBranch, AbstractBranch\nfrom ...api.exceptions import BranchError\n-from ...utils import folder_checkup\nBRANCH_DATA = \".BRANCHES.txt\"\nclass BranchManager:\ndef __init__(self, plugin_folder: str):\n- self.plugin_folder: str = folder_checkup(plugin_folder)\n- self.log_path: str = \"{path}/{branch_file}\".format(\n- path=self.plugin_folder, branch_file=BRANCH_DATA\n- )\nself._meet_up: typing.Dict[str, AbstractBranch] = {}\nself._branch_queue: typing.Dict[int, AbstractBranch] = {}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "@@ -2,7 +2,6 @@ from .task import TaskManager\nfrom .tools import (\ndict_of_dicts_merge,\nflatten,\n- folder_checkup,\nexcept_none_self,\nchunks,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -52,9 +52,3 @@ def flatten(lis):\nelse:\nyield item\n-\n-def folder_checkup(path, create: bool = True):\n- path = os.path.abspath(path)\n- if not os.path.exists(path) and create:\n- os.mkdir(path)\n- return path\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 remove trash
|
718,838 |
06.03.2020 17:55:59
| -10,800 |
eff6940028e6dcaf0a40b654a5b6599f9e6a7227
|
v2.4 lil fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/uploader.py",
"new_path": "vkbottle/api/uploader/uploader.py",
"diff": "@@ -63,7 +63,7 @@ class PhotoUploader(Uploader):\nfor i, file in enumerate(pathlike):\nfiles[\"file{}\".format(i + 1)] = self.open_pathlike(file)\n- uploader = self.upload(server, files, params)\n+ uploader = await self.upload(server, files, params)\nphotos = await self.vk.api.request(\n\"photos.save\",\n@@ -78,7 +78,7 @@ class PhotoUploader(Uploader):\nasync def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\nserver = await self.vk.api.request(\"photos.getWallUploadServer\", {})\n- uploader = self.upload(server, {\"photo\": self.open_pathlike(pathlike)}, params)\n+ uploader = await self.upload(server, {\"photo\": self.open_pathlike(pathlike)}, params)\nparams = {**uploader, **params}\nphoto = await self.vk.api.request(\"photos.saveWallPhoto\", params)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.4 lil fix
|
718,838 |
20.03.2020 22:07:44
| -10,800 |
8800e0e8fec61a02a49f2946d56a15af490ed3ae
|
Poor fix of
[need tests]
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -36,7 +36,6 @@ class User(HTTP):\nself.__debug: bool = debug\nself.__api: UserApi = UserApi(token)\nUserApi.set_current(self.__api)\n- self._mode = mode\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\nself.user_id: typing.Optional[int] = user_id or self.get_id_by_token(token)\n@@ -92,12 +91,11 @@ class User(HTTP):\n:return: VK LongPoll Event\n\"\"\"\ntry:\n- url = \"https://{}?act=a_check&key={}&ts={}&wait={}&mode={}&version={}\".format(\n+ url = \"https://{}?act=a_check&key={}&ts={}&wait={}&mode=234&version={}\".format(\nlong_poll_server[\"server\"],\nlong_poll_server[\"key\"],\nlong_poll_server[\"ts\"],\nself.__wait or DEFAULT_WAIT,\n- self.mode or MODE,\nself.version or VERSION,\n)\nreturn await self.request.post(url)\n@@ -175,8 +173,7 @@ class User(HTTP):\nexit(0)\ndef mode(self, mode: int):\n- self._mode = mode\n- self.on.mode = mode\n+ raise VKError(\"User LP mode specifier is abandoned, mode 234 is used as default. See issue #36\")\n@property\ndef loop(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/user.py",
"new_path": "vkbottle/handler/user.py",
"diff": "@@ -2,13 +2,7 @@ import typing\nfrom ..framework.rule import UserLongPollEventRule\nfrom ..types.user_longpoll import Message\n-MESSAGE_FIELDS = {\n- 2: (\"peer_id\", \"timestamp\", \"text\", \"info\", \"attachments\"),\n- 8: (\"peer_id\", \"timestamp\", \"text\"),\n- 32: (\"peer_id\", \"timestamp\", \"text\"),\n- 64: (\"peer_id\", \"timestamp\", \"text\"),\n- 128: (\"peer_id\", \"timestamp\", \"text\", \"random_id\"),\n-}\n+ADDITIONAL_FIELDS = (\"peer_id\", \"timestamp\", \"text\", \"info\", \"attachments\", \"random_id\")\nclass Handler:\n@@ -19,15 +13,6 @@ class Handler:\ndef concatenate(self, other: \"Handler\"):\nself.rules += other.rules\n- def additional_fields(self, event: int):\n- if event in [1, 2, 3, 4]:\n- return MESSAGE_FIELDS[self.mode]\n- if event == 5:\n- if self.mode == 2:\n- return [\"attachments\", \"null\"]\n- return [\"null\"]\n- return []\n-\ndef message_flag_change(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(1, *rules)\n@@ -35,7 +20,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_flag_change\",\n- \"data\": [\"message_id\", \"flags\", *self.additional_fields(1)],\n+ \"data\": [\"message_id\", \"flags\", *ADDITIONAL_FIELDS],\n},\n)\nself.rules.append(rule)\n@@ -50,7 +35,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_flag_set\",\n- \"data\": [\"message_id\", \"mask\", *self.additional_fields(2)],\n+ \"data\": [\"message_id\", \"mask\", *ADDITIONAL_FIELDS],\n},\n)\nself.rules.append(rule)\n@@ -65,7 +50,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_flag_remove\",\n- \"data\": [\"message_id\", \"mask\", *self.additional_fields(3)],\n+ \"data\": [\"message_id\", \"mask\", *ADDITIONAL_FIELDS],\n},\n)\nself.rules.append(rule)\n@@ -80,7 +65,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_new\",\n- \"data\": [\"message_id\", \"flags\", *self.additional_fields(4)],\n+ \"data\": [\"message_id\", \"flags\", *ADDITIONAL_FIELDS],\n\"dataclass\": Message,\n},\n)\n@@ -102,7 +87,7 @@ class Handler:\n\"peer_id\",\n\"timestamp\",\n\"new_text\",\n- *self.additional_fields(5),\n+ *ADDITIONAL_FIELDS,\n],\n},\n)\n@@ -118,7 +103,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_read_in\",\n- \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(6)],\n+ \"data\": [\"peer_id\", \"local_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -133,7 +118,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_read_out\",\n- \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(7)],\n+ \"data\": [\"peer_id\", \"local_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -152,7 +137,7 @@ class Handler:\n\"user_id\",\n\"extra\",\n\"timestamp\",\n- *self.additional_fields(8),\n+\n],\n},\n)\n@@ -172,7 +157,7 @@ class Handler:\n\"user_id\",\n\"flags\",\n\"timestamp\",\n- *self.additional_fields(9),\n+\n],\n},\n)\n@@ -188,7 +173,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_flag_change\",\n- \"data\": [\"peer_id\", \"flags\", *self.additional_fields(11)],\n+ \"data\": [\"peer_id\", \"flags\", ],\n},\n)\nself.rules.append(rule)\n@@ -203,7 +188,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_flag_set\",\n- \"data\": [\"peer_id\", \"mask\", *self.additional_fields(12)],\n+ \"data\": [\"peer_id\", \"mask\", ],\n},\n)\nself.rules.append(rule)\n@@ -218,7 +203,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_flag_remove\",\n- \"data\": [\"peer_id\", \"mask\", *self.additional_fields(10)],\n+ \"data\": [\"peer_id\", \"mask\", ],\n},\n)\nself.rules.append(rule)\n@@ -233,7 +218,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_remove\",\n- \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(13)],\n+ \"data\": [\"peer_id\", \"local_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -248,7 +233,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_restore\",\n- \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(14)],\n+ \"data\": [\"peer_id\", \"local_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -263,7 +248,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_edit\",\n- \"data\": [\"chat_id\", \"self\", *self.additional_fields(51)],\n+ \"data\": [\"chat_id\", \"self\", ],\n},\n)\nself.rules.append(rule)\n@@ -278,7 +263,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_info_edit\",\n- \"data\": [\"type_id\", \"peer_id\", \"info\", *self.additional_fields(52)],\n+ \"data\": [\"type_id\", \"peer_id\", \"info\", ],\n},\n)\nself.rules.append(rule)\n@@ -293,7 +278,7 @@ class Handler:\nfunc,\n{\n\"name\": \"message_typing_state\",\n- \"data\": [\"user_id\", \"flags\", *self.additional_fields(61)],\n+ \"data\": [\"user_id\", \"flags\", ],\n},\n)\nself.rules.append(rule)\n@@ -308,7 +293,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_typing_state\",\n- \"data\": [\"user_id\", \"chat_id\", *self.additional_fields(62)],\n+ \"data\": [\"user_id\", \"chat_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -328,7 +313,7 @@ class Handler:\n\"peer_id\",\n\"total_count\",\n\"ts\",\n- *self.additional_fields(63),\n+\n],\n},\n)\n@@ -349,7 +334,7 @@ class Handler:\n\"peer_id\",\n\"total_count\",\n\"ts\",\n- *self.additional_fields(64),\n+\n],\n},\n)\n@@ -365,7 +350,7 @@ class Handler:\nfunc,\n{\n\"name\": \"call\",\n- \"data\": [\"user_id\", \"call_id\", *self.additional_fields(70)],\n+ \"data\": [\"user_id\", \"call_id\", ],\n},\n)\nself.rules.append(rule)\n@@ -380,7 +365,7 @@ class Handler:\nfunc,\n{\n\"name\": \"left_counter\",\n- \"data\": [\"counter\", \"null\", *self.additional_fields(80)],\n+ \"data\": [\"counter\", \"null\", ],\n},\n)\nself.rules.append(rule)\n@@ -399,7 +384,7 @@ class Handler:\n\"peer_id\",\n\"sound\",\n\"disabled_until\",\n- *self.additional_fields(114),\n+\n],\n},\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Poor fix of #36
[need tests]
|
718,838 |
20.03.2020 22:19:33
| -10,800 |
87f4342dd1eab356602159bb5c6cee7a508293d4
|
Possibility from issue
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "import typing\nimport inspect\n+import re\nfrom copy import copy\nfrom vbml import Pattern, Patcher\n@@ -215,6 +216,7 @@ class VBML(AbstractMessageRule):\ntyping.List[typing.Union[str, Pattern]],\ntyping.Dict[typing.Union[str, Pattern], typing.Union[list, dict]],\n],\n+ lower: bool = None\n):\nif isinstance(pattern, dict):\nself.watch_context = pattern\n@@ -227,7 +229,7 @@ class VBML(AbstractMessageRule):\nelif isinstance(pattern, list):\nfor p in pattern:\nif isinstance(p, str):\n- patterns.append(self._patcher.pattern(p))\n+ patterns.append(self._patcher.pattern(p, flags=re.IGNORECASE if lower else None))\nelse:\npatterns.append(p)\nelif isinstance(pattern, str):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Possibility from issue #52
|
718,838 |
21.03.2020 16:29:15
| -10,800 |
2a590bbc2aecfa25abbd478a3ff5d2ecf2348710
|
v2.6 Branch disposal
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_new.py",
"new_path": "examples/tests/branches_new.py",
"diff": "from vkbottle import Bot, Message\n-from vkbottle.branch import ClsBranch, ExitBranch\n+from vkbottle.rule import VBMLRule\n+from vkbottle.branch import ClsBranch, ExitBranch, rule_disposal\nimport os\n@@ -17,11 +18,15 @@ async def branch_wrapper(ans: Message, word):\n@bot.branch.cls_branch(branch_name=\"another\")\nclass Branch(ClsBranch):\n+ @rule_disposal(VBMLRule(\"what <some>\"))\n+ async def some(self, ans: Message, some):\n+ await ans(f\"I don't know what {some} is that\")\n+\nasync def branch(self, ans: Message):\n- return \"An another class branch\"\n+ return f\"Saying {self.context['word']}\"\nasync def exit(self, ans: Message):\n- await ans(\"life on mars?\")\n+ await ans(\"is this the escape?\")\n@bot.on.message_handler(text=[\"say <word>\", \"add <word>\"])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/branch.py",
"new_path": "vkbottle/branch.py",
"diff": "@@ -5,4 +5,5 @@ from .framework.branch import (\nAbstractBranch,\nFunctionBranch,\nClsBranch,\n+ rule_disposal,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/__init__.py",
"new_path": "vkbottle/framework/branch/__init__.py",
"diff": "from .branch import BranchManager\n-from .standart_branch import Branch, ExitBranch\n+from .standart_branch import Branch, ExitBranch, rule_disposal\nfrom .cls import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "import typing, asyncio\n+import inspect\nfrom .cls import FunctionBranch, AbstractBranch\n+from ...utils import logger\nfrom ...api.exceptions import BranchError\n+from ...framework.rule import AbstractMessageRule\nBRANCH_DATA = \".BRANCHES.txt\"\n+class CoroutineBranch(AbstractBranch):\n+ coroutine: typing.Callable = None\n+\n+ async def enter(self, ans):\n+ logger.info(\"Branch {} entered at\", self.key or self.coroutine.__name__)\n+\n+ async def exit(self, ans):\n+ logger.info(\"Branch {} exit at\", self.key or self.coroutine.__name__)\n+\n+ async def branch(self, ans):\n+ return await self.coroutine(ans)\n+\n+\nclass BranchManager:\ndef __init__(self, plugin_folder: str):\nself._meet_up: typing.Dict[str, AbstractBranch] = {}\n@@ -49,7 +65,8 @@ class BranchManager:\nraise BranchError(\n\"Branch {} hasn't been yet assigned with decorator\".format(branch)\n)\n- branch = self._meet_up[branch]\n+ state = CoroutineBranch(branch)\n+ state.coroutine = self._meet_up[branch]\nelif isinstance(branch, typing.Coroutine):\nq = {b.data[\"call\"]: b for b in self._meet_up.values() if \"call\" in b.data}\nif branch not in q:\n@@ -58,7 +75,8 @@ class BranchManager:\nbranch.__name__\n)\n)\n- branch = q[branch]\n+ state = CoroutineBranch(q[branch])\n+ state.coroutine = branch\nelse:\nfor k, v in self._meet_up.items():\nif isinstance(v, branch):\n@@ -67,9 +85,17 @@ class BranchManager:\nbranch.create(**context)\nself._branch_queue[uid] = branch\n- def load(self, uid: int) -> AbstractBranch:\n+ async def load(self, uid: int) -> typing.Tuple[\n+ typing.Dict[\n+ str, typing.Union[typing.Tuple[typing.Callable, typing.List[AbstractMessageRule], typing.Callable]]\n+ ],\n+ AbstractBranch\n+ ]:\nif uid in self._branch_queue:\n- return self._branch_queue.get(uid)\n+ branch = self._branch_queue.get(uid)\n+ disposal = dict(inspect.getmembers(branch, predicate=lambda obj: isinstance(obj, tuple)))\n+ disposal[\"default\"] = [branch.__class__.branch, []]\n+ return disposal, branch\ndef exit(self, uid: int) -> AbstractBranch:\nif uid in self._branch_queue:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/standart_branch.py",
"new_path": "vkbottle/framework/branch/standart_branch.py",
"diff": "+import typing\n+from ..rule import AbstractMessageRule\n+\n+\nclass Branch:\nbranch_name: str\nbranch_kwargs: dict\n@@ -10,3 +14,14 @@ class Branch:\nclass ExitBranch:\ndef __init__(self):\npass\n+\n+\n+def rule_disposal(*rules: AbstractMessageRule):\n+ disposal = []\n+\n+ def wrapper(func):\n+ for rule in rules:\n+ rule.create(func)\n+ disposal.append(rule)\n+ return func, disposal\n+ return wrapper\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "-import typing\n+import typing, types\nfrom asyncio import AbstractEventLoop\nfrom re import sub\nfrom ..utils import logger\n@@ -128,12 +128,22 @@ class EventProcessor(RegexHelper):\nanswer.text.replace(\"\\n\", \" \"),\n)\n- branch = self.branch.load(answer.peer_id)\n-\n+ disposal, branch = await self.branch.load(answer.peer_id)\nawait branch.enter(answer)\n- task = await branch.branch(answer)\n- task = await self._handler_return(task, obj, client_info)\n+ for n, member in disposal.items():\n+ rules = member[1]\n+ for rule in rules:\n+ if not await rule(answer):\n+ break\n+ else:\n+ task = types.MethodType(member[0], branch)\n+ args = [a for rule in rules for a in rule.context.args]\n+ kwargs = {\n+ k: v for rule in rules for k, v in rule.context.kwargs.items()\n+ }\n+ await self._handler_return(await task(answer, *args, **kwargs), obj, client_info)\n+ break\nlogger.info(\n'New BRANCHED \"{0}\" compiled with branch <{2}> (from: {1})'.format(\n@@ -148,7 +158,6 @@ class EventProcessor(RegexHelper):\n)\n)\nawait branch.exit(answer)\n- return task\nasync def _handler_return(self, handler_return, obj: dict, client_info: dict):\n\"\"\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Branch disposal
|
718,838 |
22.03.2020 23:20:35
| -10,800 |
ee7543764a6766713f01e71e7e0414179a5f1e25
|
Edit handler to able poorly use handler as a blueprint
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -36,7 +36,7 @@ def should_ignore_ans(func: typing.Callable, arguments: list) -> bool:\nclass Handler:\n- def __init__(self, group_id: int = 0):\n+ def __init__(self, group_id: int = 0, patcher: Patcher = Patcher()):\nself.group_id: int = group_id\nself.rules: typing.List[typing.List[AbstractRule]] = list()\n@@ -48,7 +48,7 @@ class Handler:\nself.event: Event = Event()\nself._pre_p: typing.Optional[typing.Callable] = None\n- self._patcher = Patcher.get_current()\n+ self._patcher = Patcher.get_current() or patcher\nif not hasattr(Pattern, \"context_copy\"):\nraise RuntimeError(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Edit handler to able poorly use handler as a blueprint
|
718,838 |
23.03.2020 12:41:32
| -10,800 |
44fc93e9fde5b92edcbcde331e2e499040cc5a99
|
v2.6 concatenate_blueprint_from_dir
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/ext.py",
"new_path": "vkbottle/ext.py",
"diff": "from .handler.middleware import Middleware\n+from .framework import Bot\n+import glob, importlib, os\n+\n+\n+def concatenate_blueprint_from_dir(bot: Bot, dirname: str, dp: str = \"dp\"):\n+ all_list = list()\n+ for f in glob.glob(os.path.dirname(__file__) + \"/*.py\"):\n+ if os.path.isfile(f) and not os.path.basename(f).startswith('_'):\n+ all_list.append(os.path.basename(f)[:-3])\n+\n+ dispatcher = [importlib.import_module(dirname + \".\" + m, __package__) for m in all_list]\n+ for module in dispatcher:\n+ bot.on.concatenate(getattr(module, dp))\n+\n+ return bot, dispatcher\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 concatenate_blueprint_from_dir
|
718,838 |
24.03.2020 13:06:15
| -10,800 |
ea16bead4e295a3bfa90aa685fdfeb28e73bae66
|
v2.6 Add data expander for User Longpoll and changed code style to black
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/uploader.py",
"new_path": "vkbottle/api/uploader/uploader.py",
"diff": "@@ -78,7 +78,9 @@ class PhotoUploader(Uploader):\nasync def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\nserver = await self.vk.api.request(\"photos.getWallUploadServer\", {})\n- uploader = await self.upload(server, {\"photo\": self.open_pathlike(pathlike)}, params)\n+ uploader = await self.upload(\n+ server, {\"photo\": self.open_pathlike(pathlike)}, params\n+ )\nparams = {**uploader, **params}\nphoto = await self.vk.api.request(\"photos.saveWallPhoto\", params)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "@@ -85,15 +85,24 @@ class BranchManager:\nbranch.create(**context)\nself._branch_queue[uid] = branch\n- async def load(self, uid: int) -> typing.Tuple[\n+ async def load(\n+ self, uid: int\n+ ) -> typing.Tuple[\ntyping.Dict[\n- str, typing.Union[typing.Tuple[typing.Callable, typing.List[AbstractMessageRule], typing.Callable]]\n+ str,\n+ typing.Union[\n+ typing.Tuple[\n+ typing.Callable, typing.List[AbstractMessageRule], typing.Callable\n+ ]\n],\n- AbstractBranch\n+ ],\n+ AbstractBranch,\n]:\nif uid in self._branch_queue:\nbranch = self._branch_queue.get(uid)\n- disposal = dict(inspect.getmembers(branch, predicate=lambda obj: isinstance(obj, tuple)))\n+ disposal = dict(\n+ inspect.getmembers(branch, predicate=lambda obj: isinstance(obj, tuple))\n+ )\ndisposal[\"default\"] = [branch.__class__.branch, []]\nreturn disposal, branch\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/standart_branch.py",
"new_path": "vkbottle/framework/branch/standart_branch.py",
"diff": "@@ -24,4 +24,5 @@ def rule_disposal(*rules: AbstractMessageRule):\nrule.create(func)\ndisposal.append(rule)\nreturn func, disposal\n+\nreturn wrapper\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -142,7 +142,9 @@ class EventProcessor(RegexHelper):\nkwargs = {\nk: v for rule in rules for k, v in rule.context.kwargs.items()\n}\n- await self._handler_return(await task(answer, *args, **kwargs), obj, client_info)\n+ await self._handler_return(\n+ await task(answer, *args, **kwargs), obj, client_info\n+ )\nbreak\nlogger.info(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -216,7 +216,7 @@ class VBML(AbstractMessageRule):\ntyping.List[typing.Union[str, Pattern]],\ntyping.Dict[typing.Union[str, Pattern], typing.Union[list, dict]],\n],\n- lower: bool = None\n+ lower: bool = None,\n):\nif isinstance(pattern, dict):\nself.watch_context = pattern\n@@ -229,7 +229,9 @@ class VBML(AbstractMessageRule):\nelif isinstance(pattern, list):\nfor p in pattern:\nif isinstance(p, str):\n- patterns.append(self._patcher.pattern(p, flags=re.IGNORECASE if lower else None))\n+ patterns.append(\n+ self._patcher.pattern(p, flags=re.IGNORECASE if lower else None)\n+ )\nelse:\npatterns.append(p)\nelif isinstance(pattern, str):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -28,7 +28,7 @@ class User(HTTP):\ntoken: str,\nuser_id: int = None,\ndebug: bool = True,\n- mode: int = None,\n+ expand_models: bool = True,\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n):\n@@ -36,6 +36,8 @@ class User(HTTP):\nself.__debug: bool = debug\nself.__api: UserApi = UserApi(token)\nUserApi.set_current(self.__api)\n+\n+ self._expand_models: bool = expand_models\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\nself.user_id: typing.Optional[int] = user_id or self.get_id_by_token(token)\n@@ -135,7 +137,7 @@ class User(HTTP):\nasync def emulate(self, event: dict):\nfor update in event.get(\"updates\", []):\n- update_fields = update[1:]\n+ update_code, update_fields = update[0], update[1:]\nfor rule in self.on.rules:\ncheck = await rule.check(update)\n@@ -145,6 +147,9 @@ class User(HTTP):\ndata = dict(zip(fields, update_fields))\nargs, kwargs = [], {}\n+ if self._expand_models:\n+ data.update(await self.expand_data(update_code, data))\n+\nif rule.data.get(\"dataclass\"):\ndata = rule.data.get(\"dataclass\")(**data)\n@@ -172,8 +177,21 @@ class User(HTTP):\nlogger.error(\"Keyboard Interrupt\")\nexit(0)\n+ async def expand_data(self, code: int, data: dict):\n+ if code in range(6):\n+ data.update(\n+ (\n+ await self.api.request(\n+ \"messages.getById\", {\"message_ids\": data[\"message_id\"]},\n+ )\n+ )[\"items\"][0]\n+ )\n+ return data\n+\ndef mode(self, mode: int):\n- raise VKError(\"User LP mode specifier is abandoned, mode 234 is used as default. See issue #36\")\n+ raise VKError(\n+ \"User LP mode specifier is abandoned, mode 234 is used as default. See issue #36\"\n+ )\n@property\ndef loop(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/user.py",
"new_path": "vkbottle/handler/user.py",
"diff": "@@ -100,11 +100,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(6, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"message_read_in\",\n- \"data\": [\"peer_id\", \"local_id\", ],\n- },\n+ func, {\"name\": \"message_read_in\", \"data\": [\"peer_id\", \"local_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -115,11 +111,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(7, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"message_read_out\",\n- \"data\": [\"peer_id\", \"local_id\", ],\n- },\n+ func, {\"name\": \"message_read_out\", \"data\": [\"peer_id\", \"local_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -131,15 +123,7 @@ class Handler:\nrule = UserLongPollEventRule(8, *rules)\nrule.create(\nfunc,\n- {\n- \"name\": \"friend_online\",\n- \"data\": [\n- \"user_id\",\n- \"extra\",\n- \"timestamp\",\n-\n- ],\n- },\n+ {\"name\": \"friend_online\", \"data\": [\"user_id\", \"extra\", \"timestamp\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -151,15 +135,7 @@ class Handler:\nrule = UserLongPollEventRule(9, *rules)\nrule.create(\nfunc,\n- {\n- \"name\": \"friend_offline\",\n- \"data\": [\n- \"user_id\",\n- \"flags\",\n- \"timestamp\",\n-\n- ],\n- },\n+ {\"name\": \"friend_offline\", \"data\": [\"user_id\", \"flags\", \"timestamp\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -170,11 +146,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(11, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_flag_change\",\n- \"data\": [\"peer_id\", \"flags\", ],\n- },\n+ func, {\"name\": \"chat_flag_change\", \"data\": [\"peer_id\", \"flags\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -185,11 +157,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(12, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_flag_set\",\n- \"data\": [\"peer_id\", \"mask\", ],\n- },\n+ func, {\"name\": \"chat_flag_set\", \"data\": [\"peer_id\", \"mask\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -200,11 +168,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(10, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_flag_remove\",\n- \"data\": [\"peer_id\", \"mask\", ],\n- },\n+ func, {\"name\": \"chat_flag_remove\", \"data\": [\"peer_id\", \"mask\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -215,11 +179,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(13, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_remove\",\n- \"data\": [\"peer_id\", \"local_id\", ],\n- },\n+ func, {\"name\": \"chat_remove\", \"data\": [\"peer_id\", \"local_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -230,11 +190,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(14, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_restore\",\n- \"data\": [\"peer_id\", \"local_id\", ],\n- },\n+ func, {\"name\": \"chat_restore\", \"data\": [\"peer_id\", \"local_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -245,11 +201,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(51, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_edit\",\n- \"data\": [\"chat_id\", \"self\", ],\n- },\n+ func, {\"name\": \"chat_edit\", \"data\": [\"chat_id\", \"self\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -261,10 +213,7 @@ class Handler:\nrule = UserLongPollEventRule(52, *rules)\nrule.create(\nfunc,\n- {\n- \"name\": \"chat_info_edit\",\n- \"data\": [\"type_id\", \"peer_id\", \"info\", ],\n- },\n+ {\"name\": \"chat_info_edit\", \"data\": [\"type_id\", \"peer_id\", \"info\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -275,11 +224,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(61, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"message_typing_state\",\n- \"data\": [\"user_id\", \"flags\", ],\n- },\n+ func, {\"name\": \"message_typing_state\", \"data\": [\"user_id\", \"flags\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -290,11 +235,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(62, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"chat_typing_state\",\n- \"data\": [\"user_id\", \"chat_id\", ],\n- },\n+ func, {\"name\": \"chat_typing_state\", \"data\": [\"user_id\", \"chat_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -308,13 +249,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_typing_states\",\n- \"data\": [\n- \"user_ids\",\n- \"peer_id\",\n- \"total_count\",\n- \"ts\",\n-\n- ],\n+ \"data\": [\"user_ids\", \"peer_id\", \"total_count\", \"ts\",],\n},\n)\nself.rules.append(rule)\n@@ -329,13 +264,7 @@ class Handler:\nfunc,\n{\n\"name\": \"chat_voice_message_states\",\n- \"data\": [\n- \"user_ids\",\n- \"peer_id\",\n- \"total_count\",\n- \"ts\",\n-\n- ],\n+ \"data\": [\"user_ids\", \"peer_id\", \"total_count\", \"ts\",],\n},\n)\nself.rules.append(rule)\n@@ -347,11 +276,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(70, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"call\",\n- \"data\": [\"user_id\", \"call_id\", ],\n- },\n+ func, {\"name\": \"call\", \"data\": [\"user_id\", \"call_id\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -362,11 +287,7 @@ class Handler:\ndef decorator(func):\nrule = UserLongPollEventRule(80, *rules)\nrule.create(\n- func,\n- {\n- \"name\": \"left_counter\",\n- \"data\": [\"counter\", \"null\", ],\n- },\n+ func, {\"name\": \"left_counter\", \"data\": [\"counter\", \"null\",],},\n)\nself.rules.append(rule)\nreturn func\n@@ -380,12 +301,7 @@ class Handler:\nfunc,\n{\n\"name\": \"notifications_settings_changed\",\n- \"data\": [\n- \"peer_id\",\n- \"sound\",\n- \"disabled_until\",\n-\n- ],\n+ \"data\": [\"peer_id\", \"sound\", \"disabled_until\",],\n},\n)\nself.rules.append(rule)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "from .base import BaseModel\n-from .message import sep_bytes\n+from .attachments import Geo\n+from .message import sep_bytes, MessageAction\nfrom ..api import UserApi\nimport random\n@@ -14,6 +15,17 @@ class Message(BaseModel):\ntext: str = None\nattachments: dict = None\nrandom_id: int = None\n+ # from messages.getById\n+ from_id: int = None\n+ date: int = None\n+ out: int = None\n+ read_state: int = None\n+ ref: str = None\n+ ref_source: str = None\n+ important: bool = None\n+ geo: Geo = None\n+ reply_message: int = None\n+ action: MessageAction = None\nasync def get(self) -> dict:\nreturn (\n@@ -24,22 +36,6 @@ class Message(BaseModel):\ndef chat_id(self) -> int:\nreturn self.peer_id - 2000000000\n- @property\n- async def from_id(self) -> int:\n- return (await self.get())[\"from_id\"]\n-\n- @property\n- async def date(self) -> int:\n- return (await self.get())[\"date\"]\n-\n- @property\n- async def out(self) -> int:\n- return (await self.get())[\"out\"]\n-\n- @property\n- async def read_state(self) -> int:\n- return (await self.get())[\"read_state\"]\n-\nasync def reply(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -51,4 +51,3 @@ def flatten(lis):\nyield from flatten(item)\nelse:\nyield item\n-\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Add data expander for User Longpoll and changed code style to black
|
718,838 |
24.03.2020 13:09:26
| -10,800 |
2a1fce853626dde0afd44a29836dde6bbff6ca6d
|
v2.6 Fix mistaken
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -24,7 +24,7 @@ class Message(BaseModel):\nref_source: str = None\nimportant: bool = None\ngeo: Geo = None\n- reply_message: int = None\n+ reply_message: \"Message\" = None\naction: MessageAction = None\nasync def get(self) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Fix mistaken
|
718,838 |
24.03.2020 13:12:55
| -10,800 |
2e87bbec67d9a9e5917f87b12cd52c3e4b64a69e
|
v2.6 Fix forgotten
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -3,6 +3,7 @@ from .attachments import Geo\nfrom .message import sep_bytes, MessageAction\nfrom ..api import UserApi\nimport random\n+import typing\nAPI = UserApi.get_current\n@@ -16,6 +17,7 @@ class Message(BaseModel):\nattachments: dict = None\nrandom_id: int = None\n# from messages.getById\n+ id: int = None\nfrom_id: int = None\ndate: int = None\nout: int = None\n@@ -25,6 +27,7 @@ class Message(BaseModel):\nimportant: bool = None\ngeo: Geo = None\nreply_message: \"Message\" = None\n+ fwd_messages: typing.List[\"Message\"] = None\naction: MessageAction = None\nasync def get(self) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Fix forgotten
|
718,838 |
24.03.2020 22:16:42
| -10,800 |
4597ef96eddee395701cccc5f7cb51fae1c4022c
|
v2.6 Sweet middleware arguments
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -35,6 +35,7 @@ class EventProcessor(RegexHelper):\nasync def _processor(self, obj: dict, client_info: dict):\nprocessor = dict(obj=obj, client_info=client_info)\n+ middleware_args = []\nmessage = Message(\n**{**obj, \"text\": self.init_bot_mention(obj[\"text\"])},\n@@ -45,6 +46,8 @@ class EventProcessor(RegexHelper):\nif self.status.middleware_expressions:\nif mr is False:\nreturn\n+ elif mr is not None:\n+ middleware_args.append(mr)\nif message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\nawait self._branched_processor(obj, client_info)\n@@ -70,7 +73,7 @@ class EventProcessor(RegexHelper):\nk: v for rule in rules for k, v in rule.context.kwargs.items()\n}\nif not getattr(rules[0], \"data\", {}).get(\"ignore_ans\"):\n- args = [message, *args]\n+ args = [message, *middleware_args, *args]\ntask = await rules[0].call(*args, **kwargs)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Sweet middleware arguments
|
718,838 |
25.03.2020 00:36:03
| -10,800 |
0ec25c5639a506cc7a0b02c7345b6834e7910347
|
v2.6 Sweet add_branch without a decorator
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_new.py",
"new_path": "examples/tests/branches_new.py",
"diff": "from vkbottle import Bot, Message\nfrom vkbottle.rule import VBMLRule\n-from vkbottle.branch import ClsBranch, ExitBranch, rule_disposal\n+from vkbottle.branch import ClsBranch, ExitBranch, rule_disposal, Branch\nimport os\n@@ -8,6 +8,11 @@ import os\nbot = Bot(os.environ[\"TOKEN\"])\n+class LovelessBranch(ClsBranch):\n+ async def branch(self, ans: Message):\n+ return \"I don't love you forever\"\n+\n+\n@bot.branch.simple_branch()\nasync def branch_wrapper(ans: Message, word):\nif ans.text.lower() in [\"exit\", \"stop\"]:\n@@ -17,7 +22,7 @@ async def branch_wrapper(ans: Message, word):\n@bot.branch.cls_branch(branch_name=\"another\")\n-class Branch(ClsBranch):\n+class AnotherBranch(ClsBranch):\n@rule_disposal(VBMLRule(\"what <some>\"))\nasync def some(self, ans: Message, some):\nawait ans(f\"I don't know what {some} is that\")\n@@ -35,4 +40,10 @@ async def pronounce(ans: Message, word):\nreturn \"Okay!\"\n+@bot.on.message_handler(text=\"love\")\n+async def loveless(ans: Message):\n+ await ans(\"Loveless..\")\n+ return Branch(LovelessBranch)\n+\n+bot.branch.add_branch(LovelessBranch)\nbot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "-import typing, asyncio\n+import typing, asyncio, types\nimport inspect\nfrom .cls import FunctionBranch, AbstractBranch\n@@ -39,6 +39,16 @@ class BranchManager:\nreturn decorator\n+ def add_branch(self, branch: typing.Callable, name: str = None):\n+ if inspect.isclass(type(branch)):\n+ self._meet_up[name or branch.__name__] = branch(name)\n+ elif asyncio.iscoroutinefunction(branch):\n+ self._meet_up[name or branch.__name__] = FunctionBranch(\n+ name or branch.__name__, call=branch\n+ )\n+ else:\n+ raise BranchError(\"Branch Callable should be an AbstractBranch (ClsBranch) or a async function\")\n+\ndef cls_branch(self, branch_name: str = None):\ndef decorator(cls: typing.ClassVar):\nself._meet_up[branch_name or cls.__name__] = cls(branch_name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Sweet add_branch without a decorator
|
718,838 |
25.03.2020 01:02:38
| -10,800 |
e88edf30ebcde11b7e154c29f26fc07e06eb710f
|
v2.6 Update version in root
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -5,3 +5,4 @@ from .api import template_gen, TemplateElement\nfrom .api.keyboard import keyboard_gen\nfrom .api.exceptions import *\nfrom .api.uploader import PhotoUploader\n+from .const import __version__\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"1.0\" # Package VKBottle version\n+__version__ = \"2.6 Released 25.03.2020 01:00\" # Package VKBottle version\n__author__ = \"Arseniy Timonik\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Update version in root
|
718,838 |
25.03.2020 01:25:26
| -10,800 |
29bf53e38c6830a391c5b57350978008e0f318b2
|
v2.6 Check updates with description
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -96,10 +96,10 @@ class Handler:\ncurrent_rest = await get_current_rest()\nif current_rest[\"version\"] != __version__:\nlogger.info(\n- \"You are using old version of VKBottle. Update is found: {}\".format(\n- current_rest[\"version\"]\n- ),\n+ \"You are using old version of VKBottle. Update is found: {} | {}\".format(\n+ current_rest[\"version\"],\ncurrent_rest[\"description\"],\n+ ),\n)\nlogger.debug(\"Bot successfully dispatched\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Check updates with description
|
718,838 |
25.03.2020 11:53:36
| -10,800 |
3ae1b907979845744fe0fc83d5c78032b9eada02
|
v2.6 Middleware args are inherited to the branched_processor
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -50,7 +50,7 @@ class EventProcessor(RegexHelper):\nmiddleware_args.append(mr)\nif message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\n- await self._branched_processor(obj, client_info)\n+ await self._branched_processor(obj, client_info, middleware_args)\nreturn\nlogger.debug(\n@@ -116,7 +116,7 @@ class EventProcessor(RegexHelper):\n)\nreturn True\n- async def _branched_processor(self, obj: dict, client_info: dict):\n+ async def _branched_processor(self, obj: dict, client_info: dict, middleware_args: list):\n\"\"\"\nBranched messages processor manager\n:param obj: VK Server Event Object\n@@ -146,7 +146,7 @@ class EventProcessor(RegexHelper):\nk: v for rule in rules for k, v in rule.context.kwargs.items()\n}\nawait self._handler_return(\n- await task(answer, *args, **kwargs), obj, client_info\n+ await task(answer, *middleware_args, *args, **kwargs), obj, client_info\n)\nbreak\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Middleware args are inherited to the branched_processor
|
718,838 |
25.03.2020 12:07:05
| -10,800 |
aeb7d3f0452d4a7a7f3f5da78706b5f151bfc31f
|
v2.6 Args in AbstractBranch fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/cls.py",
"new_path": "vkbottle/framework/branch/cls.py",
"diff": "@@ -23,7 +23,7 @@ class AbstractBranch(Copy):\nasync def enter(self, ans: Message):\n...\n- async def branch(self, ans: Message):\n+ async def branch(self, ans: Message, *args):\n...\nasync def exit(self, ans: Message):\n@@ -45,5 +45,5 @@ class CoroutineBranch(AbstractBranch):\nasync def exit(self, ans):\nlogger.info(\"Branch {} exit at\", self.key or self.data[\"call\"].__name__)\n- async def branch(self, ans):\n- return await self.data[\"call\"](ans)\n+ async def branch(self, ans, *args):\n+ return await self.data[\"call\"](ans, *args)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Args in AbstractBranch fix
|
718,838 |
25.03.2020 14:29:10
| -10,800 |
aa3d4ed3ef1c01428f240db1d515416c24fb3704
|
v2.6 pre_process is ABANDONED but fixed still
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -289,6 +289,8 @@ class Bot(HTTP, EventProcessor):\nself.__secret = None\nif not self.status.dispatched:\n+ if self.on.pre:\n+ self.middleware.add_middleware(self.on.pre)\nawait self.on.dispatch(self.get_current_rest)\nself.status.dispatched = True\n@@ -316,6 +318,8 @@ class Bot(HTTP, EventProcessor):\n:return: \"ok\"\n\"\"\"\nif not self.status.dispatched:\n+ if self.on.pre:\n+ self.middleware.add_middleware(self.on.pre)\nawait self.on.dispatch(self.get_current_rest)\nself.status.dispatched = True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -67,8 +67,6 @@ class Handler:\nself.chat_message.concatenate(handler.chat_message)\nself.message_handler.concatenate(handler.message_handler)\nself.event.rules += handler.event.rules\n-\n- if self.pre is None:\nself._pre_p = handler.pre\nlogger.debug(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 pre_process is ABANDONED but fixed still
|
718,838 |
25.03.2020 16:34:51
| -10,800 |
ce76cc49287147e1c79b182b965d6b1b2ef167e1
|
v2.6 Added doc uploader
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/vkbottle_bot/img/2.txt",
"diff": "+Hi, it is a silly document\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -4,5 +4,5 @@ from .utils.task import TaskManager\nfrom .api import template_gen, TemplateElement\nfrom .api.keyboard import keyboard_gen\nfrom .api.exceptions import *\n-from .api.uploader import PhotoUploader\n+from .api.uploader import PhotoUploader, DocUploader\nfrom .const import __version__\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/__init__.py",
"new_path": "vkbottle/api/uploader/__init__.py",
"diff": "-from .uploader import *\n+from .uploader import Uploader\n+from .photo import PhotoUploader\n+from .doc import DocUploader\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/uploader/doc.py",
"diff": "+import typing\n+from .uploader import Uploader\n+from enum import Enum\n+\n+\n+class DocUploader(Uploader):\n+ async def upload_doc_to_wall(self, pathlike, group_id: int = None, **params) -> typing.Union[str, dict]:\n+ server = await self.vk.api.request(\"docs.getWallUploadServer\", {\"group_id\": group_id} if group_id else {})\n+ uploader = await self.upload(\n+ server, {\"file\": self.open_pathlike(pathlike)}, params\n+ )\n+ params = {**uploader, **params}\n+ doc = await self.vk.api.request(\"docs.save\", params)\n+ if self.gas:\n+ doc = doc[doc[\"type\"]]\n+ return self.generate_attachment_string(\n+ \"doc\", doc[\"owner_id\"], doc[\"id\"]\n+ )\n+ return doc\n+\n+ async def upload_doc(self, pathlike, group_id: int = None, **params) -> typing.Union[str, dict]:\n+ server = await self.vk.api.request(\"docs.getUploadServer\", {\"group_id\": group_id} if group_id else {})\n+ uploader = await self.upload(\n+ server, {\"file\": self.open_pathlike(pathlike)}, params\n+ )\n+ params = {**uploader, **params}\n+ doc = await self.vk.api.request(\"docs.save\", params)\n+ if self.gas:\n+ doc = doc[doc[\"type\"]]\n+ return self.generate_attachment_string(\n+ \"doc\", doc[\"owner_id\"], doc[\"id\"]\n+ )\n+ return doc\n+\n+ async def upload_doc_to_message(self, pathlike, peer_id: int, doc_type: str = \"doc\", **params):\n+ server = await self.vk.api.request(\"docs.getMessagesUploadServer\", {\"type\": doc_type, \"peer_id\": peer_id})\n+ uploader = await self.upload(\n+ server, {\"file\": self.open_pathlike(pathlike)}, params\n+ )\n+ params = {**uploader, **params}\n+ doc = await self.vk.api.request(\"docs.save\", params)\n+ if self.gas:\n+ doc = doc[doc[\"type\"]]\n+ return self.generate_attachment_string(\n+ \"doc\", doc[\"owner_id\"], doc[\"id\"]\n+ )\n+ return doc\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/uploader/photo.py",
"diff": "+import typing\n+from .uploader import Uploader\n+\n+\n+class PhotoUploader(Uploader):\n+ async def upload_photo_to_album(\n+ self,\n+ album_id: int,\n+ pathlike: typing.Union[list, typing.Any],\n+ group_id: int = None,\n+ **params,\n+ ) -> typing.Union[str, typing.List[dict]]:\n+\n+ if not isinstance(pathlike, list):\n+ pathlike = [pathlike]\n+\n+ group_id = self.get_group_id(group_id)\n+ server = await self.vk.api.request(\n+ \"photos.getUploadServer\", {\"album_id\": album_id, \"group_id\": group_id}\n+ )\n+ files = dict()\n+\n+ for i, file in enumerate(pathlike):\n+ files[\"file{}\".format(i + 1)] = self.open_pathlike(file)\n+\n+ uploader = await self.upload(server, files, params)\n+\n+ photos = await self.vk.api.request(\n+ \"photos.save\",\n+ {\"album_id\": album_id, \"group_id\": group_id, **uploader, **params},\n+ )\n+ if self.gas:\n+ return [\n+ self.generate_attachment_string(\"photo\", -group_id, photo[\"id\"])\n+ for photo in photos\n+ ]\n+ return photos\n+\n+ async def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\n+ server = await self.vk.api.request(\"photos.getWallUploadServer\", {})\n+ uploader = await self.upload(\n+ server, {\"photo\": self.open_pathlike(pathlike)}, params\n+ )\n+\n+ params = {**uploader, **params}\n+ photo = await self.vk.api.request(\"photos.saveWallPhoto\", params)\n+ if self.gas:\n+ return self.generate_attachment_string(\n+ \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n+ )\n+ return photo\n+\n+ async def update_favicon(self, pathlike, group_id: int = None, **params):\n+ server = await self.vk.api.request(\n+ \"photos.getOwnerPhotoUploadServer\",\n+ {\"owner_id\": self.get_owner_id(group_id)},\n+ )\n+ uploader = await self.upload(\n+ server, {\"photo\": self.open_pathlike(pathlike)}, params\n+ )\n+ photo = await self.vk.api.request(\"photos.saveOwnerPhoto\", uploader)\n+ return photo\n+\n+ async def upload_message_photo(self, pathlike, **params):\n+ server = await self.vk.api.request(\"photos.getMessagesUploadServer\", params)\n+ uploader = await self.upload(\n+ server, {\"photo\": self.open_pathlike(pathlike)}, {}\n+ )\n+\n+ photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n+ if self.gas:\n+ return self.generate_attachment_string(\n+ \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n+ )\n+ return photo\n+\n+ async def upload_chat_favicon(self, pathlike, chat_id: int, **params) -> str:\n+ server = await self.vk.api.request(\n+ \"photos.getChatUploadServer\", dict(chat_id=chat_id, **params)\n+ )\n+ uploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n+ return uploader[\"response\"]\n+\n+ async def upload_market_photo(self, pathlike, **params):\n+ server = await self.vk.api.request(\"photos.getMarketUploadServer\", params)\n+ uploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n+\n+ photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n+ return await self.vk.api.request(\n+ \"messages.setChatPhoto\", {\"file\": photo[\"response\"]}\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/uploader.py",
"new_path": "vkbottle/api/uploader/uploader.py",
"diff": "@@ -40,92 +40,3 @@ class Uploader:\n@staticmethod\ndef generate_attachment_string(segment: str, owner_id: int, id_: int) -> str:\nreturn \"{segment}{owner_id}_{id_}\".format(**locals())\n-\n-\n-class PhotoUploader(Uploader):\n- async def upload_photo_to_album(\n- self,\n- album_id: int,\n- pathlike: typing.Union[list, typing.Any],\n- group_id: int = None,\n- **params,\n- ) -> typing.Union[str, typing.List[dict]]:\n-\n- if not isinstance(pathlike, list):\n- pathlike = [pathlike]\n-\n- group_id = self.get_group_id(group_id)\n- server = await self.vk.api.request(\n- \"photos.getUploadServer\", {\"album_id\": album_id, \"group_id\": group_id}\n- )\n- files = dict()\n-\n- for i, file in enumerate(pathlike):\n- files[\"file{}\".format(i + 1)] = self.open_pathlike(file)\n-\n- uploader = await self.upload(server, files, params)\n-\n- photos = await self.vk.api.request(\n- \"photos.save\",\n- {\"album_id\": album_id, \"group_id\": group_id, **uploader, **params},\n- )\n- if self.gas:\n- return [\n- self.generate_attachment_string(\"photo\", -group_id, photo[\"id\"])\n- for photo in photos\n- ]\n- return photos\n-\n- async def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\n- server = await self.vk.api.request(\"photos.getWallUploadServer\", {})\n- uploader = await self.upload(\n- server, {\"photo\": self.open_pathlike(pathlike)}, params\n- )\n-\n- params = {**uploader, **params}\n- photo = await self.vk.api.request(\"photos.saveWallPhoto\", params)\n- if self.gas:\n- return self.generate_attachment_string(\n- \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n- )\n- return photo\n-\n- async def update_favicon(self, pathlike, group_id: int = None, **params):\n- server = await self.vk.api.request(\n- \"photos.getOwnerPhotoUploadServer\",\n- {\"owner_id\": self.get_owner_id(group_id)},\n- )\n- uploader = await self.upload(\n- server, {\"photo\": self.open_pathlike(pathlike)}, params\n- )\n- photo = await self.vk.api.request(\"photos.saveOwnerPhoto\", uploader)\n- return photo\n-\n- async def upload_message_photo(self, pathlike, **params):\n- server = await self.vk.api.request(\"photos.getMessagesUploadServer\", params)\n- uploader = await self.upload(\n- server, {\"photo\": self.open_pathlike(pathlike)}, {}\n- )\n-\n- photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n- if self.gas:\n- return self.generate_attachment_string(\n- \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n- )\n- return photo\n-\n- async def upload_chat_favicon(self, pathlike, chat_id: int, **params) -> str:\n- server = await self.vk.api.request(\n- \"photos.getChatUploadServer\", dict(chat_id=chat_id, **params)\n- )\n- uploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n- return uploader[\"response\"]\n-\n- async def upload_market_photo(self, pathlike, **params):\n- server = await self.vk.api.request(\"photos.getMarketUploadServer\", params)\n- uploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n-\n- photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n- return await self.vk.api.request(\n- \"messages.setChatPhoto\", {\"file\": photo[\"response\"]}\n- )\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Added doc uploader
|
718,838 |
27.03.2020 20:49:25
| -10,800 |
cfc773b9c15a2c34eeee5e6063a2117e8b2b6d6c
|
v2.6 Add possibility to skip all errors
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -98,6 +98,7 @@ class Bot(HTTP, EventProcessor):\n# Sign assets\nself.__api: Api = Api(token, throw_errors=throw_errors)\n+ self._throw_errors: bool = throw_errors\nApi.set_current(self.__api)\nself.group_id = group_id or self.get_id_by_token(token)\n@@ -375,12 +376,17 @@ class Bot(HTTP, EventProcessor):\n)\nawait handler(e)\nelse:\n+ if self._throw_errors:\nlogger.error(\n\"VKError! Add @bot.error_handler({}) to process this error!\".format(\ne\n)\n)\nraise VKError(e)\n+ logger.error(\n+ \"While bot worked error occurred \\n\\n{traceback}\",\n+ traceback=traceback.format_exc(),\n+ )\nexcept:\nlogger.error(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Add possibility to skip all errors
|
718,838 |
27.03.2020 21:08:06
| -10,800 |
19d6abf505b8b67eef26295cd73fa2c334bd1897
|
v2.6 Fix (abandoned) pre_process
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -67,6 +67,7 @@ class Handler:\nself.chat_message.concatenate(handler.chat_message)\nself.message_handler.concatenate(handler.message_handler)\nself.event.rules += handler.event.rules\n+ if not self._pre_p:\nself._pre_p = handler.pre\nlogger.debug(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Fix (abandoned) pre_process
|
718,838 |
28.03.2020 11:38:02
| -10,800 |
c4aadeae9fea5bd699732219ee0b626be60b9f89
|
v2.6 Silly fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -49,7 +49,7 @@ class EventProcessor(RegexHelper):\nelif mr is not None:\nmiddleware_args.append(mr)\n- if message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\n+ if message.peer_id in self.branch.queue:\nawait self._branched_processor(obj, client_info, middleware_args)\nreturn\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Silly fix
|
718,838 |
28.03.2020 21:45:30
| -10,800 |
e4e97e48fbe87cfb3b6f0f63caf0f91381c7ed05
|
v2.6 Delete exited branches without pop them
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "@@ -105,4 +105,4 @@ class BranchManager:\ndef exit(self, uid: int) -> AbstractBranch:\nif uid in self._branch_queue:\n- return self._branch_queue.pop(uid, None)\n+ del self._branch_queue[uid]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Delete exited branches without pop them
|
718,838 |
29.03.2020 13:28:29
| -10,800 |
d2fd55a2da4857c5062609d0189e8aaed746fb7a
|
v2.6 Add auto_reload_dir
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -270,6 +270,7 @@ class Bot(HTTP, EventProcessor):\n*,\nskip_updates: bool = True,\nauto_reload: bool = False,\n+ auto_reload_dir: str = \".\",\non_shutdown: typing.Callable = None,\non_startup: typing.Callable = None,\n):\n@@ -279,7 +280,10 @@ class Bot(HTTP, EventProcessor):\ntask = TaskManager(self.__loop)\ntask.add_task(self.run(skip_updates))\ntask.run(\n- auto_reload=auto_reload, on_shutdown=on_shutdown, on_startup=on_startup\n+ auto_reload=auto_reload,\n+ on_shutdown=on_shutdown,\n+ on_startup=on_startup,\n+ auto_reload_dir=auto_reload_dir,\n)\nasync def run(self, skip_updates: bool, wait: int = DEFAULT_WAIT):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/auto_reload.py",
"new_path": "vkbottle/utils/auto_reload.py",
"diff": "@@ -22,11 +22,11 @@ def restart():\nos.execv(sys.executable, args)\n-async def _auto_reload():\n+async def _auto_reload(check_dir: str = \".\"):\n\"\"\"\nCoro which see changes in your code and restart him.\n:return:\n\"\"\"\n- async for _ in awatch(\".\"):\n+ async for _ in awatch(check_dir):\nlogger.info(\"Changes were found. Restarting...\")\nrestart()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -45,6 +45,7 @@ class TaskManager:\non_shutdown: typing.Callable = None,\non_startup: typing.Callable = None,\nauto_reload: bool = False,\n+ auto_reload_dir: str = \".\",\nasyncio_debug_mode: bool = False,\n):\n\"\"\"\n@@ -52,6 +53,7 @@ class TaskManager:\n:param auto_reload: auto reload code when changes\n:param on_shutdown: coroutine which runned after complete tasks\n:param on_startup: coroutine which runned before start main tasks\n+ :param auto_reload_dir:\n:param asyncio_debug_mode: asyncio debug mode state\n:return:\n\"\"\"\n@@ -65,7 +67,7 @@ class TaskManager:\nself.loop.set_debug(True)\nif auto_reload:\n- self.loop.create_task(_auto_reload())\n+ self.loop.create_task(_auto_reload(auto_reload_dir))\n[self.loop.create_task(task) for task in self.tasks]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.6 Add auto_reload_dir
|
718,838 |
31.03.2020 01:29:08
| -10,800 |
995c8a7a1ab1d797214c6faa95d78d0308169bbc
|
Nothing has changed
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_new.py",
"new_path": "examples/tests/branches_new.py",
"diff": "@@ -9,11 +9,11 @@ bot = Bot(os.environ[\"TOKEN\"])\nclass LovelessBranch(ClsBranch):\n- async def branch(self, ans: Message):\n+ async def branch(self, ans: Message, *args):\nreturn \"I don't love you forever\"\n-@bot.branch.simple_branch()\n+@bot.branch.simple_branch(branch_name=\"nun\")\nasync def branch_wrapper(ans: Message, word):\nif ans.text.lower() in [\"exit\", \"stop\"]:\nawait ans(\"As you want to!\")\n@@ -25,18 +25,21 @@ async def branch_wrapper(ans: Message, word):\nclass AnotherBranch(ClsBranch):\n@rule_disposal(VBMLRule(\"what <some>\"))\nasync def some(self, ans: Message, some):\n+ self.context[\"s\"] = some\nawait ans(f\"I don't know what {some} is that\")\n+ return ExitBranch()\n- async def branch(self, ans: Message):\n+ async def branch(self, ans: Message, *args):\nreturn f\"Saying {self.context['word']}\"\nasync def exit(self, ans: Message):\n+ await ans(self.context)\nawait ans(\"is this the escape?\")\n@bot.on.message_handler(text=[\"say <word>\", \"add <word>\"])\nasync def pronounce(ans: Message, word):\n- bot.branch.add(ans.peer_id, Branch, word=word)\n+ bot.branch.add(ans.peer_id, \"another\", word=word)\nreturn \"Okay!\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Nothing has changed
|
718,838 |
03.04.2020 17:13:42
| -10,800 |
8d72a0b558a1205380792f1dea8b38e81a517a1d
|
v2.7 Add filters
|
[
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -48,7 +48,7 @@ async def wrapper(ans: Message):\nawait ans(\"New chat name: {}\".format(ans.action.text))\n-# REGEX ARGS USE\n+# REGEX ARGS USAGE\n@bot.on.message(\"my name is <name>\")\n@@ -56,20 +56,9 @@ async def wrapper(ans: Message, name):\nawait ans(\"your name is {}\".format(name))\n-\"\"\"\n-Do not do it like this:\n-@bot.on.message('<arg1><arg2>')\n-Arguments in these instances are not separable!\n-\"\"\"\n-\n-\n-@bot.on.message(text=\"+<country_code>(<state_code>)<number>\")\n+@bot.on.message(text=\"+<country_code:int>(<state_code:int>)<number:int>\")\nasync def wrapper(ans: Message, country_code, state_code, number):\n- # +0(123)456\n- if country_code.isdigit() and state_code.isdigit() and number.isdigit():\n- await ans(\"Well done!\")\n- else:\n- await ans(\"Number is incorrect!\")\n+ return f\"{country_code + 1}{state_code}{number}\"\n# OPTIONAL HANDLERS\n@@ -89,7 +78,7 @@ async def wrapper(ans: Message):\n@bot.on.chat_mention()\nasync def wrapper(ans: Message):\n# Raising when bot is just mentioned, in one word\n- await ans(\"I have been mentioned\")\n+ await ans(\"I was mentioned\")\nif __name__ == \"__main__\":\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/user_longpoll.py",
"new_path": "examples/user_longpoll.py",
"diff": "@@ -2,8 +2,11 @@ from vkbottle.user import User\nfrom vkbottle.user.types import Message\nfrom vkbottle.rule import VBMLUserRule\n-user = User(\"user-token\", 123)\n-user.mode(8)\n+token_1 = \"...\"\n+token_2 = \"...\"\n+token_3 = \"...\"\n+\n+user = User([token_1, token_2, token_3])\n@user.on.message_new(VBMLUserRule(\"hi, <name>\"))\n@@ -11,16 +14,4 @@ async def wrapper(ans: Message, name):\nawait ans(f\"I'm not a {name}!\")\n-@user.on.message_read_out()\n-async def call(event: dict):\n- await user.api.request(\n- \"messages.send\",\n- {\n- \"message\": \"Ye! You finally read it!\",\n- \"peer_id\": event[\"peer_id\"],\n- \"random_id\": 0,\n- },\n- )\n-\n-\nuser.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/__init__.py",
"new_path": "vkbottle/framework/framework/rule/__init__.py",
"diff": "from .rule import *\n+from . import filters\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/rule/filters/__init__.py",
"diff": "+from .filter import AbstractFilter\n+from .builtin import (\n+ AndFilter as and_filter,\n+ OrFilter as or_filter,\n+ AnyFilter as any_filter,\n+ AllFilter as all_filter\n+)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/rule/filters/builtin.py",
"diff": "+from .filter import AbstractFilter\n+\n+\n+class OrFilter(AbstractFilter):\n+ async def check(self, event) -> bool:\n+ for rule in self.rules:\n+ if await rule.check(event):\n+ return True\n+\n+\n+class AndFilter(AbstractFilter):\n+ async def check(self, event) -> bool:\n+ for rule in self.rules:\n+ if not await rule.check(event):\n+ return False\n+ return True\n+\n+\n+class AnyFilter(AbstractFilter):\n+ async def check(self, event) -> bool:\n+ return any((await rule.check(event) for rule in self.rules))\n+\n+\n+class AllFilter(AbstractFilter):\n+ async def check(self, event) -> bool:\n+ return all((await rule.check(event) for rule in self.rules))\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/rule/filters/filter.py",
"diff": "+import typing\n+from ..rule import AbstractRule, RuleExecute\n+\n+\n+class AbstractFilter:\n+ def __init__(self, *rules: typing.Tuple[AbstractRule]):\n+ self.rules: typing.Tuple[AbstractRule] = rules\n+ self.context = RuleExecute()\n+\n+ async def __call__(self, event) -> bool:\n+ self.__init_subclass__()\n+ return await self.check(event)\n+\n+ async def check(self, event) -> bool:\n+ ...\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -55,22 +55,22 @@ class AbstractRule(Copy):\nself.__init_subclass__()\nreturn await self.check(event)\n- async def check(self, event):\n+ async def check(self, event) -> bool:\n...\nclass Any(AbstractRule):\n- async def check(self, event):\n+ async def check(self, event) -> bool:\nreturn True\nclass AbstractUserRule(AbstractRule):\n- async def check(self, update: typing.Tuple[dict, BaseModel]):\n+ async def check(self, update: typing.Tuple[dict, BaseModel]) -> bool:\n...\nclass AbstractMessageRule(AbstractRule):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\n...\n@@ -88,7 +88,7 @@ class UnionMixin(AbstractMessageRule):\nclass StickerRule(UnionMixin):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.attachments and message.attachments[0].sticker:\nif not self.data[\"mixin\"]:\nreturn True\n@@ -102,7 +102,7 @@ class MessageRule(AbstractMessageRule):\nmessage = [message]\nself.data = {\"message\": message}\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.text in self.data[\"message\"]:\nreturn True\n@@ -139,7 +139,7 @@ class LevenshteinDisRule(AbstractMessageRule):\nreturn current_row[n]\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nfor sample in self.data[\"samples\"]:\nif self.distance(message.text, sample) <= self.lev:\nself.resolve(sample)\n@@ -155,7 +155,7 @@ class CommandRule(AbstractMessageRule):\nmessage = [message]\nself.data = {\"message\": [\"/\" + c for c in message]}\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.text in self.data[\"message\"]:\nreturn True\n@@ -166,7 +166,7 @@ class EventRule(AbstractRule):\nevent = [event]\nself.data = {\"event\": event}\n- async def check(self, event):\n+ async def check(self, event) -> bool:\nif \"data\" not in self.data:\nself.data[\"data\"] = self.getfullargspec.annotations.get(\nself.getfullargspec.args[0], dict\n@@ -197,13 +197,13 @@ class UserMessageRule(AbstractUserRule, UnionMixin):\nclass ChatMessage(AbstractMessageRule):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.peer_id > 2e9:\nreturn True\nclass PrivateMessage(AbstractMessageRule):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.peer_id < 2e9:\nreturn True\n@@ -242,7 +242,7 @@ class VBML(AbstractMessageRule):\nclass VBMLRule(VBML):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\nmessage = (\nmessage.text.replace(\"<br>\", \"\\n\")\n@@ -279,7 +279,7 @@ class VBMLUserRule(VBML):\nclass AttachmentRule(UnionMixin):\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nattachments = flatten(\n[\nlist(attachment.dict(skip_defaults=True).keys())\n@@ -304,7 +304,7 @@ class ChatActionRule(AbstractMessageRule):\nself.data[\"chat_action\"] = chat_action\nself.data[\"rules\"] = rules or {}\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.action:\nif message.action.type in self.data[\"chat_action\"]:\nif {\n@@ -327,7 +327,7 @@ class PayloadRule(AbstractMessageRule):\nexcept json.decoder.JSONDecodeError:\nreturn dict()\n- async def check(self, message: Message):\n+ async def check(self, message: Message) -> bool:\nif message.payload is not None:\npayload = self.dispatch(message.payload)\nif self.data[\"mode\"] == 1:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Add filters
|
718,844 |
05.04.2020 21:19:29
| -10,800 |
0a2e819eb4043058a2f2caf4dc4f85005558576b
|
Poor fix get_updates for a while
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -134,6 +134,7 @@ class Bot(HTTP, AsyncHandleManager):\nchunk = list(chunks(updates, 100))\nfor mid in chunk:\n+ try:\nmessages = await self.api.request(\n\"messages.getById\", {\"message_ids\": \",\".join(map(str, mid))}\n)\n@@ -148,7 +149,8 @@ class Bot(HTTP, AsyncHandleManager):\n]\n}\n)\n-\n+ except:\n+ continue\ndef dispatch(self, ext: \"Bot\"):\n\"\"\"\nConcatenate handlers to current bot object\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Poor fix get_updates for a while (#58)
|
718,838 |
08.04.2020 00:31:47
| -10,800 |
836fc9de14d35ce9640ea2ec8bb0954421c78fb0
|
v2.7 Flock of fixes
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -79,7 +79,8 @@ app = web.Application()\nasync def executor(request: web.Request):\nevent = await request.json()\n- return await bot.emulate(event=event, confirmation_token=\"ConfirmationToken\")\n+ emulation = await bot.emulate(event=event, confirmation_token=\"ConfirmationToken\")\n+ return web.Response(text=emulation)\n@bot.on.message(text=\"test\", lower=True)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "-from .api import Api, UserApi, request\nfrom .exceptions import *\nfrom .template import template_gen, TemplateElement\n+from vkbottle.api.api import Api, UserApi, API, request\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -19,6 +19,7 @@ class API(ContextInstanceMixin):\n)(tokens)\nself._http = HTTPRequest()\nself.throw_errors: bool = throw_errors\n+ self.group_id: int = None\n# VK Api Methods\nself.account = Account(self.api)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -9,8 +9,10 @@ from vkbottle.http import HTTP\nfrom vkbottle.types.events import EventList\nfrom vkbottle.framework.framework.handler import Handler, ErrorHandler\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\n+from vkbottle.framework.framework.extensions import AbstractExtension\n+from vkbottle.framework.framework.extensions.standard import StandardExtension\nfrom vkbottle.framework._status import BotStatus, LoggerLevel\n-from vkbottle.framework.framework.branch import DictBranch\n+from vkbottle.framework.framework.branch import DictBranch, AbstractBranch\nfrom vkbottle.framework.bot.processor import AsyncHandleManager\nfrom vkbottle.framework.bot.builtin import DefaultValidators, DEFAULT_WAIT\nfrom vkbottle.api import Api, request\n@@ -21,7 +23,6 @@ from vkbottle.utils.json import USAGE\ntry:\nimport uvloop\n-\nasyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\nexcept ImportError:\nuvloop = None\n@@ -44,6 +45,7 @@ class Bot(HTTP, AsyncHandleManager):\npatcher: Patcher = None,\nmobile: bool = False,\nsecret: str = None,\n+ extension: AbstractExtension = None,\n):\n\"\"\"\nInit bot\n@@ -91,16 +93,19 @@ class Bot(HTTP, AsyncHandleManager):\nrotation=\"100 MB\",\n)\n+ self.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n+ self.__loop = asyncio.get_event_loop()\n+\n# Sign assets\nself.api: Api = Api(self.__tokens, throw_errors=throw_errors)\n+ self.extension: AbstractExtension = extension if extension is not None else StandardExtension()\n+ self.api.group_id = self.group_id\nself._throw_errors: bool = throw_errors\nApi.set_current(self.api)\n-\n- self.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n- self.__loop = asyncio.get_event_loop()\n+ AbstractExtension.set_current(self.extension)\n# Main workers\n- self.branch: DictBranch = DictBranch()\n+ self.branch: AbstractBranch = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler(self.group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\n@@ -151,6 +156,7 @@ class Bot(HTTP, AsyncHandleManager):\n)\nexcept:\ncontinue\n+\ndef dispatch(self, ext: \"Bot\"):\n\"\"\"\nConcatenate handlers to current bot object\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/__init__.py",
"new_path": "vkbottle/framework/framework/__init__.py",
"diff": "+from .extensions import FromExtension\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/__init__.py",
"new_path": "vkbottle/framework/framework/branch/__init__.py",
"diff": "-from .branch import DictBranch\n+from .standard import DictBranch\nfrom .standart_branch import Branch, ExitBranch, rule_disposal\nfrom .cls import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "@@ -9,9 +9,6 @@ Disposal = typing.Tuple[typing.Dict[str, BranchRule]]\nclass AbstractBranchGenerator(ABC):\n- def __init__(self):\n- ...\n-\n@abstractmethod\ndef from_function(self, *args, **kwargs) -> None:\npass\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/framework/framework/branch/branch.py",
"new_path": "vkbottle/framework/framework/branch/standard.py",
"diff": "@@ -2,7 +2,7 @@ import typing, asyncio\nimport inspect\nfrom .cls import CoroutineBranch, AbstractBranch\n-from .abc import AbstractBranchGenerator\n+from .abc import AbstractBranchGenerator, Disposal\nfrom .standart_branch import ImmutableBranchData\nfrom vkbottle.api.exceptions import BranchError\n@@ -20,19 +20,29 @@ class DictBranch(AbstractBranchGenerator):\nint, typing.Tuple[AbstractBranch, ImmutableBranchData]\n] = {}\n- def simple_branch(self, branch_name: str = None):\n- def decorator(func: typing.Callable):\n+ def from_function(\n+ self,\n+ func: typing.Callable,\n+ branch_name: str = None,\n+ ) -> typing.Tuple[AbstractBranch, ImmutableBranchData]:\nif not asyncio.iscoroutinefunction(func):\nraise BranchError(\"Branch functions should be async\")\n- self._meet_up[branch_name or func.__name__] = (\n- CoroutineBranch,\n- ImmutableBranchData(branch_name or func.__name__, call=func),\n- )\n- return func\n+ return CoroutineBranch, ImmutableBranchData(branch_name or func.__name__, call=func),\n+ def simple_branch(\n+ self,\n+ branch_name: str = None\n+ ):\n+ def decorator(func: typing.Callable):\n+ self._meet_up[branch_name or func.__name__] = self.from_function(func, branch_name)\n+ return func\nreturn decorator\n- def add_branch(self, branch: typing.Callable, name: str = None):\n+ def add_branch(\n+ self,\n+ branch: typing.Callable,\n+ name: str = None,\n+ ):\nif inspect.isclass(type(branch)):\nself._meet_up[name or branch.__name__] = (branch, ImmutableBranchData(name))\nelif asyncio.iscoroutinefunction(branch):\n@@ -45,7 +55,10 @@ class DictBranch(AbstractBranchGenerator):\n\"Branch Callable should be an AbstractBranch (ClsBranch) or a async function\"\n)\n- def cls_branch(self, branch_name: str = None):\n+ def cls_branch(\n+ self,\n+ branch_name: str = None,\n+ ):\ndef decorator(cls: typing.ClassVar):\nself._meet_up[branch_name or cls.__name__] = (\ncls,\n@@ -68,7 +81,7 @@ class DictBranch(AbstractBranchGenerator):\nuid: int,\nbranch: typing.Union[typing.Callable, str, AbstractBranch],\n**context\n- ) -> None:\n+ ) -> AbstractBranch:\nstate, data = None, None\nif isinstance(branch, str):\nif branch not in self._meet_up:\n@@ -100,20 +113,12 @@ class DictBranch(AbstractBranchGenerator):\nbranch = state(**data())\nbranch.create(**context)\nself._branch_queue[uid] = branch\n+ return self._branch_queue[uid]\nasync def load(\n- self, uid: int\n- ) -> typing.Tuple[\n- typing.Dict[\n- str,\n- typing.Union[\n- typing.Tuple[\n- typing.Callable, typing.List[AbstractMessageRule], typing.Callable\n- ]\n- ],\n- ],\n- AbstractBranch,\n- ]:\n+ self,\n+ uid: int,\n+ ) -> typing.Tuple[Disposal]:\nif uid in self._branch_queue:\nbranch = self._branch_queue.get(uid)\ndisposal = dict(\n@@ -122,6 +127,9 @@ class DictBranch(AbstractBranchGenerator):\ndisposal[\"default\"] = [branch.__class__.branch, []]\nreturn disposal, branch\n- def exit(self, uid: int) -> AbstractBranch:\n+ def exit(\n+ self,\n+ uid: int,\n+ ) -> None:\nif uid in self._branch_queue:\ndel self._branch_queue[uid]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/extensions/__init__.py",
"diff": "+from .extension import dispatch, AbstractExtension, FromExtension\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/extensions/extension.py",
"diff": "+from abc import ABC, abstractmethod\n+from vkbottle.utils import ContextInstanceMixin\n+import typing\n+\n+class FromExtension:\n+ def __init__(self, attribute: str):\n+ self.attribute = attribute\n+\n+\n+class AbstractExtension(ABC, ContextInstanceMixin):\n+ def __init__(self):\n+ pass\n+\n+ @abstractmethod\n+ def random_id(self) -> int:\n+ pass\n+\n+ @abstractmethod\n+ def api_instance(self):\n+ pass\n+\n+ @abstractmethod\n+ def group_id(self) -> int:\n+ pass\n+\n+\n+def dispatch(value: typing.Any) -> typing.Any:\n+ if isinstance(value, FromExtension):\n+ return getattr(AbstractExtension.get_current(), value.attribute)()\n+ return value\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/extensions/standard.py",
"diff": "+from .extension import AbstractExtension\n+import random\n+from vkbottle.api.api.api import Api\n+\n+class StandardExtension(AbstractExtension):\n+ def random_id(self):\n+ return random.randint(-2e9, 2e9)\n+\n+ def api_instance(self) -> Api:\n+ return Api.get_current()\n+\n+ def group_id(self):\n+ return self.api_instance().group_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/base.py",
"new_path": "vkbottle/types/base.py",
"diff": "import pydantic\n+from vkbottle.framework.framework.extensions import dispatch\nclass BaseModel(pydantic.BaseModel):\n@@ -14,3 +15,11 @@ class BaseModel(pydantic.BaseModel):\n[f\"{key}={value}\" for key, value in self.dict(skip_defaults=True).items()]\n)\nreturn \"{}({})\".format(self.__class__.__name__, args)\n+\n+ @staticmethod\n+ def get_params(params: dict) -> dict:\n+ return {\n+ k: dispatch(v)\n+ for k, v in params.items()\n+ if k != \"self\" and not k.startswith(\"_\") and v is not None\n+ }\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "-from typing import List, Union\n+import typing\nfrom enum import Enum\nfrom .attachments import Attachment\nfrom .attachments import Geo\nfrom .base import BaseModel\nfrom vkbottle.api import Api\n-import random\nfrom datetime import datetime\n+from vkbottle.framework.framework import FromExtension\n# https://vk.com/dev/objects/message\n-API = Api.get_current\n-\ndef sep_bytes(text: str, max_bytes: int = 4096) -> list:\ntext = text.encode(\"utf-8\")\n@@ -18,6 +16,12 @@ def sep_bytes(text: str, max_bytes: int = 4096) -> list:\nreturn list(map(bytes.decode, separation)) if len(separation) else [\"\"]\n+class GetApi:\n+ @property\n+ def api(self) -> Api:\n+ return Api.get_current()\n+\n+\nclass Action(Enum):\nchat_photo_update = \"chat_photo_update\"\nchat_photo_remove = \"chat_photo_remove\"\n@@ -52,7 +56,7 @@ class ClientInfo(BaseModel):\nlang_id: int = None\n-class Message(BaseModel):\n+class Message(BaseModel, GetApi):\nid: int = None\ndate: int = None\npeer_id: int = None\n@@ -61,13 +65,13 @@ class Message(BaseModel):\nrandom_id: int = None\nref: str = None\nref_source: str = None\n- attachments: List[Attachment] = []\n+ attachments: typing.List[Attachment] = []\nimportant: bool = None\ngeo: Geo = None\npayload: str = None\n- keyboard: Union[str, dict] = None\n+ keyboard: typing.Union[str, dict] = None\naction: MessageAction = None\n- fwd_messages: List[\"Message\"] = []\n+ fwd_messages: typing.List[\"Message\"] = []\nreply_message: \"Message\" = None\nclient_info: ClientInfo = None\nconversation_message_id: int = None\n@@ -76,41 +80,70 @@ class Message(BaseModel):\ndef chat_id(self) -> int:\nreturn self.peer_id - 2000000000\n- async def reply(self, message: str = None, attachment: str = None, **params):\n+ async def reply(\n+ self,\n+ message: str = None,\n+ random_id: int = FromExtension(\"random_id\"),\n+ user_id: int = None,\n+ domain: str = None,\n+ chat_id: int = None,\n+ user_ids: typing.List[int] = None,\n+ lat: typing.Any = None,\n+ long: typing.Any = None,\n+ attachment: str = None,\n+ forward_messages: typing.List[int] = None,\n+ forward: str = None,\n+ sticker_id: int = None,\n+ group_id: int = None,\n+ keyboard: str = None,\n+ payload: str = None,\n+ dont_parse_links: bool = None,\n+ disable_mentions: bool = None,\n+ ):\n+\n+ if message is not None:\nmessage = str(message)\n- locals().update(params)\n- return await API().request(\n- \"messages.send\",\n- dict(\n- peer_id=self.peer_id,\n+ return self.api.messages.send(\n+ **self.get_params(locals()),\nreply_to=self.id or self.conversation_message_id,\n- random_id=random.randint(-2e9, 2e9),\n- **{\n- k: v\n- for k, v in locals().items()\n- if v is not None and k not in [\"self\", \"params\"]\n- }\n- ),\n+ peer_id=self.peer_id,\n)\n- async def __call__(self, message: str = None, attachment: str = None, **params):\n- locals().update(params)\n-\n- for message in sep_bytes(str(message or \"\")):\n- m = await API().request(\n- \"messages.send\",\n- dict(\n+ async def __call__(\n+ self,\n+ message: str = None,\n+ random_id: int = FromExtension(\"random_id\"),\n+ user_id: int = None,\n+ domain: str = None,\n+ chat_id: int = None,\n+ user_ids: typing.List[int] = None,\n+ lat: typing.Any = None,\n+ long: typing.Any = None,\n+ attachment: str = None,\n+ reply_to: int = None,\n+ forward_messages: typing.List[int] = None,\n+ forward: str = None,\n+ sticker_id: int = None,\n+ group_id: int = None,\n+ keyboard: str = None,\n+ payload: str = None,\n+ dont_parse_links: bool = None,\n+ disable_mentions: bool = None,\n+ ):\n+ if not message:\n+ return await self.api.messages.send(\n+ **self.get_params(locals()),\n+ peer_id=self.peer_id,\n+ )\n+ _m = []\n+ for message in sep_bytes(str(message if message is not None else \"\")):\n+ mid = await self.api.messages.send(\n+ **self.get_params(locals()),\npeer_id=self.peer_id,\n- random_id=random.randint(-2e9, 2e9),\n- **{\n- k: v\n- for k, v in locals().items()\n- if v is not None and k not in [\"self\", \"params\"]\n- }\n- ),\n)\n- return m\n+ _m.append(mid)\n+ return _m if len(_m) > 1 else _m[0]\n@property\ndef date_time(self) -> datetime:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -218,7 +218,7 @@ class SearchModel(BaseModel):\nresponse: Search = None\n-Send = typing.Dict\n+Send = int\nclass SendModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "from .base import BaseModel\nfrom .attachments import Geo\nfrom .message import sep_bytes, MessageAction\n-from ..api import UserApi\n+from ..api.api import UserApi\nimport random\nimport typing\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Flock of fixes
|
718,838 |
08.04.2020 13:18:57
| -10,800 |
1781a4f3716763e71fbb809a66c3ed95adfdff20
|
v2.7 fix api
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -119,20 +119,17 @@ class Bot(HTTP, AsyncHandleManager):\nclose, offset = False, 0\nwhile not close:\n- conversations = await self.api.request(\n- \"messages.getConversations\",\n- {\"count\": 200, \"offset\": offset, \"filter\": \"unanswered\"},\n- )\n+ conversations = await self.api.messages.get_conversations(offset, 200, filter=\"unanswered\")\nif offset == 0:\n- logger.info(f\"Conversation count - {conversations['count']}\")\n- if conversations[\"count\"] == 0:\n+ logger.info(f\"Conversation count - {conversations.count}\")\n+ if conversations.count == 0:\nreturn\noffset += 200\nupdates.extend(\n- [item[\"conversation\"][\"out_read\"] for item in conversations[\"items\"]]\n+ [item.conversation.out_read for item in conversations.items]\n)\n- if len(conversations[\"items\"]) < 200:\n+ if len(conversations.items) < 200:\nclose = True\nlogger.warning(\"Answering...\")\n@@ -140,21 +137,19 @@ class Bot(HTTP, AsyncHandleManager):\nchunk = list(chunks(updates, 100))\nfor mid in chunk:\ntry:\n- messages = await self.api.request(\n- \"messages.getById\", {\"message_ids\": \",\".join(map(str, mid))}\n- )\n+ messages = await self.api.messages.get_by_id(mid)\nawait self.emulate(\n{\n\"updates\": [\n{\n\"type\": \"message_new\",\n- \"object\": {\"message\": m, \"client_info\": {}},\n+ \"object\": {\"message\": m.dict(), \"client_info\": {}},\n}\n- for m in messages[\"items\"]\n+ for m in messages.items\n]\n}\n)\n- except:\n+ except VKError:\ncontinue\ndef dispatch(self, ext: \"Bot\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -55,7 +55,7 @@ class GetByConversationMessageIdModel(BaseModel):\nclass GetById(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.messages.Message] = None\nclass GetByIdModel(BaseModel):\n@@ -99,10 +99,80 @@ class GetConversationsByIdModel(BaseModel):\nresponse: GetConversationsById = None\n+class ConversationType(enum.Enum):\n+ chat = \"chat\"\n+ user = \"user\"\n+ group = \"group\"\n+ email = \"email\"\n+\n+\n+class Peer(BaseModel):\n+ id: int = None\n+ type: ConversationType = None\n+ local_id: int = None\n+\n+\n+class PushSettings(BaseModel):\n+ disabled_until: int = None\n+ disabled_forever: bool = None\n+ no_sound: bool = None\n+\n+\n+class CanWrite(BaseModel):\n+ allowed: bool = None\n+ reason: int = None\n+\n+ def get_reason(self) -> str:\n+ return {\n+ 18: \"the user is deleted or blocked\",\n+ 900: \"can't send message to user from blacklist\",\n+ 901: \"the user has denied messages from the community\",\n+ 902: \"the user has closed messages using privacy settings\",\n+ 915: \"messages are disabled in the community\",\n+ 916: \"messages are blocked in the community\",\n+ 917: \"no access to conversation;\",\n+ 918: \"no access to e-mail\",\n+ 203: \"no access to the community\",\n+ }.get(self.reason, f\"unknown reason {self.reason}\")\n+\n+\n+class ConversationUserState(enum.Enum):\n+ in_ = \"in\"\n+ kicked = \"kicked\"\n+ left = \"left\"\n+\n+\n+class ChatSettings(BaseModel):\n+ members_count: int = None\n+ title: str = None\n+ pinned_message: objects.messages.Message = None\n+ state: ConversationUserState = None\n+ photo: objects.photos.PhotoSizes = None\n+ admin_ids: typing.List[int] = None\n+ active_ids: typing.List[int] = None\n+\n+\n+class Conversation(BaseModel):\n+ peer: Peer = None\n+ in_read: int = None\n+ out_read: int = None\n+ unread_count: int = None\n+ important: bool = None\n+ unanswered: bool = None\n+ push_settings: PushSettings = None\n+ can_write: CanWrite = None\n+ chat_settings: ChatSettings = None\n+\n+\n+class ConversationsItem(BaseModel):\n+ conversation: Conversation = None\n+ last_message: objects.messages.Message = None\n+\n+\nclass GetConversations(BaseModel):\ncount: int = None\nunread_count: int = None\n- items: typing.List = None\n+ items: typing.List[ConversationsItem] = None\nprofiles: typing.List = None\ngroups: typing.List = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 fix api
|
718,838 |
08.04.2020 16:03:53
| -10,800 |
8fc27b8fc302c0a59fd9f18272def7a5a0990fe7
|
v2.7 Fix bare requests response and AbstractBranchGenerator typing
+ fix uploader (as a consequence from fix of bare requests)
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -78,7 +78,7 @@ class Request:\nlogger.debug(f\"Response: {response}\")\nif not response_model:\n- return response\n+ return response[\"response\"]\nresp = response_model(**response)\nif raw_response:\nreturn resp\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -41,7 +41,7 @@ class AsyncHandleManager:\nelif mr is not None:\nmiddleware_args.append(mr)\n- if message.peer_id in self.branch.queue:\n+ if message.peer_id in await self.branch.queue:\nawait self._branched_processor(obj, client_info, middleware_args)\nreturn\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/__init__.py",
"new_path": "vkbottle/framework/framework/branch/__init__.py",
"diff": "-from .standard import DictBranch\n+from .dict_branch import DictBranch\nfrom .standart_branch import Branch, ExitBranch, rule_disposal\nfrom .cls import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "@@ -5,10 +5,11 @@ from ..rule import AbstractMessageRule\nBranch = typing.Union[str, AbstractBranch]\nBranchRule = typing.Tuple[typing.Callable, typing.List[AbstractMessageRule]]\n-Disposal = typing.Tuple[typing.Dict[str, BranchRule]]\nclass AbstractBranchGenerator(ABC):\n+ Disposal = typing.Dict[str, BranchRule]\n+\n@abstractmethod\ndef from_function(self, *args, **kwargs) -> None:\npass\n@@ -19,7 +20,7 @@ class AbstractBranchGenerator(ABC):\n@property\n@abstractmethod\n- def queue(self) -> typing.Dict[int, AbstractBranch]:\n+ async def queue(self) -> typing.List[int]:\n...\n@abstractmethod\n@@ -27,7 +28,7 @@ class AbstractBranchGenerator(ABC):\n...\n@abstractmethod\n- async def load(self, uid: int) -> typing.Tuple[Disposal]:\n+ async def load(self, uid: int) -> typing.Tuple[\"AbstractBranchGenerator.Disposal\", AbstractBranch]:\n...\n@abstractmethod\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/framework/framework/branch/standard.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "@@ -2,11 +2,10 @@ import typing, asyncio\nimport inspect\nfrom .cls import CoroutineBranch, AbstractBranch\n-from .abc import AbstractBranchGenerator, Disposal\n+from .abc import AbstractBranchGenerator\nfrom .standart_branch import ImmutableBranchData\nfrom vkbottle.api.exceptions import BranchError\n-from vkbottle.framework.framework.rule import AbstractMessageRule\nBRANCH_DATA = \".BRANCHES.txt\"\n@@ -17,7 +16,7 @@ class DictBranch(AbstractBranchGenerator):\nstr, typing.Tuple[AbstractBranch, ImmutableBranchData]\n] = {}\nself._branch_queue: typing.Dict[\n- int, typing.Tuple[AbstractBranch, ImmutableBranchData]\n+ int, AbstractBranch\n] = {}\ndef from_function(\n@@ -69,8 +68,8 @@ class DictBranch(AbstractBranchGenerator):\nreturn decorator\n@property\n- def queue(self) -> typing.Dict[int, AbstractBranch]:\n- return self._branch_queue\n+ async def queue(self) -> typing.List[int]:\n+ return self._branch_queue.keys()\n@property\ndef branches(self) -> typing.Dict[str, AbstractBranch]:\n@@ -118,7 +117,7 @@ class DictBranch(AbstractBranchGenerator):\nasync def load(\nself,\nuid: int,\n- ) -> typing.Tuple[Disposal]:\n+ ) -> typing.Tuple[\"AbstractBranchGenerator.Disposal\", AbstractBranch]:\nif uid in self._branch_queue:\nbranch = self._branch_queue.get(uid)\ndisposal = dict(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Fix bare requests response and AbstractBranchGenerator typing
+ fix uploader (as a consequence from fix of bare requests)
|
718,838 |
08.04.2020 21:39:21
| -10,800 |
58430160de4f4b60fe3fa6e189a1b1fb9f25d6d5
|
v2.7 Some fixes for API and Branches maintenance
+ made add, exit (and load) branch managers to work asynchronous ( + change in examples)
+ fix User LP expanding models
+ swap random_id and attachment parameters in message answering function
+ some fixes in API specifically
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_new.py",
"new_path": "examples/tests/branches_new.py",
"diff": "@@ -39,7 +39,7 @@ class AnotherBranch(ClsBranch):\n@bot.on.message_handler(text=[\"say <word>\", \"add <word>\"])\nasync def pronounce(ans: Message, word):\n- bot.branch.add(ans.peer_id, \"another\", word=word)\n+ await bot.branch.add(ans.peer_id, \"another\", word=word)\nreturn \"Okay!\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -12,7 +12,8 @@ from vkbottle.framework.framework.handler import MiddlewareExecutor\nfrom vkbottle.framework.framework.extensions import AbstractExtension\nfrom vkbottle.framework.framework.extensions.standard import StandardExtension\nfrom vkbottle.framework._status import BotStatus, LoggerLevel\n-from vkbottle.framework.framework.branch import DictBranch, AbstractBranch\n+from vkbottle.framework.framework.branch import DictBranch\n+from vkbottle.framework.framework.branch.abc import AbstractBranchGenerator\nfrom vkbottle.framework.bot.processor import AsyncHandleManager\nfrom vkbottle.framework.bot.builtin import DefaultValidators, DEFAULT_WAIT\nfrom vkbottle.api import Api, request\n@@ -105,7 +106,7 @@ class Bot(HTTP, AsyncHandleManager):\nAbstractExtension.set_current(self.extension)\n# Main workers\n- self.branch: AbstractBranch = DictBranch()\n+ self.branch: typing.Union[AbstractBranchGenerator, DictBranch] = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler(self.group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -168,13 +168,13 @@ class AsyncHandleManager:\n:return:\n\"\"\"\nif isinstance(handler_return, Branch):\n- self.branch.add(\n+ await self.branch.add(\nobj[\"peer_id\"],\nhandler_return.branch_name,\n**handler_return.branch_kwargs\n)\nelif isinstance(handler_return, ExitBranch):\n- self.branch.exit(obj[\"peer_id\"])\n+ await self.branch.exit(obj[\"peer_id\"])\nelif handler_return is not None:\nawait Message(**obj, client_info=client_info)(\nstr(handler_return), **self.status.handler_return_context\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "@@ -9,13 +9,15 @@ BranchRule = typing.Tuple[typing.Callable, typing.List[AbstractMessageRule]]\nclass AbstractBranchGenerator(ABC):\nDisposal = typing.Dict[str, BranchRule]\n+ cls_branch: typing.Any\n+ simple_branch: typing.Any\n@abstractmethod\ndef from_function(self, *args, **kwargs) -> None:\npass\n@abstractmethod\n- def add_branch(self, branch: AbstractBranch, name: str) -> AbstractBranch:\n+ def add_branch(self, branch: AbstractBranch, name: str = None, **context) -> AbstractBranch:\n...\n@property\n@@ -24,7 +26,7 @@ class AbstractBranchGenerator(ABC):\n...\n@abstractmethod\n- def add(self, uid: int, branch: Branch):\n+ async def add(self, uid: int, branch: Branch):\n...\n@abstractmethod\n@@ -32,5 +34,5 @@ class AbstractBranchGenerator(ABC):\n...\n@abstractmethod\n- def exit(self, uid: int):\n+ async def exit(self, uid: int):\n...\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/dict_branch.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "@@ -75,7 +75,7 @@ class DictBranch(AbstractBranchGenerator):\ndef branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self._meet_up\n- def add(\n+ async def add(\nself,\nuid: int,\nbranch: typing.Union[typing.Callable, str, AbstractBranch],\n@@ -126,7 +126,7 @@ class DictBranch(AbstractBranchGenerator):\ndisposal[\"default\"] = [branch.__class__.branch, []]\nreturn disposal, branch\n- def exit(\n+ async def exit(\nself,\nuid: int,\n) -> None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -181,10 +181,8 @@ class User(HTTP):\nif code in range(6):\ndata.update(\n(\n- await self.api.request(\n- \"messages.getById\", {\"message_ids\": data[\"message_id\"]},\n- )\n- )[\"response\"][\"items\"][0]\n+ await self.api.messages.get_by_id(message_ids=data[\"message_id\"])\n+ ).items[0].dict()\n)\nreturn data\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -83,14 +83,14 @@ class Message(BaseModel, GetApi):\nasync def reply(\nself,\nmessage: str = None,\n- random_id: int = FromExtension(\"random_id\"),\n+ attachment: str = None,\nuser_id: int = None,\ndomain: str = None,\nchat_id: int = None,\n+ random_id: int = FromExtension(\"random_id\"),\nuser_ids: typing.List[int] = None,\nlat: typing.Any = None,\nlong: typing.Any = None,\n- attachment: str = None,\nforward_messages: typing.List[int] = None,\nforward: str = None,\nsticker_id: int = None,\n@@ -113,14 +113,14 @@ class Message(BaseModel, GetApi):\nasync def __call__(\nself,\nmessage: str = None,\n- random_id: int = FromExtension(\"random_id\"),\n+ attachment: str = None,\nuser_id: int = None,\ndomain: str = None,\nchat_id: int = None,\n+ random_id: int = FromExtension(\"random_id\"),\nuser_ids: typing.List[int] = None,\nlat: typing.Any = None,\nlong: typing.Any = None,\n- attachment: str = None,\nreply_to: int = None,\nforward_messages: typing.List[int] = None,\nforward: str = None,\n@@ -138,11 +138,11 @@ class Message(BaseModel, GetApi):\n)\n_m = []\nfor message in sep_bytes(str(message if message is not None else \"\")):\n- mid = await self.api.messages.send(\n+ _mid = await self.api.messages.send(\n**self.get_params(locals()),\npeer_id=self.peer_id,\n)\n- _m.append(mid)\n+ _m.append(_mid)\nreturn _m if len(_m) > 1 else _m[0]\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/base.py",
"new_path": "vkbottle/types/objects/base.py",
"diff": "@@ -3,9 +3,7 @@ from enum import Enum\nfrom ..base import BaseModel\n-class BoolInt(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n+BoolInt = int\nclass City(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -297,3 +297,6 @@ class PinnedMessage(BaseModel):\nclass UserXtrInvitedBy(users.UserXtrType):\ninvited_by: int = None\n+\n+\n+Message.update_forward_refs()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -239,7 +239,7 @@ class GetLongPollServerModel(BaseModel):\nclass IsMessagesFromGroupAllowed(BaseModel):\n- is_allowed: objects.base.BoolInt = None\n+ is_allowed: int = None\nclass IsMessagesFromGroupAllowedModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Some fixes for API and Branches maintenance
+ made add, exit (and load) branch managers to work asynchronous ( + change in examples)
+ fix User LP expanding models
+ swap random_id and attachment parameters in message answering function
+ some fixes in API specifically
|
718,838 |
09.04.2020 01:36:35
| -10,800 |
a8972c45f5e2ca0052ee91e39e848a2b2385e52f
|
v2.7 DatabaseBranch
+ add structured example with documentation
+ example of SqliteBranch implementation
[wait for your addons with different database integrations]
|
[
{
"change_type": "MODIFY",
"old_path": "examples/middleware.py",
"new_path": "examples/middleware.py",
"diff": "@@ -3,8 +3,8 @@ from time import time as current\nfrom tortoise import Tortoise\nfrom vkbottle import Bot, Message\n-from vkbottle.rule import AbstractMessageRule\nfrom vkbottle.ext import Middleware\n+from vkbottle.rule import AbstractMessageRule\nfrom .tortoise_models import User\nbot = Bot(\"token\")\n@@ -41,4 +41,4 @@ async def init_db():\nawait Tortoise.generate_schemas()\n-bot.run_polling(skip_updates=False)\n+bot.run_polling(skip_updates=False, on_startup=init_db)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tortoise_models.py",
"new_path": "examples/tortoise_models.py",
"diff": "@@ -2,7 +2,28 @@ from tortoise import fields\nfrom tortoise.models import Model\n+\"\"\"\n+Simple User model with tortoise orm\n+\"\"\"\nclass User(Model):\nid = fields.IntField(pk=True)\nuid = fields.IntField()\ntime = fields.IntField()\n+\n+ class Meta:\n+ database = \"user\"\n+\n+\n+\"\"\"\n+A model was made to work with DatabaseBranch manager\n+Three fields are required: uid as integer, branch as string (near 20 symbols max)\n+and context as string (as big as possible) to store context json\n+\"\"\"\n+class UserState(Model):\n+ id = fields.IntField(pk=True) # Primary key is often recommended\n+ uid = fields.IntField()\n+ branch = fields.CharField(20)\n+ context = fields.CharField(255)\n+\n+ class Meta:\n+ database = \"user_state\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -9,7 +9,7 @@ from vkbottle.types.message import Message\nfrom vkbottle.api import Api\nfrom vkbottle.framework.framework.handler import Handler\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\n-from vkbottle.framework.framework.branch import DictBranch\n+from vkbottle.framework.framework.branch import DictBranch, GeneratorType\nfrom vkbottle.framework.framework.branch import Branch, ExitBranch\nfrom vkbottle.framework._status import BotStatus\nfrom vkbottle.utils.tools import get_attr\n@@ -126,6 +126,7 @@ class AsyncHandleManager:\n)\ndisposal, branch = await self.branch.load(answer.peer_id)\n+ edited = None\nawait branch.enter(answer)\nfor n, member in disposal.items():\n@@ -139,13 +140,17 @@ class AsyncHandleManager:\nkwargs = {\nk: v for rule in rules for k, v in rule.context.kwargs.items()\n}\n- await self._handler_return(\n+ edited = await self._handler_return(\nawait task(answer, *middleware_args, *args, **kwargs),\nobj,\nclient_info,\n)\nbreak\n+ if edited is False and self.branch.generator is GeneratorType.DATABASE:\n+ if answer.peer_id in await self.branch.queue:\n+ await self.branch.add(answer.peer_id, branch.key, **branch.context)\n+\nlogger.info(\n'New BRANCHED \"{0}\" compiled with branch <{2}> (from: {1})'.format(\nanswer.text.replace(\"\\n\", \" \"),\n@@ -173,9 +178,12 @@ class AsyncHandleManager:\nhandler_return.branch_name,\n**handler_return.branch_kwargs\n)\n+ return True\nelif isinstance(handler_return, ExitBranch):\nawait self.branch.exit(obj[\"peer_id\"])\n+ return True\nelif handler_return is not None:\nawait Message(**obj, client_info=client_info)(\nstr(handler_return), **self.status.handler_return_context\n)\n+ return False\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/__init__.py",
"new_path": "vkbottle/framework/framework/branch/__init__.py",
"diff": "from .dict_branch import DictBranch\n+from .abc import AbstractBranchGenerator, GeneratorType\nfrom .standart_branch import Branch, ExitBranch, rule_disposal\nfrom .cls import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "@@ -2,22 +2,30 @@ import typing\nfrom abc import ABC, abstractmethod\nfrom .cls import AbstractBranch\nfrom ..rule import AbstractMessageRule\n+import enum\nBranch = typing.Union[str, AbstractBranch]\nBranchRule = typing.Tuple[typing.Callable, typing.List[AbstractMessageRule]]\n+class GeneratorType(enum.Enum):\n+ ABSTRACT = \"abstract\"\n+ DATABASE = \"database\"\n+ DICT = \"dict\"\n+\n+\nclass AbstractBranchGenerator(ABC):\nDisposal = typing.Dict[str, BranchRule]\ncls_branch: typing.Any\nsimple_branch: typing.Any\n+ generator: GeneratorType = GeneratorType.ABSTRACT\n@abstractmethod\ndef from_function(self, *args, **kwargs) -> None:\npass\n@abstractmethod\n- def add_branch(self, branch: AbstractBranch, name: str = None, **context) -> AbstractBranch:\n+ def add_branch(self, branch: AbstractBranch, name: str = None) -> AbstractBranch:\n...\n@property\n@@ -25,8 +33,13 @@ class AbstractBranchGenerator(ABC):\nasync def queue(self) -> typing.List[int]:\n...\n+ @property\n+ @abstractmethod\n+ async def branches(self) -> typing.Dict[str, AbstractBranch]:\n+ ...\n+\n@abstractmethod\n- async def add(self, uid: int, branch: Branch):\n+ async def add(self, uid: int, branch: Branch, **context):\n...\n@abstractmethod\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "+from abc import abstractmethod\n+from .abc import AbstractBranchGenerator, Branch, AbstractBranch, GeneratorType\n+from .standart_branch import ImmutableBranchData\n+from .cls import CoroutineBranch\n+from vkbottle.api.exceptions import BranchError\n+from vkbottle.utils.json import json\n+import typing\n+import asyncio\n+import inspect\n+\n+\n+class DatabaseBranch(AbstractBranchGenerator):\n+ def __init__(self):\n+ self.names: typing.Dict[str, typing.Type[AbstractBranch]] = {}\n+ self.encoding: str = \"utf-8\"\n+ self.generator = GeneratorType.DATABASE\n+\n+ @abstractmethod\n+ async def get_user(self, uid: int) -> typing.Tuple[str, typing.Union[str, dict]]:\n+ pass\n+\n+ @abstractmethod\n+ async def set_user(self, uid: int, branch: str, context: str) -> None:\n+ pass\n+\n+ @abstractmethod\n+ async def delete_user(self, uid: int):\n+ pass\n+\n+ @abstractmethod\n+ async def all_users(self) -> typing.List[int]:\n+ pass\n+\n+ async def from_function(\n+ self,\n+ func: typing.Callable,\n+ branch_name: str = None,\n+ ) -> typing.Tuple[AbstractBranch, ImmutableBranchData]:\n+ if not asyncio.iscoroutinefunction(func):\n+ raise BranchError(\"Branch functions should be async\")\n+\n+ class FromFunctionDatabaseBranch(CoroutineBranch):\n+ key = branch_name or func.__name__\n+ data = {\"call\": func}\n+ return FromFunctionDatabaseBranch\n+\n+ def add_branch(self, branch: AbstractBranch, name: str = None, **context) -> AbstractBranch:\n+ self.names[name or branch.__name__] = branch\n+ return branch\n+\n+ @property\n+ async def queue(self) -> typing.List[int]:\n+ return await self.all_users()\n+\n+ @property\n+ async def branches(self) -> typing.Dict[str, AbstractBranch]:\n+ return self.names\n+\n+ async def add(self, uid: int, branch: Branch, **context):\n+ if isinstance(branch, str):\n+ if branch not in self.names:\n+ raise BranchError(f\"Branch {branch} hasn't yet been assigned with decorator\")\n+ else:\n+ if branch not in self.names.values():\n+ raise BranchError(f\"Branch {branch.__name__} hasn't yet been assigned with decorator\")\n+ branch = dict((v, k) for k, v in self.names.items())[branch]\n+ await self.set_user(uid, branch, json.dumps(context).decode(self.encoding))\n+\n+ async def load(self, uid: int) -> typing.Tuple[\"AbstractBranchGenerator.Disposal\", AbstractBranch]:\n+ branch_name, context = await self.get_user(uid)\n+ if isinstance(context, str):\n+ context = json.loads(context)\n+ branch = self.names.get(branch_name)()\n+ branch.context = context\n+ branch.key = branch_name\n+ if not branch:\n+ raise BranchError(f\"User {uid} is signed with undefined branch \\\"{branch_name}\\\"\")\n+\n+ disposal = dict(\n+ inspect.getmembers(branch, predicate=lambda obj: isinstance(obj, tuple))\n+ )\n+ disposal[\"default\"] = [branch.__class__.branch, []]\n+ return disposal, branch\n+\n+ async def exit(self, uid: int):\n+ if uid in await self.queue:\n+ await self.delete_user(uid)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/dict_branch.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "@@ -2,7 +2,7 @@ import typing, asyncio\nimport inspect\nfrom .cls import CoroutineBranch, AbstractBranch\n-from .abc import AbstractBranchGenerator\n+from .abc import AbstractBranchGenerator, GeneratorType\nfrom .standart_branch import ImmutableBranchData\nfrom vkbottle.api.exceptions import BranchError\n@@ -12,12 +12,9 @@ BRANCH_DATA = \".BRANCHES.txt\"\nclass DictBranch(AbstractBranchGenerator):\ndef __init__(self):\n- self._meet_up: typing.Dict[\n- str, typing.Tuple[AbstractBranch, ImmutableBranchData]\n- ] = {}\n- self._branch_queue: typing.Dict[\n- int, AbstractBranch\n- ] = {}\n+ self._meet_up: typing.Dict[str, typing.Tuple[AbstractBranch, ImmutableBranchData]] = {}\n+ self._branch_queue: typing.Dict[int, AbstractBranch] = {}\n+ self.generator = GeneratorType.DATABASE\ndef from_function(\nself,\n@@ -72,7 +69,7 @@ class DictBranch(AbstractBranchGenerator):\nreturn self._branch_queue.keys()\n@property\n- def branches(self) -> typing.Dict[str, AbstractBranch]:\n+ async def branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self._meet_up\nasync def add(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 DatabaseBranch
+ add structured example with documentation
+ example of SqliteBranch implementation
[wait for your addons with different database integrations]
|
718,867 |
09.04.2020 02:36:19
| 18,000 |
df4986a5be496a23810603d75644cf2b5ef51555
|
Filter bug fixes, small refactoring and carousel removal
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -2,7 +2,6 @@ from .framework import Bot, User\nfrom .framework.framework import branch\nfrom .types.message import Message\nfrom .utils.task import TaskManager\n-from .api import template_gen, TemplateElement\nfrom .api.keyboard import keyboard_gen\nfrom .api.exceptions import *\nfrom .api.uploader import PhotoUploader, DocUploader\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .exceptions import *\n-from .template import template_gen, TemplateElement\nfrom vkbottle.api.api import Api, UserApi, API, request\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/builtin.py",
"new_path": "vkbottle/api/api/builtin.py",
"diff": "-import typing\nimport random\nimport time\nimport math\n+\n+from typing import List, Tuple, Coroutine, Any\nfrom vkbottle.utils.logger import logger\n+\nfrom .token import AbstractTokenGenerator\nfrom .schema import TokenSchema\n@@ -12,7 +14,7 @@ class RandomTokenGenerator(AbstractTokenGenerator):\nRandomTokenGenerator allows to randomize taken tokens, works good if the amount of tokens is big\n\"\"\"\n- def __init__(self, tokens: typing.List[str]):\n+ def __init__(self, tokens: List[str]):\nself.tokens = tokens\nasync def get_token(self, *args, **kwargs) -> str:\n@@ -24,7 +26,7 @@ class ConsistentTokenGenerator(AbstractTokenGenerator):\nConsistentTokenGenerator is the best choice to generate tokens and avoid limit errors\n\"\"\"\n- def __init__(self, tokens: typing.List[str]):\n+ def __init__(self, tokens: List[str]):\nself.tokens = tokens\nself.state = 0\n@@ -39,14 +41,14 @@ class LimitedTokenGenerator(AbstractTokenGenerator):\nLimitedTokenGenerator generates tokens with the fixed limit, it's aimed to efficiently avoid limit errors\n\"\"\"\n- def __init__(self, tokens: typing.List[str], limit: int = 3):\n+ def __init__(self, tokens: List[str], limit: int = 3):\n\"\"\"\n:param tokens:\n:param limit: Fixed limit of availability of one token per second\n\"\"\"\nself.tokens = tokens\nself.limit: int = limit\n- self.state: typing.Tuple[int] = (0, 0)\n+ self.state: Tuple[int, int] = (0, 0)\nasync def get_token(self, *args, **kwargs) -> str:\nindex = self.state[1]\n@@ -72,7 +74,7 @@ class ClassifiedTokenGenerator(AbstractTokenGenerator):\ndef __init__(self, schema: TokenSchema):\nself.schema = schema\n- async def get_token(self, *args, **kwargs) -> str:\n+ async def get_token(self, *args, **kwargs) -> Coroutine[Any, Any, str]:\ngenerator = self.schema.get_generator(*args, *kwargs)\nreturn generator.get_token(*args, **kwargs)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -3,6 +3,7 @@ from vkbottle.api.exceptions import VKError\nfrom vkbottle.http import HTTPRequest\nfrom vkbottle.utils import logger\nfrom .token import AbstractTokenGenerator\n+\nimport time\nimport asyncio\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/generator.py",
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "@@ -8,6 +8,7 @@ def keyboard_gen(\n\"\"\"Simple keyboard constructor\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\"\"\"\nrows = pattern\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/api/template.py",
"new_path": null,
"diff": "-import typing\n-import json\n-\n-from .exceptions import VKError\n-\n-\n-class TemplateElement:\n- def __init__(\n- self,\n- title: str = None,\n- description: str = None,\n- photo_id: str = None,\n- buttons: typing.List[dict] = None,\n- action: dict = None,\n- ):\n- if not buttons:\n- raise VKError(\"Buttons are required\")\n- if not photo_id and not (title or description):\n- raise VKError(\"photo_id or title is required\")\n-\n- if isinstance(buttons, str):\n- buttons = json.loads(buttons)\n-\n- buttons = buttons.get(\"buttons\")[0]\n-\n- self.locals: typing.Dict = {\n- k: v for k, v in locals().items() if v is not None and k != \"self\"\n- }\n-\n-\n-def template_gen(*element: TemplateElement):\n- return json.dumps({\"type\": \"carousel\", \"elements\": [e.locals for e in element]})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -8,6 +8,7 @@ from vbml import Patcher, Pattern\nfrom .events import Event\nfrom vkbottle.const import __version__\nfrom vkbottle.api import HandlerError\n+from vkbottle.framework.framework.rule.filters import AbstractFilter\nfrom vkbottle.framework.framework.rule import (\nAbstractRule,\nVBMLRule,\n@@ -176,6 +177,7 @@ class MessageHandler:\nfor rule in self.default_rules + rules:\nif isinstance(rule, str):\nrule = VBMLRule(rule)\n+ if not isinstance(rule, AbstractFilter):\nrule.create(func)\ncurrent.append(rule)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/filters/builtin.py",
"new_path": "vkbottle/framework/framework/rule/filters/builtin.py",
"diff": "@@ -18,9 +18,9 @@ class AndFilter(AbstractFilter):\nclass AnyFilter(AbstractFilter):\nasync def check(self, event) -> bool:\n- return any((await rule.check(event) for rule in self.rules))\n+ return any([await rule.check(event) for rule in self.rules])\nclass AllFilter(AbstractFilter):\nasync def check(self, event) -> bool:\n- return all((await rule.check(event) for rule in self.rules))\n+ return all([await rule.check(event) for rule in self.rules])\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Filter bug fixes, small refactoring and carousel removal (#62)
|
718,838 |
09.04.2020 14:02:52
| -10,800 |
0c821f942bedf2b15ee01f4c305ced9d3324898b
|
v2.7 Fix DictBranch generator type
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/dict_branch.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "@@ -7,14 +7,12 @@ from .standart_branch import ImmutableBranchData\nfrom vkbottle.api.exceptions import BranchError\n-BRANCH_DATA = \".BRANCHES.txt\"\n-\nclass DictBranch(AbstractBranchGenerator):\ndef __init__(self):\nself._meet_up: typing.Dict[str, typing.Tuple[AbstractBranch, ImmutableBranchData]] = {}\nself._branch_queue: typing.Dict[int, AbstractBranch] = {}\n- self.generator = GeneratorType.DATABASE\n+ self.generator = GeneratorType.DICT\ndef from_function(\nself,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Fix DictBranch generator type
|
718,838 |
12.04.2020 21:03:52
| -10,800 |
bdb2938a87ec4e968715aef0b2a819380ba63f8c
|
v2.7 Add description for API, remove template documentation
|
[
{
"change_type": "DELETE",
"old_path": "docs/template.md",
"new_path": null,
"diff": "-# Template\n-## Carousel\n-Import elements:\n-```python\n-from vkbottle import template_gen, TemplateElement\n-```\n-`template_gen` - create template json by the template elements\n-\n-Example:\n-```python\n-from vkbottle import template_gen, TemplateElement, keyboard_gen\n-\n-template = template_gen(\n- TemplateElement(\n- \"A title\",\n- \"A description\",\n- \"-189607270_457240272\",\n- buttons=keyboard_gen(\n- [[\n- {\"label\": \"A button\"},\n- {\"type\": \"open_link\", \"link\": \"https://google.com\", \"label\": \"A link\"}\n- ]]\n- )\n- ),\n- TemplateElement(\n- \"A title of second element\",\n- \"Second element description\",\n- \"-189607270_457240272\",\n- buttons=keyboard_gen(\n- [[\n- {\"label\": \"A button\"},\n- {\"type\": \"open_link\", \"link\": \"https://github.com/timoniq/vkbottle\", \"label\": \"An another link\"}\n- ]]\n- )\n- )\n-)\n-```\n-To send a carousel:\n-```python\n-# I your message handler\n-await ans(\"Hurray!\", template=template)\n-```\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Add description for API, remove template documentation
|
718,838 |
12.04.2020 21:10:20
| -10,800 |
4365917a7022f8e4e5f772ab2e90d9e0ecfe08c9
|
v2.7 Fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/filters/filter.py",
"new_path": "vkbottle/framework/framework/rule/filters/filter.py",
"diff": "@@ -7,6 +7,9 @@ class AbstractFilter:\nself.rules: typing.Tuple[AbstractRule] = rules\nself.context = RuleExecute()\n+ def create(self, *args, **kwargs):\n+ pass\n+\nasync def __call__(self, event) -> bool:\nself.__init_subclass__()\nreturn await self.check(event)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Fix #60
|
718,838 |
12.04.2020 22:15:19
| -10,800 |
17c41fd3891a13497164389159dc63ea9b71249a
|
v2.7 Remove docs
|
[
{
"change_type": "DELETE",
"old_path": "docs/emulation.scheme.png",
"new_path": "docs/emulation.scheme.png",
"diff": "Binary files a/docs/emulation.scheme.png and /dev/null differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/todo - rewrite docs",
"diff": "+todo - rewrite docs\n\\ No newline at end of file\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Remove docs
|
718,838 |
13.04.2020 13:14:23
| -10,800 |
6f4e6f73c5bc0498ea2b154e07e6ecf4cb10b2cd
|
v2.7 Templates Idea
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/tests/templates/echo_bot.py",
"diff": "+from vkbottle.framework.bot.templates.echo import Echo\n+from vkbottle import Bot\n+import os\n+\n+bot = Bot(os.environ[\"TOKEN\"], debug=\"DEBUG\")\n+Echo(bot).ready().run()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/bot/templates/echo.py",
"diff": "+from .template import AbstractTemplate\n+from vkbottle.types.message import Message\n+from enum import Enum\n+import typing\n+\n+\n+class BotWorkSpace(Enum):\n+ DIALOG = 1\n+ CHAT = 2\n+\n+\n+async def echo_wrapper(ans: Message) -> str:\n+ return str(ans.text)\n+\n+\n+WorkSpace = typing.Tuple[BotWorkSpace]\n+\n+\n+class Echo(AbstractTemplate):\n+ wrapper: typing.Callable = echo_wrapper\n+ work_space: WorkSpace = ()\n+\n+ def ready(\n+ self,\n+ workspace: WorkSpace = (BotWorkSpace.DIALOG, BotWorkSpace.CHAT)\n+ ) -> \"Echo\":\n+ self.bot.on.message_handler.add_handler(echo_wrapper)\n+ return self\n+\n+ def run(self, skip_updates: bool = True, **kwargs):\n+ self.bot.run_polling(skip_updates=skip_updates, **kwargs)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/bot/templates/template.py",
"diff": "+from abc import ABC, abstractmethod\n+from ..bot import AnyBot\n+\n+class AbstractTemplate(ABC):\n+ def __init__(self, bot: AnyBot):\n+ self.bot: AnyBot = bot\n+\n+ @abstractmethod\n+ def ready(self, *args, **kwargs) -> \"AbstractTemplate\":\n+ pass\n+\n+ @abstractmethod\n+ def run(self, *args, **kwargs):\n+ pass\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Templates Idea
|
718,838 |
13.04.2020 13:41:01
| -10,800 |
eb8da55564ff245990c36ed72e7da853a8acb0e9
|
v2.7 Templates optimization
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/templates/echo_bot.py",
"new_path": "examples/tests/templates/echo_bot.py",
"diff": "from vkbottle.framework.bot.templates.echo import Echo\n-from vkbottle import Bot\nimport os\n-bot = Bot(os.environ[\"TOKEN\"], debug=\"DEBUG\")\n-Echo(bot).ready().run()\n+Echo(os.environ[\"TOKEN\"]).ready().run()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/templates/template.py",
"new_path": "vkbottle/framework/bot/templates/template.py",
"diff": "from abc import ABC, abstractmethod\n-from ..bot import AnyBot\n+from ..bot import AnyBot, Bot\n+import typing\nclass AbstractTemplate(ABC):\n- def __init__(self, bot: AnyBot):\n+ def __init__(self, bot: typing.Union[AnyBot, str], **kwargs):\n+ if isinstance(bot, str):\n+ bot = Bot(bot, **kwargs)\nself.bot: AnyBot = bot\n@abstractmethod\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Templates optimization
|
718,838 |
13.04.2020 13:59:31
| -10,800 |
e01b0a983b0a94960fdfb1f5d1de2657c2654110
|
v2.7 Change version + fix photo types
|
[
{
"change_type": "DELETE",
"old_path": "__init__.py",
"new_path": "__init__.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,7 +9,7 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.6\",\n+ version=\"2.7\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"2.6 Released 25.03.2020 01:00\" # Package VKBottle version\n+__version__ = \"2.7 Released 13.04.2020 14:00\" # Package VKBottle version\n-__author__ = \"Arseniy Timonik\"\n+__author__ = \"Arsenii Timoniq\"\nAPI_VERSION = 5.103 # VK Api version\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/photos.py",
"new_path": "vkbottle/types/objects/photos.py",
"diff": "@@ -72,12 +72,12 @@ class Photo(BaseModel):\ndate: int = None\nheight: int = None\nid: int = None\n- images: typing.List = None\n+ images: typing.List[Image] = None\nlat: float = None\nlong: float = None\nowner_id: int = None\npost_id: int = None\n- sizes: typing.List = None\n+ sizes: typing.List[\"PhotoSizes\"] = None\ntext: str = None\nuser_id: int = None\nwidth: int = None\n@@ -102,7 +102,7 @@ class PhotoAlbumFull(BaseModel):\nid: int = None\nowner_id: int = None\nsize: int = None\n- sizes: typing.List = None\n+ sizes: typing.List[\"PhotoSizes\"] = None\nthumb_id: int = None\nthumb_is_last: \"base.BoolInt\" = None\nthumb_src: str = None\n@@ -119,7 +119,7 @@ class PhotoFull(BaseModel):\ndate: int = None\nheight: int = None\nid: int = None\n- images: typing.List = None\n+ images: typing.List[Image] = None\nlat: float = None\nlikes: \"base.Likes\" = None\nlong: float = None\n@@ -154,7 +154,7 @@ class PhotoFullXtrRealOffset(BaseModel):\npost_id: int = None\nreal_offset: int = None\nreposts: \"base.ObjectCount\" = None\n- sizes: typing.List = None\n+ sizes: typing.List[\"PhotoSizes\"] = None\ntags: \"base.ObjectCount\" = None\ntext: str = None\nuser_id: int = None\n@@ -225,7 +225,7 @@ class PhotoXtrRealOffset(BaseModel):\nphoto_807: str = None\npost_id: int = None\nreal_offset: int = None\n- sizes: typing.List = None\n+ sizes: typing.List[\"PhotoSizes\"] = None\ntext: str = None\nuser_id: int = None\nwidth: int = None\n@@ -248,7 +248,7 @@ class PhotoXtrTagInfo(BaseModel):\nphoto_807: str = None\nplacer_id: int = None\npost_id: int = None\n- sizes: typing.List = None\n+ sizes: typing.List[\"PhotoSizes\"] = None\ntag_created: int = None\ntag_id: int = None\ntext: str = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Change version + fix photo types
|
718,838 |
13.04.2020 14:55:49
| -10,800 |
8defc4f1bb3e938143a85f4b6fceeacb9be91c4c
|
v2.7 Add some beautiful properties to Message
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -23,6 +23,14 @@ class Message(MessageType, GetApi):\ndef chat_id(self) -> int:\nreturn self.peer_id - 2000000000\n+ @property\n+ def from_chat(self) -> bool:\n+ return self.peer_id > 2e9\n+\n+ @property\n+ def from_user(self) -> bool:\n+ return self.from_id > 0\n+\nasync def reply(\nself,\nmessage: str = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Add some beautiful properties to Message
|
718,838 |
13.04.2020 17:14:27
| -10,800 |
28e01cf36147784ab32be106a147901edae9f4f0
|
v2.7 fix types
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -49,7 +49,10 @@ class User(HTTP):\n)\nself.on: UserHandler = UserHandler()\n- self.logger = LoggerLevel(\"INFO\" if debug else \"ERROR\")\n+ if isinstance(debug, bool):\n+ debug = \"INFO\" if debug else \"ERROR\"\n+\n+ self.logger = LoggerLevel(debug)\nlogger.remove()\nlogger.add(\nsys.stderr,\n@@ -155,6 +158,7 @@ class User(HTTP):\n)\nasync def emulate(self, event: dict):\n+ logger.debug(f\"Response: {event}\")\nfor update in event.get(\"updates\", []):\nupdate_code, update_fields = update[0], update[1:]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/event.py",
"new_path": "vkbottle/types/events/event.py",
"diff": "@@ -4,9 +4,9 @@ from vkbottle.types.base import BaseModel\nfrom . import events_objects as EventsObjects\nfrom vkbottle.types.message import Message\n-from vkbottle.types.attachments import Photo, Audio, Video\n+from vkbottle.types import objects\n-from vkbottle.types.wall_post import WallPost\n+from vkbottle.types.objects.wall import Wallpost\n# https://vk.com/dev/groups_events\n@@ -34,7 +34,7 @@ class MessageDeny(BaseEvent):\nclass PhotoNew(BaseEvent):\n- object: Photo = None\n+ object: objects.photos.Photo = None\nclass PhotoCommentNew(BaseEvent):\n@@ -54,11 +54,11 @@ class PhotoCommentDelete(BaseEvent):\nclass AudioNew(BaseEvent):\n- object: Audio = None\n+ object: objects.audio.Audio = None\nclass VideoNew(BaseEvent):\n- object: Video = None\n+ object: objects.video.Video = None\nclass VideoCommentNew(BaseEvent):\n@@ -78,7 +78,7 @@ class VideoCommentDelete(BaseEvent):\nclass WallPostNew(BaseEvent):\n- object: WallPost = None\n+ object: Wallpost = None\nclass WallRepost(WallPostNew):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/__init__.py",
"new_path": "vkbottle/types/objects/__init__.py",
"diff": "from . import account\nfrom . import apps\nfrom . import ads\n+from . import audio\nfrom . import base\nfrom . import board\nfrom . import database\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -92,7 +92,7 @@ class GetConversationMembersModel(BaseModel):\nclass GetConversationsById(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[\"Conversation\"] = None\nclass GetConversationsByIdModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/ok_response.py",
"new_path": "vkbottle/types/responses/ok_response.py",
"diff": "@@ -4,4 +4,4 @@ OkResponse = int\nclass OkResponseModel(BaseModel):\n- response: int = 0\n+ response: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -19,6 +19,7 @@ class Message(BaseModel):\nrandom_id: int = None\n# from messages.getById\nid: int = None\n+ conversation_message_id: int = None\nfrom_id: int = None\ndate: int = None\nout: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 fix types
|
718,838 |
13.04.2020 18:59:08
| -10,800 |
b192ff5c062f5f33b57ee83c9f65ecac5ce17835
|
v2.7 fix shuffle_tokens example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/user/shuffle_tokens.py",
"new_path": "examples/tests/user/shuffle_tokens.py",
"diff": "-from vkbottle.user import User, types\n+from vkbottle.user import User, Message\nfrom vkbottle.api.api.builtin import LimitedTokenGenerator\nimport os\n@@ -17,7 +17,7 @@ user.api.token_generator = generator\n@user.on.message_new()\n-async def new_message(ans: types.Message):\n+async def new_message(ans: Message):\nif ans.from_id == user.user_id:\nawait ans(ans.text)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 fix shuffle_tokens example
|
718,838 |
14.04.2020 16:21:24
| -10,800 |
cdd9515808c2bc39fc116b7d20fdff8cdcbe2a4e
|
v2.7 The strangest fix i ve ever made
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "@@ -2,7 +2,7 @@ __version__ = \"2.7 Released 13.04.2020 14:00\" # Package VKBottle version\n__author__ = \"Arsenii Timoniq\"\n-API_VERSION = 5.103 # VK Api version\n+API_VERSION = \"5.103\" # VK Api version\nAPI_URL = \"https://api.vk.com/method/\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/__init__.py",
"new_path": "vkbottle/types/objects/__init__.py",
"diff": "@@ -20,7 +20,6 @@ from . import notes\nfrom . import notifications\nfrom . import orders\nfrom . import pages\n-from . import photos\nfrom . import polls\nfrom . import pretty_cards\nfrom . import search\n@@ -34,3 +33,4 @@ from . import utils\nfrom . import video\nfrom . import wall\nfrom . import widgets\n+from . import photos\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 The strangest fix i ve ever made
|
718,838 |
14.04.2020 18:26:31
| -10,800 |
6e19274ef71ea62d1adc6e7abf8929a75c326024
|
v2.7 Fix of ok_response
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/messages.py",
"new_path": "vkbottle/types/methods/messages.py",
"diff": "@@ -60,7 +60,9 @@ class MessagesCreateChat(BaseMethod):\naccess_token_type: APIAccessibility = [APIAccessibility.USER]\nasync def __call__(\n- self, user_ids: typing.List = None, title: str = None\n+ self,\n+ user_ids: typing.List = None,\n+ title: str = None,\n) -> responses.messages.CreateChat:\n\"\"\" messages.createChat\nFrom Vk Docs: Creates a chat with several participants.\n@@ -1038,6 +1040,8 @@ class MessagesSend(BaseMethod):\npayload: str = None,\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n+ expire_ttl: int = None,\n+ silent: bool = None,\n) -> responses.messages.Send:\n\"\"\" messages.send\nFrom Vk Docs: Sends a message.\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/ok_response.py",
"new_path": "vkbottle/types/responses/ok_response.py",
"diff": "from ..base import BaseModel\n+import typing\nOkResponse = int\nclass OkResponseModel(BaseModel):\n- response: int = None\n+ response: typing.Union[int, dict] = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Fix of ok_response
|
718,838 |
15.04.2020 00:06:02
| -10,800 |
54844330073ec1df491e183c4d33d0b0f3f4d820
|
v2.7 Update curious docs and add some candies to the API
+ fix LimitedTokenGenerator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "import typing\nfrom vkbottle.http import HTTPRequest\n-from vkbottle.utils import ContextInstanceMixin\n+from vkbottle.utils import ContextInstanceMixin, logger\nfrom vkbottle.types.methods import *\nfrom .request import Request\n@@ -19,7 +19,10 @@ class API(ContextInstanceMixin):\n)(tokens)\nself._http = HTTPRequest()\nself.throw_errors: bool = throw_errors\n- self.group_id: int = None\n+ self._group_id: int = None\n+ self._user_id: int = None\n+\n+ logger.debug(f\"API: using {len(tokens)} tokens, generator {generator} (can be changed)\")\n# VK Api Methods\nself.account = Account(self.api)\n@@ -79,6 +82,26 @@ class API(ContextInstanceMixin):\nraw_response=raw_response,\n)\n+ @property\n+ async def user_id(self):\n+ if self._user_id is None:\n+ current_user = await self.users.get()\n+ self._user_id = current_user[0].id\n+ return self._user_id\n+\n+ @property\n+ async def group_id(self):\n+ if self._group_id is None:\n+ current_user = await self.groups.get()\n+ self._group_id = current_user[0].id\n+ return self._group_id\n+\n+ def __dict__(self):\n+ return {\"generator\": self.token_generator.__class__.__qualname__, \"throw_errors\": self.throw_errors}\n+\n+ def __repr__(self):\n+ return f\"<API {self.__dict__()}>\"\n+\nclass UserApi(API, ContextInstanceMixin):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/builtin.py",
"new_path": "vkbottle/api/api/builtin.py",
"diff": "@@ -2,7 +2,7 @@ import random\nimport time\nimport math\n-from typing import List, Tuple, Coroutine, Any\n+from typing import List, Coroutine, Any\nfrom vkbottle.utils.logger import logger\nfrom .token import AbstractTokenGenerator\n@@ -48,22 +48,28 @@ class LimitedTokenGenerator(AbstractTokenGenerator):\n\"\"\"\nself.tokens = tokens\nself.limit: int = limit\n- self.state: Tuple[int, int] = (0, 0)\n+ self.last_time_stack = 0\n+ self.step: List[str] = []\nasync def get_token(self, *args, **kwargs) -> str:\n- index = self.state[1]\n- timestack = math.floor(time.time()) # noqa: Accuracy to second\n- if timestack == self.state[0]:\n- if index + 1 > self.limit or index + 1 < len(self.tokens):\n+ time_stack = math.ceil(time.time()) # noqa: Accuracy to second\n+\n+ if time_stack != self.last_time_stack:\n+ if self.last_time_stack == 0 or not len(self.step):\n+ self.step = self.token_sequence\n+ elif not len(self.step):\nlogger.error(\n- f'LimitedTokenGenerator is not able to avoid the limit because there are not enough tokens ({index + 1} \"{self.tokens[index][:11]}...\")'\n+ f'LimitedTokenGenerator is not able to avoid the limit because there are not enough tokens'\n)\n- self.state = (timestack, 0)\n- else:\n- self.state = (timestack, index + 1)\n- else:\n- self.state = (timestack, 0)\n- return self.tokens[index]\n+ self.step = self.token_sequence\n+\n+ self.last_time_stack = time_stack\n+ token = self.step.pop(0)\n+ return token\n+\n+ @property\n+ def token_sequence(self) -> List[str]:\n+ return sorted(self.tokens * self.limit)\nclass ClassifiedTokenGenerator(AbstractTokenGenerator):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Update curious docs and add some candies to the API
+ fix LimitedTokenGenerator
|
718,867 |
15.04.2020 02:47:45
| 18,000 |
aff24542bee97f5597cd6044b76bbf839e0b025f
|
Added setters (fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -96,6 +96,14 @@ class API(ContextInstanceMixin):\nself._group_id = current_user[0].id\nreturn self._group_id\n+ @group_id.setter\n+ def group_id(self, group_id: int):\n+ self._group_id = group_id\n+\n+ @user_id.setter\n+ def user_id(self, user_id: int):\n+ self._user_id = user_id\n+\ndef __dict__(self):\nreturn {\"generator\": self.token_generator.__class__.__qualname__, \"throw_errors\": self.throw_errors}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added setters (fix #72)
|
718,838 |
15.04.2020 14:07:36
| -10,800 |
16dd876881cf18676c6815f8e2abd3063b190b6d
|
v2.7 Added new methods
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -54,10 +54,11 @@ class Bot(HTTP, AsyncHandleManager):\n\"\"\"\nInit bot\n:param tokens: bot tokens\n- :param group_id: [auto]\n+ :param group_id:\n:param debug: should bot debug messages for emulating\n:param log_to_path: make logs\n:param secret: secret vk code for callback\n+ :param extension:\n\"\"\"\n# Base bot classifiers\nself.__tokens: typing.List[str] = [tokens] if isinstance(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/access.py",
"new_path": "vkbottle/types/methods/access.py",
"diff": "@@ -6,3 +6,4 @@ class APIAccessibility(Enum):\nSERVICE = \"service\"\nGROUP = \"group\"\nOPEN = \"open\"\n+ VKME = \"vkme\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/messages.py",
"new_path": "vkbottle/types/methods/messages.py",
"diff": "@@ -1077,6 +1077,30 @@ class MessagesSend(BaseMethod):\n)\n+class MessagesSendService(BaseMethod):\n+ access_token_type: APIAccessibility = [\n+ APIAccessibility.GROUP,\n+ APIAccessibility.VKME,\n+ ]\n+\n+ async def __call__(self, peer_id: int, action_type: str) -> responses.ok_response.OkResponse:\n+ \"\"\" messages.sendService\n+ Still no docs in vk dox\n+ \"\"\"\n+\n+ params = {\n+ k if not k.endswith(\"_\") else k[:-1]: v\n+ for k, v in locals().items()\n+ if k not in [\"self\"] and v is not None\n+ }\n+ return await self.request(\n+ \"messages.sendService\",\n+ params,\n+ response_model=responses.ok_response.OkResponseModel,\n+ )\n+\n+\n+\nclass MessagesSetActivity(BaseMethod):\naccess_token_type: APIAccessibility = [\nAPIAccessibility.USER,\n@@ -1205,6 +1229,7 @@ class Messages:\nself.search = MessagesSearch(request)\nself.search_conversations = MessagesSearchConversations(request)\nself.send = MessagesSend(request)\n+ self.send_service = MessagesSendService(request)\nself.set_activity = MessagesSetActivity(request)\nself.set_chat_photo = MessagesSetChatPhoto(request)\nself.unpin = MessagesUnpin(request)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Added new methods
|
718,838 |
15.04.2020 15:28:30
| -10,800 |
2a67bf632ae5bcd3466b0b61fafb6a68a338af07
|
v2.7 Framework docs 1/3
|
[
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -71,7 +71,7 @@ async def error_wrapper(error):\n@bot.on.chat_invite()\nasync def wrapper(ans: Message):\n- # Raising when bot is invited to chat\n+ # Is raised if bot is invited to chat\nawait ans(\"Hooray! Hi, friends!\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Framework docs 1/3
|
718,838 |
15.04.2020 16:15:32
| -10,800 |
8707a98787f93d7af89e0859811c88c297b81bfe
|
v2.7 Edit failure logs
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -26,9 +26,9 @@ async def request(\nwhile not isinstance(response, dict):\n# Works only on python 3.6+\ndelay = 1\n- logger.critical(\n+ logger.error(\n\"\\n---\"\n- f\"{time.localtime()} - DELAY {delay * 5} sec\\n\"\n+ f\"{time.strftime('%m-%d %H:%M:%S', time.localtime())} - DELAY {delay * 5} sec\\n\"\nf\"Check your internet connection. Maybe VK died, request returned: {response}\"\nf\"Error appeared after request: {method}\",\n)\n@@ -36,7 +36,7 @@ async def request(\ndelay += 1\nresponse = await session.post(url, data=params or {})\n- logger.critical(\n+ logger.success(\nf\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\nf\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\nf\"RESPONSE: {response}\\n\",\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Edit failure logs
|
718,838 |
15.04.2020 18:25:26
| -10,800 |
10ffe0c411d0863a62c7355af7c24db25fd98701
|
v2.7 Littile advantage
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -179,18 +179,21 @@ class Bot(HTTP, AsyncHandleManager):\nlogger.debug(\"Blueprints have been successfully loaded\")\n@staticmethod\n- def get_id_by_token(token: str):\n+ def get_id_by_token(token: str, throw_exc: bool = True) -> typing.Union[int, bool]:\n\"\"\"\nGet group id from token\n:param token:\n+ :param throw_exc:\n:return:\n\"\"\"\nlogger.debug(\"Making API request groups.getById to get group_id\")\nresponse = asyncio.get_event_loop().run_until_complete(\n- request(\"groups.getById\", {}, token)\n+ request(\"groups.getById\", {}, token, throw_errors=False)\n)\nif \"error\" in response:\n+ if throw_exc:\nraise VKError(\"Token is invalid\")\n+ return False\nreturn response[\"response\"][0][\"id\"]\ndef _check_secret(self, event: dict):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Littile advantage
|
718,838 |
15.04.2020 22:18:56
| -10,800 |
ddfd84bcb0a2d5fe7578ffcd6fcb5a5ce9571513
|
v2.7 Pleasure
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -76,7 +76,7 @@ class Request:\nelse self.throw_errors,\n)\n- logger.debug(f\"Response: {response}\")\n+ logger.debug(\"Response: {}\", response)\nif not response_model:\nreturn response[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -399,7 +399,7 @@ class Bot(HTTP, AsyncHandleManager):\nreturn \"ok\"\n- def __str__(self) -> str:\n+ def __repr__(self) -> str:\nreturn \"<Bot {}>\".format(self.status.as_dict)\n@property\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Pleasure
|
718,867 |
16.04.2020 04:04:11
| 18,000 |
8857685eb3da8ed1b61ad027c882b20aea0ae724
|
Added feature of debugging level selection and minor changes in User LP
|
[
{
"change_type": "MODIFY",
"old_path": "docs/todo - rewrite docs",
"new_path": "docs/todo - rewrite docs",
"diff": "-todo - rewrite docs\n\\ No newline at end of file\n+# TODO - Rewrite:\n+ 1) Rules docs\n+ 2) Validator docs\n+ 3) Complete Framework (User-bot) docs\n+ 4) Complete Uploader docs\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -11,7 +11,14 @@ from vkbottle.api import UserApi, VKError, request\nfrom vkbottle.framework.framework.handler import UserHandler\nfrom vkbottle.framework.blueprint.user import Blueprint\nfrom vkbottle.http import HTTP\n-from vkbottle.utils import logger\n+from vkbottle.utils import TaskManager, logger\n+\n+try:\n+ import uvloop\n+ asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\n+except ImportError:\n+ uvloop = None\n+\nDEFAULT_WAIT = 20\nVERSION = 3\n@@ -30,7 +37,7 @@ class User(HTTP):\nself,\ntokens: Token = None,\nuser_id: int = None,\n- debug: bool = True,\n+ debug: typing.Union[str, bool] = True,\nexpand_models: bool = True,\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n@@ -192,13 +199,22 @@ class User(HTTP):\nif task is not None:\nawait data(str(task))\n- def run_polling(self):\n- loop = self.__loop\n- try:\n- loop.run_until_complete(self.run())\n- except KeyboardInterrupt:\n- logger.error(\"Keyboard Interrupt\")\n- exit(0)\n+ def run_polling(\n+ self,\n+ *,\n+ auto_reload: bool = False,\n+ auto_reload_dir: str = \".\",\n+ on_shutdown: typing.Callable = None,\n+ on_startup: typing.Callable = None,\n+ ):\n+ task = TaskManager(self.__loop)\n+ task.add_task(self.run())\n+ task.run(\n+ auto_reload=auto_reload,\n+ on_shutdown=on_shutdown,\n+ on_startup=on_startup,\n+ auto_reload_dir=auto_reload_dir,\n+ )\nasync def expand_data(self, code: int, data):\nif code in range(6):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added feature of debugging level selection and minor changes in User LP (#75)
|
718,838 |
16.04.2020 13:01:09
| -10,800 |
d9798e6bc5046a0ef85bb6f899060c487d22066d
|
adv change in repr
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -153,11 +153,11 @@ class Handler:\ndef __repr__(self):\nreturn (\n- f\"MESSAGE HANDLERS: {len(self.message.rules)}\\n\"\n- f\"CHAT-MESSAGE HANDLERS: {len(self.chat_message.rules)}\\n\"\n+ f\"MESSAGE HANDLERS: {len(self.message.rules) + len(self.message_handler.rules)}\\n\"\n+ f\"CHAT-MESSAGE HANDLERS: {len(self.chat_message.rules + len(self.message_handler.rules))}\\n\"\nf\"EVENT HANDLERS: {len(self.event.rules)}\\n\"\n- f\"MESSAGE-PAYLOAD HANDLERS: {len(self.message.payload.rules)}\\n\"\n- f\"CHAT-MESSAGE-PAYLOAD HANDLERS: {len(self.chat_message.payload.rules)}\"\n+ f\"MESSAGE-PAYLOAD HANDLERS: {len(self.message.payload.rules) + len(self.message_handler.payload.rules)}\\n\"\n+ f\"CHAT-MESSAGE-PAYLOAD HANDLERS: {len(self.chat_message.payload.rules) + len(self.message_handler.payload.rules)}\"\n)\ndef __str__(self):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
adv change in repr
|
718,838 |
17.04.2020 18:07:22
| -10,800 |
0d6e3d5581a10096a7610cbfbffaa1feea2fd5d0
|
v2.7 Fix log
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -22,7 +22,8 @@ class API(ContextInstanceMixin):\nself._group_id: typing.Optional[int] = None\nself._user_id: typing.Optional[int] = None\n- logger.debug(f\"API: using {len(tokens)} tokens, generator {generator} (can be changed)\")\n+ logger.debug(f\"API: using {len(tokens) if tokens is not None else 0} tokens, \"\n+ f\"generator {generator} (can be changed)\")\n# VK Api Methods\nself.account = Account(self.api)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/base.py",
"new_path": "vkbottle/types/base.py",
"diff": "@@ -4,7 +4,7 @@ from vkbottle.framework.framework.extensions import dispatch\nclass BaseModel(pydantic.BaseModel):\nclass Config:\n- allow_mutation = False\n+ allow_mutation = True\nuse_enum_values = True\ndef __str__(self):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7 Fix log
|
718,838 |
18.04.2020 20:02:30
| -10,800 |
eb2a8f4eee87bc67ce0e1c6a37d9c47b7efaa406
|
v2.7.1 to pypi
|
[
{
"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\",\n+ version=\"2.7.1\",\nauthor=\"timoniq\",\ndescription=\"Working with VK by this homogenetic way and it's awesome!\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"2.7 Released 13.04.2020 14:00\" # Package VKBottle version\n+__version__ = \"2.7.1 Released 18.04.2020 20:00\" # Package VKBottle version\n__author__ = \"Arsenii Timoniq\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 to pypi
|
718,867 |
18.04.2020 15:47:14
| 18,000 |
4ec1d2de6ead7cfb648c450e2ef9c876ddb7d80c
|
Loop setter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -415,6 +415,10 @@ class Bot(HTTP, AsyncHandleManager):\ndef loop(self):\nreturn self.__loop\n+ @loop.setter\n+ def loop(self, loop: asyncio.AbstractEventLoop):\n+ self.__loop = loop\n+\n@property\ndef patcher(self):\nreturn Patcher.get_current()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -203,5 +203,9 @@ class User(HTTP, AsyncHandleManager):\ndef loop(self):\nreturn self.__loop\n+ @loop.setter\n+ def loop(self, loop: asyncio.AbstractEventLoop):\n+ self.__loop = loop\n+\ndef __repr__(self):\nreturn f\"<User {self.user_id}>\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Loop setter (#78)
|
718,838 |
19.04.2020 16:55:00
| -10,800 |
371a2dc7bd0e281c94410cdf8ed68a4e9f0255ab
|
v2.7.1 Add middlewares as a blueprint inheritance
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "@@ -8,7 +8,6 @@ from vkbottle.framework.framework.handler import (\nMiddlewareExecutor,\n)\nfrom vkbottle.framework.framework.handler.handler import Handler\n-\nfrom .abc import AbstractBlueprint\n@@ -29,9 +28,9 @@ class Blueprint(AbstractBlueprint):\ndef create(\nself,\n*,\n- familiar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api],\n+ familiar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api, MiddlewareExecutor],\n):\n- branch, extension, api_instance = familiar\n+ branch, extension, api_instance, middleware = familiar\nif not isinstance(self.branch, type(branch)):\nraise exceptions.VKError(\nf\"All blueprints should have the same branch generative type ({self.name} \"\n@@ -39,3 +38,4 @@ class Blueprint(AbstractBlueprint):\n)\nself.extension = extension\nself.api = api_instance\n+ self.middleware = middleware\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -166,6 +166,7 @@ class Bot(HTTP, AsyncHandleManager):\n\"\"\"\nself.on.concatenate(bot.on)\nself.error_handler.update(bot.error_handler.processors)\n+ self.middleware.middleware += bot.middleware.middleware\nfor branch_name, disposal in (await bot.branch.branches).items():\nself.branch.add_branch(disposal[0], name=branch_name)\nlogger.debug(\"Bot has been successfully dispatched\")\n@@ -175,7 +176,7 @@ class Bot(HTTP, AsyncHandleManager):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- blueprint.create(familiar=(self.branch, self.extension, self.api))\n+ blueprint.create(familiar=(self.branch, self.extension, self.api, self.middleware))\nself.loop.create_task(self.dispatch(blueprint))\nlogger.debug(\"Blueprints have been successfully loaded\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"new_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"diff": "+import types\n+import typing\n+\nfrom vkbottle.types import BaseModel\nfrom vkbottle.utils import logger\nfrom .middleware import Middleware\n-import typing\n-import types\nclass MiddlewareExecutor:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Add middlewares as a blueprint inheritance
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.