author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
718,838 |
19.04.2020 17:00:32
| -10,800 |
68b1ab033b1e162a0f3c76bdf2a67fb232b086dd
|
v2.7.1 Fix chat_invite, chat_mention, chat_action :bowtie: (fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -112,7 +112,6 @@ class Handler:\ndef decorator(func):\nrule = ChatActionRule(type_, rules=rules)\n- rule.create(func)\nself.chat_message.add_rules([rule], func)\nreturn func\n@@ -121,11 +120,7 @@ class Handler:\ndef chat_mention(self):\ndef decorator(func):\npattern = Pattern(pattern=r\"\\[(club|public){}\\|.*?]\".format(self.group_id))\n- print(pattern.pattern)\n- ignore_ans = len(signature(func).parameters) < 1\n-\nrule = VBMLRule(pattern)\n- rule.create(func, {\"ignore_ans\": ignore_ans})\nself.chat_message.add_rules([rule], func)\nreturn func\n@@ -134,7 +129,6 @@ class Handler:\ndef chat_invite(self):\ndef decorator(func):\nrule = ChatActionRule(\"chat_invite_user\", {\"member_id\": -self.group_id})\n- rule.create(func)\nself.chat_message.add_rules([rule], func)\nreturn func\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix chat_invite, chat_mention, chat_action :bowtie: (fix #81)
|
718,867 |
19.04.2020 10:56:55
| 18,000 |
f8fd1eabb6aeaeb0fc349280d3f2eae2293cd6d9
|
Middleware fix in Blueprint
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "@@ -16,7 +16,7 @@ class Blueprint(AbstractBlueprint):\nsuper().__init__()\n# Main workers\nself.branch: typing.Optional[AbstractBranchGenerator] = DictBranch()\n- self.middleware: MiddlewareExecutor = None\n+ self.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler()\nself.error_handler = ErrorHandler()\n@@ -28,9 +28,9 @@ class Blueprint(AbstractBlueprint):\ndef create(\nself,\n*,\n- familiar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api, MiddlewareExecutor],\n+ familiar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api],\n):\n- branch, extension, api_instance, middleware = familiar\n+ branch, extension, api_instance = familiar\nif not isinstance(self.branch, type(branch)):\nraise exceptions.VKError(\nf\"All blueprints should have the same branch generative type ({self.name} \"\n@@ -38,4 +38,3 @@ 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": "@@ -45,6 +45,7 @@ class Bot(HTTP, AsyncHandleManager):\n*,\ngroup_id: int = None,\ndebug: typing.Union[str, bool] = True,\n+ loop: asyncio.AbstractEventLoop = None,\nthrow_errors: bool = True,\nlog_to_path: typing.Union[str, bool] = None,\npatcher: Patcher = None,\n@@ -100,7 +101,7 @@ class Bot(HTTP, AsyncHandleManager):\n)\nself.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n- self.__loop = asyncio.get_event_loop()\n+ self.__loop = loop or asyncio.get_event_loop()\n# Sign assets\nself.api: Api = Api(self.__tokens, throw_errors=throw_errors)\n@@ -176,7 +177,7 @@ class Bot(HTTP, AsyncHandleManager):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- blueprint.create(familiar=(self.branch, self.extension, self.api, self.middleware))\n+ blueprint.create(familiar=(self.branch, self.extension, self.api))\nself.loop.create_task(self.dispatch(blueprint))\nlogger.debug(\"Blueprints have been successfully loaded\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -43,12 +43,13 @@ class User(HTTP, AsyncHandleManager):\ntokens: Token = None,\nuser_id: int = None,\ndebug: typing.Union[str, bool] = True,\n+ loop: asyncio.AbstractEventLoop = None,\nexpand_models: bool = True,\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n):\nself.__tokens = [tokens] if isinstance(tokens, str) else tokens\n- self.__loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()\n+ self.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\nUserApi.set_current(self.api)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Middleware fix in Blueprint (#82)
|
718,838 |
19.04.2020 19:27:18
| -10,800 |
2af01dcf9ecf77c712c68b01a740dcd356bcf64f
|
v2.7.1 Minor advancements
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/wall.py",
"new_path": "vkbottle/types/objects/wall.py",
"diff": "@@ -127,7 +127,7 @@ class WallComment(BaseModel):\nclass Wallpost(BaseModel):\naccess_key: str = None\n- attachments: typing.List = None\n+ attachments: typing.List[\"WallpostAttachment\"] = None\ndate: int = None\nedited: int = None\nfrom_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Minor advancements
|
718,838 |
20.04.2020 10:34:34
| -10,800 |
83674656b0bb0cf7d61490702a17ae751b7d3deb
|
v2.7.1 Add poll to attachments (fix
ambulance: :ambulance: :ambulance:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "-from . import base, audio, docs, photos, video, gifts, market, wall, users, link\n+from . import base, audio, docs, photos, video, gifts, market, wall, users, link, polls\nimport typing\nfrom enum import Enum\nfrom ..base import BaseModel\n@@ -140,6 +140,7 @@ class HistoryMessageAttachment(BaseModel):\ntype: \"HistoryMessageAttachmentType\" = None\nvideo: \"video.Video\" = None\nwall: \"link.Link\" = None\n+ poll: \"polls.Poll\" = None\nclass HistoryMessageAttachmentType(Enum):\n@@ -251,6 +252,7 @@ class MessageAttachment(BaseModel):\naudio: \"audio.Audio\" = None\naudio_message: \"AudioMessage\" = None\ndoc: \"docs.Doc\" = None\n+ poll: \"polls.Poll\" = None\ngift: \"gifts.Layout\" = None\ngraffiti: \"Graffiti\" = None\nlink: \"link.Link\" = None\n@@ -270,6 +272,7 @@ class MessageAttachmentType(Enum):\nvideo = \"video\"\ndoc = \"doc\"\nlink = \"link\"\n+ poll = \"poll\"\nmarket = \"market\"\nmarket_album = \"market_album\"\ngift = \"gift\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/polls.py",
"new_path": "vkbottle/types/objects/polls.py",
"diff": "@@ -14,7 +14,7 @@ class Answer(BaseModel):\nclass Poll(BaseModel):\nanonymous: bool = None\nanswer_id: int = None\n- answers: typing.List = None\n+ answers: typing.List[Answer] = None\ncreated: int = None\nid: int = None\nowner_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Add poll to attachments (fix #74)
:ambulance: :ambulance: :ambulance:
|
718,838 |
20.04.2020 21:09:42
| -10,800 |
8db3536a084d45969eb9537c3fc637b921e3ccf8
|
v2.7.1 Fix expand_data
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -2,7 +2,6 @@ import asyncio\nimport sys\nimport traceback\nimport typing\n-\nfrom vbml import Patcher\nfrom vkbottle.http import HTTP\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -100,13 +100,11 @@ class AsyncHandleManager:\ntask = await rule.call(message, *args, **kwargs)\nreturn task\n- async def expand_data(self, code: int, data):\n+ async def expand_data(self, code: int, data: dict) -> dict:\nif code in range(6):\n- data.update(\n- (await self.api.messages.get_by_id(message_ids=data[\"message_id\"]))\n- .items[0]\n- .dict()\n- )\n+ exp = (await self.api.messages.get_by_id(message_ids=data[\"message_id\"])).items\n+ if len(exp):\n+ data.update(exp[0].dict())\nreturn data\nasync def _branched_processor(self, message: Message, middleware_args: list):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix expand_data
|
718,838 |
20.04.2020 21:22:06
| -10,800 |
09c963726bf2b6bb6329430d900abaa2e8548151
|
v2.7.1 New event chat_info_edit :cat2:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/events.py",
"new_path": "vkbottle/framework/framework/handler/user/events.py",
"diff": "@@ -237,7 +237,11 @@ class UserEvents:\nrule = UserLongPollEventRule(52, *rules)\nrule.create(\nfunc,\n- {\"name\": \"chat_info_edit\", \"data\": [\"type_id\", \"peer_id\", \"info\"]},\n+ {\n+ \"name\": \"chat_info_edit\",\n+ \"data\": [\"type_id\", \"peer_id\", \"info\"],\n+ \"dataclass\": events.ChatInfoEdit,\n+ },\n)\nself.rules.append(rule)\nreturn func\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/user_longpoll.py",
"new_path": "vkbottle/types/events/user_longpoll.py",
"diff": "@@ -15,6 +15,7 @@ class UserEvents(IntEnum):\ninstall_dialog_flags = 12\ndelete_messages = 13\ntopic_params_change = 51\n+ chat_info_edit = 52\ndialog_typing_state = 61\nconversation_typing_state = 62\ncall = 70\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/events.py",
"new_path": "vkbottle/types/user_longpoll/events.py",
"diff": "@@ -100,3 +100,9 @@ class ChangedNotificationsSettings(BaseModel):\npeer_id: int\nsound: int\ndisabled_until: int\n+\n+\n+class ChatInfoEdit(BaseModel):\n+ type_id: int\n+ peer_id: int\n+ info: typing.Union[str, int]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 New event chat_info_edit :cat2:
|
718,838 |
20.04.2020 21:40:35
| -10,800 |
6da2b86bad983c1525d981b7c10c305d91ee20a1
|
v2.7.1 Add two events to user lp :cat2: :cat2:
+ chat_restore
+ chat_voice_message_states
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/events.py",
"new_path": "vkbottle/framework/framework/handler/user/events.py",
"diff": "@@ -213,7 +213,9 @@ class UserEvents:\nrule.create(\nfunc,\n{\n- \"name\": \"chat_restore\", \"data\": [\"peer_id\", \"local_id\"],\n+ \"name\": \"chat_restore\",\n+ \"data\": [\"peer_id\", \"local_id\"],\n+ \"dataclass\": events.RestoreDeleted,\n},\n)\nself.rules.append(rule)\n@@ -225,7 +227,12 @@ class UserEvents:\ndef decorator(func):\nrule = UserLongPollEventRule(51, *rules)\nrule.create(\n- func, {\"name\": \"chat_edit\", \"data\": [\"chat_id\", \"self\"]},\n+ func,\n+ {\n+ \"name\": \"chat_edit\",\n+ \"data\": [\"chat_id\", \"self\"],\n+ \"dataclass\": events.ChatEdit,\n+ },\n)\nself.rules.append(rule)\nreturn func\n@@ -288,6 +295,7 @@ class UserEvents:\n{\n\"name\": \"chat_voice_message_states\",\n\"data\": [\"user_ids\", \"peer_id\", \"total_count\", \"ts\"],\n+ \"dataclass\": events.ChatVoiceMessageStates,\n},\n)\nself.rules.append(rule)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/user_longpoll.py",
"new_path": "vkbottle/types/events/user_longpoll.py",
"diff": "@@ -14,10 +14,12 @@ class UserEvents(IntEnum):\nreplace_dialog_flags = 11\ninstall_dialog_flags = 12\ndelete_messages = 13\n+ chat_restore = 14\ntopic_params_change = 51\nchat_info_edit = 52\ndialog_typing_state = 61\nconversation_typing_state = 62\n+ chat_voice_message_states = 64\ncall = 70\ncounter = 80\nnotifications_settings_changed = 114\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/events.py",
"new_path": "vkbottle/types/user_longpoll/events.py",
"diff": "@@ -102,7 +102,23 @@ class ChangedNotificationsSettings(BaseModel):\ndisabled_until: int\n+class RestoreDeleted(DeleteMessages):\n+ pass\n+\n+\nclass ChatInfoEdit(BaseModel):\ntype_id: int\npeer_id: int\ninfo: typing.Union[str, int]\n+\n+\n+class ChatVoiceMessageStates(BaseModel):\n+ user_ids: typing.List[int]\n+ peer_id: int\n+ total_count: int\n+ ts: typing.Optional[int] = None\n+\n+\n+class ChatEdit(BaseModel):\n+ chat_id: int\n+ self: int\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Add two events to user lp :cat2: :cat2:
+ chat_restore
+ chat_voice_message_states
|
718,889 |
21.04.2020 13:04:07
| -18,000 |
ea306283fe2837d22748db980259e7ce87b22262
|
v2.7.1 Types typo
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/wall.py",
"new_path": "vkbottle/types/objects/wall.py",
"diff": "@@ -109,7 +109,7 @@ class Views(BaseModel):\nclass WallComment(BaseModel):\n- attachments: typing.List = None\n+ attachments: typing.List[CommentAttachment] = None\ndate: int = None\nfrom_id: int = None\nid: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Types typo (#85)
|
718,838 |
21.04.2020 17:52:28
| -10,800 |
971bc11c3f4575116340b640c960e01b89c114e3
|
v2.7.1 Add params to get_token
|
[
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -22,11 +22,5 @@ setuptools.setup(\n\"Programming Language :: Python :: 3.7\",\n\"Operating System :: OS Independent\",\n],\n- install_requires=[\n- \"aiohttp\",\n- \"pydantic\",\n- \"contextvars\",\n- \"vbml\",\n- \"watchgod\",\n- ],\n+ install_requires=[\"aiohttp\", \"pydantic\", \"contextvars\", \"vbml\", \"watchgod\",],\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -70,7 +70,7 @@ class Request:\nresponse = await request(\nmethod,\nparams,\n- await self.token_generator.get_token(),\n+ await self.token_generator.get_token(method=method, params=params),\nthrow_errors=throw_errors\nif throw_errors is not None\nelse self.throw_errors,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/user.py",
"new_path": "vkbottle/framework/blueprint/user.py",
"diff": "from vkbottle.api import api\n-from vkbottle.framework.framework.handler import (\n- ErrorHandler,\n-)\n+from vkbottle.framework.framework.handler import ErrorHandler\nfrom vkbottle.framework.framework.handler.user.handler import Handler\nfrom .abc import AbstractBlueprint\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/events.py",
"new_path": "vkbottle/framework/framework/handler/user/events.py",
"diff": "import typing\n-from vkbottle.framework.framework.rule import (\n- UserLongPollEventRule,\n-)\n+from vkbottle.framework.framework.rule import UserLongPollEventRule\nfrom vkbottle.types.user_longpoll import events\nADDITIONAL_FIELDS = (\"peer_id\", \"timestamp\", \"text\", \"info\", \"attachments\", \"random_id\")\n@@ -102,7 +100,8 @@ class UserEvents:\ndef decorator(func):\nrule = UserLongPollEventRule(7, *rules)\nrule.create(\n- func, {\n+ func,\n+ {\n\"name\": \"message_read_out\",\n\"data\": [\"peer_id\", \"local_id\"],\n\"dataclass\": events.OutRead,\n@@ -182,7 +181,8 @@ class UserEvents:\nrule = UserLongPollEventRule(10, *rules)\nrule.create(\nfunc,\n- {\"name\": \"chat_flag_remove\",\n+ {\n+ \"name\": \"chat_flag_remove\",\n\"data\": [\"peer_id\", \"mask\"],\n\"dataclass\": events.ResetDialogFlags,\n},\n@@ -198,7 +198,8 @@ class UserEvents:\nrule.create(\nfunc,\n{\n- \"name\": \"chat_remove\", \"data\": [\"peer_id\", \"local_id\"],\n+ \"name\": \"chat_remove\",\n+ \"data\": [\"peer_id\", \"local_id\"],\n\"dataclass\": events.DeleteMessages,\n},\n)\n@@ -311,7 +312,7 @@ class UserEvents:\n{\n\"name\": \"call\",\n\"data\": [\"user_id\", \"call_id\"],\n- \"dataclass\": events.Call\n+ \"dataclass\": events.Call,\n},\n)\nself.rules.append(rule)\n@@ -327,7 +328,7 @@ class UserEvents:\n{\n\"name\": \"left_counter\",\n\"data\": [\"counter\", \"null\"],\n- \"dataclass\": events.Counter\n+ \"dataclass\": events.Counter,\n},\n)\nself.rules.append(rule)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -37,15 +37,15 @@ class Handler:\ndef dispatch(self):\nself.message_rules.extend(\n- self.message.rules\n- + self.chat_message.rules\n- + self.message_handler.rules\n+ self.message.rules + self.chat_message.rules + self.message_handler.rules\n)\n- def message_new(self, *rules: typing.Tuple[typing.Union[AbstractRule, AbstractFilter]]):\n+ def message_new(\n+ self, *rules: typing.Tuple[typing.Union[AbstractRule, AbstractFilter]]\n+ ):\nwarnings.warn(\n\"Event message_new is deprecated, use message, chat_message, message_handler instead. See issue #77\",\n- DeprecationWarning\n+ DeprecationWarning,\n)\ndef decorator(func):\n@@ -75,7 +75,9 @@ class MessageHandler:\nself._patcher = Patcher.get_current()\nself.prefix: list = [\"/\", \"!\"]\n- def add_handled_rule(self, rules: typing.List[AbstractRule], func: typing.Callable) -> UserLongPollEventRule:\n+ def add_handled_rule(\n+ self, rules: typing.List[AbstractRule], func: typing.Callable\n+ ) -> UserLongPollEventRule:\nrule = UserLongPollEventRule(4, *rules)\nrule.create(\nfunc,\n@@ -88,7 +90,9 @@ class MessageHandler:\nself.rules.append(rule)\nreturn rule\n- def add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable) -> UserLongPollEventRule:\n+ def add_rules(\n+ self, rules: typing.List[AbstractRule], func: typing.Callable\n+ ) -> UserLongPollEventRule:\ncurrent = list()\nfor rule in self.default_rules + rules:\nif isinstance(rule, str):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -22,7 +22,9 @@ class AsyncHandleManager:\nloop: AbstractEventLoop\n_expand_models: bool\n- async def _event_processor(self, update: dict, update_code: int, update_fields: list):\n+ async def _event_processor(\n+ self, update: dict, update_code: int, update_fields: list\n+ ):\nfor rule in self.on.event.rules:\ncheck = await rule.check(update)\n@@ -61,7 +63,9 @@ class AsyncHandleManager:\nreturn await self._message_processor(*data)\nreturn await self._event_processor(*data)\n- async def _message_processor(self, update: dict, update_code: int, update_fields: list):\n+ async def _message_processor(\n+ self, update: dict, update_code: int, update_fields: list\n+ ):\nfor rule in self.on.message_rules:\ncheck = await rule.check(update)\n@@ -102,7 +106,9 @@ class AsyncHandleManager:\nasync def expand_data(self, code: int, data: dict) -> dict:\nif code in range(6):\n- exp = (await self.api.messages.get_by_id(message_ids=data[\"message_id\"])).items\n+ exp = (\n+ await self.api.messages.get_by_id(message_ids=data[\"message_id\"])\n+ ).items\nif len(exp):\ndata.update(exp[0].dict())\nreturn data\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -199,7 +199,7 @@ class User(HTTP, AsyncHandleManager):\ndef mode(self, *_):\nwarnings.warn(\n\"User LP mode specifier is abandoned, mode 234 is used as default. See issue #36\",\n- DeprecationWarning\n+ DeprecationWarning,\n)\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/user_longpoll.py",
"new_path": "vkbottle/types/events/user_longpoll.py",
"diff": "from enum import IntEnum\n+\nclass UserEvents(IntEnum):\nreplace_message_flags = 1\ninstall_message_flags = 2\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -164,8 +164,10 @@ class Conversation(BaseModel):\ncan_write: CanWrite = None\nchat_settings: ChatSettings = None\n+\nGetConversationsById.update_forward_refs()\n+\nclass ConversationsItem(BaseModel):\nconversation: Conversation = None\nlast_message: objects.messages.Message = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/events.py",
"new_path": "vkbottle/types/user_longpoll/events.py",
"diff": "from vkbottle.types.base import BaseModel\nimport typing\n+\nclass MessageFields(BaseModel):\nmessage_id: int\npeer_id: typing.Optional[int] = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Add params to get_token
|
718,867 |
21.04.2020 13:19:53
| 18,000 |
26ddac7eba5fc656236316a8f483231dd87d9b38
|
v2.7.1 Get tokens by login & password
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -13,7 +13,7 @@ from vkbottle.framework.framework.handler.user.handler import Handler\nfrom vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch\nfrom vkbottle.framework.framework.handler.middleware import MiddlewareExecutor\nfrom vkbottle.framework.blueprint.user import Blueprint\n-from vkbottle.http import HTTP\n+from vkbottle.http import HTTP, App\nfrom vkbottle.utils import TaskManager, logger\nfrom .processor import AsyncHandleManager\n@@ -40,6 +40,8 @@ class User(HTTP, AsyncHandleManager):\ndef __init__(\nself,\n+ login: str = None,\n+ password: str = None,\ntokens: Token = None,\nuser_id: int = None,\ndebug: typing.Union[str, bool] = True,\n@@ -49,6 +51,8 @@ class User(HTTP, AsyncHandleManager):\nvbml_patcher: vbml.Patcher = None,\n):\nself.__tokens = [tokens] if isinstance(tokens, str) else tokens\n+ if not tokens:\n+ self.__tokens = self.get_tokens(login, password)\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\n@@ -98,6 +102,14 @@ class User(HTTP, AsyncHandleManager):\nraise VKError(\"Token is invalid\")\nreturn response[\"response\"][0][\"id\"]\n+ @staticmethod\n+ def get_tokens(login: str, password: str) -> list:\n+ app = App(login, password)\n+ tokens = asyncio.get_event_loop().run_until_complete(\n+ app()\n+ )\n+ return tokens\n+\ndef dispatch(self, user: AnyUser):\n\"\"\"\nConcatenate handlers to current user object\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/__init__.py",
"new_path": "vkbottle/http/__init__.py",
"diff": "from .request import HTTP, HTTPRequest\n+from .app import App\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/http/app.py",
"diff": "+from vkbottle.api.exceptions import VKError\n+from .request import HTTP\n+import typing\n+\n+\n+class App(HTTP):\n+ available_apps = {\n+ \"android\": {\"client_id\": 2274003, \"client_secret\": \"hHbZxrka2uZ6jB1inYsH\"},\n+ \"iphone\": {\"client_id\": 3140623, \"client_secret\": \"VeWdmVclDCtn6ihuP1nt\"},\n+ \"desktop\": {\"client_id\": 3697615, \"client_secret\": \"AlVXZFMUqyrnABp8ncuU\"},\n+ }\n+\n+ def __init__(self, login: str, password: str):\n+ self._login = login\n+ self._password = password\n+ self._tokens: typing.List[str] = []\n+\n+ async def __call__(self) -> list:\n+ for k, v in self.available_apps.items():\n+ response = await self.request.get(\n+ \"https://oauth.vk.com/token\"\n+ \"?grant_type=password\"\n+ f\"&client_id={v['client_id']}\"\n+ f\"&client_secret={v['client_secret']}\"\n+ f\"&username={self._login}\"\n+ f\"&password={self._password}\"\n+ )\n+ if \"error\" in response:\n+ raise VKError(response[\"error_description\"])\n+ self._tokens.append(response[\"access_token\"])\n+ return self._tokens\n+\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Get tokens by login & password (#86)
|
718,838 |
22.04.2020 10:53:46
| -10,800 |
ebb4f4e262fe665670b4328626ea257d1cf038d6
|
v2.7.1 Change queue of initial args
1234:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -40,9 +40,10 @@ class User(HTTP, AsyncHandleManager):\ndef __init__(\nself,\n+ tokens: Token = None,\n+ *,\nlogin: str = None,\npassword: str = None,\n- tokens: Token = None,\nuser_id: int = None,\ndebug: typing.Union[str, bool] = True,\nloop: asyncio.AbstractEventLoop = None,\n@@ -51,8 +52,10 @@ class User(HTTP, AsyncHandleManager):\nvbml_patcher: vbml.Patcher = None,\n):\nself.__tokens = [tokens] if isinstance(tokens, str) else tokens\n- if not tokens:\n- self.__tokens = self.get_tokens(login, password)\n+\n+ if login and password:\n+ self.__tokens = [self.get_tokens(login, password)]\n+\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Change queue of initial args
:1234:
|
718,838 |
23.04.2020 16:26:45
| -10,800 |
ed7604a317aaaf9d6e8a3fe47016d53f2daa2b62
|
v2.7.1 Correct the wrong behaviour was caused by an error after the raw github request failure
due to recent github problems
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -3,7 +3,7 @@ import traceback\nfrom aiohttp import ClientSession\n-from vkbottle.const import VERSION_REST\n+from vkbottle.const import VERSION_REST, __version__\nfrom vkbottle.utils import json, logger\n@@ -73,5 +73,6 @@ class HTTP:\nurl=VERSION_REST, content_type=\"text/plain\"\n)\nif rest_status is None:\n- logger.error(\"Check your internet connection\")\n+ logger.info(\"Unable to check version! Skipping it\")\n+ return {\"version\": __version__}\nreturn rest_status\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Correct the wrong behaviour was caused by an error after the raw github request failure
due to recent github problems
|
718,838 |
24.04.2020 22:43:19
| -10,800 |
b4843111c59472443f8ea127ec8c8f92546b3431
|
v2.7.1 Fix type :beer:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/groups.py",
"new_path": "vkbottle/types/objects/groups.py",
"diff": "@@ -171,7 +171,7 @@ class Group(BaseModel):\nid: int = None\nis_admin: \"base.BoolInt\" = None\nis_advertiser: \"base.BoolInt\" = None\n- is_closed: \"GroupIsClosed\" = None\n+ is_closed: int = None\nis_member: \"base.BoolInt\" = None\nname: str = None\nphoto_100: str = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix type :beer:
|
718,867 |
24.04.2020 14:47:32
| 18,000 |
5e91e78f832f7e7d1a160310d57aa252cf902f59
|
v2.7.1 Fix error in User LP for those who use Pydroid, Termux and etc.
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -95,7 +95,7 @@ class API(ContextInstanceMixin):\n@property\nasync def group_id(self):\nif self._group_id is None:\n- current_user = await self.groups.get()\n+ current_user = await self.groups.get_by_id()\nself._group_id = current_user[0].id\nreturn self._group_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -105,7 +105,7 @@ class Bot(HTTP, AsyncHandleManager):\n# Sign assets\nself.api: Api = Api(self.__tokens, throw_errors=throw_errors)\nself.extension: AbstractExtension = extension if extension is not None else StandardExtension()\n- self.api.group_id = self.group_id\n+\nself._throw_errors: bool = throw_errors\nApi.set_current(self.api)\nAbstractExtension.set_current(self.extension)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "import typing\nimport re\n-from inspect import signature\nfrom vkbottle.utils import logger\nfrom vbml import Patcher, Pattern\n@@ -90,9 +89,8 @@ 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\"], current_rest[\"description\"],\n- ),\n+ \"You are using old version of VKBottle. Update is found: {} | {}\",\n+ current_rest[\"version\"], current_rest[\"description\"]\n)\nlogger.debug(\"Bot successfully dispatched\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -40,14 +40,15 @@ class User(HTTP, AsyncHandleManager):\ndef __init__(\nself,\n- tokens: Token = None,\n- *,\nlogin: str = None,\npassword: str = None,\n+ tokens: Token = None,\n+ *,\nuser_id: int = None,\ndebug: typing.Union[str, bool] = True,\nloop: asyncio.AbstractEventLoop = None,\nexpand_models: bool = True,\n+ mobile: bool = False,\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n):\n@@ -82,7 +83,7 @@ class User(HTTP, AsyncHandleManager):\nformat=\"<level>[<blue>VKBottle</blue>] {message}</level>\",\nfilter=self.logger,\nlevel=0,\n- enqueue=True,\n+ enqueue=mobile is False,\n)\nif log_to_path:\nlogger.add(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/app.py",
"new_path": "vkbottle/http/app.py",
"diff": "@@ -2,21 +2,21 @@ from vkbottle.api.exceptions import VKError\nfrom .request import HTTP\nimport typing\n-\n-class App(HTTP):\n- available_apps = {\n+APPS = {\n\"android\": {\"client_id\": 2274003, \"client_secret\": \"hHbZxrka2uZ6jB1inYsH\"},\n\"iphone\": {\"client_id\": 3140623, \"client_secret\": \"VeWdmVclDCtn6ihuP1nt\"},\n- \"desktop\": {\"client_id\": 3697615, \"client_secret\": \"AlVXZFMUqyrnABp8ncuU\"},\n+ \"desktop\": {\"client_id\": 3697615, \"client_secret\": \"AlVXZFMUqyrnABp8ncuU\"}\n}\n+\n+class App(HTTP):\ndef __init__(self, login: str, password: str):\nself._login = login\nself._password = password\nself._tokens: typing.List[str] = []\n- async def __call__(self) -> list:\n- for k, v in self.available_apps.items():\n+ async def __call__(self, limit: int = 3) -> list:\n+ for k, v in APPS.items():\nresponse = await self.request.get(\n\"https://oauth.vk.com/token\"\n\"?grant_type=password\"\n@@ -27,6 +27,7 @@ class App(HTTP):\n)\nif \"error\" in response:\nraise VKError(response[\"error_description\"])\n+ if len(self._tokens) < limit:\nself._tokens.append(response[\"access_token\"])\nreturn self._tokens\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix error in User LP for those who use Pydroid, Termux and etc. (#87)
|
718,889 |
25.04.2020 13:38:00
| -18,000 |
2ee666db4b7f2c5cd6e9b175809c52a94687cd46
|
v2.7.1 Auto iterable transformation in API
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -65,9 +65,14 @@ class API(ContextInstanceMixin):\nself.wall = Wall(self.api)\nself.widgets = Widgets(self.api)\n- def api(self, *args, **kwargs):\n+ def api(self, method, params, **kwargs):\n+\n+ for k, v in params.items():\n+ if isinstance(v, (tuple, list)):\n+ params[k] = ','.join(repr(i) for i in v)\n+\nrequest = Request(self.token_generator)\n- return request(*args, **kwargs)\n+ return request(method, params, **kwargs)\nasync def request(\nself,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Auto iterable transformation in API (#88)
|
718,838 |
26.04.2020 21:45:18
| -10,800 |
a8f8ec26a19770d5debe896e0059ada791bd8169
|
v2.7.1 Fix poorly merged
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -40,10 +40,10 @@ class User(HTTP, AsyncHandleManager):\ndef __init__(\nself,\n- login: str = None,\n- password: str = None,\ntokens: Token = None,\n*,\n+ login: str = None,\n+ password: str = None,\nuser_id: int = None,\ndebug: typing.Union[str, bool] = True,\nloop: asyncio.AbstractEventLoop = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix poorly merged
|
718,838 |
30.04.2020 08:19:21
| -10,800 |
a707c3ce0ecfb50c9ddf1b4d15d2e9b1a711cb6a
|
v2.7.1 Some changes + col_rule from_me
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -3,11 +3,15 @@ from vkbottle.http import HTTPRequest\nfrom vkbottle.utils import ContextInstanceMixin, logger\nfrom vkbottle.types.methods import *\n+from pydantic import BaseModel\nfrom .request import Request\nfrom .builtin import AbstractTokenGenerator, ConsistentTokenGenerator, GENERATORS\nclass API(ContextInstanceMixin):\n+ \"\"\" Main VK API object\n+ Possess user_id/group_id getters, request\n+ \"\"\"\ndef __init__(\nself,\ntokens: typing.List[str] = None,\n@@ -22,12 +26,7 @@ class API(ContextInstanceMixin):\nself._group_id: typing.Optional[int] = None\nself._user_id: typing.Optional[int] = None\n- logger.debug(\n- f\"API: using {len(tokens) if tokens is not None else 0} tokens, \"\n- f\"generator {generator} (can be changed)\"\n- )\n-\n- # VK Api Methods\n+ # VK Api Categories\nself.account = Account(self.api)\nself.ads = Ads(self.api)\nself.appwidgets = Appwidgets(self.api)\n@@ -65,8 +64,11 @@ class API(ContextInstanceMixin):\nself.wall = Wall(self.api)\nself.widgets = Widgets(self.api)\n- def api(self, method, params, **kwargs):\n-\n+ def api(self, method: str, params: dict, **kwargs) -> typing.Coroutine:\n+ \"\"\" Return an awaitable request\n+ :param method: method's name to make a request and pass to the token_generator\n+ :param params: params dict is passed to the token_generator and used to make a request\n+ \"\"\"\nfor k, v in params.items():\nif isinstance(v, (tuple, list)):\nparams[k] = ','.join(repr(i) for i in v)\n@@ -79,9 +81,10 @@ class API(ContextInstanceMixin):\nmethod: str,\nparams: dict,\nthrow_errors: typing.Optional[bool] = None,\n- response_model=None,\n+ response_model: typing.Optional[BaseModel] = None,\nraw_response: bool = False,\n- ):\n+ ) -> typing.Union[dict, BaseModel]:\n+ \"\"\"Make a request\"\"\"\nreturn await self.api(\nmethod,\nparams,\n@@ -116,6 +119,7 @@ class API(ContextInstanceMixin):\nreturn {\n\"generator\": self.token_generator.__class__.__qualname__,\n\"throw_errors\": self.throw_errors,\n+ \"tokens_amount\": len(self.token_generator),\n}\ndef __repr__(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/builtin.py",
"new_path": "vkbottle/api/api/builtin.py",
"diff": "@@ -80,6 +80,10 @@ class ClassifiedTokenGenerator(AbstractTokenGenerator):\ndef __init__(self, schema: TokenSchema):\nself.schema = schema\n+ @property\n+ def tokens(self):\n+ return []\n+\nasync 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/token.py",
"new_path": "vkbottle/api/api/token.py",
"diff": "from vkbottle.types.methods.access import APIAccessibility\n+from abc import ABC, abstractmethod\n+import typing\n+import warnings\n-class AbstractTokenGenerator:\n+class AbstractTokenGenerator(ABC):\ntokens_type: APIAccessibility = APIAccessibility.OPEN\nasync def __aenter__(self, *args, **kwargs):\nreturn await self.get_token(*args, **kwargs)\ndef __repr__(self):\n- return f\"<{self.__class__.__qualname__} tokens_type={self.tokens_type}>\"\n+ return f\"<{self.__class__.__qualname__} tokens_type={self.tokens_type} tokens_amount={self.__len__()}>\"\n+ def __len__(self):\n+ tokens: typing.Optional[typing.Iterable[str]] = getattr(self, \"tokens\")\n+ if tokens is None:\n+ warnings.warn(f\"Add property or name an attribute containing tokens '{self.__class__.__name__}.tokens'\")\n+ tokens = []\n+ return len(tokens)\n+\n+ @abstractmethod\nasync def get_token(self, *args, **kwargs) -> str:\n- ...\n+ pass\nclass Token(AbstractTokenGenerator):\ndef __init__(self, token: str):\nself.token = token\n+ @property\n+ def tokens(self) -> typing.Iterable[str]:\n+ return [self.token]\n+\nasync def get_token(self, *args, **kwargs) -> str:\nreturn self.token\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -10,6 +10,7 @@ from vkbottle.framework.framework.rule import (\nLevenshteinDisRule,\nPrivateMessage,\nChatMessage,\n+ FromMe,\n)\nfrom vkbottle.framework.framework.rule.filters import AbstractFilter\nfrom vkbottle.api.exceptions import HandlerError\n@@ -21,6 +22,7 @@ COL_RULES = {\n\"sticker\": StickerRule,\n\"levenstein\": LevenshteinDisRule,\n\"lev\": LevenshteinDisRule,\n+ \"from_me\": FromMe,\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -89,6 +89,15 @@ class StickerRule(UnionMixin):\nreturn True\n+class FromMe(AbstractMessageRule):\n+ def __init__(self, from_me: bool = True):\n+ self.from_me = from_me\n+\n+ async def check(self, message: Message) -> bool:\n+ if (message.from_id == await message.api.user_id) is self.from_me:\n+ return True\n+\n+\nclass MessageRule(AbstractMessageRule):\ndef __init__(self, message: typing.Union[str, typing.List[str]]):\nif isinstance(message, str):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -60,7 +60,6 @@ class User(HTTP, AsyncHandleManager):\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\n- UserApi.set_current(self.api)\nself._expand_models: bool = expand_models\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\n@@ -68,6 +67,8 @@ class User(HTTP, AsyncHandleManager):\nself.user_id: typing.Optional[int] = user_id or self.get_id_by_token(\nself.__tokens[0]\n)\n+ self.api.user_id = user_id\n+ UserApi.set_current(self.api)\nself.on: Handler = Handler()\nself.branch: AbstractBranchGenerator = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "import typing\n-from enum import Enum\nfrom .objects.messages import Message as MessageType\nfrom vkbottle.framework.framework.extensions import FromExtension\nfrom vkbottle.api import Api\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/message.py",
"new_path": "vkbottle/types/user_longpoll/message.py",
"diff": "@@ -2,14 +2,18 @@ from vkbottle.types.base import BaseModel\nfrom vkbottle.types.message import sep_bytes\nfrom vkbottle.types.objects.messages import MessageAction\nfrom vkbottle.types.objects.base import Geo\n-from vkbottle.api.api import UserApi\n+from vkbottle.api import UserApi\nimport random\nimport typing\n-API = UserApi.get_current\n+\n+class GetApi:\n+ @property\n+ def api(self) -> UserApi:\n+ return UserApi.get_current()\n-class Message(BaseModel):\n+class Message(BaseModel, GetApi):\nmessage_id: int = None\nflags: int = None\npeer_id: int = None\n@@ -34,7 +38,7 @@ class Message(BaseModel):\nasync def get(self) -> dict:\nreturn (\n- await API().request(\"messages.getById\", {\"message_ids\": self.message_id})\n+ await self.api.request(\"messages.getById\", {\"message_ids\": self.message_id})\n)[\"items\"][0]\n@property\n@@ -44,7 +48,7 @@ class Message(BaseModel):\nasync def reply(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\n- return await API().request(\n+ return await self.api.request(\n\"messages.send\",\ndict(\npeer_id=self.peer_id,\n@@ -62,7 +66,7 @@ class Message(BaseModel):\nlocals().update(params)\nfor message in sep_bytes(message or \"\"):\n- m = await API().request(\n+ m = await self.api.request(\n\"messages.send\",\ndict(\npeer_id=self.peer_id,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Some changes + col_rule from_me
|
718,838 |
30.04.2020 09:51:21
| -10,800 |
fb9b8c886696f72aee9f80ca1651662e4a0fcf7c
|
v2.7.1 User LP :apple: Possibility to change mode
+ Added draft handler return
+ Some improvements in typing
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/vkbottle_bot/img/2.txt",
"new_path": "examples/tests/vkbottle_bot/img/2.txt",
"diff": "-Hi, it is a silly document\n\\ No newline at end of file\n+silly document\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -165,7 +165,7 @@ class AsyncHandleManager:\n)\nawait branch.exit(answer)\n- async def _handler_return(self, handler_return, obj: dict, client_info: dict):\n+ async def _handler_return(self, handler_return, obj: dict, client_info: dict) -> bool:\n\"\"\"\nAllows use returns in handlers and operates them\n:param handler_return:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -8,7 +8,7 @@ from vkbottle.api import UserApi\nfrom vkbottle.types.user_longpoll import Message\nfrom vkbottle.framework.framework.handler.user.handler import Handler\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\n-from vkbottle.framework.framework.branch import AbstractBranchGenerator\n+from vkbottle.framework.framework.branch import AbstractBranchGenerator, Branch, ExitBranch\nfrom vkbottle.types.events import UserEvents\n@@ -102,6 +102,7 @@ class AsyncHandleManager:\nreturn\ntask = await rule.call(message, *args, **kwargs)\n+ await self._handler_return(task, data)\nreturn task\nasync def expand_data(self, code: int, data: dict) -> dict:\n@@ -150,3 +151,24 @@ class AsyncHandleManager:\n)\n)\nawait branch.exit(message)\n+\n+ async def _handler_return(self, handler_return, data: dict) -> bool:\n+ \"\"\"\n+ Allows use returns in handlers and operates them\n+ :param handler_return:\n+ :param data:\n+ :return:\n+ \"\"\"\n+ if isinstance(handler_return, Branch):\n+ await self.branch.add(\n+ data[\"peer_id\"],\n+ handler_return.branch_name,\n+ **handler_return.branch_kwargs\n+ )\n+ return True\n+ elif isinstance(handler_return, ExitBranch):\n+ await self.branch.exit(data[\"peer_id\"])\n+ return True\n+ elif handler_return is not None:\n+ await Message(**data)(str(handler_return))\n+ return False\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -51,6 +51,7 @@ class User(HTTP, AsyncHandleManager):\nmobile: bool = False,\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\n+ mode: int = 234,\n):\nself.__tokens = [tokens] if isinstance(tokens, str) else tokens\n@@ -60,6 +61,7 @@ class User(HTTP, AsyncHandleManager):\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\n+ self._mode = mode\nself._expand_models: bool = expand_models\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\n@@ -132,10 +134,10 @@ class User(HTTP, AsyncHandleManager):\nself.dispatch(blueprint)\nlogger.debug(\"Blueprints have been successfully loaded\")\n- async def get_server(self):\n+ async def get_server(self) -> dict:\n\"\"\"\nGet longPoll server for long request creation\n- :return:\n+ :return: server\n\"\"\"\nself.long_poll_server = (await self.api.messages.get_long_poll_server()).dict()\nreturn self.long_poll_server\n@@ -147,10 +149,11 @@ class User(HTTP, AsyncHandleManager):\n:return: VK LongPoll Event\n\"\"\"\ntry:\n- url = \"https://{}?act=a_check&key={}&ts={}&wait={}&mode=234&version={}\".format(\n+ url = \"https://{}?act=a_check&key={}&ts={}&wait={}&mode={}&version={}\".format(\nlong_poll_server[\"server\"],\nlong_poll_server[\"key\"],\nlong_poll_server[\"ts\"],\n+ self._mode,\nself.__wait or DEFAULT_WAIT,\nself.version or VERSION,\n)\n@@ -204,6 +207,8 @@ class User(HTTP, AsyncHandleManager):\non_shutdown: typing.Callable = None,\non_startup: typing.Callable = None,\n):\n+ \"\"\" Run loop with bot.run() task with loop.run_forever()\n+ \"\"\"\ntask = TaskManager(self.__loop)\ntask.add_task(self.run())\ntask.run(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 User LP :apple: Possibility to change mode
+ Added draft handler return
+ Some improvements in typing
|
718,838 |
30.04.2020 10:05:45
| -10,800 |
d4a549226aaf60822b314385e1102fbdf2f17578
|
v2.7.1 Added github actions
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/workflows/pythonpublish.yml",
"diff": "+# This workflows will upload a Python Package using Twine when a release is created\n+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries\n+\n+name: Upload Python Package\n+\n+on:\n+ push:\n+ branches:\n+ - safe\n+\n+jobs:\n+ deploy:\n+ runs-on: ubuntu-latest\n+ steps:\n+ - uses: actions/checkout@v2\n+ - name: Set up Python\n+ uses: actions/setup-python@v1\n+ with:\n+ python-version: '3.x'\n+ - name: Install dependencies\n+ run: |\n+ python -m pip install --upgrade pip\n+ pip install setuptools wheel twine\n+ - name: Build and publish\n+ env:\n+ TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}\n+ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}\n+ run: |\n+ python setup.py sdist bdist_wheel\n+ twine upload dist/*\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Added github actions
|
718,838 |
01.05.2020 09:51:35
| -10,800 |
71e71e9bc3be54d11d8dfe599e741d5aacbcd5c8
|
v2.7.1 Added draft error handler :boat:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "@@ -8,4 +8,4 @@ from vkbottle.framework.framework.branch import (\nCoroutineBranch,\n)\nfrom vkbottle.framework.framework.handler import Handler, Middleware\n-from .framework import rule\n+from .framework import rule, swear\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/__init__.py",
"new_path": "vkbottle/framework/framework/__init__.py",
"diff": "from .extensions import FromExtension\n+from .error_handler import swear\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/error_handler/__init__.py",
"diff": "+from .error_handler import swear\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"diff": "+import typing\n+import traceback\n+from vkbottle.utils import logger\n+\n+def swear(\n+ exception: typing.Union[Exception, typing.Tuple[Exception]],\n+ exception_handler: typing.Callable = None,\n+ ignore: bool = False,\n+) -> typing.Union[typing.Any, Exception]:\n+ \"\"\" Swear catcher allows to handle exceptions\n+ \"\"\"\n+ def decorator(func):\n+ async def wrapper(*args, **kwargs):\n+ try:\n+ return await func(*args, **kwargs)\n+ except exception as e:\n+ if ignore:\n+ return e\n+ if exception_handler is not None:\n+ await exception_handler(e, *args, **kwargs)\n+ else:\n+ logger.error(traceback.format_exc())\n+ finally:\n+ logger.debug(f\"{func.__name__} successfully handled with swear\")\n+ return wrapper\n+ return decorator\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Added draft error handler :boat:
|
718,838 |
01.05.2020 11:55:19
| -10,800 |
fb8f8fb9b2a2843e2397e58ee45cd1bcb1ebd8fc
|
v2.7.1 Added param logs_folder
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/abc.py",
"new_path": "vkbottle/framework/blueprint/abc.py",
"diff": "@@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod\nimport typing\n-class AbstractBlueprint(object, metaclass=ABCMeta):\n+class AbstractBlueprint(metaclass=ABCMeta):\n_name: typing.Optional[str] = None\n_description: typing.Optional[str] = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -51,6 +51,7 @@ class Bot(HTTP, AsyncHandleManager):\nmobile: bool = False,\nsecret: str = None,\nextension: AbstractExtension = None,\n+ logs_folder: typing.Optional[str] = None,\n):\n\"\"\"\nInit bot\n@@ -95,7 +96,7 @@ class Bot(HTTP, AsyncHandleManager):\nlogger.level(\"ERROR\", color=\"<red>\")\nif log_to_path:\nlogger.add(\n- \"log_{time}.log\" if log_to_path is True else log_to_path,\n+ (logs_folder or \"\") + \"log_{time}.log\" if log_to_path is True else log_to_path,\nrotation=\"100 MB\",\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Added param logs_folder
|
718,838 |
01.05.2020 14:14:08
| -10,800 |
1d8e60783d994b941bf8547cae77c99cefd30c20
|
v2.7.1 Blueprints can receive data
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "@@ -24,11 +24,13 @@ class Blueprint(AbstractBlueprint):\nself.api: api.Api = None\nself._name = name or \"Unknown\"\nself._description = description or \"Unknown\"\n+ self.data: dict = {}\ndef create(\nself,\n*,\nfamiliar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api],\n+ data: typing.Optional[dict] = None,\n):\nbranch, extension, api_instance = familiar\nif not isinstance(self.branch, type(branch)):\n@@ -38,3 +40,4 @@ class Blueprint(AbstractBlueprint):\n)\nself.extension = extension\nself.api = api_instance\n+ self.data = data or {}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Blueprints can receive data
|
718,838 |
01.05.2020 14:16:23
| -10,800 |
c94b6ff4278943a8a583dfc49a5be0cb362c47b8
|
v2.7.1 Change behaviour
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "@@ -40,4 +40,5 @@ class Blueprint(AbstractBlueprint):\n)\nself.extension = extension\nself.api = api_instance\n- self.data = data or {}\n+ if data is not None:\n+ self.data = data\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Change behaviour
|
718,838 |
02.05.2020 16:18:51
| -10,800 |
57c1a3a73f2a26755e60b19ec6f893b429ff32de
|
v2.7.1 Fix types + add method get_api
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .exceptions import *\n-from vkbottle.api.api import Api, UserApi, API, request\n+from vkbottle.api.api import Api, UserApi, API, request, get_api\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/__init__.py",
"new_path": "vkbottle/api/api/__init__.py",
"diff": "-from .api import API, UserApi, Api\n+from .api import API, UserApi, Api, get_api\nfrom .request import Request, request\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -132,3 +132,7 @@ class UserApi(API, ContextInstanceMixin):\nclass Api(API, ContextInstanceMixin):\npass\n+\n+\n+def get_api() -> \"API\":\n+ return Api.get_current() or UserApi.get_current()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -80,10 +80,10 @@ class GetChatModel(BaseModel):\nclass GetConversationMembers(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[\"objects.messages.ConversationMember\"] = None\nchat_restrictions: objects.messages.ChatRestrictions = None\n- profiles: typing.List = None\n- groups: typing.List = None\n+ profiles: typing.List[\"objects.users.User\"] = None\n+ groups: typing.List[\"objects.groups.Group\"] = None\nclass GetConversationMembersModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 Fix types + add method get_api
|
718,838 |
02.05.2020 21:06:38
| -10,800 |
ddc69d87bb08430e03c8efe880a1ea5a7c0983e7
|
v2.7.2 Reformat with black
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -12,6 +12,7 @@ class API(ContextInstanceMixin):\n\"\"\" Main VK API object\nPossess user_id/group_id getters, request\n\"\"\"\n+\ndef __init__(\nself,\ntokens: typing.List[str] = None,\n@@ -71,7 +72,7 @@ class API(ContextInstanceMixin):\n\"\"\"\nfor k, v in params.items():\nif isinstance(v, (tuple, list)):\n- params[k] = ','.join(repr(i) for i in v)\n+ params[k] = \",\".join(repr(i) for i in v)\nrequest = Request(self.token_generator)\nreturn request(method, params, **kwargs)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/token.py",
"new_path": "vkbottle/api/api/token.py",
"diff": "@@ -16,7 +16,9 @@ class AbstractTokenGenerator(ABC):\ndef __len__(self):\ntokens: typing.Optional[typing.Iterable[str]] = getattr(self, \"tokens\")\nif tokens is None:\n- warnings.warn(f\"Add property or name an attribute containing tokens '{self.__class__.__name__}.tokens'\")\n+ warnings.warn(\n+ f\"Add property or name an attribute containing tokens '{self.__class__.__name__}.tokens'\"\n+ )\ntokens = []\nreturn len(tokens)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -96,7 +96,9 @@ class Bot(HTTP, AsyncHandleManager):\nlogger.level(\"ERROR\", color=\"<red>\")\nif log_to_path:\nlogger.add(\n- (logs_folder or \"\") + \"log_{time}.log\" if log_to_path is True else log_to_path,\n+ (logs_folder or \"\") + \"log_{time}.log\"\n+ if log_to_path is True\n+ else log_to_path,\nrotation=\"100 MB\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -165,7 +165,9 @@ class AsyncHandleManager:\n)\nawait branch.exit(answer)\n- async def _handler_return(self, handler_return, obj: dict, client_info: dict) -> bool:\n+ async def _handler_return(\n+ self, handler_return, obj: dict, client_info: dict\n+ ) -> bool:\n\"\"\"\nAllows use returns in handlers and operates them\n:param handler_return:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"new_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"diff": "@@ -2,6 +2,7 @@ import typing\nimport traceback\nfrom vkbottle.utils import logger\n+\ndef swear(\nexception: typing.Union[Exception, typing.Tuple[Exception]],\nexception_handler: typing.Callable = None,\n@@ -9,6 +10,7 @@ def swear(\n) -> typing.Union[typing.Any, Exception]:\n\"\"\" Swear catcher allows to handle exceptions\n\"\"\"\n+\ndef decorator(func):\nasync def wrapper(*args, **kwargs):\ntry:\n@@ -22,5 +24,7 @@ def swear(\nlogger.error(traceback.format_exc())\nfinally:\nlogger.debug(f\"{func.__name__} successfully handled with swear\")\n+\nreturn wrapper\n+\nreturn decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -90,7 +90,8 @@ class Handler:\nif current_rest[\"version\"] != __version__:\nlogger.info(\n\"You are using old version of VKBottle. Update is found: {} | {}\",\n- current_rest[\"version\"], current_rest[\"description\"]\n+ current_rest[\"version\"],\n+ current_rest[\"description\"],\n)\nlogger.debug(\"Bot successfully dispatched\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -8,7 +8,11 @@ from vkbottle.api import UserApi\nfrom vkbottle.types.user_longpoll import Message\nfrom vkbottle.framework.framework.handler.user.handler import Handler\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\n-from vkbottle.framework.framework.branch import AbstractBranchGenerator, Branch, ExitBranch\n+from vkbottle.framework.framework.branch import (\n+ AbstractBranchGenerator,\n+ Branch,\n+ ExitBranch,\n+)\nfrom vkbottle.types.events import UserEvents\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -112,9 +112,7 @@ class User(HTTP, AsyncHandleManager):\n@staticmethod\ndef get_tokens(login: str, password: str) -> list:\napp = App(login, password)\n- tokens = asyncio.get_event_loop().run_until_complete(\n- app()\n- )\n+ tokens = asyncio.get_event_loop().run_until_complete(app())\nreturn tokens\ndef dispatch(self, user: AnyUser):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/app.py",
"new_path": "vkbottle/http/app.py",
"diff": "@@ -5,7 +5,7 @@ import typing\nAPPS = {\n\"android\": {\"client_id\": 2274003, \"client_secret\": \"hHbZxrka2uZ6jB1inYsH\"},\n\"iphone\": {\"client_id\": 3140623, \"client_secret\": \"VeWdmVclDCtn6ihuP1nt\"},\n- \"desktop\": {\"client_id\": 3697615, \"client_secret\": \"AlVXZFMUqyrnABp8ncuU\"}\n+ \"desktop\": {\"client_id\": 3697615, \"client_secret\": \"AlVXZFMUqyrnABp8ncuU\"},\n}\n@@ -30,4 +30,3 @@ class App(HTTP):\nif len(self._tokens) < limit:\nself._tokens.append(response[\"access_token\"])\nreturn self._tokens\n-\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Reformat with black
|
718,838 |
03.05.2020 15:41:23
| -10,800 |
ca83306b23f36f9865f1080782d0206bb800c16a
|
v2.7.2 Added error_handler to user blueprints and remove ensure_ancii from keyboard generator because with incompatibility with orjson
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/generator.py",
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "@@ -38,7 +38,7 @@ def keyboard_gen(\nkeyboard = str(\njson.dumps(\n- dict(one_time=one_time, buttons=buttons, inline=inline), ensure_ascii=False\n+ dict(one_time=one_time, buttons=buttons, inline=inline)\n)\n.encode(\"utf-8\")\n.decode(\"utf-8\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/user.py",
"new_path": "vkbottle/framework/blueprint/user.py",
"diff": "@@ -16,5 +16,6 @@ class Blueprint(AbstractBlueprint):\nself._name: str = name or \"Unknown\"\nself._description: str = description or \"Unknown\"\n- def create(self, *, api_instance: api.UserApi):\n+ def create(self, *, api_instance: api.UserApi, error_handler: VKErrorHandler):\nself.api = api_instance\n+ self.error_handler = error_handler\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -131,7 +131,7 @@ class User(HTTP, AsyncHandleManager):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- blueprint.create(api_instance=self.api)\n+ blueprint.create(api_instance=self.api, error_handler=self.error_handler)\nself.dispatch(blueprint)\nlogger.debug(\"Blueprints have been successfully loaded\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Added error_handler to user blueprints and remove ensure_ancii from keyboard generator because with incompatibility with orjson
|
718,838 |
03.05.2020 15:52:08
| -10,800 |
7a49790cbdd098a5b09b257206acb5f2d1c88249
|
v2.7.2 Added client_info
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/types/client_info.py",
"diff": "+import enum\n+\n+from .base import BaseModel\n+\n+\n+class ButtonActions(enum.Enum):\n+ text = \"text\"\n+ location = \"location\"\n+ vkpay = \"vkpay\"\n+ open_app = \"open_app\"\n+\n+\n+class ClientInfo(BaseModel):\n+ button_actions: ButtonActions\n+ keyboard: bool\n+ inline_keyboard: bool\n+ lang_id: int\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "import typing\n-from .objects.messages import Message as MessageType\n-from vkbottle.framework.framework.extensions import FromExtension\n-from vkbottle.api import Api\nfrom datetime import datetime\n+from vkbottle.api import Api\n+from vkbottle.framework.framework.extensions import FromExtension\n+from .client_info import ClientInfo\n+from .objects.messages import Message as MessageType\n+\ndef sep_bytes(text: str, max_bytes: int = 4096) -> list:\ntext = text.encode(\"utf-8\")\n@@ -18,6 +20,8 @@ class GetApi:\nclass Message(MessageType, GetApi):\n+ client_info: ClientInfo = None\n+\n@property\ndef chat_id(self) -> int:\nreturn self.peer_id - 2000000000\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/vkpay.py",
"new_path": "vkbottle/types/vkpay.py",
"diff": "-from .base import BaseModel\n-from typing import Union\nfrom datetime import datetime\n+from typing import Union\n+\n+from .base import BaseModel\nclass VKPayTransaction(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Added client_info
|
718,838 |
03.05.2020 17:34:24
| -10,800 |
41108292ab8ffaf970aa420c8cc7ad452f9574fe
|
v2.7.1 :ambulance: silly fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/client_info.py",
"new_path": "vkbottle/types/client_info.py",
"diff": "import enum\n-\n+import typing\nfrom .base import BaseModel\n@@ -12,7 +12,7 @@ class ButtonActions(enum.Enum):\nclass ClientInfo(BaseModel):\n- button_actions: ButtonActions\n+ button_actions: typing.List[ButtonActions]\nkeyboard: bool\ninline_keyboard: bool\nlang_id: int\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.1 :ambulance: silly fix
|
718,838 |
03.05.2020 19:50:38
| -10,800 |
2c171615c28cb183adc4ee8c08c59abde060e4b1
|
v2.7.2 :expressionless:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/client_info.py",
"new_path": "vkbottle/types/client_info.py",
"diff": "@@ -13,7 +13,7 @@ class ButtonActions(enum.Enum):\nclass ClientInfo(BaseModel):\n- button_actions: typing.List[ButtonActions]\n- keyboard: bool\n- inline_keyboard: bool\n- lang_id: int\n+ button_actions: typing.List[ButtonActions] = None\n+ keyboard: bool = None\n+ inline_keyboard: bool = None\n+ lang_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 :expressionless:
|
718,838 |
04.05.2020 14:04:49
| -10,800 |
d8331dbe20323d9998dd0162e4278f62ee6ad8dd
|
v2.7.2 Fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/keyboard.py",
"new_path": "vkbottle/api/keyboard/keyboard.py",
"diff": "@@ -26,7 +26,10 @@ class KeyboardButton:\n@property\ndef button(self):\n- return {\"action\": except_none_self(self.action.dict()), \"color\": self.color}\n+ b = {\"action\": except_none_self(self.action.dict())}\n+ if self.action is Text:\n+ b[\"color\"] = self.color\n+ return b\nclass Keyboard:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix #96
|
718,838 |
04.05.2020 21:58:07
| -10,800 |
9bd1448392a79f25049b9bc0d03a4a32d866b265
|
v2.7.2 Remove encoding
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -69,7 +69,7 @@ class DatabaseBranch(AbstractBranchGenerator):\nf\"Branch {branch.__name__} hasn't yet been assigned with decorator\"\n)\nbranch = 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+ await self.set_user(uid, branch, json.dumps(context))\nasync def load(\nself, uid: int\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Remove encoding
|
718,838 |
05.05.2020 10:11:16
| -10,800 |
1b3bf6760448fa9bc205986846ec5a7fc72ce8e2
|
v2.7.2 Fix friends.add response
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/friends.py",
"new_path": "vkbottle/types/responses/friends.py",
"diff": "@@ -21,7 +21,10 @@ class AddListModel(BaseModel):\nresponse: AddList = None\n-Add = typing.Dict\n+class Add(enum.IntEnum):\n+ sent = 1\n+ approved = 2\n+ resending = 4\nclass AddModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix friends.add response
|
718,838 |
05.05.2020 13:00:54
| -10,800 |
41654ef57243414df3306acc83a1ea6d3b7f0988
|
v2.7.2 Some fixes (close fix
+ secret can be received in emulate
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -124,3 +124,5 @@ dmypy.json\n# Pyre type checker\n.pyre/\n.DS_Store\n+*.db\n+.db\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "examples/tests/templates/echo_bot.py",
"new_path": "examples/tests/templates/echo_template.py",
"diff": ""
},
{
"change_type": "DELETE",
"old_path": "examples/users.db",
"new_path": "examples/users.db",
"diff": "Binary files a/examples/users.db and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "examples/users.db-shm",
"new_path": "examples/users.db-shm",
"diff": "Binary files a/examples/users.db-shm and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "examples/users.db-wal",
"new_path": "examples/users.db-wal",
"diff": "Binary files a/examples/users.db-wal and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -204,17 +204,17 @@ class Bot(HTTP, AsyncHandleManager):\nreturn False\nreturn response[\"response\"][0][\"id\"]\n- def _check_secret(self, event: dict):\n+ def _check_secret(self, event: dict, secret: typing.Optional[str] = None):\n\"\"\"\nMatch secret code with current secret\n:param event:\n:return:\n\"\"\"\n- if self.__secret:\n+ if self.__secret or secret:\nlogger.debug(\n\"Checking secret for event ({secret})\", secret=event.get(\"secret\")\n)\n- return event.get(\"secret\") == self.__secret\n+ return event.get(\"secret\") == (self.__secret or secret)\nreturn True\ndef executor_api(self, api):\n@@ -322,12 +322,16 @@ class Bot(HTTP, AsyncHandleManager):\nawait self.get_server()\nasync def emulate(\n- self, event: dict, confirmation_token: str = None\n+ self,\n+ event: dict,\n+ confirmation_token: str = None,\n+ secret: str = None,\n) -> typing.Union[str, None]:\n\"\"\"\nProcess all types of events\n:param event: VK Event (LP or CB)\n:param confirmation_token: code which confirm VK callback\n+ :param secret: secret key for callback\n:return: \"ok\"\n\"\"\"\nif not self.status.dispatched:\n@@ -345,7 +349,7 @@ class Bot(HTTP, AsyncHandleManager):\nreturn confirmation_token or \"dissatisfied\"\nupdates = event.get(\"updates\", [event])\n- if not self._check_secret(event):\n+ if not self._check_secret(event, secret=secret):\nlogger.debug(\"Aborted. Secret is invalid\")\nreturn \"access denied\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/bot/templates/answer.py",
"diff": "+from .template import AbstractTemplate\n+import typing\n+\n+\n+class Answer(AbstractTemplate):\n+ def ready(\n+ self,\n+ text: typing.Union[str, typing.List[str]],\n+ answer: str,\n+ lower: bool = True,\n+ ) -> \"Answer\":\n+\n+ async def wrapper(*_) -> str:\n+ return answer\n+\n+ self.bot.on.message_handler.add_handler(\n+ wrapper,\n+ text=text,\n+ lower=lower)\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": "MODIFY",
"old_path": "vkbottle/framework/framework/extensions/standard.py",
"new_path": "vkbottle/framework/framework/extensions/standard.py",
"diff": "from .extension import AbstractExtension\nimport random\n-from vkbottle.api.api.api import Api\n+from vkbottle.api.api.api import get_api, API\nclass StandardExtension(AbstractExtension):\ndef random_id(self):\nreturn random.randint(-2e9, 2e9)\n- def api_instance(self) -> Api:\n- return Api.get_current()\n+ def api_instance(self) -> API:\n+ return get_api()\ndef group_id(self):\nreturn self.api_instance().group_id\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Some fixes (close #69, fix #93)
+ secret can be received in emulate
|
718,838 |
06.05.2020 15:21:42
| -10,800 |
1107032d74148dcaed265a7782aea91761bdb03c
|
v2.7.2 Fix types and IntEnums
+ fixed sex
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/base.py",
"new_path": "vkbottle/types/objects/base.py",
"diff": "import typing\n-from enum import Enum\n+from enum import Enum, IntEnum\nfrom ..base import BaseModel\n@@ -77,8 +77,8 @@ class ObjectWithName(BaseModel):\nname: str = None\n-class OkResponse(Enum):\n- _1 = \"1\"\n+class OkResponse(IntEnum):\n+ ok = 1\nclass Place(BaseModel):\n@@ -95,8 +95,8 @@ class Place(BaseModel):\ntype: str = None\n-class PropertyExists(Enum):\n- _1 = \"1\"\n+class PropertyExists(IntEnum):\n+ exists = 1\nclass RepostsInfo(BaseModel):\n@@ -109,10 +109,10 @@ class RequestParam(BaseModel):\nvalue: str = None\n-class Sex(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n+class Sex(IntEnum):\n+ no = 0\n+ female = 1\n+ male = 2\nclass Sticker(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/messages.py",
"new_path": "vkbottle/types/responses/messages.py",
"diff": "@@ -13,7 +13,7 @@ class SetChatPhotoModel(BaseModel):\nresponse: SetChatPhoto = None\n-CreateChat = typing.Dict\n+CreateChat = int\nclass CreateChatModel(BaseModel):\n@@ -165,9 +165,6 @@ class Conversation(BaseModel):\nchat_settings: ChatSettings = None\n-GetConversationsById.update_forward_refs()\n-\n-\nclass ConversationsItem(BaseModel):\nconversation: Conversation = None\nlast_message: objects.messages.Message = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix types and IntEnums
+ fixed sex
|
718,838 |
06.05.2020 21:09:24
| -10,800 |
b5198c29f48f2df3814992ca3d3d594abef74358
|
v2.7.2 Fix branches + enter/exit behaviour change
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -124,5 +124,9 @@ dmypy.json\n# Pyre type checker\n.pyre/\n.DS_Store\n+\n+# Test databases\n*.db\n.db\n+*.db-shm\n+*.db-wal\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -286,14 +286,15 @@ class Bot(HTTP, AsyncHandleManager):\n\"\"\"\n:return:\n\"\"\"\n- task = TaskManager(self.__loop)\n- task.add_task(self.run(skip_updates))\n- task.run(\n+ task = TaskManager(\n+ self.__loop,\nauto_reload=auto_reload,\non_shutdown=on_shutdown,\non_startup=on_startup,\nauto_reload_dir=auto_reload_dir,\n)\n+ task.add_task(self.run(skip_updates))\n+ task.run()\nasync def run(self, skip_updates: bool, wait: int = DEFAULT_WAIT):\nself.__wait = wait\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -127,7 +127,6 @@ class AsyncHandleManager:\ndisposal, branch = await self.branch.load(answer.peer_id)\nedited = None\n- await branch.enter(answer)\nfor n, member in disposal.items():\nrules = member[1]\n@@ -163,7 +162,6 @@ class AsyncHandleManager:\n),\n)\n)\n- await branch.exit(answer)\nasync def _handler_return(\nself, handler_return, obj: dict, client_info: dict\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/cls.py",
"new_path": "vkbottle/framework/framework/branch/cls.py",
"diff": "@@ -20,13 +20,13 @@ class AbstractBranch(Copy):\nself.context = context\n...\n- async def enter(self, ans: Message):\n+ async def enter(self):\n...\nasync def branch(self, ans: Message, *args):\n...\n- async def exit(self, ans: Message):\n+ async def exit(self):\n...\ndef __repr__(self):\n@@ -34,18 +34,18 @@ class AbstractBranch(Copy):\nclass ClsBranch(AbstractBranch):\n- async def enter(self, ans: Message):\n+ async def enter(self):\nlogger.info(\"Branch {} entered at\", self.key)\n- async def exit(self, ans: Message):\n+ async def exit(self):\nlogger.info(\"Branch {} exit at\", self.key)\nclass CoroutineBranch(AbstractBranch):\n- async def enter(self, ans):\n+ async def enter(self):\nlogger.info(\"Branch {} entered at\", self.key or self.data[\"call\"].__name__)\n- async def exit(self, ans):\n+ async def exit(self):\nlogger.info(\"Branch {} exit at\", self.key or self.data[\"call\"].__name__)\nasync def branch(self, ans, *args):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -12,7 +12,6 @@ import inspect\nclass DatabaseBranch(AbstractBranchGenerator):\ndef __init__(self):\nself.names: typing.Dict[str, typing.Type[AbstractBranch]] = {}\n- self.encoding: str = \"utf-8\"\nself.generator = GeneratorType.DATABASE\n@abstractmethod\n@@ -31,6 +30,14 @@ class DatabaseBranch(AbstractBranchGenerator):\nasync def all_users(self) -> typing.List[int]:\npass\n+ def get_branch(self, branch_name: str, context: typing.Union[str, dict]) -> Branch:\n+ branch = self.names[branch_name]()\n+ if isinstance(context, str):\n+ context = json.loads(context)\n+ branch.context = context\n+ branch.key = branch_name\n+ return branch\n+\nasync def from_function(\nself, func: typing.Callable, branch_name: str = None,\n) -> typing.Tuple[AbstractBranch, ImmutableBranchData]:\n@@ -57,32 +64,38 @@ class DatabaseBranch(AbstractBranchGenerator):\nasync def branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self.names\n- async def add(self, uid: int, branch: Branch, **context):\n+ async def add(\n+ self,\n+ uid: int,\n+ branch: typing.Union[Branch, str],\n+ call_enter: bool = False,\n+ **context\n+ ):\nif isinstance(branch, str):\nif branch not in self.names:\nraise BranchError(\n- f\"Branch {branch} hasn't yet been assigned with decorator\"\n+ f\"Branch {branch!r} hasn't yet been assigned with decorator\"\n)\nelse:\nif branch not in self.names.values():\nraise BranchError(\n- f\"Branch {branch.__name__} hasn't yet been assigned with decorator\"\n+ f\"Branch {branch.__name__!r} hasn't yet been assigned with decorator\"\n)\nbranch = dict((v, k) for k, v in self.names.items())[branch]\nawait self.set_user(uid, branch, json.dumps(context))\n+ if call_enter:\n+ await self.get_branch(branch, context).enter()\n+\nasync def load(\nself, uid: int\n) -> typing.Tuple[\"AbstractBranchGenerator.Disposal\", AbstractBranch]:\nbranch_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+ branch = self.get_branch(branch_name, context)\n+\nif not branch:\nraise BranchError(\n- f'User {uid} is signed with undefined branch \"{branch_name}\"'\n+ f\"User {uid} is signed with undefined branch {branch_name!r}\"\n)\ndisposal = dict(\n@@ -91,6 +104,10 @@ class DatabaseBranch(AbstractBranchGenerator):\ndisposal[\"default\"] = [branch.__class__.branch, []]\nreturn disposal, branch\n- async def exit(self, uid: int):\n+ async def exit(self, uid: int, call_exit: bool = True):\nif uid in await self.queue:\n+ if call_exit:\n+ name, context = await self.get_user(uid)\n+ branch = self.get_branch(name, context)\n+ await branch.exit()\nawait 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": "@@ -74,6 +74,7 @@ class DictBranch(AbstractBranchGenerator):\nself,\nuid: int,\nbranch: typing.Union[typing.Callable, str, AbstractBranch],\n+ call_enter: bool = True,\n**context\n) -> AbstractBranch:\nstate, data = None, None\n@@ -107,6 +108,8 @@ class DictBranch(AbstractBranchGenerator):\nbranch = state(**data())\nbranch.create(**context)\nself._branch_queue[uid] = branch\n+ if call_enter:\n+ await branch.enter()\nreturn self._branch_queue[uid]\nasync def load(\n@@ -120,6 +123,8 @@ class DictBranch(AbstractBranchGenerator):\ndisposal[\"default\"] = [branch.__class__.branch, []]\nreturn disposal, branch\n- async def exit(self, uid: int,) -> None:\n+ async def exit(self, uid: int, call_exit: bool = True) -> None:\nif uid in self._branch_queue:\n+ if call_exit:\n+ await self._branch_queue[uid].exit()\ndel self._branch_queue[uid]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -141,7 +141,6 @@ class AsyncHandleManager:\n)\ndisposal, branch = await self.branch.load(message.peer_id)\n- await branch.enter(message)\nfor n, member in disposal.items():\nrules = member[1]\n@@ -169,7 +168,6 @@ class AsyncHandleManager:\n),\n)\n)\n- await branch.exit(message)\nasync def _handler_return(self, handler_return, data: dict) -> bool:\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -213,14 +213,15 @@ class User(HTTP, AsyncHandleManager):\n):\n\"\"\" Run loop with bot.run() task with loop.run_forever()\n\"\"\"\n- task = TaskManager(self.__loop)\n- task.add_task(self.run())\n- task.run(\n+ task = TaskManager(\n+ self.__loop,\nauto_reload=auto_reload,\non_shutdown=on_shutdown,\non_startup=on_startup,\nauto_reload_dir=auto_reload_dir,\n)\n+ task.add_task(self.run())\n+ task.run()\ndef mode(self, *_):\nwarnings.warn(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -40,6 +40,9 @@ class TaskManager:\nif len(self.tasks) < 1:\nraise RuntimeError(\"Count of tasks - 0. Add tasks.\")\ntry:\n+ if self.on_startup is not None:\n+ self.loop.run_until_complete(self.on_startup())\n+\nif self.auto_reload:\nself.loop.create_task(_auto_reload(self.auto_reload_dir))\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix branches + enter/exit behaviour change
|
718,838 |
07.05.2020 11:50:53
| -10,800 |
e47750346d0f5a7612f5de903977223ec8ff5d85
|
v2.7.2 Reformat and change uploader :cactus:
This commit can constantly affect on uploader usage, see docs
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".github/FUNDING.yml",
"diff": "+patreon: timoniq\n"
},
{
"change_type": "DELETE",
"old_path": "docs/todo - rewrite docs",
"new_path": null,
"diff": "-# 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": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -2,13 +2,6 @@ from vkbottle import Bot, Message\nbot = Bot(\"token\")\n-\"\"\"\n-Bot functions\n-Described in code comments\n-\"\"\"\n-\n-# STANDART HANDLERS\n-\n@bot.on.message(text=[\"hi\", \"hello\"])\nasync def wrapper(ans: Message):\n@@ -28,13 +21,6 @@ async def wrapper(ans: Message):\nawait ans(\"steve jobs..((((\")\n-# EVENT HANDLER\n-\n-\"\"\"\n-To recognise types, import events object from vkbottle\n-You can make type-hints to work with it easier\n-Like this:\n-\"\"\"\nfrom vkbottle.types import GroupJoin\n@@ -48,9 +34,6 @@ async def wrapper(ans: Message):\nawait ans(\"New chat name: {}\".format(ans.action.text))\n-# REGEX ARGS USAGE\n-\n-\n@bot.on.message(\"my name is <name>\")\nasync def wrapper(ans: Message, name):\nawait ans(\"your name is {}\".format(name))\n@@ -61,23 +44,13 @@ async def wrapper(ans: Message, country_code, state_code, number):\nreturn f\"{country_code + 1}{state_code}{number}\"\n-# OPTIONAL HANDLERS\n-\n-\n-@bot.error_handler(1, 3, 5)\n-async def error_wrapper(error):\n- print(\"Catching VKError with code 1, 3 or 5\", error[1])\n-\n-\n@bot.on.chat_invite()\nasync def wrapper(ans: Message):\n- # Is raised if bot is invited to chat\nawait ans(\"Hooray! Hi, friends!\")\n@bot.on.chat_mention()\nasync def wrapper(ans: Message):\n- # Raising when bot is just mentioned, in one word\nawait ans(\"I was mentioned\")\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_types.py",
"new_path": "examples/tests/branches_types.py",
"diff": "@@ -32,10 +32,6 @@ class AnotherBranch(ClsBranch):\nasync def branch(self, ans: Message, *args):\nreturn f\"Saying {self.context['word']}\"\n- async def exit(self, ans: Message):\n- await ans(self.context)\n- await ans(\"is this the escape?\")\n-\n@bot.on.message_handler(text=[\"say <word>\", \"add <word>\"])\nasync def pronounce(ans: Message, word):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/base.py",
"new_path": "vkbottle/api/uploader/base.py",
"diff": "-import typing\n-from vkbottle.framework import Bot, User\n+from vkbottle.api import API\nimport aiohttp, json\nimport ssl\nclass Uploader:\n- def __init__(\n- self, vk: typing.Union[Bot, User], generate_attachment_strings: bool = False\n- ):\n- self.vk = vk\n- self.user_instance = isinstance(vk, User)\n+ def __init__(self, api: API, generate_attachment_strings: bool = False):\n+ \"\"\" Uploader base\n+ :param api: API Instance\n+ :param generate_attachment_strings: return attachment short strings after upload\n+ \"\"\"\n+ self.api = api\nself.gas = generate_attachment_strings\n- def get_group_id(self, group_id: int = None) -> int:\n- return group_id if group_id is not None else getattr(self.vk, \"group_id\", False)\n+ async def get_group_id(self, group_id: int = None) -> int:\n+ return (\n+ group_id\n+ if group_id is not None\n+ else await getattr(self.api, \"group_id\", False)\n+ )\n- def get_owner_id(self, group_id: int = None) -> int:\n- group_id = self.get_group_id(group_id)\n- return -group_id if group_id is not False else self.vk.user_id\n+ async def get_owner_id(self, group_id: int = None) -> int:\n+ group_id = await self.get_group_id(group_id)\n+ return -group_id if group_id is not False else await self.api.user_id\n- def client(self, vk: typing.Union[Bot, User]):\n- return self.__class__(vk, self.gas)\n+ def with_api(self, api: API):\n+ return self.__class__(api, self.gas)\n@staticmethod\ndef open_pathlike(pathlike):\nif isinstance(pathlike, str):\n- pathlike = open(pathlike, \"rb\")\n+ return open(pathlike, \"rb\")\nreturn pathlike\n@staticmethod\n@@ -38,8 +42,8 @@ class Uploader:\nreturn uploader\n@staticmethod\n- def generate_attachment_string(segment: str, owner_id: int, id_: int) -> str:\n- return \"{segment}{owner_id}_{id_}\".format(**locals())\n+ def generate_attachment_string(segment: str, owner_id: int, item_id: int) -> str:\n+ return \"{segment}{owner_id}_{item_id}\".format(**locals())\ndef __repr__(self):\n- return f\"<{self.__class__.__name__} linked {self.vk.__class__.__name__}>\"\n+ return f\"<{self.__class__.__name__} linked {self.api!r}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/doc.py",
"new_path": "vkbottle/api/uploader/doc.py",
"diff": "import typing\nfrom .base import Uploader\n-from enum import Enum\nclass DocUploader(Uploader):\nasync def upload_doc_to_wall(\nself, pathlike, group_id: int = None, **params\n) -> typing.Union[str, dict]:\n- server = await self.vk.api.request(\n+ server = await self.api.request(\n\"docs.getWallUploadServer\", {\"group_id\": group_id} if group_id else {}\n)\nuploader = await self.upload(\nserver, {\"file\": self.open_pathlike(pathlike)}, params\n)\nparams = {**uploader, **params}\n- doc = await self.vk.api.request(\"docs.save\", params)\n+ doc = await self.api.request(\"docs.save\", params)\nif self.gas:\ndoc = doc[doc[\"type\"]]\nreturn self.generate_attachment_string(\"doc\", doc[\"owner_id\"], doc[\"id\"])\n@@ -23,14 +22,14 @@ class DocUploader(Uploader):\nasync def upload_doc(\nself, pathlike, group_id: int = None, **params\n) -> typing.Union[str, dict]:\n- server = await self.vk.api.request(\n+ server = await self.api.request(\n\"docs.getUploadServer\", {\"group_id\": group_id} if group_id else {}\n)\nuploader = await self.upload(\nserver, {\"file\": self.open_pathlike(pathlike)}, params\n)\nparams = {**uploader, **params}\n- doc = await self.vk.api.request(\"docs.save\", params)\n+ doc = await self.api.request(\"docs.save\", params)\nif self.gas:\ndoc = doc[doc[\"type\"]]\nreturn self.generate_attachment_string(\"doc\", doc[\"owner_id\"], doc[\"id\"])\n@@ -39,14 +38,14 @@ class DocUploader(Uploader):\nasync def upload_doc_to_message(\nself, pathlike, peer_id: int, doc_type: str = \"doc\", **params\n):\n- server = await self.vk.api.request(\n+ server = await self.api.request(\n\"docs.getMessagesUploadServer\", {\"type\": doc_type, \"peer_id\": peer_id}\n)\nuploader = await self.upload(\nserver, {\"file\": self.open_pathlike(pathlike)}, params\n)\nparams = {**uploader, **params}\n- doc = await self.vk.api.request(\"docs.save\", params)\n+ doc = await self.api.request(\"docs.save\", params)\nif self.gas:\ndoc = doc[doc[\"type\"]]\nreturn self.generate_attachment_string(\"doc\", doc[\"owner_id\"], doc[\"id\"])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/photo.py",
"new_path": "vkbottle/api/uploader/photo.py",
"diff": "@@ -14,8 +14,8 @@ class PhotoUploader(Uploader):\nif not isinstance(pathlike, list):\npathlike = [pathlike]\n- group_id = self.get_group_id(group_id)\n- server = await self.vk.api.request(\n+ group_id = await self.get_group_id(group_id)\n+ server = await self.api.request(\n\"photos.getUploadServer\", {\"album_id\": album_id, \"group_id\": group_id}\n)\nfiles = dict()\n@@ -25,7 +25,7 @@ class PhotoUploader(Uploader):\nuploader = await self.upload(server, files, params)\n- photos = await self.vk.api.request(\n+ photos = await self.api.request(\n\"photos.save\",\n{\"album_id\": album_id, \"group_id\": group_id, **uploader, **params},\n)\n@@ -37,13 +37,13 @@ class PhotoUploader(Uploader):\nreturn photos\nasync def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\n- server = await self.vk.api.request(\"photos.getWallUploadServer\", {})\n+ server = await self.api.request(\"photos.getWallUploadServer\", {})\nuploader = await self.upload(\nserver, {\"photo\": self.open_pathlike(pathlike)}, params\n)\nparams = {**uploader, **params}\n- photo = await self.vk.api.request(\"photos.saveWallPhoto\", params)\n+ photo = await self.api.request(\"photos.saveWallPhoto\", params)\nif self.gas:\nreturn self.generate_attachment_string(\n\"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n@@ -51,23 +51,23 @@ class PhotoUploader(Uploader):\nreturn photo\nasync def update_favicon(self, pathlike, group_id: int = None, **params):\n- server = await self.vk.api.request(\n+ server = await self.api.request(\n\"photos.getOwnerPhotoUploadServer\",\n{\"owner_id\": self.get_owner_id(group_id)},\n)\nuploader = await self.upload(\nserver, {\"photo\": self.open_pathlike(pathlike)}, params\n)\n- photo = await self.vk.api.request(\"photos.saveOwnerPhoto\", uploader)\n+ photo = await self.api.request(\"photos.saveOwnerPhoto\", uploader)\nreturn photo\nasync def upload_message_photo(self, pathlike, **params):\n- server = await self.vk.api.request(\"photos.getMessagesUploadServer\", params)\n+ server = await self.api.request(\"photos.getMessagesUploadServer\", params)\nuploader = await self.upload(\nserver, {\"photo\": self.open_pathlike(pathlike)}, {}\n)\n- photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n+ photo = await self.api.request(\"photos.saveMessagesPhoto\", uploader)\nif self.gas:\nreturn self.generate_attachment_string(\n\"photo\", photo[0][\"owner_id\"], photo[0][\"id\"]\n@@ -75,17 +75,17 @@ class PhotoUploader(Uploader):\nreturn photo\nasync def upload_chat_favicon(self, pathlike, chat_id: int, **params) -> str:\n- server = await self.vk.api.request(\n+ server = await self.api.request(\n\"photos.getChatUploadServer\", dict(chat_id=chat_id, **params)\n)\nuploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\nreturn uploader[\"response\"]\nasync def upload_market_photo(self, pathlike, **params):\n- server = await self.vk.api.request(\"photos.getMarketUploadServer\", params)\n+ server = await self.api.request(\"photos.getMarketUploadServer\", params)\nuploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n- photo = await self.vk.api.request(\"photos.saveMessagesPhoto\", uploader)\n- return await self.vk.api.request(\n+ photo = await self.api.request(\"photos.saveMessagesPhoto\", uploader)\n+ return await self.api.request(\n\"messages.setChatPhoto\", {\"file\": photo[\"response\"]}\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -69,7 +69,7 @@ class DatabaseBranch(AbstractBranchGenerator):\nuid: int,\nbranch: typing.Union[Branch, str],\ncall_enter: bool = False,\n- **context\n+ **context,\n):\nif isinstance(branch, str):\nif branch not in self.names:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -2,7 +2,6 @@ import sys\nimport traceback\nimport typing\nimport asyncio\n-import warnings\nimport aiohttp\nimport vbml\n@@ -66,7 +65,7 @@ class User(HTTP, AsyncHandleManager):\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself.api: UserApi = UserApi(self.__tokens)\n- self._mode = mode\n+ self.mode = mode\nself._expand_models: bool = expand_models\nself._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\n@@ -116,9 +115,11 @@ class User(HTTP, AsyncHandleManager):\nreturn response[\"response\"][0][\"id\"]\n@staticmethod\n- def get_tokens(login: str, password: str) -> list:\n+ def get_tokens(login: str, password: str, limit: int = 3) -> typing.List[str]:\napp = App(login, password)\n- tokens = asyncio.get_event_loop().run_until_complete(app())\n+ tokens = asyncio.get_event_loop().run_until_complete(\n+ app.get_tokens(limit=limit)\n+ )\nreturn tokens\ndef dispatch(self, user: AnyUser):\n@@ -146,7 +147,7 @@ class User(HTTP, AsyncHandleManager):\nself.long_poll_server = (await self.api.messages.get_long_poll_server()).dict()\nreturn self.long_poll_server\n- async def make_long_request(self, long_poll_server) -> dict:\n+ async def make_long_request(self, long_poll_server: dict) -> dict:\n\"\"\"\nMake longPoll request to the VK Server\n:param long_poll_server:\n@@ -157,7 +158,7 @@ class User(HTTP, AsyncHandleManager):\nlong_poll_server[\"server\"],\nlong_poll_server[\"key\"],\nlong_poll_server[\"ts\"],\n- self._mode,\n+ self.mode,\nself.__wait or DEFAULT_WAIT,\nself.version or VERSION,\n)\n@@ -223,12 +224,6 @@ class User(HTTP, AsyncHandleManager):\ntask.add_task(self.run())\ntask.run()\n- def mode(self, *_):\n- warnings.warn(\n- \"User LP mode specifier is abandoned, mode 234 is used as default. See issue #36\",\n- DeprecationWarning,\n- )\n-\n@property\ndef loop(self):\nreturn self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/app.py",
"new_path": "vkbottle/http/app.py",
"diff": "@@ -15,7 +15,7 @@ class App(HTTP):\nself._password = password\nself._tokens: typing.List[str] = []\n- async def __call__(self, limit: int = 3) -> list:\n+ async def get_tokens(self, limit: int = 3) -> typing.List[str]:\nfor k, v in APPS.items():\nresponse = await self.request.get(\n\"https://oauth.vk.com/token\"\n@@ -26,7 +26,7 @@ class App(HTTP):\nf\"&password={self._password}\"\n)\nif \"error\" in response:\n- raise VKError(response[\"error_description\"])\n+ raise VKError(0, response[\"error_description\"])\nif len(self._tokens) < limit:\nself._tokens.append(response[\"access_token\"])\nreturn self._tokens\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Reformat and change uploader :cactus:
This commit can constantly affect on uploader usage, see docs
|
718,838 |
08.05.2020 08:19:07
| -10,800 |
ebb1039ff0eb09f36c8b570a04a651d5a9bed5fd
|
v2.7.2 Fix IntEnums
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/ads.py",
"new_path": "vkbottle/types/objects/ads.py",
"diff": "@@ -155,9 +155,9 @@ class Criteria(BaseModel):\nclass CriteriaSex(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n+ no = 0\n+ female = 1\n+ male = 2\nclass DemoStats(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/board.py",
"new_path": "vkbottle/types/objects/board.py",
"diff": "from . import base\nimport typing\n-from enum import Enum\nfrom ..base import BaseModel\n-class DefaultOrder(Enum):\n- _1 = \"1\"\n- _2 = \"2\"\n- minus1 = \"-1\"\n- minus2 = \"-2\"\n-\n-\nclass Topic(BaseModel):\ncomments: int = None\ncreated: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/callback.py",
"new_path": "vkbottle/types/objects/callback.py",
"diff": "@@ -44,23 +44,12 @@ class GroupLeave(BaseModel):\nself: \"base.BoolInt\" = None\n-class GroupMarket(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n-\n-\n-class GroupOfficerRole(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n-\nclass GroupOfficersEdit(BaseModel):\nadmin_id: int = None\nuser_id: int = None\n- level_old: \"GroupOfficerRole\" = None\n- level_new: \"GroupOfficerRole\" = None\n+ level_old: int = None\n+ level_new: int = None\nclass GroupSettingsChanges(BaseModel):\n@@ -76,7 +65,7 @@ class GroupSettingsChanges(BaseModel):\nenable_audio: int = None\nenable_video: int = None\nenable_photo: \"groups.GroupPhotos\" = None\n- enable_market: \"GroupMarket\" = None\n+ enable_market: int = None\nclass MarketComment(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/friends.py",
"new_path": "vkbottle/types/objects/friends.py",
"diff": "from . import base\nimport typing\n-from enum import Enum\nfrom ..base import BaseModel\nclass FriendStatus(BaseModel):\n- friend_status: \"FriendStatusStatus\" = None\n+ friend_status: int = None\nread_state: \"base.BoolInt\" = None\nrequest_message: str = None\nsign: str = None\nuser_id: int = None\n-class FriendStatusStatus(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n-\n-\nclass FriendsList(BaseModel):\nid: int = None\nname: str = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/gifts.py",
"new_path": "vkbottle/types/objects/gifts.py",
"diff": "-from enum import Enum\n+from enum import IntEnum\nfrom ..base import BaseModel\n@@ -12,10 +12,10 @@ class Gift(BaseModel):\nprivacy: \"GiftPrivacy\" = None\n-class GiftPrivacy(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n+class GiftPrivacy(IntEnum):\n+ visible_name_and_message = 0\n+ visible_name = 1\n+ visible_only_owner = 2\nclass Layout(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/groups.py",
"new_path": "vkbottle/types/objects/groups.py",
"diff": "@@ -58,15 +58,7 @@ class BanInfo(BaseModel):\nis_closed: bool = None\ndate: int = None\nend_date: int = None\n- reason: \"BanInfoReason\" = None\n-\n-\n-class BanInfoReason(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n- _4 = \"4\"\n+ reason: int = None\nclass CallbackServer(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/market.py",
"new_path": "vkbottle/types/objects/market.py",
"diff": "from . import photos, base\nimport typing\n-from enum import Enum\nfrom ..base import BaseModel\n@@ -26,7 +25,7 @@ class MarketCategory(BaseModel):\nclass MarketItem(BaseModel):\naccess_key: str = None\n- availability: \"MarketItemAvailability\" = None\n+ availability: int = None\nbutton_title: str = None\ncategory: \"MarketCategory\" = None\ndate: int = None\n@@ -41,12 +40,6 @@ class MarketItem(BaseModel):\nurl: str = None\n-class MarketItemAvailability(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass MarketItemFull(MarketItem):\nalbums_ids: typing.List = None\nphotos: typing.List = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/users.py",
"new_path": "vkbottle/types/objects/users.py",
"diff": "@@ -223,7 +223,7 @@ class User(UserMin):\nonline_app: int = None\nverified: \"base.BoolInt\" = None\ntrending: \"base.BoolInt\" = None\n- friend_status: \"friends.FriendStatusStatus\" = None\n+ friend_status: int = None\nmutual: \"friends.RequestsMutual\" = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix IntEnums
|
718,838 |
08.05.2020 08:20:53
| -10,800 |
ba97d8d36d7a404bf5d2be960bb852f887da76ee
|
v2.7.2 minor fix deprecated
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/board.py",
"new_path": "vkbottle/types/responses/board.py",
"diff": "@@ -6,7 +6,6 @@ from vkbottle.types import objects\nclass GetTopics(BaseModel):\ncount: int = None\nitems: typing.List = None\n- default_order: objects.board.DefaultOrder = None\ncan_add_topics: objects.base.BoolInt = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 minor fix deprecated
|
718,838 |
08.05.2020 15:22:30
| -10,800 |
8a7638cf9b2a03cc1f8c4c3dbe1ab5609a481110
|
v2.7.2 Cosmetic changes (Refactoring)
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -28,8 +28,6 @@ from vkbottle.utils.json import USAGE\ntry:\nimport uvloop\n-\n- asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\nexcept ImportError:\nuvloop = None\n@@ -55,6 +53,8 @@ class Bot(HTTP, AsyncHandleManager):\nsecret: str = None,\nextension: AbstractExtension = None,\nlogs_folder: typing.Optional[str] = None,\n+ only_asyncio_loop: bool = False,\n+ **context,\n):\n\"\"\"\nInit bot\n@@ -74,6 +74,12 @@ class Bot(HTTP, AsyncHandleManager):\nself.__secret = secret\nself._status: BotStatus = BotStatus()\n+ self.context: dict = context\n+\n+ if uvloop is not None:\n+ if not only_asyncio_loop:\n+ asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\n+\nif isinstance(debug, bool):\ndebug = \"INFO\" if debug else \"ERROR\"\n@@ -122,7 +128,10 @@ class Bot(HTTP, AsyncHandleManager):\nself.on: Handler = Handler(self.group_id)\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\n+ self._stop: bool = False\n+\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\n+ logger.info(\"Using asyncio loop - {}\".format(asyncio.get_event_loop_policy()))\nasync def get_updates(self):\n# noqa\n@@ -286,6 +295,7 @@ class Bot(HTTP, AsyncHandleManager):\n\"\"\"\n:return:\n\"\"\"\n+ self._stop = False\ntask = TaskManager(\nself.__loop,\nauto_reload=auto_reload,\n@@ -297,6 +307,10 @@ class Bot(HTTP, AsyncHandleManager):\ntask.run()\nasync def run(self, skip_updates: bool, wait: int = DEFAULT_WAIT):\n+ \"\"\" Run bot polling forever\n+ Can be manually stopped with:\n+ bot.stop()\n+ \"\"\"\nself.__wait = wait\nlogger.debug(\"Polling will be started. Is it OK?\")\nif self.__secret is not None:\n@@ -314,7 +328,7 @@ class Bot(HTTP, AsyncHandleManager):\nawait self.get_server()\nlogger.info(\"Polling successfully started. Press Ctrl+C to stop it\")\n- while True:\n+ while not self._stop:\nevent = await self.make_long_request(self.long_poll_server)\nif isinstance(event, dict) and event.get(\"ts\"):\nself.loop.create_task(self.emulate(event))\n@@ -322,6 +336,8 @@ class Bot(HTTP, AsyncHandleManager):\nelse:\nawait self.get_server()\n+ logger.error(\"Polling was stopped\")\n+\nasync def emulate(\nself, event: dict, confirmation_token: str = None, secret: str = None,\n) -> typing.Union[str, None]:\n@@ -380,12 +396,15 @@ class Bot(HTTP, AsyncHandleManager):\nexcept:\nlogger.error(\n- \"While bot worked error occurred \\n\\n{traceback}\",\n+ \"While event was emulating error occurred \\n\\n{traceback}\",\ntraceback=traceback.format_exc(),\n)\nreturn \"ok\"\n+ def stop(self):\n+ self._stop = True\n+\ndef __repr__(self) -> str:\nreturn \"<Bot {}>\".format(self.status.as_dict)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -19,12 +19,11 @@ from vkbottle.framework.framework.handler.middleware import MiddlewareExecutor\nfrom vkbottle.framework.blueprint.user import Blueprint\nfrom vkbottle.http import HTTP, App\nfrom vkbottle.utils import TaskManager, logger\n+from vkbottle.utils.json import USAGE\nfrom .processor import AsyncHandleManager\ntry:\nimport uvloop\n-\n- asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\nexcept ImportError:\nuvloop = None\n@@ -56,9 +55,17 @@ class User(HTTP, AsyncHandleManager):\nlog_to_path: typing.Union[str, bool] = None,\nvbml_patcher: vbml.Patcher = None,\nmode: int = 234,\n+ only_asyncio_loop: bool = False,\n+ **context,\n):\nself.__tokens = [tokens] if isinstance(tokens, str) else tokens\n+ self.context: dict = context\n+\n+ if uvloop is not None:\n+ if not only_asyncio_loop:\n+ asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())\n+\nif login and password:\nself.__tokens = [self.get_tokens(login, password)]\n@@ -80,6 +87,8 @@ class User(HTTP, AsyncHandleManager):\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\n+ self._stop: bool = False\n+\nif isinstance(debug, bool):\ndebug = \"INFO\" if debug else \"ERROR\"\n@@ -99,6 +108,9 @@ class User(HTTP, AsyncHandleManager):\nrotation=\"100 MB\",\n)\n+ logger.info(\"Using JSON_MODULE - {}\".format(USAGE))\n+ logger.info(\"Using asyncio loop - {}\".format(asyncio.get_event_loop_policy().__class__.__module__))\n+\n@staticmethod\ndef get_id_by_token(token: str):\n\"\"\"\n@@ -167,6 +179,10 @@ class User(HTTP, AsyncHandleManager):\nreturn await self.make_long_request(long_poll_server)\nasync def run(self, wait: int = DEFAULT_WAIT):\n+ \"\"\" Run user polling forever\n+ Can be manually stopped with:\n+ >> user.stop()\n+ \"\"\"\nself.__wait = wait\nlogger.info(\"Polling will be started. Is it OK?\")\n@@ -174,7 +190,7 @@ class User(HTTP, AsyncHandleManager):\nself.on.dispatch()\nlogger.debug(\"User Polling successfully started\")\n- while True:\n+ while not self._stop:\ntry:\nevent = await self.make_long_request(self.long_poll_server)\nif isinstance(event, dict) and event.get(\"ts\"):\n@@ -193,12 +209,15 @@ class User(HTTP, AsyncHandleManager):\nexcept:\nlogger.error(\n- \"While user lp worked error occurred \\n\\n{}\".format(\n+ \"While user lp was running error occurred \\n\\n{}\".format(\ntraceback.format_exc()\n)\n)\n+ logger.error(\"Polling was stopped\")\n+\nasync def emulate(self, event: dict):\n+ \"\"\" Emulate event \"\"\"\nlogger.debug(\"Response: {}\", event)\nfor update in event.get(\"updates\", []):\nupdate_code, update_fields = update[0], update[1:]\n@@ -214,6 +233,7 @@ class User(HTTP, AsyncHandleManager):\n):\n\"\"\" Run loop with bot.run() task with loop.run_forever()\n\"\"\"\n+ self._stop = False\ntask = TaskManager(\nself.__loop,\nauto_reload=auto_reload,\n@@ -224,6 +244,9 @@ class User(HTTP, AsyncHandleManager):\ntask.add_task(self.run())\ntask.run()\n+ def stop(self):\n+ self._stop = True\n+\n@property\ndef loop(self):\nreturn self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -20,6 +20,7 @@ class TaskManager:\nasyncio_debug_mode: bool = False,\n):\nself.tasks: typing.List[typing.Callable] = []\n+\nself.loop: asyncio.AbstractEventLoop = loop or asyncio.get_event_loop()\nself.on_shutdown: CallableAwaitable = on_shutdown\n@@ -52,11 +53,12 @@ class TaskManager:\nexcept KeyboardInterrupt:\nlogger.info(\"Keyboard Interrupt\")\n- exit(0)\n+ self.close()\nfinally:\nif self.on_shutdown is not None:\nself.loop.run_until_complete(self.on_shutdown())\n+ if not self.loop.is_running():\nself.close()\ndef close(self):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Cosmetic changes (Refactoring)
|
718,838 |
08.05.2020 17:51:14
| -10,800 |
c87ce17eee4b0c8919909946a6c217f89e74e779
|
v2.7.2 Rule wrong type warning
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "import typing\n+import warnings\nimport re\nfrom vkbottle.utils import logger\n@@ -168,8 +169,9 @@ class MessageHandler:\ndef add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable):\ncurrent = list()\nfor rule in self.default_rules + rules:\n- if isinstance(rule, str):\n- rule = VBMLRule(rule)\n+ if not isinstance(rule, (AbstractRule, AbstractFilter)):\n+ warnings.warn(f\"Wrong rule! Got type {rule.__class__} instead of AbstractRule. Rule will be ignored\", Warning)\n+ continue\nif not isinstance(rule, AbstractFilter):\nrule.create(func)\ncurrent.append(rule)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Rule wrong type warning
|
718,838 |
10.05.2020 10:15:16
| -10,800 |
cc5eac9df74820b1b243a298825290ee01571c2c
|
v2.7.2 Fix DocPreviewPhoto
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/docs.py",
"new_path": "vkbottle/types/objects/docs.py",
"diff": "-from . import base\n+from . import base, photos\nimport typing\nfrom enum import Enum\nfrom ..base import BaseModel\n@@ -30,7 +30,7 @@ class DocPreview(BaseModel):\nclass DocPreviewPhoto(BaseModel):\n- sizes: typing.List = None\n+ sizes: typing.List[\"photos.PhotoSizes\"] = None\nclass DocPreviewVideo(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Fix DocPreviewPhoto
|
718,838 |
10.05.2020 14:26:01
| -10,800 |
f7724d53eee8a419c71a5121ccbf5453cba5f759
|
v2.7.2 Add new PhotoSizesTypes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/photos.py",
"new_path": "vkbottle/types/objects/photos.py",
"diff": "@@ -36,6 +36,8 @@ class ImageType(Enum):\ny = \"y\"\nz = \"z\"\nw = \"w\"\n+ i = \"i\"\n+ d = \"d\"\nclass MarketAlbumUploadResponse(BaseModel):\n@@ -179,6 +181,8 @@ class PhotoSizesType(Enum):\ny = \"y\"\nz = \"z\"\nw = \"w\"\n+ i = \"i\"\n+ d = \"d\"\nclass PhotoTag(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Add new PhotoSizesTypes
|
718,838 |
11.05.2020 09:15:00
| -10,800 |
ae8fa0aaf8400f151c9a5e687191756256260930
|
v2.7.2 Add raw_error field into VKError; fix typing enums
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/error_handler/error_handler.py",
"new_path": "examples/tests/error_handler/error_handler.py",
"diff": "@@ -9,6 +9,7 @@ user = User(os.environ[\"TOKEN\"])\nasync def solve_captcha(e: VKError):\n# solving captcha\n+ print(e.raw_error[\"captcha_img\"], e.raw_error[\"captcha_sid\"])\nawait e.method_requested(**e.params_requested)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -58,6 +58,7 @@ async def request(\n(request_instance, None),\n),\nparams,\n+ raw_error=response[\"error\"],\n)\nif throw_errors:\nraise exception\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/ads.py",
"new_path": "vkbottle/types/objects/ads.py",
"diff": "@@ -31,11 +31,11 @@ class Ad(BaseModel):\nad_format: int = None\nad_platform: typing.Union[int, str] = None\nall_limit: int = None\n- approved: \"AdApproved\" = None\n+ approved: int = None\ncampaign_id: int = None\ncategory1_id: int = None\ncategory2_id: int = None\n- cost_type: \"AdCostType\" = None\n+ cost_type: int = None\ncpc: int = None\ncpm: int = None\ncpa: int = None\n@@ -46,27 +46,14 @@ class Ad(BaseModel):\nimpressions_limit: int = None\nimpressions_limited: \"base.BoolInt\" = None\nname: str = None\n- status: \"AdStatus\" = None\n+ status: int = None\nvideo: \"base.BoolInt\" = None\n-class AdApproved(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n-\n-\n-class AdCostType(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass AdLayout(BaseModel):\nad_format: int = None\ncampaign_id: int = None\n- cost_type: \"AdCostType\" = None\n+ cost_type: int = None\ndescription: str = None\nid: int = None\nimage_src: str = None\n@@ -78,29 +65,17 @@ class AdLayout(BaseModel):\nvideo: \"base.BoolInt\" = None\n-class AdStatus(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass Campaign(BaseModel):\nall_limit: str = None\nday_limit: str = None\nid: int = None\nname: str = None\nstart_time: int = None\n- status: \"CampaignStatus\" = None\n+ status: int = None\nstop_time: int = None\ntype: \"CampaignType\" = None\n-class CampaignStatus(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass CampaignType(Enum):\nnormal = \"normal\"\nvk_apps_managed = \"vk_apps_managed\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/apps.py",
"new_path": "vkbottle/types/objects/apps.py",
"diff": "@@ -3,12 +3,6 @@ from enum import Enum\nfrom ..base import BaseModel\n-class AppLeaderboardType(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass AppMin(BaseModel):\ntype: \"AppType\" = None\nid: int = None\n@@ -32,7 +26,7 @@ class App(AppMin):\ngenre_id: int = None\ninternational: int = None\nis_in_catalog: int = None\n- leaderboard_type: \"AppLeaderboardType\" = None\n+ leaderboard_type: int = None\nmembers_count: int = None\nplatform_id: int = None\npublished_date: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/callback.py",
"new_path": "vkbottle/types/objects/callback.py",
"diff": "@@ -44,7 +44,6 @@ class GroupLeave(BaseModel):\nself: \"base.BoolInt\" = None\n-\nclass GroupOfficersEdit(BaseModel):\nadmin_id: int = None\nuser_id: int = None\n@@ -55,16 +54,16 @@ class GroupOfficersEdit(BaseModel):\nclass GroupSettingsChanges(BaseModel):\ntitle: str = None\ndescription: str = None\n- access: \"groups.GroupIsClosed\" = None\n+ access: int = None\nscreen_name: str = None\npublic_category: int = None\npublic_subcategory: int = None\n- age_limits: \"groups.GroupFullAgeLimits\" = None\n+ age_limits: int = None\nwebsite: str = None\nenable_status_default: int = None\nenable_audio: int = None\nenable_video: int = None\n- enable_photo: \"groups.GroupPhotos\" = None\n+ enable_photo: int = None\nenable_market: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/events.py",
"new_path": "vkbottle/types/objects/events.py",
"diff": "@@ -9,7 +9,7 @@ class EventAttach(BaseModel):\nfriends: typing.List = None\nid: int = None\nis_favorite: bool = None\n- member_status: \"groups.GroupFullMemberStatus\" = None\n+ member_status: int = None\ntext: str = None\ntime: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/groups.py",
"new_path": "vkbottle/types/objects/groups.py",
"diff": "@@ -160,6 +160,7 @@ class Group(BaseModel):\ndeactivated: str = None\nfinish_date: int = None\nid: int = None\n+ wall: int = None\nis_admin: \"base.BoolInt\" = None\nis_advertiser: \"base.BoolInt\" = None\nis_closed: int = None\n@@ -197,15 +198,9 @@ class GroupCategoryType(BaseModel):\nname: str = None\n-class GroupDocs(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass GroupFull(Group):\nmarket: \"MarketInfo\" = None\n- member_status: \"GroupFullMemberStatus\" = None\n+ member_status: int = None\nis_favorite: \"base.BoolInt\" = None\nis_subscribed: \"base.BoolInt\" = None\ncity: \"base.Object\" = None\n@@ -228,13 +223,13 @@ class GroupFull(Group):\nlinks: typing.List = None\ncontacts: typing.List = None\nsite: str = None\n- main_section: \"GroupFullMainSection\" = None\n+ main_section: int = None\ntrending: \"base.BoolInt\" = None\ncan_message: \"base.BoolInt\" = None\nis_messages_blocked: \"base.BoolInt\" = None\ncan_send_notify: \"base.BoolInt\" = None\nonline_status: \"OnlineStatus\" = None\n- age_limits: \"GroupFullAgeLimits\" = None\n+ age_limits: int = None\nban_info: \"GroupBanInfo\" = None\naddresses: \"AddressesInfo\" = None\nis_subscribed_podcasts: bool = None\n@@ -242,36 +237,6 @@ class GroupFull(Group):\ncan_subscribe_posts: bool = None\n-class GroupFullAgeLimits(Enum):\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n-\n-\n-class GroupFullMainSection(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n- _4 = \"4\"\n- _5 = \"5\"\n-\n-\n-class GroupFullMemberStatus(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n- _4 = \"4\"\n- _5 = \"5\"\n-\n-\n-class GroupIsClosed(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass GroupLink(BaseModel):\nname: str = None\ndesc: str = None\n@@ -281,20 +246,6 @@ class GroupLink(BaseModel):\nurl: str = None\n-class GroupMarketCurrency(Enum):\n- _643 = \"643\"\n- _980 = \"980\"\n- _398 = \"398\"\n- _978 = \"978\"\n- _840 = \"840\"\n-\n-\n-class GroupPhotos(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass GroupPublicCategoryList(BaseModel):\nid: int = None\nname: str = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/newsfeed.py",
"new_path": "vkbottle/types/objects/newsfeed.py",
"diff": "-from . import groups, base, wall, photos\n+from . import base, wall, photos\nimport typing\nfrom enum import Enum\nfrom ..base import BaseModel\n@@ -15,8 +15,8 @@ class CommentsFilters(Enum):\nclass EventActivity(BaseModel):\naddress: str = None\nbutton_text: str = None\n- friends: typing.List = None\n- member_status: \"groups.GroupFullMemberStatus\" = None\n+ friends: typing.List[\"ItemFriend\"] = None\n+ member_status: int = None\ntext: str = None\ntime: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/pages.py",
"new_path": "vkbottle/types/objects/pages.py",
"diff": "@@ -3,12 +3,6 @@ from enum import Enum\nfrom ..base import BaseModel\n-class PrivacySettings(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n-\n-\nclass Wikipage(BaseModel):\ncreator_id: int = None\ncreator_name: int = None\n@@ -18,8 +12,8 @@ class Wikipage(BaseModel):\nid: int = None\ntitle: str = None\nviews: int = None\n- who_can_edit: \"PrivacySettings\" = None\n- who_can_view: \"PrivacySettings\" = None\n+ who_can_edit: int = None\n+ who_can_view: int = None\nclass WikipageFull(BaseModel):\n@@ -36,8 +30,8 @@ class WikipageFull(BaseModel):\ntitle: str = None\nview_url: str = None\nviews: int = None\n- who_can_edit: \"PrivacySettings\" = None\n- who_can_view: \"PrivacySettings\" = None\n+ who_can_edit: int = None\n+ who_can_view: int = None\nclass WikipageHistory(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/users.py",
"new_path": "vkbottle/types/objects/users.py",
"diff": "@@ -276,7 +276,7 @@ class UserFull(User):\neducation_form: str = None\neducation_status: str = None\nhome_town: str = None\n- relation: \"UserRelation\" = None\n+ relation: int = None\nrelation_partner: \"UserMin\" = None\npersonal: \"Personal\" = None\nuniversities: typing.List = None\n@@ -287,18 +287,6 @@ class UserFull(User):\ncan_subscribe_posts: bool = None\n-class UserRelation(Enum):\n- _0 = \"0\"\n- _1 = \"1\"\n- _2 = \"2\"\n- _3 = \"3\"\n- _4 = \"4\"\n- _5 = \"5\"\n- _6 = \"6\"\n- _7 = \"7\"\n- _8 = \"8\"\n-\n-\nclass UserSettingsXtr(BaseModel):\nconnections: \"UserConnections\" = None\nbdate: str = None\n@@ -312,7 +300,7 @@ class UserSettingsXtr(BaseModel):\nname_request: \"account.NameRequest\" = None\npersonal: \"Personal\" = None\nphone: str = None\n- relation: \"UserRelation\" = None\n+ relation: int = None\nrelation_partner: \"UserMin\" = None\nrelation_pending: \"base.BoolInt\" = None\nrelation_requests: typing.List = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/exceptions.py",
"new_path": "vkbottle/utils/exceptions.py",
"diff": "@@ -8,11 +8,13 @@ class VKError(Exception):\nerror_description: str,\nmethod_requested=None,\nparams_requested: typing.Optional[dict] = None,\n+ raw_error: typing.Optional[dict] = None,\n):\nself.error_code = error_code\nself.error_description = error_description\nself.method_requested = method_requested\nself.params_requested = params_requested\n+ self.raw_error = raw_error\ndef __repr__(self):\nreturn f\"<VKError error_code={self.error_code} error_description={self.error_description}>\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Add raw_error field into VKError; fix typing enums
|
718,838 |
11.05.2020 12:58:23
| -10,800 |
88adf3114bbcd72796d4494b823d946e03e5c748
|
v2.7.2 Reformat; cosmetic changes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -26,23 +26,22 @@ async def request(\nresponse = await session.post(url, data=params or {})\nif not isinstance(response, dict):\n- while not isinstance(response, dict):\n- # Works only on python 3.6+\ndelay = 1\n+\n+ while not isinstance(response, dict):\nlogger.error(\n\"\\n---\"\nf\"{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}\"\n- f\"Error appeared after request: {method}\",\n+ f\"Error appeared after request: {method}\"\n)\nawait asyncio.sleep(delay * 5)\n- delay += 1\nresponse = await session.post(url, data=params or {})\nlogger.success(\nf\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\nf\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\n- f\"RESPONSE: {response}\\n\",\n+ f\"RESPONSE: {response}\\n\"\n)\nif \"error\" in response:\n@@ -62,9 +61,9 @@ async def request(\n)\nif throw_errors:\nraise exception\n+\nlogger.debug(f\"Error ignored {exception}\")\nreturn response\n- return response\nclass Request:\n@@ -92,12 +91,9 @@ class Request:\nlogger.debug(\"Response: {}\", response)\n- if not response_model:\n+ if not response_model or raw_response:\nreturn response[\"response\"]\n- resp = response_model(**response)\n- if raw_response:\n- return resp\n- return resp.response\n+ return response_model(**response).response\ndef __repr__(self):\nreturn f\"<Request {self.token_generator.__class__.__qualname__} throw_errors={self.throw_errors}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -131,7 +131,11 @@ class Bot(HTTP, AsyncHandleManager):\nself._stop: bool = False\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\n- logger.info(\"Using asyncio loop - {}\".format(asyncio.get_event_loop_policy()))\n+ logger.info(\n+ \"Using asyncio loop - {}\".format(\n+ asyncio.get_event_loop_policy().__class__.__module__\n+ )\n+ )\nasync def get_updates(self):\n# noqa\n@@ -386,7 +390,6 @@ class Bot(HTTP, AsyncHandleManager):\nawait self._processor(obj, client_info)\nelse:\n- # If this is an event of the group AND this is not SELF-EVENT\nawait (\nself._event_processor(obj=obj, event_type=update[\"type\"])\n) # noqa\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -170,7 +170,10 @@ class MessageHandler:\ncurrent = list()\nfor rule in self.default_rules + rules:\nif not isinstance(rule, (AbstractRule, AbstractFilter)):\n- warnings.warn(f\"Wrong rule! Got type {rule.__class__} instead of AbstractRule. Rule will be ignored\", Warning)\n+ warnings.warn(\n+ f\"Wrong rule! Got type {rule.__class__} instead of AbstractRule. Rule will be ignored\",\n+ Warning,\n+ )\ncontinue\nif not isinstance(rule, AbstractFilter):\nrule.create(func)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -109,7 +109,11 @@ class User(HTTP, AsyncHandleManager):\n)\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\n- logger.info(\"Using asyncio loop - {}\".format(asyncio.get_event_loop_policy().__class__.__module__))\n+ logger.info(\n+ \"Using asyncio loop - {}\".format(\n+ asyncio.get_event_loop_policy().__class__.__module__\n+ )\n+ )\n@staticmethod\ndef get_id_by_token(token: str):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Reformat; cosmetic changes
|
718,838 |
11.05.2020 13:34:29
| -10,800 |
d30ca7b5fd3b331060164672234af56d43267fcd
|
v2.7.2 Cosmetic changes :black_joker:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -108,7 +108,7 @@ class Bot(HTTP, AsyncHandleManager):\n(logs_folder or \"\") + \"log_{time}.log\"\nif log_to_path is True\nelse log_to_path,\n- rotation=\"100 MB\",\n+ rotation=\"20 MB\",\n)\nself.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"new_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"diff": "@@ -21,6 +21,9 @@ class VKErrorHandler(ABC):\nasync def unhandled_error(self, e: VKError):\npass\n+ def __repr__(self):\n+ return f\"<VKErrorHandler handled_errors={tuple(self.handled_errors.keys())}>\"\n+\nclass DefaultErrorHandler(VKErrorHandler):\nasync def unhandled_error(self, e: VKError):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"new_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"diff": "@@ -2,7 +2,7 @@ import types\nimport typing\nfrom vkbottle.types import BaseModel\n-from vkbottle.utils import logger\n+from vkbottle.utils import logger, names\nfrom .middleware import Middleware\n@@ -32,3 +32,6 @@ class MiddlewareExecutor:\nfor middleware in self.middleware:\nlogger.debug(f\"Executing middleware {middleware.__class__.__name__}\")\nyield await middleware(event)\n+\n+ def __repr__(self):\n+ return f\"<MiddlewareExecutor middleware={', '.join(names(self.middleware))}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/filters/filter.py",
"new_path": "vkbottle/framework/framework/rule/filters/filter.py",
"diff": "@@ -16,3 +16,8 @@ class AbstractFilter:\nasync def check(self, event) -> bool:\n...\n+\n+ def __repr__(self):\n+ return (f\"<Filter {self.__class__.__qualname__} \"\n+ f\"rules={(rule.__class__.__name__ for rule in self.rules)} \"\n+ f\"context={self.context}>\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -61,6 +61,9 @@ class AbstractRule(Copy):\nasync def check(self, event) -> bool:\n...\n+ def __repr__(self):\n+ return f\"<Rule {self.__class__.__qualname__} context={self.context}>\"\n+\nclass Any(AbstractRule):\nasync def check(self, event) -> bool:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -105,7 +105,7 @@ class User(HTTP, AsyncHandleManager):\nif log_to_path:\nlogger.add(\n\"log_user_{time}.log\" if log_to_path is True else log_to_path,\n- rotation=\"100 MB\",\n+ rotation=\"20 MB\",\n)\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/app.py",
"new_path": "vkbottle/http/app.py",
"diff": "@@ -30,3 +30,6 @@ class App(HTTP):\nif len(self._tokens) < limit:\nself._tokens.append(response[\"access_token\"])\nreturn self._tokens\n+\n+ def __repr__(self):\n+ return f\"<App {self._login}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -61,6 +61,9 @@ class HTTPRequest:\n) as response:\nreturn await response.json(content_type=content_type)\n+ def __repr__(self):\n+ return \"<HTTPRequest>\"\n+\nclass HTTP:\nrequest = HTTPRequest()\n@@ -76,3 +79,6 @@ class HTTP:\nlogger.info(\"Unable to check version! Skipping it\")\nreturn {\"version\": __version__}\nreturn rest_status\n+\n+ def __repr__(self):\n+ return \"<HTTP>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "@@ -7,6 +7,7 @@ from .tools import (\ninit_bot_mention,\nto_snake_case,\nfrom_attr,\n+ names,\n)\nfrom .util import ContextInstanceMixin\nfrom .json import json\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -74,6 +74,10 @@ def except_none_self(adict: dict) -> dict:\nreturn ndict\n+def names(object_list: list) -> typing.List[str]:\n+ return [obj.__class__.__name__ for obj in object_list]\n+\n+\ndef flatten(lis):\nfor item in lis:\nif isinstance(item, Sequence) and not isinstance(item, str):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.2 Cosmetic changes :black_joker:
|
718,865 |
11.05.2020 23:21:19
| 18,000 |
4fa15144f0eb28bb64cc8fbb60f686f342f314ab
|
Cosmetic editions
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/photo.py",
"new_path": "vkbottle/api/uploader/photo.py",
"diff": "@@ -9,7 +9,7 @@ class PhotoUploader(Uploader):\npathlike: typing.Union[list, typing.Any],\ngroup_id: int = None,\n**params,\n- ) -> typing.Union[str, typing.List[dict]]:\n+ ) -> typing.Union[str, typing.List[str]]:\nif not isinstance(pathlike, list):\npathlike = [pathlike]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -37,9 +37,11 @@ class Handler:\nself.message_handler: MessageHandler = MessageHandler()\ndef dispatch(self):\n- self.message_rules.extend(\n- self.message.rules + self.chat_message.rules + self.message_handler.rules\n- )\n+ self.message_rules.extend([\n+ *self.message.rules,\n+ *self.chat_message.rules,\n+ *self.message_handler.rules\n+ ])\ndef concatenate(self, other: \"Handler\"):\nself.event.rules += other.event.rules\n@@ -128,7 +130,7 @@ class MessageHandler:\nrule.watch_context = dict(zip(patterns, source))\narguments = [\narguments for pattern in patterns for arguments in pattern.arguments\n- ]\n+ ] # Why?\nreturn rule\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/filters/filter.py",
"new_path": "vkbottle/framework/framework/rule/filters/filter.py",
"diff": "@@ -3,7 +3,7 @@ from ..rule import AbstractRule, RuleExecute\nclass AbstractFilter:\n- def __init__(self, *rules: typing.Tuple[AbstractRule]):\n+ def __init__(self, *rules: AbstractRule):\nself.rules: typing.Tuple[AbstractRule] = rules\nself.context = RuleExecute()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -33,6 +33,10 @@ class RuleExecute:\nclass AbstractRule(Copy):\n+\n+ call: typing.Callable\n+ getfullargspec: inspect.FullArgSpec\n+\ndef __init_subclass__(cls, **kwargs):\ncls.context: RuleExecute = RuleExecute()\ncls.watch_context = None\n@@ -226,8 +230,7 @@ class VBML(AbstractMessageRule):\n):\nif isinstance(pattern, dict):\nself.watch_context = pattern\n- pattern = list(pattern.keys())\n- print(pattern)\n+ pattern = list(pattern) # It's not necessary to write .keys()\nself._patcher = Patcher.get_current()\npatterns: typing.List[Pattern] = []\nif isinstance(pattern, Pattern):\n@@ -282,7 +285,9 @@ class AttachmentRule(UnionMixin):\nclass ChatActionRule(AbstractMessageRule):\ndef __init__(\n- self, chat_action: typing.Union[str, typing.List[str]], rules: dict = None\n+ self,\n+ chat_action: typing.Union[str, typing.List[str]],\n+ rules: dict = None\n):\nif isinstance(chat_action, str):\nchat_action = [chat_action]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/app.py",
"new_path": "vkbottle/http/app.py",
"diff": "-from vkbottle.utils.exceptions import VKError\n+from ..exceptions import VKError\nfrom .request import HTTP\nimport typing\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Cosmetic editions (#101)
|
718,838 |
12.05.2020 14:46:50
| -10,800 |
2112a0816f32a1c059c8989fad0e7566401cbf48
|
v2.7.3 VKScript converter [need tests]
close
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/vkscript.py",
"diff": "+from vkbottle import Bot, Message, vkscript\n+from typing import List\n+\n+bot = Bot(\"token\")\n+\n+@vkscript\n+def get_names(api, user_ids=1):\n+ names = []\n+ for user in api.users.get(user_ids=user_ids):\n+ names.append(user.first_name)\n+ return names\n+\n+\n+@bot.on.message_handler(\"/names <( )*ids:int>\")\n+async def fetch_names(ans: Message, ids: List[int]):\n+ return \", \".join(await bot.api.execute(get_names(user_ids=ids)))\n+\n+bot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "from .framework import Bot, User\n-from .framework.framework import branch\n+from .framework.framework import branch, vkscript\nfrom .types.message import Message\nfrom .utils.task import TaskManager\nfrom .api.keyboard import keyboard_gen\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/api.py",
"new_path": "vkbottle/api/api/api.py",
"diff": "@@ -63,6 +63,9 @@ class API(ContextInstanceMixin, Categories):\nraw_response=raw_response,\n)\n+ async def execute(self, code):\n+ return await self.request(\"execute\", {\"code\": code})\n+\n@property\nasync def user_id(self):\nif self._user_id is None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -53,7 +53,9 @@ async def request(\nresponse[\"error\"][\"error_msg\"],\nfrom_attr(\nCategories,\n- [method.split(\".\")[0], to_snake_case(method.split(\".\")[1])],\n+ [method.split(\".\")[0], to_snake_case(method.split(\".\")[1])]\n+ if \".\" in method\n+ else method,\n(request_instance, None),\n),\nparams,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "@@ -8,4 +8,4 @@ from vkbottle.framework.framework.branch import (\nCoroutineBranch,\n)\nfrom vkbottle.framework.framework.handler import Handler, Middleware\n-from .framework import rule, swear\n+from .framework import rule, swear, converter, vkscript\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/__init__.py",
"new_path": "vkbottle/framework/framework/__init__.py",
"diff": "from .extensions import FromExtension\nfrom .error_handler import swear, DefaultErrorHandler, VKErrorHandler\n+from .execute import converter, vkscript\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/execute/__init__.py",
"diff": "+from .definitions import converter, vkscript\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "+import ast\n+import typing\n+from inspect import getsource\n+from vkbottle.utils import ContextInstanceMixin\n+\n+\n+class ConverterError(Exception):\n+ pass\n+\n+\n+class Area(ContextInstanceMixin):\n+ def __init__(self, **values):\n+ self.values = values\n+ self.set_current(self)\n+\n+\n+class Converter:\n+ \"\"\" Translate Python into the VKScript with AST \"\"\"\n+\n+ def __init__(self):\n+ self.definitions: typing.Dict[ast.AST, ast] = {}\n+\n+ def __call__(self, for_definition: ast.AST):\n+ def decorator(func):\n+ self.definitions[for_definition] = func\n+ return func\n+\n+ return decorator\n+\n+ def find_definition(self, d):\n+ if d.__class__ not in self.definitions:\n+ raise ConverterError(f\"Definition for {d.__class__} is undefined\")\n+ return self.definitions[d.__class__](d)\n+\n+ def scriptify(self, func: typing.Callable, **values) -> str:\n+ \"\"\" Translate function to VKScript \"\"\"\n+ source = getsource(func)\n+ code = ast.parse(source).body[0]\n+ Area(**values)\n+ return \"\".join(self.find_definition(line) for line in code.body)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "+import ast\n+import typing\n+from .base_converter import Converter, ConverterError, Area\n+from vkbottle.utils import random_string\n+\n+CALL_REPLACEMENTS = {\n+ \"append\": \"push\",\n+}\n+converter = Converter()\n+find = converter.find_definition\n+\n+\n+@converter(ast.Assign)\n+def assign(d: ast.Assign):\n+ left = d.targets\n+ left_ = []\n+ for target in left:\n+ if target.__class__ == ast.Name:\n+ left_.append(find(target))\n+ elif target.__class__ == ast.Subscript:\n+ pass\n+ elif target.__class__ == ast.Tuple:\n+ raise NotImplementedError(\"Tuple assignments are not allowed\")\n+ else:\n+ raise NotImplementedError(\n+ f\"Assignments of {target.__class__} are not implemented\"\n+ )\n+\n+ right = find(d.value)\n+ return \"var \" + \",\".join(f\"{target}={right}\" for target in left_) + \";\"\n+\n+\n+@converter(ast.Add)\n+@converter(ast.UAdd)\n+def add_operator(d: ast.Add):\n+ return \"+\"\n+\n+\n+@converter(ast.Sub)\n+@converter(ast.USub)\n+def sub_operator(d: ast.Sub):\n+ return \"-\"\n+\n+\n+@converter(ast.Mult)\n+def mult_operator(d: ast.Mult):\n+ return \"*\"\n+\n+\n+@converter(ast.Div)\n+def div_operator(d: ast.Div):\n+ return \"/\"\n+\n+\n+@converter(ast.Pow)\n+def pow_operator(d: ast.Pow):\n+ return \"**\"\n+\n+\n+@converter(ast.RShift)\n+def rshift_operator(d: ast.RShift):\n+ return \">>\"\n+\n+\n+@converter(ast.LShift)\n+def lshift_operator(d: ast.LShift):\n+ return \"<<\"\n+\n+\n+@converter(ast.BitAnd)\n+def bitand_operator(d: ast.BitAnd):\n+ return \"&\"\n+\n+\n+@converter(ast.BitOr)\n+def bitor_operator(d: ast.BitOr):\n+ return \"|\"\n+\n+\n+@converter(ast.Mod)\n+def mod_operator(d: ast.Mod):\n+ return \"%\"\n+\n+\n+@converter(ast.Gt)\n+def gt_operator(d: ast.Gt):\n+ return \">\"\n+\n+\n+@converter(ast.Lt)\n+def lt_operator(d: ast.Lt):\n+ return \"<\"\n+\n+\n+@converter(ast.GtE)\n+def gt_operator(d: ast.GtE):\n+ return \">=\"\n+\n+\n+@converter(ast.LtE)\n+def gt_operator(d: ast.LtE):\n+ return \"<=\"\n+\n+\n+@converter(ast.Eq)\n+def gt_operator(d: ast.Eq):\n+ return \"==\"\n+\n+\n+@converter(ast.NotEq)\n+def gt_operator(d: ast.Gt):\n+ return \"!=\"\n+\n+\n+@converter(ast.And)\n+def and_operator(d: ast.And):\n+ return \"&&\"\n+\n+\n+@converter(ast.Or)\n+def or_operator(d: ast.Or):\n+ return \"||\"\n+\n+\n+@converter(ast.AugAssign)\n+def aug_assign(d: ast.AugAssign):\n+ operator = find(d.op)\n+ value = find(d.value)\n+ target = find(d.target)\n+ return f\"{target} = {target} {operator} {value};\"\n+\n+\n+@converter(ast.Name)\n+def name(d: ast.Name):\n+ values = Area.get_current().values\n+ return values[d.id] if d.id in values else d.id\n+\n+\n+@converter(ast.While)\n+def while_cycle(d: ast.While):\n+ if d.orelse:\n+ raise ConverterError(\"You can't use while or/else in vkscript\")\n+ body = \"\".join(find(line) for line in d.body)\n+ return \"while(\" + find(d.test) + \"){\" + body + \"};\"\n+\n+\n+@converter(ast.For)\n+def for_cycle(d: ast.For):\n+ random_iter_name = f\"__iter_{random_string(5)}__\"\n+ body = \"\".join(find(line) for line in d.body)\n+ return (\n+ f\"var {random_iter_name} = {find(d.iter)};\"\n+ f\"while({random_iter_name}.length > 0){{var {find(d.target)}={random_iter_name}.pop();{body}}};\"\n+ )\n+\n+\n+@converter(ast.If)\n+def if_statement(d: ast.If):\n+ return (\n+ \"if(\" + find(d.test) + \"){\" + find(d.body) + \"}else{\" + find(d.orelse)\n+ or \"\" + \"};\"\n+ )\n+\n+\n+@converter(ast.Call)\n+def call(d: ast.Call):\n+ func = d.func\n+ calls = []\n+\n+ while isinstance(func, ast.Attribute):\n+ calls.append(func.attr)\n+ func = func.value\n+\n+ if func.id.lower() == \"api\":\n+ params = \",\".join(f\"{param.arg}:{find(param.value)}\" for param in d.keywords)\n+ return \"API.\" + \".\".join(calls[::-1]) + \"({\" + params + \"})\"\n+ elif func.id == \"len\":\n+ return f\"{find(d.args[0])}.length\"\n+ elif calls and calls[0] in CALL_REPLACEMENTS:\n+ args = \",\".join(find(arg) for arg in d.args)\n+ return find(d.func.value) + \".\" + CALL_REPLACEMENTS[calls[0]] + \"(\" + args + \")\"\n+ raise ConverterError(f\"Call for {d.func.id} is not referenced\")\n+\n+\n+@converter(ast.Pass)\n+def pass_expr(d: ast.Pass):\n+ return \"\"\n+\n+\n+@converter(ast.Expr)\n+def expr(d: ast.Expr):\n+ return find(d.value) + \";\"\n+\n+\n+@converter(ast.Module)\n+def module(d: ast.Module):\n+ return find(d.body)\n+\n+\n+@converter(ast.BinOp)\n+def bin_operation(d: ast.BinOp):\n+ return f\"{find(d.left)}{find(d.op)}{find(d.right)}\"\n+\n+\n+@converter(ast.Compare)\n+def compare(d: ast.Compare):\n+ left = find(d.left)\n+ operations = [\n+ f\"{left}{find(operator)}{find(comparator)}\"\n+ for operator, comparator in zip(d.ops, d.comparators)\n+ ]\n+ return \"&&\".join(operations)\n+\n+\n+@converter(ast.BoolOp)\n+def bool_op(d: ast.BoolOp):\n+ return find(d.op).join(find(value) for value in d.values)\n+\n+\n+@converter(ast.UnaryOp)\n+def unary_op(d: ast.UnaryOp):\n+ return f\"{find(d.op)}{find(d.operand)}\"\n+\n+\n+@converter(ast.Subscript)\n+def subscript(d: ast.Subscript):\n+ value = find(d.value)\n+ if d.slice.__class__ == ast.Index:\n+ if d.slice.value.__class__ == str:\n+ return f\"{value}.{d.slice.value.s}\"\n+ return f\"{value}[{find(d.slice.value)}]\"\n+ raise ConverterError(f\"Slice {d.slice} is not referenced\")\n+\n+\n+@converter(ast.Attribute)\n+def attribute(d: ast.Attribute):\n+ return f\"{find(d.value)}.{d.attr}\"\n+\n+\n+@converter(ast.Return)\n+def return_statement(d: ast.Return):\n+ value = \"null\" if d is None else find(d.value)\n+ return f\"return {value};\"\n+\n+\n+@converter(ast.Delete)\n+def delete_statement(d: ast.Delete):\n+ return \"\".join(f\"delete {find(target)};\" for target in d.targets)\n+\n+\n+@converter(ast.Dict)\n+def dict_type(d: ast.Dict):\n+ dict_s = \",\".join(\n+ f\"{find(key)}:{find(value)}\" for key, value in zip(d.keys, d.values)\n+ )\n+ return \"{\" + dict_s + \"}\"\n+\n+\n+@converter(ast.List)\n+@converter(ast.Tuple)\n+def list_type(d: typing.Union[ast.List, ast.Tuple]):\n+ return \"[\" + \",\".join(find(elt) for elt in d.elts) + \"]\"\n+\n+\n+@converter(ast.Num)\n+def num_type(d: ast.Num):\n+ return str(d.n)\n+\n+\n+@converter(ast.Str)\n+def str_type(d: ast.Num):\n+ return repr(d.s)\n+\n+\n+@converter(ast.NameConstant)\n+def name_constant_type(d: ast.NameConstant):\n+ consts = {True: \"true\", False: \"false\", None: \"null\"}\n+ return consts[d.value]\n+\n+\n+def vkscript(func: typing.Callable) -> typing.Callable[[], str]:\n+ def decorator(**context):\n+ return converter.scriptify(func, **context)\n+\n+ return decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -37,11 +37,9 @@ class Handler:\nself.message_handler: MessageHandler = MessageHandler()\ndef dispatch(self):\n- self.message_rules.extend([\n- *self.message.rules,\n- *self.chat_message.rules,\n- *self.message_handler.rules\n- ])\n+ self.message_rules.extend(\n+ [*self.message.rules, *self.chat_message.rules, *self.message_handler.rules]\n+ )\ndef concatenate(self, other: \"Handler\"):\nself.event.rules += other.event.rules\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/filters/filter.py",
"new_path": "vkbottle/framework/framework/rule/filters/filter.py",
"diff": "@@ -18,6 +18,8 @@ class AbstractFilter:\n...\ndef __repr__(self):\n- return (f\"<Filter {self.__class__.__qualname__} \"\n+ return (\n+ f\"<Filter {self.__class__.__qualname__} \"\nf\"rules={(rule.__class__.__name__ for rule in self.rules)} \"\n- f\"context={self.context}>\")\n+ f\"context={self.context}>\"\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -285,9 +285,7 @@ class AttachmentRule(UnionMixin):\nclass ChatActionRule(AbstractMessageRule):\ndef __init__(\n- self,\n- chat_action: typing.Union[str, typing.List[str]],\n- rules: dict = None\n+ self, chat_action: typing.Union[str, typing.List[str]], rules: dict = None\n):\nif isinstance(chat_action, str):\nchat_action = [chat_action]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/editor.py",
"new_path": "vkbottle/types/methods/editor.py",
"diff": "@@ -6,8 +6,11 @@ for file_name in os.listdir(\".\"):\nwith open(file_name, \"r\") as f:\nlines = f.readlines()\nfor i, line in enumerate(lines):\n- if 'for k, v in locals().items()' in line:\n- line = line.replace('for k, v in locals().items()', 'for k, v in {**locals(), **self.kwargs}.items()')\n+ if \"for k, v in locals().items()\" in line:\n+ line = line.replace(\n+ \"for k, v in locals().items()\",\n+ \"for k, v in {**locals(), **self.kwargs}.items()\",\n+ )\nlines[i] = line\nwith open(file_name, \"w\") as fw:\nfw.writelines(lines)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "@@ -8,6 +8,7 @@ from .tools import (\nto_snake_case,\nfrom_attr,\nnames,\n+ random_string,\n)\nfrom .util import ContextInstanceMixin\nfrom .json import json\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -4,6 +4,8 @@ import time\nimport typing\nfrom collections import MutableMapping\nfrom typing import Sequence, List\n+import random\n+import string\nclass Logger:\n@@ -49,6 +51,11 @@ def dict_of_dicts_merge(d1, d2) -> dict:\nreturn d3\n+def random_string(length):\n+ letters = string.ascii_lowercase\n+ return \"\".join(random.choice(letters) for i in range(length))\n+\n+\ndef to_snake_case(string: str) -> str:\nreturn \"\".join([\"_\" + i.lower() if i.isupper() else i for i in string]).lstrip(\"_\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 VKScript converter [need tests]
close #102
|
718,838 |
12.05.2020 16:52:39
| -10,800 |
73475d2fb75a74267dd296ff6b64406b013e9354
|
v2.7.3 Implement ErrorHandler
|
[
{
"change_type": "MODIFY",
"old_path": "examples/vkscript.py",
"new_path": "examples/vkscript.py",
"diff": "from vkbottle import Bot, Message, vkscript\nfrom typing import List\n+import os\n-bot = Bot(\"token\")\n+bot = Bot(os.environ[\"TOKEN\"])\n@vkscript\ndef get_names(api, user_ids=1):\n@@ -11,7 +12,7 @@ def get_names(api, user_ids=1):\nreturn names\n-@bot.on.message_handler(\"/names <( )*ids:int>\")\n+@bot.on.message_handler(text=\"/names <( )*ids>\")\nasync def fetch_names(ans: Message, ids: List[int]):\nreturn \", \".join(await bot.api.execute(get_names(user_ids=ids)))\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/framework/framework/error_handler/__init__.py",
"new_path": "vkbottle/api/api/error_handler/__init__.py",
"diff": "-from .swear_handler import swear\nfrom .error_handler import VKErrorHandler, DefaultErrorHandler\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/framework/framework/error_handler/error_handler.py",
"new_path": "vkbottle/api/api/error_handler/error_handler.py",
"diff": "@@ -2,10 +2,10 @@ from abc import ABC, abstractmethod\nfrom vkbottle.utils.exceptions import VKError\nimport typing\nimport traceback\n-from vkbottle.utils import logger\n+from vkbottle.utils import logger, ContextInstanceMixin\n-class VKErrorHandler(ABC):\n+class VKErrorHandler(ABC, ContextInstanceMixin):\ndef __init__(self):\nself.handled_errors: typing.Dict[int, typing.Callable] = {}\n@@ -27,4 +27,4 @@ class VKErrorHandler(ABC):\nclass DefaultErrorHandler(VKErrorHandler):\nasync def unhandled_error(self, e: VKError):\n- logger.error(traceback.format_exc(2))\n+ raise e\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "@@ -4,6 +4,7 @@ from vkbottle.api.api.category import Categories\nfrom vkbottle.http import HTTPRequest\nfrom vkbottle.utils import logger, to_snake_case, from_attr\nfrom vkbottle.api.api.util.token import AbstractTokenGenerator\n+from .error_handler import VKErrorHandler\nimport time\nimport typing\n@@ -61,10 +62,8 @@ async def request(\nparams,\nraw_error=response[\"error\"],\n)\n- if throw_errors:\n- raise exception\n-\n- logger.debug(f\"Error ignored {exception}\")\n+ error_handler = VKErrorHandler.get_current()\n+ return await error_handler.handle_error(exception)\nreturn response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "@@ -8,4 +8,4 @@ from vkbottle.framework.framework.branch import (\nCoroutineBranch,\n)\nfrom vkbottle.framework.framework.handler import Handler, Middleware\n-from .framework import rule, swear, converter, vkscript\n+from .framework import rule, converter, vkscript, swear\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "@@ -5,7 +5,7 @@ from ...utils import exceptions\nfrom vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch\nfrom vkbottle.framework.framework.extensions import AbstractExtension\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\n-from vkbottle.framework.framework.error_handler import (\n+from vkbottle.api.api.error_handler import (\nVKErrorHandler,\nDefaultErrorHandler,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/user.py",
"new_path": "vkbottle/framework/blueprint/user.py",
"diff": "from vkbottle.api import api\n-from vkbottle.framework.framework.error_handler import (\n+from vkbottle.api.api.error_handler import (\nVKErrorHandler,\nDefaultErrorHandler,\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -7,7 +7,7 @@ from vbml import Patcher\nfrom vkbottle.http import HTTP\nfrom vkbottle.types.events import EventList\nfrom vkbottle.framework.framework.handler.handler import Handler\n-from vkbottle.framework.framework.error_handler import (\n+from vkbottle.api.api.error_handler import (\nVKErrorHandler,\nDefaultErrorHandler,\n)\n@@ -116,17 +116,18 @@ class Bot(HTTP, AsyncHandleManager):\n# Sign assets\nself.api: Api = Api(self.__tokens, throw_errors=throw_errors)\n+ self.error_handler: VKErrorHandler = DefaultErrorHandler()\nself.extension: AbstractExtension = extension if extension is not None else StandardExtension()\nself._throw_errors: bool = throw_errors\nApi.set_current(self.api)\n+ VKErrorHandler.set_current(self.error_handler)\nAbstractExtension.set_current(self.extension)\n# Main workers\nself.branch: typing.Union[AbstractBranchGenerator, DictBranch] = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler(self.group_id)\n- self.error_handler: VKErrorHandler = DefaultErrorHandler()\nself._stop: bool = False\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/__init__.py",
"new_path": "vkbottle/framework/framework/__init__.py",
"diff": "from .extensions import FromExtension\n-from .error_handler import swear, DefaultErrorHandler, VKErrorHandler\nfrom .execute import converter, vkscript\n+from .swear_handler import swear\n"
},
{
"change_type": "RENAME",
"old_path": "vkbottle/framework/framework/error_handler/swear_handler.py",
"new_path": "vkbottle/framework/framework/swear_handler.py",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -9,7 +9,7 @@ from vkbottle.api import UserApi\nfrom vkbottle.exceptions import VKError\nfrom vkbottle.types.user_longpoll import Message\nfrom vkbottle.framework.framework.handler.user.handler import Handler\n-from vkbottle.framework.framework.error_handler import VKErrorHandler\n+from vkbottle.api.api.error_handler import VKErrorHandler\nfrom vkbottle.framework.framework.handler import MiddlewareExecutor\nfrom vkbottle.framework.framework.branch import (\nAbstractBranchGenerator,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -10,7 +10,7 @@ from vkbottle.framework._status import LoggerLevel\nfrom vkbottle.api import UserApi, request\nfrom vkbottle.exceptions import VKError\nfrom vkbottle.framework.framework.handler.user.handler import Handler\n-from vkbottle.framework.framework.error_handler import (\n+from vkbottle.api.api.error_handler import (\nVKErrorHandler,\nDefaultErrorHandler,\n)\n@@ -81,7 +81,9 @@ class User(HTTP, AsyncHandleManager):\nself.__tokens[0]\n)\nself.api.user_id = user_id\n+ self.error_handler: VKErrorHandler = DefaultErrorHandler()\nUserApi.set_current(self.api)\n+ VKErrorHandler.set_current(self.error_handler)\nself.on: Handler = Handler()\nself.branch: AbstractBranchGenerator = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Implement ErrorHandler
|
718,838 |
13.05.2020 09:12:44
| -10,800 |
da08f714ff1e4773d8c4acfc168d2586bbfec763
|
v2.7.3 Cometic changes in vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/base_converter.py",
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "import ast\nimport typing\nfrom inspect import getsource\n-from vkbottle.utils import ContextInstanceMixin\nclass ConverterError(Exception):\npass\n-class Area(ContextInstanceMixin):\n- def __init__(self, **values):\n- self.values = values\n- self.set_current(self)\n-\n-\nclass Converter:\n\"\"\" Translate Python into the VKScript with AST \"\"\"\n@@ -24,17 +17,16 @@ class Converter:\ndef decorator(func):\nself.definitions[for_definition] = func\nreturn func\n-\nreturn decorator\ndef find_definition(self, d):\nif d.__class__ not in self.definitions:\n- raise ConverterError(f\"Definition for {d.__class__} is undefined\")\n+ raise ConverterError(f\"Definition for {d.__class__} is undefined. Maybe vkscript doesn't support it\")\nreturn self.definitions[d.__class__](d)\ndef scriptify(self, func: typing.Callable, **values) -> str:\n\"\"\" Translate function to VKScript \"\"\"\nsource = getsource(func)\ncode = ast.parse(source).body[0]\n- Area(**values)\n- return \"\".join(self.find_definition(line) for line in code.body)\n+ values_assignments = [f\"var {k}={v};\" for k, v in values.items()]\n+ return \"\".join(values_assignments) + \"\".join(self.find_definition(line) for line in code.body)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "import ast\nimport typing\n-from .base_converter import Converter, ConverterError, Area\n+from .base_converter import Converter, ConverterError\nfrom vkbottle.utils import random_string\nCALL_REPLACEMENTS = {\n@@ -19,12 +19,6 @@ def assign(d: ast.Assign):\nleft_.append(find(target))\nelif target.__class__ == ast.Subscript:\npass\n- elif target.__class__ == ast.Tuple:\n- raise NotImplementedError(\"Tuple assignments are not allowed\")\n- else:\n- raise NotImplementedError(\n- f\"Assignments of {target.__class__} are not implemented\"\n- )\nright = find(d.value)\nreturn \"var \" + \",\".join(f\"{target}={right}\" for target in left_) + \";\"\n@@ -132,8 +126,7 @@ def aug_assign(d: ast.AugAssign):\n@converter(ast.Name)\ndef name(d: ast.Name):\n- values = Area.get_current().values\n- return values[d.id] if d.id in values else d.id\n+ return d.id\n@converter(ast.While)\n@@ -171,6 +164,9 @@ def call(d: ast.Call):\ncalls.append(func.attr)\nfunc = func.value\n+ if func.__class__ == ast.Str:\n+ return str(find(d.args[0])) + \".\" + calls[0] + \"(\" + find(func) + \")\"\n+\nif func.id.lower() == \"api\":\nparams = \",\".join(f\"{param.arg}:{find(param.value)}\" for param in d.keywords)\nreturn \"API.\" + \".\".join(calls[::-1]) + \"({\" + params + \"})\"\n@@ -271,6 +267,10 @@ def num_type(d: ast.Num):\ndef str_type(d: ast.Num):\nreturn repr(d.s)\n+@converter(ast.JoinedStr)\n+def joined_str(d: ast.JoinedStr):\n+ print(d)\n+\n@converter(ast.NameConstant)\ndef name_constant_type(d: ast.NameConstant):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Cometic changes in vkscript converter
|
718,838 |
13.05.2020 09:30:27
| -10,800 |
ae66c6be50a01d3dd7aff49f27ef9a0e607d07b1
|
v2.7.3 Add ability to use f-strings in vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -269,8 +269,11 @@ def str_type(d: ast.Num):\n@converter(ast.JoinedStr)\ndef joined_str(d: ast.JoinedStr):\n- print(d)\n+ return \"+\".join(find(value) for value in d.values)\n+@converter(ast.FormattedValue)\n+def formatted_value(d: ast.FormattedValue):\n+ return find(d.value)\n@converter(ast.NameConstant)\ndef name_constant_type(d: ast.NameConstant):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Add ability to use f-strings in vkscript converter
|
718,838 |
13.05.2020 09:52:37
| -10,800 |
b57afce4e11074b571f2f5a02e2fc01a3e42e6d3
|
v2.7.3 Improve converter + type fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -6,9 +6,13 @@ from vkbottle.utils import random_string\nCALL_REPLACEMENTS = {\n\"append\": \"push\",\n}\n+CALL_STRING = [\"join\", \"strip\"]\n+\nconverter = Converter()\nfind = converter.find_definition\n+def dispatch_keywords(keywords: dict, assigner: str = \":\", sep: str = \",\"):\n+ return sep.join(f\"{param.arg}{assigner}{find(param.value)}\" for param in keywords)\n@converter(ast.Assign)\ndef assign(d: ast.Assign):\n@@ -165,10 +169,14 @@ def call(d: ast.Call):\nfunc = func.value\nif func.__class__ == ast.Str:\n+ if calls[0] in CALL_STRING:\nreturn str(find(d.args[0])) + \".\" + calls[0] + \"(\" + find(func) + \")\"\n+ elif calls[0] == \"format\":\n+ raise ConverterError(\"Use f-strings instead of str.format\")\n+ raise ConverterError(\"String formatter\")\nif func.id.lower() == \"api\":\n- params = \",\".join(f\"{param.arg}:{find(param.value)}\" for param in d.keywords)\n+ params = dispatch_keywords(d.keywords)\nreturn \"API.\" + \".\".join(calls[::-1]) + \"({\" + params + \"})\"\nelif func.id == \"len\":\nreturn f\"{find(d.args[0])}.length\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/photos.py",
"new_path": "vkbottle/types/objects/photos.py",
"diff": "@@ -166,6 +166,7 @@ class PhotoFullXtrRealOffset(BaseModel):\nclass PhotoSizes(BaseModel):\nheight: int = None\nurl: str = None\n+ src: str = None\ntype: \"PhotoSizesType\" = None\nwidth: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Improve converter + type fix
|
718,838 |
14.05.2020 00:19:37
| -10,800 |
88c8d0db46ef6bd4cd04fcc04883544d29bc56cf
|
v2.7.3 Captcha handling implementation
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/__init__.py",
"new_path": "vkbottle/api/api/__init__.py",
"diff": "from .api import API, UserApi, Api, get_api\n-from .request import Request, request\n+from .request import Request\n+from .util.requester import request\n"
},
{
"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, Constructor\n+from .error_handler.error_handler import VKErrorHandler\nfrom pydantic import BaseModel\nfrom .request import Request\n@@ -11,10 +12,13 @@ from vkbottle.api.api.util.builtin import (\nGENERATORS,\n)\n+if typing.TYPE_CHECKING:\n+ from vkbottle.framework.framework.extensions.extension import AbstractExtension\n-class API(ContextInstanceMixin, Categories):\n+\n+class API(ContextInstanceMixin, Categories, Constructor):\n\"\"\" Main VK API object\n- Possess user_id/group_id getters, request\n+ Possess user_id/group_id getters, request, constructor\n\"\"\"\ndef __init__(\n@@ -31,10 +35,14 @@ class API(ContextInstanceMixin, Categories):\nself._group_id: typing.Optional[int] = None\nself._user_id: typing.Optional[int] = None\n+ # Construct values\n+ self.error_handler: typing.Optional[\"VKErrorHandler\"] = None\n+ self.extension: typing.Optional[\"AbstractExtension\"] = None\n+\nfor category in self.__categories__:\nsetattr(self, category, getattr(self, category)(self.api))\n- def api(self, method: str, params: dict, **kwargs) -> typing.Coroutine:\n+ def api(self, method: str, params: dict, **kwargs) -> typing.Awaitable:\n\"\"\" Return an awaitable request\n:param method: method's name to make a request and pass to the token_generator\n:param params: params dict is passed to the token_generator and used to make a request\n@@ -43,7 +51,7 @@ class API(ContextInstanceMixin, Categories):\nif isinstance(v, (tuple, list)):\nparams[k] = \",\".join(repr(i) for i in v)\n- request = Request(self.token_generator)\n+ request = Request(self.token_generator, self.error_handler)\nreturn request(method, params, **kwargs)\nasync def request(\n@@ -63,9 +71,17 @@ class API(ContextInstanceMixin, Categories):\nraw_response=raw_response,\n)\n- async def execute(self, code):\n+ async def execute(self, code: str) -> typing.Any:\n+ \"\"\" Make an execute method \"\"\"\nreturn await self.request(\"execute\", {\"code\": code})\n+ def construct(\n+ self, error_handler: \"VKErrorHandler\", extension: \"AbstractExtension\"\n+ ) -> \"API\":\n+ self.error_handler = error_handler\n+ self.extension = extension\n+ return self\n+\n@property\nasync def user_id(self):\nif self._user_id is None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/error_handler/error_handler.py",
"new_path": "vkbottle/api/api/error_handler/error_handler.py",
"diff": "+import typing\nfrom abc import ABC, abstractmethod\n+\n+from vkbottle.utils import ContextInstanceMixin\nfrom vkbottle.utils.exceptions import VKError\n-import typing\n-import traceback\n-from vkbottle.utils import logger, ContextInstanceMixin\n+\n+CAPTCHA_ERROR_CODE = 14\n+ErrorHandler = typing.Callable[[VKError], typing.Awaitable]\nclass VKErrorHandler(ABC, ContextInstanceMixin):\ndef __init__(self):\n- self.handled_errors: typing.Dict[int, typing.Callable] = {}\n+ self.handled_errors: typing.Dict[int, ErrorHandler] = {}\n+ self.handled_captcha: typing.Optional[ErrorHandler] = None\n+ self._captcha_delayed: bool = False\n+\n+ def captcha_handler(self, func: typing.Callable[[VKError], typing.Awaitable[str]]):\n+ self.handled_captcha = func\n+ return func\nasync def handle_error(self, e: VKError):\n- if e.error_code not in self.handled_errors:\n+ \"\"\" Handle errors with added error handlers / undefined error handler \"\"\"\n+ if e.error_code == CAPTCHA_ERROR_CODE and self.handled_captcha is not None:\n+ key = await self.handled_captcha(e)\n+ response = await self.call_method_with_captcha(e, key)\n+ return {\"response\": response}\n+ elif e.error_code not in self.handled_errors:\nreturn await self.unhandled_error(e)\nreturn await self.handled_errors[e.error_code](e)\n+ def error_handler(self, error_code: int):\n+ def decorator(func):\n+ self.handled_errors[error_code] = func\n+ return func\n+\n+ return decorator\n+\ndef add_error_handler(self, error_code: int, handler: typing.Callable):\n+ \"\"\" Add handler for error with specified error_code \"\"\"\nself.handled_errors[error_code] = handler\n@abstractmethod\nasync def unhandled_error(self, e: VKError):\npass\n+ @staticmethod\n+ async def call_method_with_captcha(e: VKError, key: str):\n+ method = e.method_requested\n+ method.kwargs = {\"captcha_sid\": e.raw_error[\"captcha_sid\"], \"captcha_key\": key}\n+ return await method(**e.params_requested)\n+\ndef __repr__(self):\n- return f\"<VKErrorHandler handled_errors={tuple(self.handled_errors.keys())}>\"\n+ return f\"<VKErrorHandler handled_errors={tuple(self.handled_errors.keys())} captcha_handler={self.handled_captcha}>\"\nclass DefaultErrorHandler(VKErrorHandler):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/request.py",
"new_path": "vkbottle/api/api/request.py",
"diff": "-from vkbottle.const import API_VERSION, API_URL\n-from vkbottle.utils.exceptions import VKError\n-from vkbottle.api.api.category import Categories\n-from vkbottle.http import HTTPRequest\n-from vkbottle.utils import logger, to_snake_case, from_attr\n+from vkbottle.utils import logger\nfrom vkbottle.api.api.util.token import AbstractTokenGenerator\n-from .error_handler import VKErrorHandler\n+from .util.requester import request\n+from typing import TYPE_CHECKING\n-import time\n-import typing\n-import asyncio\n-\n-\n-async def request(\n- method: str,\n- params: dict,\n- token: str,\n- throw_errors: bool = True,\n- session: HTTPRequest = None,\n- request_instance: typing.Optional[\"Request\"] = None,\n-):\n- url = \"{}{method}/?access_token={token}&v={version}\".format(\n- API_URL, method=method, token=token, version=API_VERSION,\n- )\n-\n- session = session or HTTPRequest()\n- response = await session.post(url, data=params or {})\n-\n- if not isinstance(response, dict):\n- delay = 1\n-\n- while not isinstance(response, dict):\n- logger.error(\n- \"\\n---\"\n- f\"{time.strftime('%m-%d %H:%M:%S', time.localtime())} - DELAY {delay * 5} sec\\n\"\n- f\"Check your internet connection. Maybe VK died, request returned: {response}\"\n- f\"Error appeared after request: {method}\"\n- )\n- await asyncio.sleep(delay * 5)\n- response = await session.post(url, data=params or {})\n-\n- logger.success(\n- f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\n- f\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\n- f\"RESPONSE: {response}\\n\"\n- )\n-\n- if \"error\" in response:\n- logger.debug(\n- \"Error after request {method}, response: {r}\", method=method, r=response\n- )\n- exception = VKError(\n- response[\"error\"][\"error_code\"],\n- response[\"error\"][\"error_msg\"],\n- from_attr(\n- Categories,\n- [method.split(\".\")[0], to_snake_case(method.split(\".\")[1])]\n- if \".\" in method\n- else method,\n- (request_instance, None),\n- ),\n- params,\n- raw_error=response[\"error\"],\n- )\n- error_handler = VKErrorHandler.get_current()\n- return await error_handler.handle_error(exception)\n- return response\n+if TYPE_CHECKING:\n+ from .error_handler.error_handler import VKErrorHandler\nclass Request:\n- def __init__(self, token_generator: AbstractTokenGenerator):\n- self.token_generator: AbstractTokenGenerator = token_generator\n+ def __init__(\n+ self, token_generator: \"AbstractTokenGenerator\", error_handler: \"VKErrorHandler\"\n+ ):\n+ self.token_generator: \"AbstractTokenGenerator\" = token_generator\n+ self.error_handler: \"VKErrorHandler\" = error_handler\nself.throw_errors: bool = True\nasync def __call__(\n@@ -84,10 +27,8 @@ class Request:\nmethod,\nparams,\nawait self.token_generator.get_token(method=method, params=params),\n- throw_errors=throw_errors\n- if throw_errors is not None\n- else self.throw_errors,\nrequest_instance=self,\n+ error_handler=self.error_handler,\n)\nlogger.debug(\"Response: {}\", response)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/api/util/requester.py",
"diff": "+from vkbottle.const import API_VERSION, API_URL\n+from vkbottle.utils.exceptions import VKError\n+from vkbottle.api.api.category import Categories\n+from vkbottle.http import HTTPRequest\n+from vkbottle.utils import logger, to_snake_case, from_attr\n+\n+import time\n+import asyncio\n+import typing\n+\n+if typing.TYPE_CHECKING:\n+ from ..error_handler import VKErrorHandler\n+\n+\n+async def request(\n+ method: str,\n+ params: dict,\n+ token: str,\n+ session: HTTPRequest = None,\n+ error_handler: \"VKErrorHandler\" = None,\n+ request_instance=None,\n+):\n+ url = \"{}{method}/?access_token={token}&v={version}\".format(\n+ API_URL, method=method, token=token, version=API_VERSION,\n+ )\n+\n+ session = session or HTTPRequest()\n+ response = await session.post(url, data=params or {})\n+\n+ if not isinstance(response, dict):\n+ delay = 1\n+\n+ while not isinstance(response, dict):\n+ logger.error(\n+ \"\\n---\"\n+ f\"{time.strftime('%m-%d %H:%M:%S', time.localtime())} - DELAY {delay * 5} sec\\n\"\n+ f\"Check your internet connection. Maybe VK died, request returned: {response}\"\n+ f\"Error appeared after request: {method}\"\n+ )\n+ await asyncio.sleep(delay * 5)\n+ response = await session.post(url, data=params or {})\n+\n+ logger.success(\n+ f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\n+ f\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\n+ f\"RESPONSE: {response}\\n\"\n+ )\n+\n+ if \"error\" in response:\n+ logger.debug(\n+ \"Error after request {method}, response: {r}\", method=method, r=response\n+ )\n+ exception = VKError(\n+ response[\"error\"][\"error_code\"],\n+ response[\"error\"][\"error_msg\"],\n+ from_attr(\n+ Categories,\n+ [method.split(\".\")[0], to_snake_case(method.split(\".\")[1])]\n+ if \".\" in method\n+ else method,\n+ (request_instance, None),\n+ ),\n+ params,\n+ raw_error=response[\"error\"],\n+ )\n+ if not error_handler:\n+ raise exception\n+ return await error_handler.handle_error(exception)\n+ return response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -115,12 +115,12 @@ class Bot(HTTP, AsyncHandleManager):\nself.__loop = loop or asyncio.get_event_loop()\n# Sign assets\n- self.api: Api = Api(self.__tokens, throw_errors=throw_errors)\n+ self._api: Api = Api(self.__tokens, throw_errors=throw_errors)\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\nself.extension: AbstractExtension = extension if extension is not None else StandardExtension()\nself._throw_errors: bool = throw_errors\n- Api.set_current(self.api)\n+ Api.set_current(self._api)\nVKErrorHandler.set_current(self.error_handler)\nAbstractExtension.set_current(self.extension)\n@@ -210,7 +210,7 @@ class Bot(HTTP, AsyncHandleManager):\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, throw_errors=False)\n+ request(\"groups.getById\", {}, token)\n)\nif \"error\" in response:\nif throw_exc:\n@@ -232,7 +232,7 @@ class Bot(HTTP, AsyncHandleManager):\nreturn True\ndef executor_api(self, api):\n- self.api = api\n+ self._api = api\nApi.set_current(api)\ndef loop_update(self, loop: asyncio.AbstractEventLoop = None):\n@@ -412,6 +412,10 @@ class Bot(HTTP, AsyncHandleManager):\ndef __repr__(self) -> str:\nreturn \"<Bot {}>\".format(self.status.as_dict)\n+ @property\n+ def api(self) -> Api:\n+ return self._api.get_current().construct(self.error_handler, self.extension)\n+\n@property\ndef __dict__(self) -> dict:\nreturn self.status.as_dict\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/base_converter.py",
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "@@ -17,11 +17,14 @@ class Converter:\ndef decorator(func):\nself.definitions[for_definition] = func\nreturn func\n+\nreturn decorator\ndef find_definition(self, d):\nif d.__class__ not in self.definitions:\n- raise ConverterError(f\"Definition for {d.__class__} is undefined. Maybe vkscript doesn't support it\")\n+ raise ConverterError(\n+ f\"Definition for {d.__class__} is undefined. Maybe vkscript doesn't support it\"\n+ )\nreturn self.definitions[d.__class__](d)\ndef scriptify(self, func: typing.Callable, **values) -> str:\n@@ -29,4 +32,6 @@ class Converter:\nsource = getsource(func)\ncode = ast.parse(source).body[0]\nvalues_assignments = [f\"var {k}={v};\" for k, v in values.items()]\n- return \"\".join(values_assignments) + \"\".join(self.find_definition(line) for line in code.body)\n+ return \"\".join(values_assignments) + \"\".join(\n+ self.find_definition(line) for line in code.body\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -11,9 +11,11 @@ CALL_STRING = [\"join\", \"strip\"]\nconverter = Converter()\nfind = converter.find_definition\n+\ndef dispatch_keywords(keywords: dict, assigner: str = \":\", sep: str = \",\"):\nreturn sep.join(f\"{param.arg}{assigner}{find(param.value)}\" for param in keywords)\n+\n@converter(ast.Assign)\ndef assign(d: ast.Assign):\nleft = d.targets\n@@ -275,14 +277,17 @@ def num_type(d: ast.Num):\ndef str_type(d: ast.Num):\nreturn repr(d.s)\n+\n@converter(ast.JoinedStr)\ndef joined_str(d: ast.JoinedStr):\nreturn \"+\".join(find(value) for value in d.values)\n+\n@converter(ast.FormattedValue)\ndef formatted_value(d: ast.FormattedValue):\nreturn find(d.value)\n+\n@converter(ast.NameConstant)\ndef name_constant_type(d: ast.NameConstant):\nconsts = {True: \"true\", False: \"false\", None: \"null\"}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -71,7 +71,7 @@ class User(HTTP, AsyncHandleManager):\nself.__loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\n- self.api: UserApi = UserApi(self.__tokens)\n+ self._api: UserApi = UserApi(self.__tokens)\nself.mode = mode\nself._expand_models: bool = expand_models\n@@ -80,10 +80,12 @@ class User(HTTP, AsyncHandleManager):\nself.user_id: typing.Optional[int] = user_id or self.get_id_by_token(\nself.__tokens[0]\n)\n- self.api.user_id = user_id\n+\n+ self._api.user_id = user_id\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\n- UserApi.set_current(self.api)\n+ UserApi.set_current(self._api)\nVKErrorHandler.set_current(self.error_handler)\n+\nself.on: Handler = Handler()\nself.branch: AbstractBranchGenerator = DictBranch()\nself.middleware: MiddlewareExecutor = MiddlewareExecutor()\n@@ -253,6 +255,10 @@ class User(HTTP, AsyncHandleManager):\ndef stop(self):\nself._stop = True\n+ @property\n+ def api(self) -> UserApi:\n+ return self._api.get_current().construct(self.error_handler, None)\n+\n@property\ndef loop(self):\nreturn self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "@@ -13,3 +13,4 @@ from .tools import (\nfrom .util import ContextInstanceMixin\nfrom .json import json\nfrom .logger import logger\n+from .constructor import Constructor\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/utils/constructor.py",
"diff": "+from abc import ABC, abstractmethod\n+import typing\n+\n+\n+class Constructor(ABC):\n+ @abstractmethod\n+ def construct(self, *args, **kwargs) -> typing.ClassVar:\n+ \"\"\" Construct new object \"\"\"\n+ pass\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Captcha handling implementation
|
718,838 |
14.05.2020 09:19:37
| -10,800 |
5e6b1f646e80a78c2c0c80ce2bbc0aeb9fb24540
|
v2.7.3 Made PhotoSizesType vk unstable type scheme undependent
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api/error_handler/error_handler.py",
"new_path": "vkbottle/api/api/error_handler/error_handler.py",
"diff": "@@ -26,7 +26,7 @@ class VKErrorHandler(ABC, ContextInstanceMixin):\nreturn {\"response\": response}\nelif e.error_code not in self.handled_errors:\nreturn await self.unhandled_error(e)\n- return await self.handled_errors[e.error_code](e)\n+ return {\"response\": await self.handled_errors[e.error_code](e)}\ndef error_handler(self, error_code: int):\ndef decorator(func):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/photos.py",
"new_path": "vkbottle/types/objects/photos.py",
"diff": "@@ -171,19 +171,7 @@ class PhotoSizes(BaseModel):\nwidth: int = None\n-class PhotoSizesType(Enum):\n- s = \"s\"\n- m = \"m\"\n- x = \"x\"\n- o = \"o\"\n- p = \"p\"\n- q = \"q\"\n- r = \"r\"\n- y = \"y\"\n- z = \"z\"\n- w = \"w\"\n- i = \"i\"\n- d = \"d\"\n+PhotoSizesType = str\nclass PhotoTag(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Made PhotoSizesType vk unstable type scheme undependent
|
718,889 |
15.05.2020 10:03:56
| -18,000 |
6dd14db562af005fdbe966b1d241730980364753
|
Message attachment history field
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "-from . import base, audio, docs, photos, video, gifts, market, wall, users, link, polls\n+from . import base, audio, docs, photos, video, gifts, market, wall, users, link, polls, stories\nimport typing\nfrom enum import Enum\nfrom ..base import BaseModel\n@@ -259,6 +259,7 @@ class MessageAttachment(BaseModel):\nmarket_market_album: \"market.MarketAlbum\" = None\nphoto: \"photos.Photo\" = None\nsticker: \"base.Sticker\" = None\n+ story: \"stories.Story\" = None\ntype: \"MessageAttachmentType\" = None\nvideo: \"video.Video\" = None\nwall: \"wall.WallpostFull\" = None\n@@ -276,6 +277,7 @@ class MessageAttachmentType(Enum):\nmarket_album = \"market_album\"\ngift = \"gift\"\nsticker = \"sticker\"\n+ story = \"story\"\nwall = \"wall\"\nwall_reply = \"wall_reply\"\narticle = \"article\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Message attachment history field (#104)
|
718,838 |
16.05.2020 11:38:30
| -10,800 |
3ef038ddb169617cce8065b640d5d22dc59fb29b
|
v2.7.3 Fix keyboard generation color
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/keyboard.py",
"new_path": "vkbottle/api/keyboard/keyboard.py",
"diff": "@@ -27,7 +27,7 @@ class KeyboardButton:\n@property\ndef button(self):\nb = {\"action\": except_none_self(self.action.dict())}\n- if self.action is Text:\n+ if isinstance(self.action, Text):\nb[\"color\"] = self.color\nreturn b\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 Fix keyboard generation color (#97)
|
718,838 |
16.05.2020 15:38:07
| -10,800 |
09f3c097c463eff54ed75839429dab92d49cd99f
|
v2.7.3 typo example fix
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/error_handler/error_handler.py",
"new_path": "examples/tests/error_handler/error_handler.py",
"diff": "@@ -19,7 +19,7 @@ async def solve_captcha(e: VKError):\nimage = await response_image.content.read()\nasync with session.post(\n\"https://rucaptcha.com/in.php\",\n- ata={\"key\": os.environ[\"RUCAPTCHA_TOKEN\"], \"file\": image},\n+ data={\"key\": os.environ[\"RUCAPTCHA_TOKEN\"], \"file\": image},\n) as response_wait:\nresult_id = (await response_wait.text()).split(\"|\")[1]\nawait asyncio.sleep(5)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.3 typo example fix
|
718,865 |
16.05.2020 12:00:30
| 18,000 |
da6007e21130ee83a79676cce4807f60c0864950
|
Blueprint editions
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/abc.py",
"new_path": "vkbottle/framework/blueprint/abc.py",
"diff": "+from vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch\n+from vkbottle.framework.framework.handler import MiddlewareExecutor\n+from vkbottle.api.api.api import Api\n+from vkbottle.api.api.error_handler import (\n+ VKErrorHandler,\n+ DefaultErrorHandler,\n+)\nfrom abc import ABCMeta, abstractmethod\nimport typing\n@@ -8,7 +15,13 @@ class AbstractBlueprint(metaclass=ABCMeta):\n@abstractmethod\ndef __init__(self, name: str = None, description: str = None) -> None:\n- pass\n+ self.branch: typing.Optional[AbstractBranchGenerator] = DictBranch()\n+ self.middleware: MiddlewareExecutor = MiddlewareExecutor()\n+ self.error_handler: VKErrorHandler = DefaultErrorHandler()\n+\n+ self.api: Api = None\n+ self._name = name or \"Unknown\"\n+ self._description = description or \"Unknown\"\n@abstractmethod\ndef create(self, *args, **kwargs):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/bot.py",
"new_path": "vkbottle/framework/blueprint/bot.py",
"diff": "import typing\n-from vkbottle.api import api\n-from ...utils import exceptions\n-from vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch\n+from vkbottle.api.api import Api\n+from ...utils.exceptions import VKError\n+from vkbottle.framework.framework.branch import AbstractBranchGenerator\nfrom vkbottle.framework.framework.extensions import AbstractExtension\n-from vkbottle.framework.framework.handler import MiddlewareExecutor\n-from vkbottle.api.api.error_handler import (\n- VKErrorHandler,\n- DefaultErrorHandler,\n-)\nfrom vkbottle.framework.framework.handler.handler import Handler\nfrom .abc import AbstractBlueprint\n+Familiar = typing.Tuple[\n+ AbstractBranchGenerator, AbstractExtension, Api\n+]\n+\nclass Blueprint(AbstractBlueprint):\ndef __init__(self, name: str = None, description: str = None) -> None:\nsuper().__init__()\n- # Main workers\n- self.branch: typing.Optional[AbstractBranchGenerator] = DictBranch()\n- self.middleware: MiddlewareExecutor = MiddlewareExecutor()\nself.on: Handler = Handler()\n- self.error_handler: VKErrorHandler = DefaultErrorHandler()\n-\nself.extension: AbstractExtension = None\n- self.api: api.Api = None\n+ self.data: dict = {}\n+\nself._name = name or \"Unknown\"\nself._description = description or \"Unknown\"\n- self.data: dict = {}\ndef create(\nself,\n*,\n- familiar: typing.Tuple[AbstractBranchGenerator, AbstractExtension, api.Api],\n+ familiar: Familiar,\ndata: typing.Optional[dict] = None,\n):\nbranch, extension, api_instance = familiar\nif not isinstance(self.branch, type(branch)):\n- raise exceptions.VKError(\n+ raise VKError(\n0,\nf\"All blueprints should have the same branch generative type ({self.name} \"\nf\"Blueprint, branch {self.branch.__name__} / familiar {branch.__name__}\",\n@@ -45,3 +39,6 @@ class Blueprint(AbstractBlueprint):\nself.api = api_instance\nif data is not None:\nself.data = data\n+\n+\n+bp = Blueprint()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/blueprint/user.py",
"new_path": "vkbottle/framework/blueprint/user.py",
"diff": "-from vkbottle.api import api\n-from vkbottle.api.api.error_handler import (\n- VKErrorHandler,\n- DefaultErrorHandler,\n-)\n+from vkbottle.api import UserApi\n+from vkbottle.framework.framework.branch import AbstractBranchGenerator\nfrom vkbottle.framework.framework.handler.user.handler import Handler\n-\n+from vkbottle.utils.exceptions import VKError\n+from typing import Tuple\nfrom .abc import AbstractBlueprint\n@@ -13,12 +11,19 @@ class Blueprint(AbstractBlueprint):\nsuper().__init__()\n# Main workers\nself.on: Handler = Handler()\n- self.error_handler: VKErrorHandler = DefaultErrorHandler()\n-\n- self.api: api.Api = None\nself._name: str = name or \"Unknown\"\nself._description: str = description or \"Unknown\"\n- def create(self, *, api_instance: api.UserApi, error_handler: VKErrorHandler):\n+ def create(\n+ self,\n+ *,\n+ familiar: Tuple[AbstractBranchGenerator, UserApi]\n+ ):\n+ branch, api_instance = familiar\n+ if not isinstance(self.branch, type(branch)):\n+ raise VKError(\n+ 0,\n+ f\"All blueprints should have the same branch generative type ({self.name} \"\n+ f\"Blueprint, branch {self.branch.__name__} / familiar {branch.__name__}\",\n+ )\nself.api = api_instance\n- self.error_handler = error_handler\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -117,7 +117,11 @@ class Bot(HTTP, AsyncHandleManager):\n# Sign assets\nself._api: Api = Api(self.__tokens, throw_errors=throw_errors)\nself.error_handler: VKErrorHandler = DefaultErrorHandler()\n- self.extension: AbstractExtension = extension if extension is not None else StandardExtension()\n+ self.extension: AbstractExtension = (\n+ extension\n+ if extension is not None else\n+ StandardExtension()\n+ )\nself._throw_errors: bool = throw_errors\nApi.set_current(self._api)\n@@ -428,10 +432,6 @@ 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/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -37,6 +37,11 @@ class Handler:\nself.message_handler: MessageHandler = MessageHandler()\ndef dispatch(self):\n+ self.message_rules.extend([\n+ *self.message.rules,\n+ *self.chat_message.rules,\n+ *self.message_handler.rules\n+ ])\nself.message_rules.extend(\n[*self.message.rules, *self.chat_message.rules, *self.message_handler.rules]\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -285,7 +285,9 @@ class AttachmentRule(UnionMixin):\nclass ChatActionRule(AbstractMessageRule):\ndef __init__(\n- self, chat_action: typing.Union[str, typing.List[str]], rules: dict = None\n+ self,\n+ chat_action: typing.Union[str, typing.List[str]],\n+ rules: dict = None\n):\nif isinstance(chat_action, str):\nchat_action = [chat_action]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -142,21 +142,26 @@ class User(HTTP, AsyncHandleManager):\n)\nreturn tokens\n- def dispatch(self, user: AnyUser):\n+ async def dispatch(self, user: AnyUser):\n\"\"\"\nConcatenate handlers to current user object\n:param user:\n:return:\n\"\"\"\nself.on.concatenate(user.on)\n+ self.error_handler.handled_errors.update(user.error_handler.handled_errors)\n+ self.middleware.middleware += user.middleware.middleware\n+ for branch_name, disposal in (await user.branch.branches).items():\n+ self.branch.add_branch(disposal[0], name=branch_name)\n+ logger.debug(\"Bot has been successfully dispatched\")\ndef set_blueprints(self, *blueprints: Blueprint):\n\"\"\"\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- blueprint.create(api_instance=self.api, error_handler=self.error_handler)\n- self.dispatch(blueprint)\n+ blueprint.create(familiar=(self.branch, self.api))\n+ self.loop.create_task(self.dispatch(blueprint))\nlogger.debug(\"Blueprints have been successfully loaded\")\nasync def get_server(self) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Blueprint editions (#103)
|
718,838 |
17.05.2020 18:46:45
| -10,800 |
160e825676830cf9624631f5371ed7c26c337c9d
|
v2.7.4 Improve docs, release version
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/error_handler/error_handler.py",
"new_path": "examples/tests/error_handler/error_handler.py",
"diff": "@@ -48,10 +48,10 @@ async def hi(ans: Message, text: str):\nfor symbol in list(text):\nnew_text += symbol\nawait user.api.messages.edit(ans.peer_id, message_id, new_text + \"|\")\n- await asyncio.sleep(1)\n+ await asyncio.sleep(0.5)\nif random.randint(0, 100) > 50:\nawait user.api.messages.edit(ans.peer_id, message_id, new_text)\n- await asyncio.sleep(1)\n+ await asyncio.sleep(0.5)\nuser.error_handler.add_error_handler(6, rps_limit)\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -9,9 +9,9 @@ except:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"2.7.3\",\n+ version=\"2.7.4\",\nauthor=\"timoniq\",\n- description=\"Working with VK by this homogenetic way and it's awesome!\",\n+ description=\"Homogenic!\",\nlong_description=long_description,\nlong_description_content_type=\"text/markdown\",\nlicense=\"GPL-3.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"2.7.3 Released 11.05.20 14:43\" # Package VKBottle version\n+__version__ = \"2.7.4 Released 17.05.20 14:43\" # Package VKBottle version\n__author__ = \"Arsenii Timoniq\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Improve docs, release version
|
718,838 |
17.05.2020 22:26:24
| -10,800 |
75337149e2600cdc1935bffc83975b3034619847
|
v2.7.4 Fix branches
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -191,8 +191,7 @@ class Bot(HTTP, AsyncHandleManager):\nself.on.concatenate(bot.on)\nself.error_handler.handled_errors.update(bot.error_handler.handled_errors)\nself.middleware.middleware += bot.middleware.middleware\n- for branch_name, disposal in (await bot.branch.branches).items():\n- self.branch.add_branch(disposal[0], name=branch_name)\n+ self.branch.add_branches(bot.branch.branches)\nlogger.debug(\"Bot has been successfully dispatched\")\ndef set_blueprints(self, *blueprints: Blueprint):\n@@ -200,8 +199,8 @@ class Bot(HTTP, AsyncHandleManager):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- blueprint.create(familiar=(self.branch, self.extension, self.api))\nself.loop.create_task(self.dispatch(blueprint))\n+ blueprint.create(familiar=(self.branch, self.extension, self.api))\nlogger.debug(\"Blueprints have been successfully loaded\")\n@staticmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "import typing\nfrom abc import ABC, abstractmethod\n+from vkbottle.utils.util import ContextInstanceMixin\nfrom .cls import AbstractBranch\nfrom ..rule import AbstractMessageRule\nimport enum\n@@ -14,7 +15,7 @@ class GeneratorType(enum.Enum):\nDICT = \"dict\"\n-class AbstractBranchGenerator(ABC):\n+class AbstractBranchGenerator(ABC, ContextInstanceMixin):\nDisposal = typing.Dict[str, BranchRule]\ncls_branch: typing.Any\nsimple_branch: typing.Any\n@@ -35,7 +36,11 @@ class AbstractBranchGenerator(ABC):\n@property\n@abstractmethod\n- async def branches(self) -> typing.Dict[str, typing.Tuple[AbstractBranch, ...]]:\n+ def branches(self) -> typing.Dict[str, typing.Tuple[AbstractBranch, ...]]:\n+ ...\n+\n+ @abstractmethod\n+ def add_branches(self, new_branches: typing.Dict[str, typing.Tuple[AbstractBranch, ...]]):\n...\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -31,7 +31,10 @@ class DatabaseBranch(AbstractBranchGenerator):\npass\ndef get_branch(self, branch_name: str, context: typing.Union[str, dict]) -> Branch:\n- branch = self.names[branch_name]()\n+ bare = self.names[branch_name]\n+ if isinstance(bare, tuple):\n+ bare = bare[0]\n+ branch = bare()\nif isinstance(context, str):\ncontext = json.loads(context)\nbranch.context = context\n@@ -40,7 +43,7 @@ class DatabaseBranch(AbstractBranchGenerator):\nasync def from_function(\nself, func: typing.Callable, branch_name: str = None,\n- ) -> typing.Tuple[AbstractBranch, ImmutableBranchData]:\n+ ) -> AbstractBranch:\nif not asyncio.iscoroutinefunction(func):\nraise BranchError(\"Branch functions should be async\")\n@@ -61,9 +64,12 @@ class DatabaseBranch(AbstractBranchGenerator):\nreturn await self.all_users()\n@property\n- async def branches(self) -> typing.Dict[str, AbstractBranch]:\n+ def branches(self) -> typing.Dict[str, AbstractBranch]:\nreturn self.names\n+ def add_branches(self, new_branches: typing.Dict[str, AbstractBranch]):\n+ self.names.update(new_branches)\n+\nasync def add(\nself,\nuid: int,\n@@ -111,3 +117,6 @@ class DatabaseBranch(AbstractBranchGenerator):\nbranch = self.get_branch(name, context)\nawait branch.exit()\nawait self.delete_user(uid)\n+\n+ def get_current(self, *args, **kwargs):\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/dict_branch.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "-import typing, asyncio\n-import inspect\n+import typing\n-from .cls import CoroutineBranch, AbstractBranch\n-from .abc import AbstractBranchGenerator, GeneratorType\n+from .abc import GeneratorType\n+from .database_branch import DatabaseBranch\nfrom .standart_branch import ImmutableBranchData\n-from vkbottle.utils.exceptions import BranchError\n+class DictBranch(DatabaseBranch):\n+ user_states: typing.Dict[int, typing.Tuple[str, ...]] = {}\n+ generator = GeneratorType.DICT\n-class DictBranch(AbstractBranchGenerator):\n- def __init__(self):\n- self._meet_up: typing.Dict[\n- str, typing.Tuple[AbstractBranch, ImmutableBranchData]\n- ] = {}\n- self._branch_queue: typing.Dict[int, AbstractBranch] = {}\n- self.generator = GeneratorType.DICT\n+ async def get_user(self, uid: int) -> typing.Tuple[str, typing.Union[str, dict]]:\n+ return self.user_states[uid]\n- def from_function(\n- self, func: typing.Callable, branch_name: str = None,\n- ) -> typing.Tuple[AbstractBranch, ImmutableBranchData]:\n- if not asyncio.iscoroutinefunction(func):\n- raise BranchError(\"Branch functions should be async\")\n- return (\n- CoroutineBranch,\n- ImmutableBranchData(branch_name or func.__name__, call=func),\n- )\n-\n- def simple_branch(self, branch_name: str = None):\n- def decorator(func: typing.Callable):\n- self._meet_up[branch_name or func.__name__] = self.from_function(\n- func, branch_name\n- )\n- return func\n+ async def set_user(self, uid: int, branch: str, context: str) -> None:\n+ self.user_states[uid] = (branch, context)\n- return decorator\n+ async def delete_user(self, uid: int):\n+ del self.user_states[uid]\n- def add_branch(\n- self, branch: typing.Callable, name: str = None,\n- ):\n- if inspect.isclass(type(branch)):\n- self._meet_up[name or branch.__name__] = (branch, ImmutableBranchData(name))\n- elif asyncio.iscoroutinefunction(branch):\n- self._meet_up[name or branch.__name__] = (\n- CoroutineBranch,\n- ImmutableBranchData(name or branch.__name__, call=branch),\n- )\n- else:\n- raise BranchError(\n- \"Branch Callable should be an AbstractBranch (ClsBranch) or a async function\"\n- )\n+ async def all_users(self) -> typing.List[int]:\n+ return list(self.user_states.keys())\ndef cls_branch(\nself, branch_name: str = None,\n):\ndef decorator(cls: typing.ClassVar):\n- self._meet_up[branch_name or cls.__name__] = (\n+ self.names[branch_name or cls.__name__] = (\ncls,\nImmutableBranchData(branch_name),\n)\nreturn cls\n-\nreturn decorator\n- @property\n- async def queue(self) -> typing.List[int]:\n- return self._branch_queue.keys()\n-\n- @property\n- async def branches(self) -> typing.Dict[str, AbstractBranch]:\n- return self._meet_up\n-\n- async def add(\n- self,\n- uid: int,\n- branch: typing.Union[typing.Callable, str, AbstractBranch],\n- call_enter: bool = True,\n- **context\n- ) -> AbstractBranch:\n- state, data = None, None\n- if isinstance(branch, str):\n- if branch not in self._meet_up:\n- raise BranchError(\n- \"Branch {} hasn't been yet assigned with decorator\".format(branch)\n- )\n- state, data = self._meet_up[branch]\n- elif isinstance(branch, typing.Coroutine):\n- q = {\n- b[1].data[\"call\"]: b\n- for b in self._meet_up.values()\n- if \"call\" in b[1].data\n- }\n- if branch not in q:\n- raise BranchError(\n- \"Branch {} hasn't been yet assigned with decorator\".format(\n- branch.__name__\n- )\n- )\n- state, data = q[branch]\n- else:\n- for k, v in self._meet_up.items():\n- if v[0] is branch:\n- state, data = self._meet_up[k]\n- break\n- assert state and data, BranchError(\n- \"Branch not found, maybe it still hasn't been assigned\"\n- )\n- branch = state(**data())\n- branch.create(**context)\n- self._branch_queue[uid] = branch\n- if call_enter:\n- await branch.enter()\n- return self._branch_queue[uid]\n-\n- async def load(\n- self, uid: int,\n- ) -> typing.Tuple[\"AbstractBranchGenerator.Disposal\", AbstractBranch]:\n- if uid in self._branch_queue:\n- branch = self._branch_queue.get(uid)\n- disposal = dict(\n- inspect.getmembers(branch, predicate=lambda obj: isinstance(obj, tuple))\n+ def simple_branch(self, branch_name: str = None):\n+ def decorator(func: typing.Callable):\n+ self.names[branch_name or func.__name__] = self.from_function(\n+ func, branch_name\n)\n- disposal[\"default\"] = [branch.__class__.branch, []]\n- return disposal, branch\n+ return func\n+ return decorator\n- async def exit(self, uid: int, call_exit: bool = True) -> None:\n- if uid in self._branch_queue:\n- if call_exit:\n- await self._branch_queue[uid].exit()\n- del self._branch_queue[uid]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/rule/rule.py",
"new_path": "vkbottle/framework/framework/rule/rule.py",
"diff": "@@ -31,6 +31,9 @@ class RuleExecute:\ndef __call__(self):\nreturn self.args, self.kwargs\n+ def __repr__(self):\n+ return f\"<{self.args}{self.kwargs}>\"\n+\nclass AbstractRule(Copy):\n@@ -230,7 +233,7 @@ class VBML(AbstractMessageRule):\n):\nif isinstance(pattern, dict):\nself.watch_context = pattern\n- pattern = list(pattern) # It's not necessary to write .keys()\n+ pattern = list(pattern)\nself._patcher = Patcher.get_current()\npatterns: typing.List[Pattern] = []\nif isinstance(pattern, Pattern):\n@@ -244,7 +247,7 @@ class VBML(AbstractMessageRule):\nelse:\npatterns.append(p)\nelif isinstance(pattern, str):\n- patterns = [self._patcher.pattern(pattern)]\n+ patterns = [self._patcher.pattern(pattern, flags=re.IGNORECASE if lower else None)]\nself.data = {\"pattern\": patterns}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -151,8 +151,7 @@ class User(HTTP, AsyncHandleManager):\nself.on.concatenate(user.on)\nself.error_handler.handled_errors.update(user.error_handler.handled_errors)\nself.middleware.middleware += user.middleware.middleware\n- for branch_name, disposal in (await user.branch.branches).items():\n- self.branch.add_branch(disposal[0], name=branch_name)\n+ self.branch.add_branches(user.branch.branches)\nlogger.debug(\"Bot has been successfully dispatched\")\ndef set_blueprints(self, *blueprints: Blueprint):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix branches #106
|
718,838 |
17.05.2020 22:35:09
| -10,800 |
7fe1bddfbbee73c36181d86f2b6c2e112f94797c
|
v2.7.4 Improve docs, reformat
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/dict_branch.py",
"new_path": "vkbottle/framework/framework/branch/dict_branch.py",
"diff": "@@ -19,7 +19,7 @@ class DictBranch(DatabaseBranch):\ndel self.user_states[uid]\nasync def all_users(self) -> typing.List[int]:\n- return list(self.user_states.keys())\n+ return list(self.user_states)\ndef cls_branch(\nself, branch_name: str = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Improve docs, reformat
|
718,838 |
19.05.2020 21:09:40
| -10,800 |
948c998b11ad48301f78ddd430c5a7b510ee92ae
|
v2.7.4 Fix user polling processor
+ added api's get_method_requested
+ add setCovidStatus method and improve docs
|
[
{
"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, Constructor\n+from vkbottle.utils import ContextInstanceMixin, Constructor, method_requested\nfrom .error_handler.error_handler import VKErrorHandler\nfrom pydantic import BaseModel\n@@ -14,6 +14,7 @@ from vkbottle.api.api.util.builtin import (\nif typing.TYPE_CHECKING:\nfrom vkbottle.framework.framework.extensions.extension import AbstractExtension\n+ from vkbottle.types.methods.method import BaseMethod\nclass API(ContextInstanceMixin, Categories, Constructor):\n@@ -75,6 +76,10 @@ class API(ContextInstanceMixin, Categories, Constructor):\n\"\"\" Make an execute method \"\"\"\nreturn await self.request(\"execute\", {\"code\": code})\n+ @staticmethod\n+ def get_method_requested(method: str) -> \"BaseMethod\":\n+ return method_requested(method, Categories, None)\n+\ndef construct(\nself, error_handler: \"VKErrorHandler\", extension: \"AbstractExtension\"\n) -> \"API\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -17,6 +17,7 @@ from vkbottle.framework.framework.branch import (\nExitBranch,\n)\nfrom vkbottle.types.events import UserEvents\n+from vkbottle.framework.framework.handler.user.events import ADDITIONAL_FIELDS\nclass AsyncHandleManager:\n@@ -33,17 +34,20 @@ class AsyncHandleManager:\nasync def _event_processor(\nself, update: dict, update_code: int, update_fields: list\n):\n+ data = None\n+\nfor rule in self.on.event.rules:\ncheck = await rule.check(update)\nif check is not None:\nfields, _ = rule.data[\"data\"], rule.data[\"name\"]\ndata = dict(zip(fields, update_fields))\n- args, kwargs = [], {}\nif self._expand_models:\ndata.update(await self.expand_data(update_code, data))\n+ args, kwargs = [], {}\n+\nif rule.data.get(\"dataclass\"):\ndata = rule.data.get(\"dataclass\")(**data)\n@@ -85,18 +89,19 @@ class AsyncHandleManager:\nasync def _message_processor(\nself, update: dict, update_code: int, update_fields: list\n):\n+ fields = [\"message_id\", \"flags\", *ADDITIONAL_FIELDS]\n+ data = dict(zip(fields, update_fields))\n+\n+ if self._expand_models:\n+ data.update(await self.expand_data(update_code, data))\n+\nfor rule in self.on.message_rules:\ncheck = await rule.check(update)\nif check is not None:\n- fields, _ = rule.data[\"data\"], rule.data[\"name\"]\n- data = dict(zip(fields, update_fields))\nargs, kwargs = [], {}\nmiddleware_args = []\n- if self._expand_models:\n- data.update(await self.expand_data(update_code, data))\n-\nmessage = Message(**data)\nif isinstance(check, tuple):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/access.py",
"new_path": "vkbottle/types/methods/access.py",
"diff": "@@ -7,3 +7,4 @@ class APIAccessibility(Enum):\nGROUP = \"group\"\nOPEN = \"open\"\nVKME = \"vkme\"\n+ COVID = \"covid\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/users.py",
"new_path": "vkbottle/types/methods/users.py",
"diff": "@@ -245,6 +245,27 @@ class UsersSearch(BaseMethod):\n)\n+class UsersSetCovidStatus(BaseMethod):\n+ kwargs: dict = {}\n+ access_token_type: APIAccessibility = [APIAccessibility.COVID]\n+\n+ async def __call__(self, status_id: int) -> responses.ok_response.OkResponse:\n+ \"\"\"\n+ Set special Covid emoji\n+ :param status_id: special status ID\n+ \"\"\"\n+ params = {\n+ k if not k.endswith(\"_\") else k[:-1]: v\n+ for k, v in {**locals(), **self.kwargs}.items()\n+ if k not in [\"self\"] and v is not None\n+ }\n+ return await self.request(\n+ \"users.setCovidStatus\",\n+ params,\n+ response_model=responses.ok_response.OkResponseModel\n+ )\n+\n+\nclass Users:\ndef __init__(self, request):\nself.get = UsersGet(request)\n@@ -253,3 +274,4 @@ class Users:\nself.is_app_user = UsersIsAppUser(request)\nself.report = UsersReport(request)\nself.search = UsersSearch(request)\n+ self.set_covid_status = UsersSetCovidStatus(request)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/events.py",
"new_path": "vkbottle/types/user_longpoll/events.py",
"diff": "@@ -121,5 +121,5 @@ class ChatVoiceMessageStates(BaseModel):\nclass ChatEdit(BaseModel):\n- chat_id: int\n- self: int\n+ chat_id: int = None\n+ self: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "@@ -9,6 +9,7 @@ from .tools import (\nfrom_attr,\nnames,\nrandom_string,\n+ method_requested,\n)\nfrom .util import ContextInstanceMixin\nfrom .json import json\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -7,6 +7,9 @@ from typing import Sequence, List\nimport random\nimport string\n+if typing.TYPE_CHECKING:\n+ from vkbottle.api.api.category import Categories\n+ from vkbottle.types.methods.method import BaseMethod\nclass Logger:\ndef __getattr__(self, item):\n@@ -91,3 +94,12 @@ def flatten(lis):\nyield from flatten(item)\nelse:\nyield item\n+\n+def method_requested(method: str, categoties: \"Categories\", request_instance) -> \"BaseMethod\":\n+ return from_attr(\n+ categoties,\n+ [method.split(\".\")[0], to_snake_case(method.split(\".\")[1])]\n+ if \".\" in method\n+ else method,\n+ (request_instance, None),\n+ ),\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix user polling processor
+ added api's get_method_requested
+ add setCovidStatus method and improve docs
|
718,838 |
21.05.2020 17:59:35
| -10,800 |
4b7a1a97c102bd9a48e7a0d1e398e71a81fa70a9
|
v2.7.4 Add audio param to status.set
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -123,7 +123,6 @@ class Handler:\nrule = VBMLRule(pattern)\nself.chat_message.add_rules([rule], func)\nreturn func\n-\nreturn decorator\ndef chat_invite(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/status.py",
"new_path": "vkbottle/types/methods/status.py",
"diff": "@@ -33,13 +33,14 @@ class StatusSet(BaseMethod):\naccess_token_type: APIAccessibility = [APIAccessibility.USER]\nasync def __call__(\n- self, text: str = None, group_id: int = None\n+ self, text: str = None, group_id: int = None, audio: str = None\n) -> responses.ok_response.OkResponse:\n\"\"\" status.set\nFrom Vk Docs: Sets a new status for the current user.\nAccess from user token(s)\n:param text: Text of the new status.\n:param group_id: Identifier of a community to set a status in. If left blank the status is set to current user.\n+ :param audio: needed to make status with audio\n\"\"\"\nparams = {\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Add audio param to status.set
|
718,838 |
21.05.2020 18:07:32
| -10,800 |
bdcc80443d05948abfc7ebdec09c63c2e9f39344
|
v2.7.4 fix middleware async_generator unpack
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -129,7 +129,10 @@ class AsyncHandleManager:\ntask = await rule.call(message, *args, **kwargs)\nawait self._handler_return(task, data)\n- await self.middleware.run_middleware(message, flag=MiddlewareFlags.PRE)\n+\n+ async for mr in self.middleware.run_middleware(message, flag=MiddlewareFlags.POST):\n+ logger.debug(f\"POST Middleware handler returned: {mr}\")\n+\nreturn task\nasync def expand_data(self, code: int, data: dict) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 fix middleware async_generator unpack
|
718,838 |
21.05.2020 19:30:21
| -10,800 |
76281913d6a2a8ce4b1620e21c59f043836232e4
|
v2.7.4 Improve types, add audio hidden fields
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/audio.py",
"new_path": "vkbottle/types/objects/audio.py",
"diff": "from ..base import BaseModel\n+from typing import List\n+\n+\n+class AudioAds(BaseModel):\n+ content_id: str = None\n+ duration: str = None\n+ account_age_type: str = None\n+\n+\n+class AlbumThumb(BaseModel):\n+ width: int = None\n+ height: int = None\n+ photo_34: str = None\n+ photo_68: str = None\n+ photo_135: str = None\n+ photo_270: str = None\n+ photo_300: str = None\n+ photo_600: str = None\n+ photo_1200: str = None\n+\n+\n+class AudioAlbum(BaseModel):\n+ id: int = None\n+ title: str = None\n+ owner_id: int = None\n+ access_key: str = None\n+ thumb: AlbumThumb = None\n+\n+\n+class Artist(BaseModel):\n+ name: str = None\n+ domain: str = None\n+ id: str = None\nclass Audio(BaseModel):\nartist: str = None\nid: int = None\n+ owner_id: int = None\ntitle: str = None\nurl: str = None\nduration: int = None\n+ access_key: str = None\n+ ads: AudioAds = None\n+ is_licensed: bool = None\n+ track_code: str = None\ndate: int = None\nalbum_id: int = None\n+ album: AudioAlbum = None\ngenre_id: int = None\nperformer: str = None\n+ main_artists: List[Artist] = None\nAudio.update_forward_refs()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Improve types, add audio hidden fields
|
718,838 |
21.05.2020 22:18:19
| -10,800 |
ba07aa40433ae68ce6ff6c7362c289413eed2fba
|
v2.7.4 Fix response types 2/2
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/notifications.py",
"new_path": "vkbottle/types/responses/notifications.py",
"diff": "@@ -11,13 +11,13 @@ class SendMessageModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n- profiles: typing.List = None\n- groups: typing.List = None\n+ items: typing.List[objects.notifications.Notification] = None\n+ profiles: typing.List[objects.users.User] = None\n+ groups: typing.List[objects.groups.Group] = None\nlast_viewed: int = None\n- photos: typing.List = None\n- videos: typing.List = None\n- apps: typing.List = None\n+ photos: typing.List[objects.photos.Photo] = None\n+ videos: typing.List[objects.video.Video] = None\n+ apps: typing.List[objects.apps.App] = None\nnext_from: str = None\nttl: int = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/orders.py",
"new_path": "vkbottle/types/responses/orders.py",
"diff": "@@ -44,13 +44,8 @@ class GetUserSubscriptionByIdModel(BaseModel):\nresponse: GetUserSubscriptionById = None\n-class GetUserSubscriptions(BaseModel):\n- count: int = None\n- items: typing.List = None\n-\n-\nclass GetUserSubscriptionsModel(BaseModel):\n- response: GetUserSubscriptions = None\n+ response: objects.orders.Subscription = None\nGet = typing.List[objects.orders.Order]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/photos.py",
"new_path": "vkbottle/types/responses/photos.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle.types import objects\nclass Search(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.Photo] = None\nclass SearchModel(BaseModel):\n@@ -49,7 +49,7 @@ class GetAlbumsCountModel(BaseModel):\nclass GetAlbums(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.PhotoAlbum] = None\nclass GetAlbumsModel(BaseModel):\n@@ -58,7 +58,7 @@ class GetAlbumsModel(BaseModel):\nclass GetAllComments(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.CommentXtrPid] = None\nclass GetAllCommentsModel(BaseModel):\n@@ -67,7 +67,7 @@ class GetAllCommentsModel(BaseModel):\nclass GetAll(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.Photo] = None\nmore: objects.base.BoolInt = None\n@@ -85,7 +85,7 @@ class GetByIdModel(BaseModel):\nclass GetComments(BaseModel):\ncount: int = None\nreal_offset: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.CommentXtrPid] = None\nclass GetCommentsModel(BaseModel):\n@@ -108,7 +108,7 @@ class GetMessagesUploadServerModel(BaseModel):\nclass GetNewTags(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.PhotoTag] = None\nclass GetNewTagsModel(BaseModel):\n@@ -131,7 +131,7 @@ class GetUploadServerModel(BaseModel):\nclass GetUserPhotos(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.Photo] = None\nclass GetUserPhotosModel(BaseModel):\n@@ -147,7 +147,7 @@ class GetWallUploadServerModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.photos.Photo] = None\nclass GetModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/pretty_cards.py",
"new_path": "vkbottle/types/responses/pretty_cards.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle.types import objects\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.pretty_cards.PrettyCard] = None\nclass GetModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/search.py",
"new_path": "vkbottle/types/responses/search.py",
"diff": "import typing\nfrom ..base import BaseModel\n+from vkbottle.types import objects\n-\n-class GetHints(BaseModel):\n- count: int = None\n- items: typing.List = None\n- suggested_queries: typing.List = None\n-\n+GetHints = typing.List[objects.search.Hint]\nclass GetHintsModel(BaseModel):\nresponse: GetHints = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/stories.py",
"new_path": "vkbottle/types/responses/stories.py",
"diff": "@@ -13,7 +13,8 @@ class UploadModel(BaseModel):\nclass GetBanned(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ profiles: typing.List[objects.users.User] = None\n+ groups: typing.List[objects.groups.Group] = None\nclass GetBannedModel(BaseModel):\n@@ -22,7 +23,7 @@ class GetBannedModel(BaseModel):\nclass GetById(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.stories.Story] = None\nclass GetByIdModel(BaseModel):\n@@ -31,7 +32,7 @@ class GetByIdModel(BaseModel):\nclass GetPhotoUploadServer(BaseModel):\nupload_url: str = None\n- user_ids: typing.List = None\n+ user_ids: typing.List[int] = None\nclass GetPhotoUploadServerModel(BaseModel):\n@@ -40,7 +41,7 @@ class GetPhotoUploadServerModel(BaseModel):\nclass GetReplies(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.stories.Replies] = None\nclass GetRepliesModel(BaseModel):\n@@ -56,7 +57,7 @@ class GetStatsModel(BaseModel):\nclass GetVideoUploadServer(BaseModel):\nupload_url: str = None\n- user_ids: typing.List = None\n+ user_ids: typing.List[int] = None\nclass GetVideoUploadServerModel(BaseModel):\n@@ -65,7 +66,7 @@ class GetVideoUploadServerModel(BaseModel):\nclass GetViewers(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[int] = None\nclass GetViewersModel(BaseModel):\n@@ -74,7 +75,7 @@ class GetViewersModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.stories.Story] = None\npromo_data: objects.stories.PromoBlock = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/users.py",
"new_path": "vkbottle/types/responses/users.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle.types import objects\nclass Search(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.users.User] = None\nclass SearchModel(BaseModel):\n@@ -14,7 +14,7 @@ class SearchModel(BaseModel):\nclass GetFollowers(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.users.User] = None\nclass GetFollowersModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/utils.py",
"new_path": "vkbottle/types/responses/utils.py",
"diff": "@@ -18,7 +18,7 @@ class CheckLinkModel(BaseModel):\nclass GetLastShortenedLinks(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.utils.LastShortenedLink] = None\nclass GetLastShortenedLinksModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/video.py",
"new_path": "vkbottle/types/responses/video.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle.types import objects\nclass Search(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.video.Video] = None\nclass SearchModel(BaseModel):\n@@ -43,7 +43,7 @@ class GetAlbumsByVideoModel(BaseModel):\nclass GetAlbums(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.video.VideoAlbumFull] = None\nclass GetAlbumsModel(BaseModel):\n@@ -52,7 +52,7 @@ class GetAlbumsModel(BaseModel):\nclass GetComments(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.wall.WallComment] = None\nclass GetCommentsModel(BaseModel):\n@@ -61,7 +61,7 @@ class GetCommentsModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.video.Video] = None\nclass GetModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/wall.py",
"new_path": "vkbottle/types/responses/wall.py",
"diff": "@@ -5,7 +5,7 @@ from vkbottle.types import objects\nclass Search(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.wall.Wallpost] = None\nclass SearchModel(BaseModel):\n@@ -37,7 +37,7 @@ class GetByIdModel(BaseModel):\nclass GetComments(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.wall.WallComment] = None\ncan_post: bool = None\ngroups_can_post: bool = None\ncurrent_level_count: int = None\n@@ -48,9 +48,9 @@ class GetCommentsModel(BaseModel):\nclass GetReposts(BaseModel):\n- items: typing.List = None\n- profiles: typing.List = None\n- groups: typing.List = None\n+ items: typing.List[objects.wall.Wallpost] = None\n+ profiles: typing.List[objects.users.UserFull] = None\n+ groups: typing.List[objects.groups.Group] = None\nclass GetRepostsModel(BaseModel):\n@@ -59,7 +59,7 @@ class GetRepostsModel(BaseModel):\nclass Get(BaseModel):\ncount: int = None\n- items: typing.List = None\n+ items: typing.List[objects.wall.Wallpost] = None\nclass GetModel(BaseModel):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/widgets.py",
"new_path": "vkbottle/types/responses/widgets.py",
"diff": "import typing\nfrom ..base import BaseModel\n+from vkbottle.types import objects\nclass GetPages(BaseModel):\ncount: int = None\n- pages: typing.List = None\n+ pages: typing.List[objects.widgets.WidgetPage] = None\nclass GetPagesModel(BaseModel):\n@@ -13,7 +14,7 @@ class GetPagesModel(BaseModel):\nclass GetComments(BaseModel):\ncount: int = None\n- posts: typing.List = None\n+ posts: typing.List[objects.widgets.WidgetComment] = None\nclass GetCommentsModel(BaseModel):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix response types 2/2
|
718,838 |
21.05.2020 22:22:58
| -10,800 |
bc343eca65a6080bd5f7a156af1c2af2d3734f05
|
v2.7.4 Fix response type :sleepy:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/orders.py",
"new_path": "vkbottle/types/responses/orders.py",
"diff": "@@ -44,8 +44,10 @@ class GetUserSubscriptionByIdModel(BaseModel):\nresponse: GetUserSubscriptionById = None\n+GetUserSubscriptions = objects.orders.Subscription\n+\nclass GetUserSubscriptionsModel(BaseModel):\n- response: objects.orders.Subscription = None\n+ response: GetUserSubscriptions = None\nGet = typing.List[objects.orders.Order]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix response type :sleepy:
|
718,838 |
22.05.2020 10:10:46
| -10,800 |
44aa10a2af7381d21e600e8d95b44fd4f726e54f
|
v2.7.4 Cosmetic improvements; add attachment getters to Message dataclass
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -112,7 +112,7 @@ class Bot(HTTP, AsyncHandleManager):\n)\nself.group_id = group_id or self.get_id_by_token(self.__tokens[0])\n- self.__loop = loop or asyncio.get_event_loop()\n+ self.loop = loop or asyncio.get_event_loop()\n# Sign assets\nself._api: Api = Api(self.__tokens, throw_errors=throw_errors)\n@@ -237,14 +237,14 @@ class Bot(HTTP, AsyncHandleManager):\nself._api = api\nApi.set_current(api)\n- def loop_update(self, loop: asyncio.AbstractEventLoop = None):\n+ def loop_update(self, loop: asyncio.AbstractEventLoop = None) -> asyncio.AbstractEventLoop:\n\"\"\"\nUpdate event loop\n:param loop:\n:return:\n\"\"\"\n- self.__loop = loop or asyncio.get_event_loop()\n- return self.__loop\n+ self.loop = loop or asyncio.get_event_loop()\n+ return self.loop\ndef empty_copy(self) -> \"Bot\":\n\"\"\"\n@@ -304,7 +304,7 @@ class Bot(HTTP, AsyncHandleManager):\n\"\"\"\nself._stop = False\ntask = TaskManager(\n- self.__loop,\n+ self.loop,\nauto_reload=auto_reload,\non_shutdown=on_shutdown,\non_startup=on_startup,\n@@ -408,7 +408,7 @@ class Bot(HTTP, AsyncHandleManager):\nreturn \"ok\"\n- def stop(self):\n+ def stop(self) -> None:\nself._stop = True\ndef __repr__(self) -> str:\n@@ -427,12 +427,12 @@ class Bot(HTTP, AsyncHandleManager):\nreturn self._status\n@property\n- def loop(self):\n- return self.__loop\n+ def patcher(self) -> Patcher:\n+ return Patcher.get_current()\n@property\n- def patcher(self):\n- return Patcher.get_current()\n+ def link(self) -> str:\n+ return f\"https://vk.com/club{self.group_id}\"\n@property\ndef eee(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -14,7 +14,7 @@ from vkbottle.api.api.error_handler import (\nVKErrorHandler,\nDefaultErrorHandler,\n)\n-from vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch, BranchCheckupKey\n+from vkbottle.framework.framework.branch import AbstractBranchGenerator, DictBranch\nfrom vkbottle.framework.framework.handler.middleware import MiddlewareExecutor\nfrom vkbottle.framework.blueprint.user import Blueprint\nfrom vkbottle.http import HTTP, App\n@@ -69,7 +69,7 @@ class User(HTTP, AsyncHandleManager):\nif login and password:\nself.__tokens = [self.get_tokens(login, password)]\n- self.__loop = loop or asyncio.get_event_loop()\n+ self.loop = loop or asyncio.get_event_loop()\nself.__debug: bool = debug\nself._api: UserApi = UserApi(self.__tokens)\nself.mode = mode\n@@ -120,7 +120,7 @@ class User(HTTP, AsyncHandleManager):\n)\n@staticmethod\n- def get_id_by_token(token: str):\n+ def get_id_by_token(token: str) -> int:\n\"\"\"\nGet group id from token\n:param token:\n@@ -142,7 +142,7 @@ class User(HTTP, AsyncHandleManager):\n)\nreturn tokens\n- async def dispatch(self, user: AnyUser):\n+ async def dispatch(self, user: AnyUser) -> None:\n\"\"\"\nConcatenate handlers to current user object\n:param user:\n@@ -154,7 +154,7 @@ class User(HTTP, AsyncHandleManager):\nself.branch.add_branches(user.branch.branches)\nlogger.debug(\"Bot has been successfully dispatched\")\n- def set_blueprints(self, *blueprints: Blueprint):\n+ def set_blueprints(self, *blueprints: Blueprint) -> None:\n\"\"\"\nAdd blueprints\n\"\"\"\n@@ -206,7 +206,7 @@ class User(HTTP, AsyncHandleManager):\ntry:\nevent = await self.make_long_request(self.long_poll_server)\nif isinstance(event, dict) and event.get(\"ts\"):\n- self.__loop.create_task(self.emulate(event))\n+ self.loop.create_task(self.emulate(event))\nself.long_poll_server[\"ts\"] = event[\"ts\"]\nelse:\nawait self.get_server()\n@@ -247,7 +247,7 @@ class User(HTTP, AsyncHandleManager):\n\"\"\"\nself._stop = False\ntask = TaskManager(\n- self.__loop,\n+ self.loop,\nauto_reload=auto_reload,\non_shutdown=on_shutdown,\non_startup=on_startup,\n@@ -256,7 +256,7 @@ class User(HTTP, AsyncHandleManager):\ntask.add_task(self.run())\ntask.run()\n- def stop(self):\n+ def stop(self) -> None:\nself._stop = True\n@property\n@@ -264,8 +264,8 @@ class User(HTTP, AsyncHandleManager):\nreturn self._api.get_current().construct(self.error_handler, None)\n@property\n- def loop(self):\n- return self.__loop\n+ def link(self) -> str:\n+ return f\"https://vk.com/id{self.user_id}\"\n- def __repr__(self):\n+ def __repr__(self) -> str:\nreturn f\"<User {self.user_id}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -7,20 +7,18 @@ from vkbottle.const import VERSION_REST, __version__\nfrom vkbottle.utils import json, logger\n-def request(func):\n+def request_decorator(func):\n\"\"\"\naioHTTP Request Decorator Wrapper\n:param func: wrapped function\n\"\"\"\n-\nasync def decorator(*args, **kwargs):\ntry:\nasync with ClientSession(json_serialize=json.dumps) as client:\nresponse = await func(*args, **kwargs, client=client)\nreturn response\n- except Exception:\n+ except Exception as e:\nlogger.error(f\"Error while requesting:\\n{traceback.format_exc()}\")\n-\nreturn decorator\n@@ -32,7 +30,7 @@ class HTTPRequest:\ndef __init__(self):\npass\n- @request\n+ @request_decorator\nasync def post(\nself,\nurl: str,\n@@ -47,7 +45,7 @@ class HTTPRequest:\n) as response:\nreturn await response.json(content_type=content_type)\n- @request\n+ @request_decorator\nasync def get(\nself,\nurl: str,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -54,15 +54,7 @@ class Message(MessageType, GetApi):\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n):\n-\n- if message is not None:\n- message = str(message)\n-\n- return self.api.messages.send(\n- **self.get_params(locals()),\n- reply_to=self.id or self.conversation_message_id,\n- peer_id=self.peer_id,\n- )\n+ return self.__call__(**self.get_params(locals()), reply_to=self.get_message_id())\nasync def __call__(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -15,6 +15,7 @@ from . import (\nimport typing\nfrom enum import Enum\nfrom ..base import BaseModel\n+from vkbottle.utils.json import json\nclass AudioMessage(BaseModel):\n@@ -231,6 +232,33 @@ class Message(BaseModel):\ntext: str = None\nupdate_time: int = None\n+ def get_photo_attachments(self) -> typing.List[\"photos.Photo\"]:\n+ return [attachment.photo for attachment in self.attachments if attachment.photo]\n+\n+ def get_video_attachments(self) -> typing.List[\"video.Video\"]:\n+ return [attachment.video for attachment in self.attachments if attachment.video]\n+\n+ def get_doc_attachments(self) -> typing.List[\"docs.Doc\"]:\n+ return [attachment.doc for attachment in self.attachments if attachment.doc]\n+\n+ def get_audio_attachments(self) -> typing.List[\"audio.Audio\"]:\n+ return [attachment.audio for attachment in self.attachments if attachment.audio]\n+\n+ def get_message_id(self) -> int:\n+ return self.id or self.conversation_message_id\n+\n+ def get_payload_json(\n+ self,\n+ throw_error: bool = False,\n+ unpack_failure: typing.Callable[[str], dict] = lambda payload: payload\n+ ) -> typing.Union[dict, None]:\n+ try:\n+ return json.loads(self.payload)\n+ except json.decoder.JSONDecodeError as e:\n+ if throw_error:\n+ raise e\n+ return unpack_failure(self.payload)\n+\nclass MessageAction(BaseModel):\nconversation_message_id: int = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Cosmetic improvements; add attachment getters to Message dataclass
|
718,838 |
22.05.2020 11:42:44
| -10,800 |
a6d3e30810ec387e3038053b37e6fa062dca4fbf
|
v2.7.4 Made dumping branch context optional
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -88,7 +88,13 @@ class DatabaseBranch(AbstractBranchGenerator):\nf\"Branch {branch.__name__!r} hasn't yet been assigned with decorator\"\n)\nbranch = dict((v, k) for k, v in self.names.items())[branch]\n- await self.set_user(uid, branch, json.dumps(context))\n+\n+ dumped_context = context\n+\n+ if self.generator is GeneratorType.DATABASE:\n+ dumped_context = json.dumps(context)\n+\n+ await self.set_user(uid, branch, dumped_context)\nif call_enter:\nawait self.get_branch(branch, context).enter()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Made dumping branch context optional
|
718,838 |
22.05.2020 11:48:36
| -10,800 |
e045dd947ca95e7425f5cb76fd52c20033b7669a
|
v2.7.4 Fix branch context dump generator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -91,7 +91,7 @@ class DatabaseBranch(AbstractBranchGenerator):\ndumped_context = context\n- if self.generator is GeneratorType.DATABASE:\n+ if self.__class__.generator is GeneratorType.DATABASE:\ndumped_context = json.dumps(context)\nawait self.set_user(uid, branch, dumped_context)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix branch context dump generator
|
718,838 |
22.05.2020 11:53:07
| -10,800 |
864642d9043d155efc8d7a4528250135ee11694d
|
v2.7.4 Fix branch checkup key; Reformat with black
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/audio.py",
"new_path": "vkbottle/api/uploader/audio.py",
"diff": "import typing\nfrom .base import Uploader\n+\nclass AudioUploader(Uploader):\nasync def upload_audio(\nself,\n@@ -10,17 +11,16 @@ class AudioUploader(Uploader):\n**params,\n) -> typing.Union[str, dict]:\n- server = await self.api.request(\n- \"audio.getUploadServer\", {}\n- )\n+ server = await self.api.request(\"audio.getUploadServer\", {})\nfile = self.open_pathlike(pathlike)\nuploader = await self.upload(server, {\"file\": file}, params)\naudio = await self.api.request(\n- \"audio.save\",\n- {\"artist\": artist, \"title\": title, **uploader, **params},\n+ \"audio.save\", {\"artist\": artist, \"title\": title, **uploader, **params},\n)\nif self.gas:\n- return self.generate_attachment_string(\"audio\", await self.api.user_id, audio[\"id\"])\n+ return self.generate_attachment_string(\n+ \"audio\", await self.api.user_id, audio[\"id\"]\n+ )\nreturn audio\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -237,7 +237,9 @@ class Bot(HTTP, AsyncHandleManager):\nself._api = api\nApi.set_current(api)\n- def loop_update(self, loop: asyncio.AbstractEventLoop = None) -> asyncio.AbstractEventLoop:\n+ def loop_update(\n+ self, loop: asyncio.AbstractEventLoop = None\n+ ) -> asyncio.AbstractEventLoop:\n\"\"\"\nUpdate event loop\n:param loop:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -32,7 +32,7 @@ class AsyncHandleManager:\nmessage = Message(\n**{**obj, \"text\": init_bot_mention(self.group_id, obj[\"text\"])},\n- client_info=client_info\n+ client_info=client_info,\n)\nasync for mr in self.middleware.run_middleware(\n@@ -83,7 +83,9 @@ class AsyncHandleManager:\nawait self._handler_return(task, **processor)\n- async for mr in self.middleware.run_middleware(message, flag=MiddlewareFlags.POST):\n+ async for mr in self.middleware.run_middleware(\n+ message, flag=MiddlewareFlags.POST\n+ ):\nlogger.debug(f\"POST Middleware handler returned: {mr}\")\nasync def _event_processor(self, obj: dict, event_type: str):\n@@ -123,6 +125,7 @@ class AsyncHandleManager:\nobj[\"text\"] = sub(r\"\\[club\" + str(self.group_id) + r\"\\|.*?\\] \", \"\", obj[\"text\"])\nanswer = Message(**obj, client_info=client_info)\n+ branch_checkup_key = answer.dict()[self.branch_checkup_key.value]\nlogger.debug(\n'-> BRANCHED MESSAGE FROM {} TEXT \"{}\"',\n@@ -130,7 +133,7 @@ class AsyncHandleManager:\nanswer.text.replace(\"\\n\", \" \"),\n)\n- disposal, branch = await self.branch.load(answer.peer_id)\n+ disposal, branch = await self.branch.load(branch_checkup_key)\nedited = None\nfor n, member in disposal.items():\n@@ -153,7 +156,7 @@ class AsyncHandleManager:\nif edited is False and self.branch.generator is GeneratorType.DATABASE:\nif answer.peer_id in await self.branch.queue:\n- await self.branch.add(answer.peer_id, branch.key, **branch.context)\n+ await self.branch.add(branch_checkup_key, branch.key, **branch.context)\nlogger.info(\n'New BRANCHED \"{0}\" compiled with branch <{2}> (from: {1})'.format(\n@@ -181,7 +184,7 @@ class AsyncHandleManager:\nawait self.branch.add(\nobj[\"peer_id\"],\nhandler_return.branch_name,\n- **handler_return.branch_kwargs\n+ **handler_return.branch_kwargs,\n)\nreturn True\nelif isinstance(handler_return, ExitBranch):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/handler.py",
"new_path": "vkbottle/framework/framework/handler/handler.py",
"diff": "@@ -123,6 +123,7 @@ class Handler:\nrule = VBMLRule(pattern)\nself.chat_message.add_rules([rule], func)\nreturn func\n+\nreturn decorator\ndef chat_invite(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -130,7 +130,9 @@ class AsyncHandleManager:\ntask = await rule.call(message, *args, **kwargs)\nawait self._handler_return(task, data)\n- async for mr in self.middleware.run_middleware(message, flag=MiddlewareFlags.POST):\n+ async for mr in self.middleware.run_middleware(\n+ message, flag=MiddlewareFlags.POST\n+ ):\nlogger.debug(f\"POST Middleware handler returned: {mr}\")\nreturn task\n@@ -191,7 +193,7 @@ class AsyncHandleManager:\nawait self.branch.add(\ndata[\"peer_id\"],\nhandler_return.branch_name,\n- **handler_return.branch_kwargs\n+ **handler_return.branch_kwargs,\n)\nreturn True\nelif isinstance(handler_return, ExitBranch):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -12,6 +12,7 @@ def request_decorator(func):\naioHTTP Request Decorator Wrapper\n:param func: wrapped function\n\"\"\"\n+\nasync def decorator(*args, **kwargs):\ntry:\nasync with ClientSession(json_serialize=json.dumps) as client:\n@@ -19,6 +20,7 @@ def request_decorator(func):\nreturn response\nexcept Exception as e:\nlogger.error(f\"Error while requesting:\\n{traceback.format_exc()}\")\n+\nreturn decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -54,7 +54,9 @@ class Message(MessageType, GetApi):\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n):\n- return self.__call__(**self.get_params(locals()), reply_to=self.get_message_id())\n+ return self.__call__(\n+ **self.get_params(locals()), reply_to=self.get_message_id()\n+ )\nasync def __call__(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -250,7 +250,7 @@ class Message(BaseModel):\ndef get_payload_json(\nself,\nthrow_error: bool = False,\n- unpack_failure: typing.Callable[[str], dict] = lambda payload: payload\n+ unpack_failure: typing.Callable[[str], dict] = lambda payload: payload,\n) -> typing.Union[dict, None]:\ntry:\nreturn json.loads(self.payload)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/database.py",
"new_path": "vkbottle/types/responses/database.py",
"diff": "@@ -16,6 +16,7 @@ class Chair(BaseModel):\nid: int = None\ntitle: str = None\n+\nclass GetChairs(BaseModel):\ncount: int = None\nitems: typing.List[Chair] = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/orders.py",
"new_path": "vkbottle/types/responses/orders.py",
"diff": "@@ -46,6 +46,7 @@ class GetUserSubscriptionByIdModel(BaseModel):\nGetUserSubscriptions = objects.orders.Subscription\n+\nclass GetUserSubscriptionsModel(BaseModel):\nresponse: GetUserSubscriptions = None\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/responses/search.py",
"new_path": "vkbottle/types/responses/search.py",
"diff": "@@ -4,5 +4,6 @@ from vkbottle.types import objects\nGetHints = typing.List[objects.search.Hint]\n+\nclass GetHintsModel(BaseModel):\nresponse: GetHints = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fix branch checkup key; Reformat with black
|
718,838 |
23.05.2020 12:26:35
| -10,800 |
015c635d133e12ef471e746c3893c91a8e3b7fa8
|
v2.7.4 Silly fix message.reply
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -54,7 +54,7 @@ class Message(MessageType, GetApi):\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n):\n- return self.__call__(\n+ return await self.__call__(\n**self.get_params(locals()), reply_to=self.get_message_id()\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Silly fix message.reply
|
718,865 |
24.05.2020 09:05:30
| 18,000 |
2f88f8436efb808d4ffb4c9e74512684c8306286
|
v2.7.4 Branch fixes
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -132,7 +132,6 @@ class Bot(HTTP, AsyncHandleManager):\nself.on: Handler = Handler(self.group_id)\nself._stop: bool = False\n- self.branch_checkup_key: BranchCheckupKey = BranchCheckupKey.PEER_ID\nlogger.info(\"Using JSON_MODULE - {}\".format(USAGE))\nlogger.info(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -24,7 +24,6 @@ class AsyncHandleManager:\nstatus: BotStatus\ngroup_id: int\nloop: AbstractEventLoop\n- branch_checkup_key: BranchCheckupKey = BranchCheckupKey.PEER_ID\nasync def _processor(self, obj: dict, client_info: dict):\nprocessor = dict(obj=obj, client_info=client_info)\n@@ -44,7 +43,7 @@ class AsyncHandleManager:\nelif mr is not None:\nmiddleware_args.append(mr)\n- if message.dict()[self.branch_checkup_key.value] in await self.branch.queue:\n+ if message.dict()[self.branch.checkup_key.value] in await self.branch.queue:\nawait self._branched_processor(obj, client_info, middleware_args)\nreturn\n@@ -125,7 +124,7 @@ class AsyncHandleManager:\nobj[\"text\"] = sub(r\"\\[club\" + str(self.group_id) + r\"\\|.*?\\] \", \"\", obj[\"text\"])\nanswer = Message(**obj, client_info=client_info)\n- branch_checkup_key = answer.dict()[self.branch_checkup_key.value]\n+ branch_checkup_key = answer.dict()[self.branch.checkup_key.value]\nlogger.debug(\n'-> BRANCHED MESSAGE FROM {} TEXT \"{}\"',\n@@ -155,7 +154,6 @@ class AsyncHandleManager:\nbreak\nif edited is False and self.branch.generator is GeneratorType.DATABASE:\n- if answer.peer_id in await self.branch.queue:\nawait self.branch.add(branch_checkup_key, branch.key, **branch.context)\nlogger.info(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "import typing\nfrom abc import ABC, abstractmethod\nfrom vkbottle.utils.util import ContextInstanceMixin\n+from ..branch import BranchCheckupKey\nfrom .cls import AbstractBranch\nfrom ..rule import AbstractMessageRule\nimport enum\n@@ -20,6 +21,7 @@ class AbstractBranchGenerator(ABC, ContextInstanceMixin):\ncls_branch: typing.Any\nsimple_branch: typing.Any\ngenerator: GeneratorType = GeneratorType.ABSTRACT\n+ checkup_key: BranchCheckupKey = BranchCheckupKey.PEER_ID\n@abstractmethod\ndef from_function(self, *args, **kwargs) -> None:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -80,6 +80,7 @@ class AsyncHandleManager:\nreturn await self._event_processor(*data)\nexcept VKError as e:\nawait self.error_handler.handle_error(e)\n+\nexcept:\nlogger.error(\n\"While user polling worked error occurred \\n\\n{traceback}\",\n@@ -104,17 +105,6 @@ class AsyncHandleManager:\nmessage = Message(**data)\n- if isinstance(check, tuple):\n- if all([await s_rule.check(message) for s_rule in check]):\n- args = [a for rule in check for a in rule.context.args]\n- kwargs = {\n- k: v\n- for rule in check\n- for k, v in rule.context.kwargs.items()\n- }\n- else:\n- continue\n-\nasync for mr in self.middleware.run_middleware(\nmessage, flag=MiddlewareFlags.PRE\n):\n@@ -123,10 +113,21 @@ class AsyncHandleManager:\nelif mr is not None:\nmiddleware_args.append(mr)\n- if message.peer_id in await self.branch.queue:\n+ if message.dict()[self.branch.checkup_key.value] in await self.branch.queue:\nawait self._branched_processor(message, middleware_args)\nreturn\n+ if isinstance(check, tuple):\n+ if all([await s_rule.check(message) for s_rule in check]):\n+ args = [a for rule in check for a in rule.context.args]\n+ kwargs = {\n+ k: v\n+ for rule in check\n+ for k, v in rule.context.kwargs.items()\n+ }\n+ else:\n+ continue\n+\ntask = await rule.call(message, *args, **kwargs)\nawait self._handler_return(task, data)\n@@ -147,13 +148,14 @@ class AsyncHandleManager:\nreturn data\nasync def _branched_processor(self, message: Message, middleware_args: list):\n+ branch_checkup_key = message.dict()[self.branch.checkup_key.value]\nlogger.debug(\n'-> BRANCHED MESSAGE FROM {} TEXT \"{}\"',\n- message.peer_id,\n+ branch_checkup_key,\nmessage.text.replace(\"\\n\", \" \"),\n)\n- disposal, branch = await self.branch.load(message.peer_id)\n+ disposal, branch = await self.branch.load(branch_checkup_key)\nfor n, member in disposal.items():\nrules = member[1]\n@@ -172,7 +174,7 @@ class AsyncHandleManager:\nlogger.info(\n'New BRANCHED \"{0}\" compiled with branch <{2}> (from: {1})'.format(\nmessage.text.replace(\"\\n\", \" \"),\n- message.from_id,\n+ branch_checkup_key,\n'\"{}\" with {} kwargs'.format(\nbranch.key,\nbranch.context\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Branch fixes (#110)
|
718,865 |
24.05.2020 09:49:58
| 18,000 |
2bd3340403d363782309304475183f84e4b3d7e5
|
v2.7.4 Import fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -15,7 +15,7 @@ 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, BranchCheckupKey\n+from vkbottle.framework.framework.branch import DictBranch\nfrom vkbottle.framework.framework.branch.abc import AbstractBranchGenerator\nfrom vkbottle.framework.blueprint.bot import Blueprint\nfrom vkbottle.framework.bot.processor import AsyncHandleManager\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -154,6 +154,7 @@ class AsyncHandleManager:\nbreak\nif edited is False and self.branch.generator is GeneratorType.DATABASE:\n+ if branch_checkup_key in await self.branch.queue:\nawait self.branch.add(branch_checkup_key, branch.key, **branch.context)\nlogger.info(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "+import enum\nimport typing\nfrom abc import ABC, abstractmethod\n+\n+from vkbottle.framework.framework.branch.standart_branch import BranchCheckupKey\nfrom vkbottle.utils.util import ContextInstanceMixin\nfrom ..branch import BranchCheckupKey\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"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "from abc import abstractmethod\nfrom .abc import AbstractBranchGenerator, Branch, AbstractBranch, GeneratorType\n-from .standart_branch import ImmutableBranchData\nfrom .cls import CoroutineBranch\nfrom vkbottle.utils.exceptions import BranchError\nfrom vkbottle.utils.json import json\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Import fix (#111)
|
718,865 |
24.05.2020 10:48:15
| 18,000 |
a09d1aab02ee8ed599360539eb188b97d28a1559
|
v2.7.4 Some minor fixes in user.processor
|
[
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -75,27 +75,23 @@ bot.run_polling(skip_updates=False)\nfrom vkbottle import Bot, Message\nfrom aiohttp import web\n-bot = Bot(token=\"my-token\", secret=\"my-secret\")\n+bot = Bot(token=\"my-token\")\napp = web.Application()\nasync def executor(request: web.Request):\nevent = await request.json()\n- emulation = await bot.emulate(event=event, confirmation_token=\"ConfirmationToken\")\n+ emulation = await bot.emulate(event, confirmation_token=\"ConfirmationToken\")\nreturn web.Response(text=emulation)\n@bot.on.message(text=\"test\", lower=True)\nasync def wrapper(ans: Message):\n- return \"Tested!\"\n+ return \"Got it.\"\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+app.router.add_route(\"/\", \"POST\", executor)\n+web.run_app(app=app)\n```\n### Rules\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/base.py",
"new_path": "vkbottle/api/uploader/base.py",
"diff": "from vkbottle.api import API\n-import aiohttp, json\n+import aiohttp\n+import json\nimport ssl\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/abc.py",
"new_path": "vkbottle/framework/framework/branch/abc.py",
"diff": "@@ -4,7 +4,6 @@ from abc import ABC, abstractmethod\nfrom vkbottle.framework.framework.branch.standart_branch import BranchCheckupKey\nfrom vkbottle.utils.util import ContextInstanceMixin\n-from ..branch import BranchCheckupKey\nfrom .cls import AbstractBranch\nfrom ..rule import AbstractMessageRule\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -44,7 +44,7 @@ class AsyncHandleManager:\ndata = dict(zip(fields, update_fields))\nif self._expand_models:\n- data.update(await self.expand_data(update_code, data))\n+ data.update(await self.expand_data(update_code, data)) # FIX\nargs, kwargs = [], {}\n@@ -92,15 +92,6 @@ class AsyncHandleManager:\n):\nfields = [\"message_id\", \"flags\", *ADDITIONAL_FIELDS]\ndata = dict(zip(fields, update_fields))\n-\n- if self._expand_models:\n- data.update(await self.expand_data(update_code, data))\n-\n- for rule in self.on.message_rules:\n- check = await rule.check(update)\n-\n- if check is not None:\n- args, kwargs = [], {}\nmiddleware_args = []\nmessage = Message(**data)\n@@ -117,6 +108,17 @@ class AsyncHandleManager:\nawait self._branched_processor(message, middleware_args)\nreturn\n+ if self._expand_models:\n+ data.update(await self.expand_data(update_code, data))\n+\n+ task = None\n+\n+ for rule in self.on.message_rules:\n+ check = await rule.check(update)\n+\n+ if check is not None:\n+ args, kwargs = [], {}\n+\nif isinstance(check, tuple):\nif all([await s_rule.check(message) for s_rule in check]):\nargs = [a for rule in check for a in rule.context.args]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll/message.py",
"new_path": "vkbottle/types/user_longpoll/message.py",
"diff": "@@ -63,7 +63,7 @@ class Message(BaseModel, GetApi):\n)\nasync def __call__(self, message: str = None, attachment: str = None, **params):\n-\n+ m = None\nlocals().update(params)\nfor message in sep_bytes(message or \"\"):\nm = await self.api.request(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Some minor fixes in user.processor (#112)
|
718,838 |
25.05.2020 21:22:24
| -10,800 |
8f7c70d7dadb2bf7b2951d27e46f9f1bde0795b1
|
v2.7.4 BotHandler refactoring; commit propertly
[ documentation needed :art: ]
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/bot/handler.py",
"new_path": "vkbottle/framework/framework/handler/bot/handler.py",
"diff": "@@ -12,17 +12,29 @@ from vkbottle.framework.framework.rule import (\nChatMessage,\nPrivateMessage,\nAny,\n- StickerRule,\nAbstractMessageRule,\n)\n-COL_RULES = {\n- \"commands\": CommandRule,\n- \"sticker\": StickerRule,\n-}\n+from ..handler import ABCHandler\n+from ..message import ABCMessageHandler\n-class Handler:\n+class MessageHandler(ABCMessageHandler):\n+ def __init__(self, *, default_rules: typing.List[AbstractMessageRule]):\n+ self._default_rules = default_rules\n+ self._patcher = Patcher.get_current()\n+\n+ def add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable):\n+ current = list()\n+ for rule in self.default_rules + rules:\n+ if not isinstance(rule, (AbstractRule, AbstractFilter)):\n+ warnings.warn(\n+ f\"Wrong rule! Got type {rule.__class__} instead of AbstractRule. Rule will be ignored\",\n+ Warning,\n+ )\n+ continue\n+ if not isinstance(rule, AbstractFilter):\n+ rule.create(func)\ncurrent.append(rule)\nself.rules.append(current)\n@@ -68,55 +80,14 @@ class BotHandler(ABCHandler):\n\"\"\"\nself.message_handler.rules += self.message.rules + self.chat_message.rules\n- )\nself.message_rules += self.message_handler.rules\nif get_current_rest:\n-\n# Check updates from timoniq/vkbottle-rest\ncurrent_rest = await get_current_rest()\n+ if current_rest.get(\"version\") != __version__:\nlogger.info(\n\"You are using old version of VKBottle. Update is found: {} | {}\",\n- current_rest[\"version\"],\n- current_rest[\"description\"],\n- )\n- logger.debug(\"Bot successfully dispatched\")\n-\n- def change_prefix_for_all(self, prefix: list) -> None:\n- self.message.prefix = prefix\n- self.chat_message.prefix = prefix\n- self.message_handler.prefix = prefix\n-\n- def chat_action(\n- self, type_: typing.Union[str, typing.List[str]], rules: dict = None\n- ):\n- \"\"\"\n- Special express processor of chat actions (https://vk.com/dev/objects/message - action object)\n- :param type_: action name\n- :param rules:\n- \"\"\"\n-\n- def decorator(func):\n- rule = ChatActionRule(type_, rules=rules)\n- self.chat_message.add_rules([rule], func)\n- return func\n-\n- return decorator\n-\n- def chat_mention(self):\n- def decorator(func):\n- pattern = Pattern(pattern=r\"\\[(club|public){}\\|.*?]\".format(self.group_id))\n- rule = VBMLRule(pattern)\n- self.chat_message.add_rules([rule], func)\n- return func\n-\n- return decorator\n-\n- def chat_invite(self):\n- def decorator(func):\n- rule = ChatActionRule(\"chat_invite_user\", {\"member_id\": -self.group_id})\n- self.chat_message.add_rules([rule], func)\n- return func\ncurrent_rest.get(\"version\"),\ncurrent_rest.get(\"description\"),\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 BotHandler refactoring; commit propertly
[ documentation needed :art: ]
|
718,838 |
25.05.2020 22:04:25
| -10,800 |
b87460b7d20b5335430c9ada60db61ce4a01c4b5
|
v2.7.4 Compexity - brueprints unpack dispatch task
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -196,7 +196,7 @@ class Bot(PollingAPI):\nAdd blueprints\n\"\"\"\nfor blueprint in blueprints:\n- self.loop.create_task(self.dispatch(blueprint))\n+ self.loop.run_until_complete(self.dispatch(blueprint))\nblueprint.create(familiar=(self.branch, self.extension, self.api))\nlogger.debug(\"Blueprints have been successfully loaded\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -166,7 +166,7 @@ class User(PollingAPI):\n\"\"\"\nfor blueprint in blueprints:\nblueprint.create(familiar=(self.branch, self.api))\n- self.loop.create_task(self.dispatch(blueprint))\n+ self.loop.run_until_complete(self.dispatch(blueprint))\nlogger.debug(\"Blueprints have been successfully loaded\")\nasync def get_server(self) -> dict:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Compexity - brueprints unpack dispatch task
|
718,838 |
26.05.2020 09:00:41
| -10,800 |
67a367d8fb3b93e9fe41caeafca1f034ac142dc3
|
v2.7.4 Fastfix unused unpack
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -66,12 +66,8 @@ class UserHandler(ABCHandler):\nasync def dispatch(\nself, get_current_rest: typing.Callable[[], typing.Awaitable[dict]] = None\n) -> None:\n- self.message_rules.extend(\n- [*self.message.rules, *self.chat_message.rules, *self.message_handler.rules]\n- )\n- self.message_rules.extend(\n- [*self.message.rules, *self.chat_message.rules, *self.message_handler.rules]\n- )\n+ self.message_handler.rules += self.message.rules + self.chat_message.rules\n+ self.message_rules += self.message_handler.rules\nif get_current_rest:\n# Check updates from timoniq/vkbottle-rest\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Fastfix unused unpack
|
718,838 |
26.05.2020 13:28:36
| -10,800 |
e95f2b35182ef54cade9e97a779bfc6c6ab9ad84
|
v2.7.4 Upload from link uploader implementation
[ documentated :baby_bottle: ]
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/audio.py",
"new_path": "vkbottle/api/uploader/audio.py",
"diff": "@@ -3,6 +3,8 @@ from .base import Uploader\nclass AudioUploader(Uploader):\n+ FILE_EXTENSIONS = [\".mp3\", \".ogg\", \".opus\"]\n+\nasync def upload_audio(\nself,\nartist: str,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/base.py",
"new_path": "vkbottle/api/uploader/base.py",
"diff": "from vkbottle.api import API\n+from vkbottle.http import HTTPRequest\nimport aiohttp\n+from io import BytesIO\nimport json\n+import typing\nimport ssl\nclass Uploader:\n+ FILE_EXTENSIONS: typing.List[str] = []\n+\ndef __init__(self, api: API, generate_attachment_strings: bool = False):\n\"\"\" Uploader base\n:param api: API Instance\n:param generate_attachment_strings: return attachment short strings after upload\n\"\"\"\nself.api = api\n+ self.http = HTTPRequest()\nself.gas = generate_attachment_strings\nasync def get_group_id(self, group_id: int = None) -> int:\n@@ -20,15 +26,22 @@ class Uploader:\nelse await getattr(self.api, \"group_id\", False)\n)\n+ async def get_data_from_link(\n+ self, link: str, ext: typing.Optional[str] = None\n+ ) -> BytesIO:\n+ content = BytesIO(await self.http.get(link, read_content=True))\n+ setattr(content, \"name\", f\"file{self.file_extensions[0] or ext}\")\n+ return content\n+\nasync def get_owner_id(self, group_id: int = None) -> int:\ngroup_id = await self.get_group_id(group_id)\nreturn -group_id if group_id is not False else await self.api.user_id\n- def with_api(self, api: API):\n+ def with_api(self, api: API) -> \"Uploader\":\nreturn self.__class__(api, self.gas)\n@staticmethod\n- def open_pathlike(pathlike):\n+ def open_pathlike(pathlike: typing.Union[str, BytesIO]) -> BytesIO:\nif isinstance(pathlike, str):\nreturn open(pathlike, \"rb\")\nreturn pathlike\n@@ -46,5 +59,9 @@ class Uploader:\ndef generate_attachment_string(segment: str, owner_id: int, item_id: int) -> str:\nreturn \"{segment}{owner_id}_{item_id}\".format(**locals())\n+ @property\n+ def file_extensions(self) -> typing.List[str]:\n+ return self.FILE_EXTENSIONS\n+\ndef __repr__(self):\nreturn f\"<{self.__class__.__name__} linked {self.api!r}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/doc.py",
"new_path": "vkbottle/api/uploader/doc.py",
"diff": "@@ -3,6 +3,12 @@ from .base import Uploader\nclass DocUploader(Uploader):\n+ FILE_EXTENSIONS = [\n+ \".txt\",\n+ \".docx\",\n+ \".mp3\",\n+ ]\n+\nasync def upload_doc_to_wall(\nself, pathlike, group_id: int = None, **params\n) -> typing.Union[str, dict]:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/photo.py",
"new_path": "vkbottle/api/uploader/photo.py",
"diff": "@@ -3,6 +3,8 @@ from .base import Uploader\nclass PhotoUploader(Uploader):\n+ FILE_EXTENSIONS = [\".jpg\", \".png\", \".gif\"]\n+\nasync def upload_photo_to_album(\nself,\nalbum_id: int,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/extensions/storage/abc.py",
"new_path": "vkbottle/framework/framework/extensions/storage/abc.py",
"diff": "from abc import ABC, abstractmethod\nimport typing\n+\nclass ABCStorage(ABC):\n@abstractmethod\ndef get(self, key: str) -> typing.Any:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "import ssl\nimport traceback\n+import typing\nfrom aiohttp import ClientSession\n@@ -41,10 +42,13 @@ class HTTPRequest:\ndata: dict = None,\njson_: dict = None,\ncontent_type: str = \"application/json\",\n- ) -> dict:\n+ read_content: bool = False,\n+ ) -> typing.Union[dict]:\nasync with client.post(\nurl, params=params or {}, ssl=ssl.SSLContext(), data=data, json=json_,\n) as response:\n+ if read_content:\n+ return await response.content.read()\nreturn await response.json(content_type=content_type)\n@request_decorator\n@@ -55,10 +59,13 @@ class HTTPRequest:\ndata: dict = None,\njson_: dict = None,\ncontent_type: str = \"application/json\",\n- ) -> dict:\n+ read_content: bool = False,\n+ ) -> typing.Union[dict]:\nasync with client.get(\nurl, ssl=ssl.SSLContext(), data=data or None, json=json_ or None\n) as response:\n+ if read_content:\n+ return await response.content.read()\nreturn await response.json(content_type=content_type)\ndef __repr__(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/util.py",
"new_path": "vkbottle/utils/util.py",
"diff": "@@ -10,7 +10,9 @@ class ContextInstanceMixin:\n\"\"\"\ndef __init_subclass__(cls, **kwargs):\n- cls.__context_instance = contextvars.ContextVar(\"instance_\" + (kwargs.get(\"ctx_name\") or cls.__name__))\n+ cls.__context_instance = contextvars.ContextVar(\n+ \"instance_\" + (kwargs.get(\"ctx_name\") or cls.__name__)\n+ )\nreturn cls\n@classmethod\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.4 Upload from link uploader implementation
[ documentated :baby_bottle: ]
|
718,865 |
27.05.2020 10:41:05
| 18,000 |
efea5e3b31590073b63cc0c815a11956fd45d9f1
|
Move ABCMessageHandler
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/bot/handler.py",
"new_path": "vkbottle/framework/framework/handler/bot/handler.py",
"diff": "@@ -21,6 +21,7 @@ from ..message import ABCMessageHandler\nclass MessageHandler(ABCMessageHandler):\ndef __init__(self, *, default_rules: typing.List[AbstractMessageRule]):\n+ super().__init__()\nself._default_rules = default_rules\nself._patcher = Patcher.get_current()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/message.py",
"new_path": "vkbottle/framework/framework/handler/message.py",
"diff": "@@ -26,11 +26,14 @@ COL_RULES = {\nclass ABCMessageHandler(ABC):\n- rules: typing.List[typing.List[AbstractRule]] = []\n- prefix: typing.List[typing.AnyStr] = []\n- _default_rules: typing.List[AbstractRule] = []\n+\n_patcher: Patcher\n+ def __init__(self):\n+ self.rules: typing.List[typing.List[AbstractRule]] = []\n+ self.prefix: typing.List[typing.AnyStr] = []\n+ self._default_rules: typing.List[AbstractRule] = []\n+\n@abstractmethod\ndef add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/user/handler.py",
"new_path": "vkbottle/framework/framework/handler/user/handler.py",
"diff": "@@ -20,6 +20,7 @@ from ..message import ABCMessageHandler\nclass MessageHandler(ABCMessageHandler):\ndef __init__(self, *, default_rules: typing.List[AbstractMessageRule]):\n+ super().__init__()\nself._default_rules = default_rules\nself._patcher = Patcher.get_current()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Move ABCMessageHandler (#114)
|
718,838 |
28.05.2020 20:18:16
| -10,800 |
4dfb73d6432dc64921609d3b65180a5789a1e18b
|
v2.7.5 Middleware PRE args are sent to POST
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -92,7 +92,7 @@ class BotProcessor(ABCProcessor):\nbreak\nasync for mr in self.middleware.run_middleware(\n- message, flag=MiddlewareFlags.POST\n+ message, flag=MiddlewareFlags.POST, *middleware_args\n):\nlogger.debug(f\"POST Middleware handler returned: {mr}\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"new_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"diff": "@@ -28,12 +28,12 @@ class MiddlewareExecutor:\ndef export_middleware(self, middleware_list: typing.List[Middleware]):\nself.middleware.extend(middleware_list)\n- async def run_middleware(self, event: BaseModel, flag: MiddlewareFlags):\n+ async def run_middleware(self, event: BaseModel, flag: MiddlewareFlags, *middleware_args):\nfor middleware in self.middleware:\nlogger.debug(\nf\"Executing middleware {middleware.__class__.__name__} ({str(flag)})\"\n)\n- yield await middleware.emulate_middleware(event, flag)\n+ yield await middleware.emulate_middleware(event, flag, *middleware_args)\ndef __repr__(self):\nreturn f\"<MiddlewareExecutor middleware={', '.join(names(self.middleware))}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"new_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"diff": "@@ -5,16 +5,16 @@ import warnings\nclass Middleware(ABC):\n- async def pre(self, event: BaseModel):\n+ async def pre(self, event: BaseModel, *args):\n...\n- async def post(self, event: BaseModel):\n+ async def post(self, event: BaseModel, *args):\n...\nasync def middleware(self, event: BaseModel):\nreturn MiddlewareFlags.UNASSIGNED\n- async def emulate_middleware(self, event: BaseModel, flag: \"MiddlewareFlags\"):\n+ async def emulate_middleware(self, event: BaseModel, flag: \"MiddlewareFlags\", *middleware_args):\n\"\"\" Emulate middleware based on given flag: PRE or POST\n:param event: Base executed event\n:param flag: MiddlewareFlags\n@@ -29,10 +29,10 @@ class Middleware(ABC):\nreturn await self.middleware(event)\nelif flag is MiddlewareFlags.PRE:\n- return await self.pre(event)\n+ return await self.pre(event, *middleware_args)\nelif flag is MiddlewareFlags.POST:\n- return await self.post(event)\n+ return await self.post(event, *middleware_args)\ndef __repr__(self):\nreturn f\"<Middleware {self.__class__.__qualname__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/processor.py",
"new_path": "vkbottle/framework/user/processor.py",
"diff": "@@ -131,7 +131,7 @@ class UserProcessor(ABCProcessor):\nbreak\nasync for mr in self.middleware.run_middleware(\n- message, flag=MiddlewareFlags.POST\n+ message, flag=MiddlewareFlags.POST, *middleware_args\n):\nlogger.debug(f\"POST Middleware handler returned: {mr}\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Middleware PRE args are sent to POST
|
718,854 |
28.05.2020 21:10:55
| -10,800 |
c149eb401154c6cddc8904352a4f176aee4354ca
|
v2.7.5 Fix middleware args
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/processor.py",
"new_path": "vkbottle/framework/bot/processor.py",
"diff": "@@ -92,7 +92,7 @@ class BotProcessor(ABCProcessor):\nbreak\nasync for mr in self.middleware.run_middleware(\n- message, flag=MiddlewareFlags.POST, *middleware_args\n+ message, MiddlewareFlags.POST, *middleware_args\n):\nlogger.debug(f\"POST Middleware handler returned: {mr}\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"new_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"diff": "@@ -26,7 +26,7 @@ class Middleware(ABC):\nwarnings.warn(\n\"Middleware.middleware is deprecated, use pre and post instead. See issue #108\"\n)\n- return await self.middleware(event)\n+ return await self.middleware(event, *middleware_args)\nelif flag is MiddlewareFlags.PRE:\nreturn await self.pre(event, *middleware_args)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Fix middleware args (#116)
|
718,838 |
29.05.2020 07:58:32
| -10,800 |
f75b6ba1df381876b0cf1bc5cde01dee43615aed
|
v2.7.5 Added types for BytesIO
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/audio.py",
"new_path": "vkbottle/api/uploader/audio.py",
"diff": "import typing\nfrom .base import Uploader\n+from io import BytesIO\nclass AudioUploader(Uploader):\nFILE_EXTENSIONS = [\".mp3\", \".ogg\", \".opus\"]\nasync def upload_audio(\n- self,\n- artist: str,\n- title: str,\n- pathlike: typing.Union[str, typing.Any],\n- **params,\n+ self, artist: str, title: str, pathlike: typing.Union[str, BytesIO], **params,\n) -> typing.Union[str, dict]:\nserver = await self.api.request(\"audio.getUploadServer\", {})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/doc.py",
"new_path": "vkbottle/api/uploader/doc.py",
"diff": "import typing\nfrom .base import Uploader\n+from io import BytesIO\nclass DocUploader(Uploader):\n@@ -10,7 +11,7 @@ class DocUploader(Uploader):\n]\nasync def upload_doc_to_wall(\n- self, pathlike, group_id: int = None, **params\n+ self, pathlike: typing.Union[str, BytesIO], group_id: int = None, **params\n) -> typing.Union[str, dict]:\nserver = await self.api.request(\n\"docs.getWallUploadServer\", {\"group_id\": group_id} if group_id else {}\n@@ -26,7 +27,7 @@ class DocUploader(Uploader):\nreturn doc\nasync def upload_doc(\n- self, pathlike, group_id: int = None, **params\n+ self, pathlike: typing.Union[str, BytesIO], group_id: int = None, **params\n) -> typing.Union[str, dict]:\nserver = await self.api.request(\n\"docs.getUploadServer\", {\"group_id\": group_id} if group_id else {}\n@@ -42,7 +43,11 @@ class DocUploader(Uploader):\nreturn doc\nasync def upload_doc_to_message(\n- self, pathlike, peer_id: int, doc_type: str = \"doc\", **params\n+ self,\n+ pathlike: typing.Union[str, BytesIO],\n+ peer_id: int,\n+ doc_type: str = \"doc\",\n+ **params\n):\nserver = await self.api.request(\n\"docs.getMessagesUploadServer\", {\"type\": doc_type, \"peer_id\": peer_id}\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/photo.py",
"new_path": "vkbottle/api/uploader/photo.py",
"diff": "import typing\nfrom .base import Uploader\n+from io import BytesIO\nclass PhotoUploader(Uploader):\n@@ -8,7 +9,7 @@ class PhotoUploader(Uploader):\nasync def upload_photo_to_album(\nself,\nalbum_id: int,\n- pathlike: typing.Union[list, typing.Any],\n+ pathlike: typing.Union[str, BytesIO],\ngroup_id: int = None,\n**params,\n) -> typing.Union[str, typing.List[str]]:\n@@ -38,7 +39,9 @@ class PhotoUploader(Uploader):\n]\nreturn photos\n- async def upload_wall_photo(self, pathlike, **params) -> typing.Union[str, dict]:\n+ async def upload_wall_photo(\n+ self, pathlike: typing.Union[str, BytesIO], **params\n+ ) -> typing.Union[str, dict]:\nserver = await self.api.request(\"photos.getWallUploadServer\", {})\nuploader = await self.upload(\nserver, {\"photo\": self.open_pathlike(pathlike)}, params\n@@ -52,7 +55,9 @@ class PhotoUploader(Uploader):\n)\nreturn photo\n- async def update_favicon(self, pathlike, group_id: int = None, **params):\n+ async def update_favicon(\n+ self, pathlike: typing.Union[str, BytesIO], group_id: int = None, **params\n+ ):\nserver = await self.api.request(\n\"photos.getOwnerPhotoUploadServer\",\n{\"owner_id\": self.get_owner_id(group_id)},\n@@ -63,7 +68,9 @@ class PhotoUploader(Uploader):\nphoto = await self.api.request(\"photos.saveOwnerPhoto\", uploader)\nreturn photo\n- async def upload_message_photo(self, pathlike, **params):\n+ async def upload_message_photo(\n+ self, pathlike: typing.Union[str, BytesIO], **params\n+ ):\nserver = await self.api.request(\"photos.getMessagesUploadServer\", params)\nuploader = await self.upload(\nserver, {\"photo\": self.open_pathlike(pathlike)}, {}\n@@ -76,14 +83,16 @@ class PhotoUploader(Uploader):\n)\nreturn photo\n- async def upload_chat_favicon(self, pathlike, chat_id: int, **params) -> str:\n+ async def upload_chat_favicon(\n+ self, pathlike: typing.Union[str, BytesIO], chat_id: int, **params\n+ ) -> str:\nserver = await self.api.request(\n\"photos.getChatUploadServer\", dict(chat_id=chat_id, **params)\n)\nuploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\nreturn uploader[\"response\"]\n- async def upload_market_photo(self, pathlike, **params):\n+ async def upload_market_photo(self, pathlike: typing.Union[str, BytesIO], **params):\nserver = await self.api.request(\"photos.getMarketUploadServer\", params)\nuploader = await self.upload(server, {\"file\": self.open_pathlike(pathlike)}, {})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"new_path": "vkbottle/framework/framework/handler/middleware/executor.py",
"diff": "@@ -28,7 +28,9 @@ class MiddlewareExecutor:\ndef export_middleware(self, middleware_list: typing.List[Middleware]):\nself.middleware.extend(middleware_list)\n- async def run_middleware(self, event: BaseModel, flag: MiddlewareFlags, *middleware_args):\n+ async def run_middleware(\n+ self, event: BaseModel, flag: MiddlewareFlags, *middleware_args\n+ ):\nfor middleware in self.middleware:\nlogger.debug(\nf\"Executing middleware {middleware.__class__.__name__} ({str(flag)})\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Added types for BytesIO
|
718,838 |
29.05.2020 09:36:24
| -10,800 |
7e1ceaad3572a17bdfda7cc381cae4ad1ebf16d1
|
v2.7.5 Fix simplified branch unpack (fix
|
[
{
"change_type": "MODIFY",
"old_path": "examples/tests/branches_types.py",
"new_path": "examples/tests/branches_types.py",
"diff": "@@ -13,8 +13,8 @@ class LovelessBranch(ClsBranch):\nreturn \"I don't love you forever\"\n-@bot.branch.simple_branch(branch_name=\"nun\")\n-async def branch_wrapper(ans: Message, word):\n+@bot.branch.simple_branch(branch_name=\"repeat\")\n+async def branch_wrapper(ans: Message, word: str):\nif ans.text.lower() in [\"exit\", \"stop\"]:\nawait ans(\"As you want to!\")\nreturn ExitBranch()\n@@ -45,5 +45,11 @@ async def loveless(ans: Message):\nreturn Branch(LovelessBranch)\n+@bot.on.message_handler(text=\"repeat <word>\")\n+async def to_nun(ans: Message, word: str):\n+ await ans(\"ok\")\n+ await bot.branch.add(ans.from_id, \"repeat\", word=word)\n+\n+\nbot.branch.add_branch(LovelessBranch)\nbot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/cls.py",
"new_path": "vkbottle/framework/framework/branch/cls.py",
"diff": "@@ -50,3 +50,6 @@ class CoroutineBranch(AbstractBranch):\nasync def branch(self, ans, *args):\nreturn await self.data[\"call\"](ans, *args, **self.context)\n+\n+ def __call__(self):\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -40,17 +40,17 @@ class DatabaseBranch(ABCBranchGenerator):\nbranch.key = branch_name\nreturn branch\n- async def from_function(\n+ def from_function(\nself, func: typing.Callable, branch_name: str = None,\n) -> AbstractBranch:\nif not asyncio.iscoroutinefunction(func):\nraise BranchError(\"Branch functions should be async\")\n- class FromFunctionDatabaseBranch(CoroutineBranch):\n- key = branch_name or func.__name__\n- data = {\"call\": func}\n+ from_function_branch = CoroutineBranch()\n+ from_function_branch.key = branch_name or func.__name__\n+ from_function_branch.data = {\"call\": func}\n- return FromFunctionDatabaseBranch\n+ return from_function_branch\ndef add_branch(\nself, branch: AbstractBranch, name: str = None, **context\n@@ -123,5 +123,5 @@ class DatabaseBranch(ABCBranchGenerator):\nawait branch.exit()\nawait self.delete_user(uid)\n- def get_current(self, *args, **kwargs):\n+ def get_current(self, *args, **kwargs) -> \"DatabaseBranch\":\nreturn self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"new_path": "vkbottle/framework/framework/handler/middleware/middleware.py",
"diff": "@@ -14,7 +14,9 @@ class Middleware(ABC):\nasync def middleware(self, event: BaseModel):\nreturn MiddlewareFlags.UNASSIGNED\n- async def emulate_middleware(self, event: BaseModel, flag: \"MiddlewareFlags\", *middleware_args):\n+ async def emulate_middleware(\n+ self, event: BaseModel, flag: \"MiddlewareFlags\", *middleware_args\n+ ):\n\"\"\" Emulate middleware based on given flag: PRE or POST\n:param event: Base executed event\n:param flag: MiddlewareFlags\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Fix simplified branch unpack (fix #117)
|
718,844 |
31.05.2020 15:53:26
| -10,800 |
cfa1356d3165a3a27736f7a3d16d7e61568ec21f
|
v2.7.5 Fix wall.edit and add audio messages uploader
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/uploader/audio.py",
"new_path": "vkbottle/api/uploader/audio.py",
"diff": "import typing\n-from .base import Uploader\nfrom io import BytesIO\n+from .base import Uploader\n+\nclass AudioUploader(Uploader):\nFILE_EXTENSIONS = [\".mp3\", \".ogg\", \".opus\"]\n@@ -23,3 +24,23 @@ class AudioUploader(Uploader):\n\"audio\", await self.api.user_id, audio[\"id\"]\n)\nreturn audio\n+\n+ async def upload_audio_message(\n+ self,\n+ pathlike: typing.Union[str, BytesIO],\n+ peer_id: int,\n+ doc_type: str = \"audio_message\",\n+ **params,\n+ ):\n+ server = await self.api.request(\n+ \"docs.getMessagesUploadServer\", {\"type\": doc_type, \"peer_id\": peer_id}\n+ )\n+ uploader = await self.upload(\n+ server, {\"file\": self.open_pathlike(pathlike)}, params\n+ )\n+ params = {**uploader, **params}\n+ doc = await self.api.request(\"docs.save\", params)\n+ if self.gas:\n+ doc = doc[doc[\"type\"]]\n+ return self.generate_attachment_string(\"doc\", doc[\"owner_id\"], doc[\"id\"])\n+ return doc\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Fix wall.edit and add audio messages uploader (#118)
|
718,838 |
31.05.2020 16:40:53
| -10,800 |
045e77170d02db86368a0e7fce591d980c1f21a2
|
v2.7.5 Added proxy support
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/proxy.py",
"diff": "+from vkbottle import Proxy, Bot\n+from vkbottle.framework.bot.templates.echo import Echo\n+import os\n+\n+proxy = Proxy(address=\"http://163.172.189.32:8811\")\n+bot = Bot(os.environ[\"token\"])\n+\n+Echo(bot).ready().run()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -6,3 +6,4 @@ from .api.keyboard import keyboard_gen\nfrom vkbottle.utils.exceptions import VKError\nfrom .api.uploader import PhotoUploader, DocUploader, AudioUploader\nfrom .const import __version__\n+from .http import Proxy\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/__init__.py",
"new_path": "vkbottle/http/__init__.py",
"diff": "from .request import HTTP, HTTPRequest\nfrom .app import App\n+from .proxy import Proxy\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/http/proxy.py",
"diff": "+from typing import Optional\n+from aiohttp import BasicAuth\n+from vkbottle.utils import ContextInstanceMixin\n+\n+class Proxy(ContextInstanceMixin):\n+ def __init__(\n+ self,\n+ address: str,\n+ login: Optional[str] = None,\n+ password: Optional[str] = None\n+ ):\n+ self.address = address\n+ self.login = login\n+ self.password = password\n+\n+ self.set_current(self)\n+\n+ def get_auth(self, encoding: str = \"latin1\") -> Optional[BasicAuth]:\n+ if self.login and self.password:\n+ return BasicAuth(login=self.login, password=self.password, encoding=encoding)\n+\n+ def get_proxy(self) -> str:\n+ return self.address\n+\n+ def __repr__(self) -> str:\n+ return f\"<Proxy {self.address}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -6,6 +6,7 @@ from aiohttp import ClientSession\nfrom vkbottle.const import VERSION_REST, __version__\nfrom vkbottle.utils import json, logger\n+from .proxy import Proxy\ndef request_decorator(func):\n@@ -45,7 +46,12 @@ class HTTPRequest:\nread_content: bool = False,\n) -> typing.Union[dict]:\nasync with client.post(\n- url, params=params or {}, ssl=ssl.SSLContext(), data=data, json=json_,\n+ url,\n+ params=params or {},\n+ ssl=ssl.SSLContext(),\n+ data=data,\n+ json=json_,\n+ **self.proxy_params,\n) as response:\nif read_content:\nreturn await response.content.read()\n@@ -62,12 +68,27 @@ class HTTPRequest:\nread_content: bool = False,\n) -> typing.Union[dict]:\nasync with client.get(\n- url, ssl=ssl.SSLContext(), data=data or None, json=json_ or None\n+ url,\n+ ssl=ssl.SSLContext(),\n+ data=data or None,\n+ json=json_ or None,\n+ **self.proxy_params,\n) as response:\nif read_content:\nreturn await response.content.read()\nreturn await response.json(content_type=content_type)\n+ @property\n+ def proxy_params(self) -> dict:\n+ if self.proxy:\n+ return {\"proxy\": self.proxy.get_proxy(),\n+ \"proxy_auth\": self.proxy.get_auth()}\n+ return {}\n+\n+ @property\n+ def proxy(self) -> Proxy:\n+ return Proxy.get_current()\n+\ndef __repr__(self):\nreturn \"<HTTPRequest>\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Added proxy support
|
718,838 |
31.05.2020 19:06:48
| -10,800 |
603749ab8a18b109b2de8d22a56187b10abf82d9
|
v2.7.5 Added carousels (move them back)
+ example :crossed_flags:
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -3,6 +3,7 @@ from .framework.framework import branch, vkscript\nfrom .types.message import Message\nfrom .utils.task import TaskManager\nfrom .api.keyboard import keyboard_gen\n+from .api.carousel import carousel_gen, CarouselEl\nfrom vkbottle.utils.exceptions import VKError\nfrom .api.uploader import PhotoUploader, DocUploader, AudioUploader\nfrom .const import __version__\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/carousel/__init__.py",
"diff": "+from .element import CarouselEl\n+from .generator import carousel_gen\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/carousel/element.py",
"diff": "+from vkbottle.utils.exceptions import TemplateError\n+from vkbottle.utils.json import json\n+import typing\n+\n+\n+class CarouselEl:\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 TemplateError(\"Buttons are required\")\n+ if not photo_id and not (title or description):\n+ raise TemplateError(\"photo_id or title is required\")\n+\n+ if isinstance(buttons, str):\n+ buttons = json.loads(buttons)\n+\n+ if isinstance(buttons, dict):\n+ buttons = buttons.get(\"buttons\")[0] # taking only first row\n+\n+ self.raw: typing.Dict = {\n+ k: v for k, v in locals().items() if v is not None and k != \"self\"\n+ }\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/carousel/generator.py",
"diff": "+from vkbottle.utils import json\n+from .element import CarouselEl\n+\n+def carousel_gen(*e: CarouselEl):\n+ \"\"\" Generates dumped carousel out of box \"\"\"\n+ return json.dumps({\"type\": \"carousel\", \"elements\": [e.raw for e in e]})\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -53,6 +53,8 @@ class Message(MessageType, GetApi):\npayload: str = None,\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n+ template: dict = None,\n+ intent: str = None,\n):\nreturn await self.__call__(\n**self.get_params(locals()), reply_to=self.get_message_id()\n@@ -78,6 +80,8 @@ class Message(MessageType, GetApi):\npayload: str = None,\ndont_parse_links: bool = None,\ndisable_mentions: bool = None,\n+ template: dict = None,\n+ intent: str = None,\n):\nif not message:\nreturn await self.api.messages.send(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/messages.py",
"new_path": "vkbottle/types/methods/messages.py",
"diff": "@@ -1072,6 +1072,8 @@ class MessagesSend(BaseMethod):\ndisable_mentions: bool = None,\nexpire_ttl: int = None,\nsilent: bool = None,\n+ template: dict = None,\n+ intent: str = None,\n) -> responses.messages.Send:\n\"\"\" messages.send\nFrom Vk Docs: Sends a message.\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/exceptions.py",
"new_path": "vkbottle/utils/exceptions.py",
"diff": "@@ -28,6 +28,10 @@ class KeyboardError(Exception):\npass\n+class TemplateError(Exception):\n+ pass\n+\n+\nclass BranchError(Exception):\npass\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Added carousels (move them back)
+ example :crossed_flags:
|
718,838 |
02.06.2020 20:08:32
| -10,800 |
4b51dbc399f2cb522e7839f0e64af74788372b78
|
v2.7.5 Fix DICT braches context dump
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -90,7 +90,7 @@ class DatabaseBranch(ABCBranchGenerator):\ndumped_context = context\n- if self.generator == GeneratorType.DATABASE:\n+ if self.__class__.generator == GeneratorType.DATABASE:\ndumped_context = json.dumps(context)\nawait self.set_user(uid, branch, dumped_context)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Fix DICT braches context dump
|
718,838 |
02.06.2020 22:15:47
| -10,800 |
f6cfbaf9a1298a47a78fe0b0f0b3fb9de1ff944b
|
v2.7.5 Minor branch generator fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/branch/database_branch.py",
"new_path": "vkbottle/framework/framework/branch/database_branch.py",
"diff": "@@ -90,7 +90,7 @@ class DatabaseBranch(ABCBranchGenerator):\ndumped_context = context\n- if self.__class__.generator == GeneratorType.DATABASE:\n+ if self.__class__.generator in [GeneratorType.DATABASE, GeneratorType.ABSTRACT]:\ndumped_context = json.dumps(context)\nawait self.set_user(uid, branch, dumped_context)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Minor branch generator fix
|
718,838 |
03.06.2020 08:13:04
| -10,800 |
e452c62ef712e2acaa10db577c7566be1a470208
|
v2.7.5 Minor storage fix; added context storage example
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/extensions/storage/context_storage.py",
"new_path": "vkbottle/framework/framework/extensions/storage/context_storage.py",
"diff": "from .abc import ABCStorage\nfrom vkbottle.utils import ContextInstanceMixin\n-import contextvars\nimport typing\n@@ -15,7 +14,8 @@ class CtxStorage(ABCStorage, ContextInstanceMixin):\ndef set(self, key: str, value: typing.Any) -> None:\ncurrent_storage = self.get_current().storage\n- self.set_current(CtxStorage({**current_storage, key: value}, True))\n+ current_storage[key] = value\n+ self.set_current(CtxStorage(current_storage, True))\ndef get(self, key: str) -> typing.Any:\nreturn self.get_current().storage.get(key)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Minor storage fix; added context storage example
|
718,838 |
04.06.2020 18:16:58
| -10,800 |
4f4097b6f5bf3d977a4a255ca976da16463d3962
|
v2.7.5 Improve vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/base_converter.py",
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "@@ -31,6 +31,10 @@ class Converter:\n\"\"\" Translate function to VKScript \"\"\"\nsource = getsource(func)\ncode = ast.parse(source).body[0]\n+ args = [a.arg for a in code.args.args]\n+ args.pop(0)\n+ if any(v not in values.values() for v in args):\n+ raise ConverterError(\"All values should be passed to func. Predefined kwargs are not allowed\")\nvalues_assignments = [f\"var {k}={v};\" for k, v in values.items()]\nreturn \"\".join(values_assignments) + \"\".join(\nself.find_definition(line) for line in code.body\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -6,7 +6,7 @@ from vkbottle.utils import random_string\nCALL_REPLACEMENTS = {\n\"append\": \"push\",\n}\n-CALL_STRING = [\"join\", \"strip\"]\n+CALL_STRING = [\"join\", \"strip\", \"split\"]\nconverter = Converter()\nfind = converter.find_definition\n@@ -156,7 +156,8 @@ def for_cycle(d: ast.For):\n@converter(ast.If)\ndef if_statement(d: ast.If):\nreturn (\n- \"if(\" + find(d.test) + \"){\" + find(d.body) + \"}else{\" + find(d.orelse)\n+ \"if(\" + find(d.test) + \"){\" + \"\".join(find(li) + \";\" for li in d.body) + \"}else{\" +\n+ (find(d.orelse) if len(d.orelse) else \"\")\nor \"\" + \"};\"\n)\n@@ -185,7 +186,9 @@ def call(d: ast.Call):\nelif calls and calls[0] in CALL_REPLACEMENTS:\nargs = \",\".join(find(arg) for arg in d.args)\nreturn find(d.func.value) + \".\" + CALL_REPLACEMENTS[calls[0]] + \"(\" + args + \")\"\n- raise ConverterError(f\"Call for {d.func.id} is not referenced\")\n+ elif calls[0] in CALL_STRING:\n+ return find(func) + \".\" + calls[0] + \"(\" + find(d.args[0]) + \")\"\n+ raise ConverterError(f\"Call for {getattr(d.func, 'attr', d.func.__dict__)} is not referenced\")\n@converter(ast.Pass)\n@@ -288,6 +291,11 @@ def formatted_value(d: ast.FormattedValue):\nreturn find(d.value)\n+@converter(ast.List)\n+def list_type(d: ast.List):\n+ return \"[\" \",\".join(find(a) for a in d.elts) + \"]\"\n+\n+\n@converter(ast.NameConstant)\ndef name_constant_type(d: ast.NameConstant):\nconsts = {True: \"true\", False: \"false\", None: \"null\"}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Improve vkscript converter
|
718,838 |
04.06.2020 19:42:06
| -10,800 |
9f3ab397f40dc83f0680da00724e78e72da26043
|
v2.7.5 Hotfix kwargs check in converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/base_converter.py",
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "@@ -33,7 +33,7 @@ class Converter:\ncode = ast.parse(source).body[0]\nargs = [a.arg for a in code.args.args]\nargs.pop(0)\n- if any(v not in values.values() for v in args):\n+ if any(v not in values for v in args):\nraise ConverterError(\"All values should be passed to func. Predefined kwargs are not allowed\")\nvalues_assignments = [f\"var {k}={v};\" for k, v in values.items()]\nreturn \"\".join(values_assignments) + \"\".join(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Hotfix kwargs check in converter
|
718,838 |
04.06.2020 19:51:55
| -10,800 |
30f57f416b2a41c902ed623c3b464fde309e824e
|
v2.7.5 Hotfix if_statement vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -157,8 +157,8 @@ def for_cycle(d: ast.For):\ndef if_statement(d: ast.If):\nreturn (\n\"if(\" + find(d.test) + \"){\" + \"\".join(find(li) + \";\" for li in d.body) + \"}else{\" +\n- (find(d.orelse) if len(d.orelse) else \"\")\n- or \"\" + \"};\"\n+ (find(d.orelse) if len(d.orelse) else \"\") +\n+ \"};\"\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Hotfix if_statement vkscript converter
|
718,838 |
04.06.2020 20:44:44
| -10,800 |
b060decb2bb13cb506963b757539917107a7a1eb
|
v2.7.5 Converter improvements
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -156,7 +156,7 @@ def for_cycle(d: ast.For):\n@converter(ast.If)\ndef if_statement(d: ast.If):\nreturn (\n- \"if(\" + find(d.test) + \"){\" + \"\".join(find(li) + \";\" for li in d.body) + \"}else{\" +\n+ \"if(\" + find(d.test) + \"){\" + \"\".join(find(li) for li in d.body) + \"}else{\" +\n(find(d.orelse) if len(d.orelse) else \"\") +\n\"};\"\n)\n@@ -265,12 +265,6 @@ def dict_type(d: ast.Dict):\nreturn \"{\" + dict_s + \"}\"\n-@converter(ast.List)\n-@converter(ast.Tuple)\n-def list_type(d: typing.Union[ast.List, ast.Tuple]):\n- return \"[\" + \",\".join(find(elt) for elt in d.elts) + \"]\"\n-\n-\n@converter(ast.Num)\ndef num_type(d: ast.Num):\nreturn str(d.n)\n@@ -292,8 +286,9 @@ def formatted_value(d: ast.FormattedValue):\n@converter(ast.List)\n+@converter(ast.Tuple)\ndef list_type(d: ast.List):\n- return \"[\" \",\".join(find(a) for a in d.elts) + \"]\"\n+ return \"[\" + \",\".join(find(a) for a in d.elts) + \"]\"\n@converter(ast.NameConstant)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Converter improvements
|
718,838 |
04.06.2020 22:05:12
| -10,800 |
f19e8e898ea5b8e9895f32063e407651486b9217
|
v2.7.5 Fix else in statements unpack for vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/definitions.py",
"new_path": "vkbottle/framework/framework/execute/definitions.py",
"diff": "@@ -157,7 +157,7 @@ def for_cycle(d: ast.For):\ndef if_statement(d: ast.If):\nreturn (\n\"if(\" + find(d.test) + \"){\" + \"\".join(find(li) for li in d.body) + \"}else{\" +\n- (find(d.orelse) if len(d.orelse) else \"\") +\n+ (\"\".join(find(e) for e in d.orelse) if len(d.orelse) else \"\") +\n\"};\"\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Fix else in statements unpack for vkscript converter
|
718,838 |
05.06.2020 11:33:00
| -10,800 |
af477107de76c2276b52585de19adf8aa3b81070
|
v2.7.5 Converter values_assignments fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/execute/base_converter.py",
"new_path": "vkbottle/framework/framework/execute/base_converter.py",
"diff": "@@ -35,7 +35,7 @@ class Converter:\nargs.pop(0)\nif any(v not in values for v in args):\nraise ConverterError(\"All values should be passed to func. Predefined kwargs are not allowed\")\n- values_assignments = [f\"var {k}={v};\" for k, v in values.items()]\n+ values_assignments = [f\"var {k}={v!r};\" for k, v in values.items()]\nreturn \"\".join(values_assignments) + \"\".join(\nself.find_definition(line) for line in code.body\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Converter values_assignments fix
|
718,865 |
11.06.2020 23:48:33
| 18,000 |
36f0aa9e403001ba7ed852891b3a376f0e29463d
|
v2.7.5 New audio message transcription method
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/messages.py",
"new_path": "vkbottle/types/methods/messages.py",
"diff": "@@ -1225,6 +1225,33 @@ class MessagesUnpin(BaseMethod):\n)\n+class MessagesRecognizeAudioMessage(BaseMethod):\n+ kwargs: dict = {}\n+ access_token_type: APIAccessibility = [\n+ APIAccessibility.USER\n+ ]\n+\n+ async def __call__(\n+ self, audio_message_id: str, message_id: int\n+ ) -> responses.ok_response.OkResponse:\n+ \"\"\" messages.recogniseAudioMessage\n+ Hidden method:\n+ :param audio_message_id: {owner_id}_{doc_id}\n+ :param message_id:\n+ \"\"\"\n+\n+ params = {\n+ k if not k.endswith(\"_\") else k[:-1]: v\n+ for k, v in {**locals(), **self.kwargs}.items()\n+ if k not in [\"self\"] and v is not None\n+ }\n+ return await self.request(\n+ \"messages.recogniseAudioMessage\",\n+ params,\n+ response_model=responses.ok_response.OkResponseModel\n+ )\n+\n+\nclass Messages:\ndef __init__(self, request):\nself.add_chat_user = MessagesAddChatUser(request)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 New audio message transcription method (#127)
|
718,889 |
12.06.2020 09:58:09
| -18,000 |
5f1508a0c5ecfbedda196f61eb97a79c1f742845
|
v2.7.5 New message fields transcript_state and transcript
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -25,6 +25,8 @@ class AudioMessage(BaseModel):\nlink_mp3: str = None\nlink_ogg: str = None\nowner_id: int = None\n+ transcript: str = None\n+ transcript_state: str = None\nwaveform: typing.List[int] = None\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 New message fields transcript_state and transcript (#124)
|
718,889 |
12.06.2020 11:57:12
| -18,000 |
815b8c259b386d21c2b8d4e49ff51af70ba72ab5
|
v2.7.5 audio message recognition method
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/methods/messages.py",
"new_path": "vkbottle/types/methods/messages.py",
"diff": "@@ -1297,3 +1297,4 @@ class Messages:\nself.set_activity = MessagesSetActivity(request)\nself.set_chat_photo = MessagesSetChatPhoto(request)\nself.unpin = MessagesUnpin(request)\n+ self.recognize_audio_message = MessagesRecognizeAudioMessage(request)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 audio message recognition method (#128)
|
718,889 |
15.06.2020 18:18:30
| -18,000 |
1c42b3a4a5a12ca53102d3365d92118d959cbdbf
|
v2.7.5 Rules queue
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/framework/handler/message.py",
"new_path": "vkbottle/framework/framework/handler/message.py",
"diff": "@@ -110,14 +110,16 @@ class ABCMessageHandler(ABC):\n:param pattern: any regex pattern pattern. {} means text which will be formatted\n:return: True\n\"\"\"\n- current: typing.List[AbstractRule] = list(rules)\n- current.extend(self._col_rules(**col_rules))\n+ current: typing.List[AbstractRule] = []\nif text:\ncurrent.append(\nself._text_rule(func, text, lower, command, pattern or \"{}$\")\n)\n+ current.extend(rules)\n+ current.extend(self._col_rules(**col_rules))\n+\nself.add_rules(current, func)\ndef rule(self, *rules):\n@@ -151,12 +153,14 @@ class ABCMessageHandler(ABC):\n\"\"\"\ndef decorator(func):\n- current: typing.List[AbstractRule] = list(rules)\n- current.extend(self._col_rules(**col_rules))\n+ current: typing.List[AbstractRule] = []\nif text:\ncurrent.append(self._text_rule(func, text, lower, command, \"{}$\"))\n+ current.extend(rules)\n+ current.extend(self._col_rules(**col_rules))\n+\nself.add_rules(current, func)\nreturn func\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
v2.7.5 Rules queue (#133)
|
718,889 |
19.06.2020 01:40:05
| -18,000 |
5d8fd8909398e0f36acefbbaf6ec7f624585f07d
|
Call attachment
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/objects/messages.py",
"new_path": "vkbottle/types/objects/messages.py",
"diff": "@@ -30,6 +30,15 @@ class AudioMessage(BaseModel):\nwaveform: typing.List[int] = None\n+class Call(BaseModel):\n+ initiator_id: int = None\n+ receiver_id: int = None\n+ state: str = None\n+ time: int = None\n+ duration: int = None\n+ video: bool = None\n+\n+\nclass Chat(BaseModel):\nadmin_id: int = None\nid: int = None\n@@ -293,6 +302,7 @@ class MessageActionStatus(Enum):\nclass MessageAttachment(BaseModel):\naudio: \"audio.Audio\" = None\naudio_message: \"AudioMessage\" = None\n+ call: \"Call\" = None\ndoc: \"docs.Doc\" = None\npoll: \"polls.Poll\" = None\ngift: \"gifts.Layout\" = None\n@@ -313,6 +323,7 @@ class MessageAttachmentType(Enum):\nphoto = \"photo\"\naudio = \"audio\"\nvideo = \"video\"\n+ call = \"call\"\ndoc = \"doc\"\nlink = \"link\"\npoll = \"poll\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Call attachment (#140)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.